@react-shimeji/core 0.3.1 → 0.3.3

package/dist/index.d.cts

@@ -422,11 +422,14 @@ declare class BehaviorController {
     selectInitial(environment: MascotEnvironment, requestedName?: string): BehaviorDefinition | undefined;
     /** Selects the weighted transition following the current behavior. */
     selectNext(environment: MascotEnvironment): BehaviorDefinition | undefined;
+    /** Tries a weighted transition from a subset without changing history when none applies. */
+    trySelectNext(environment: MascotEnvironment, predicate: (behavior: BehaviorDefinition) => boolean): BehaviorDefinition | undefined;
     /** Whether the most recent transition had no effective weighted candidate. */
     usedFallback(): boolean;
     /** Replaces selection history so an external interaction can force a behavior. */
     force(name: string): BehaviorDefinition | undefined;
     private choose;
+    private nextPool;
     private resolve;
     private findFallBehavior;
 }

package/dist/index.d.ts

@@ -422,11 +422,14 @@ declare class BehaviorController {
     selectInitial(environment: MascotEnvironment, requestedName?: string): BehaviorDefinition | undefined;
     /** Selects the weighted transition following the current behavior. */
     selectNext(environment: MascotEnvironment): BehaviorDefinition | undefined;
+    /** Tries a weighted transition from a subset without changing history when none applies. */
+    trySelectNext(environment: MascotEnvironment, predicate: (behavior: BehaviorDefinition) => boolean): BehaviorDefinition | undefined;
     /** Whether the most recent transition had no effective weighted candidate. */
     usedFallback(): boolean;
     /** Replaces selection history so an external interaction can force a behavior. */
     force(name: string): BehaviorDefinition | undefined;
     private choose;
+    private nextPool;
     private resolve;
     private findFallBehavior;
 }

package/dist/index.js

@@ -615,12 +615,17 @@ var BehaviorController = class {
   }
   /** Selects the weighted transition following the current behavior. */
   selectNext(environment) {
-    const next = this.previous?.nextBehaviors ?? [];
-    const pool = this.previous && this.previous.nextAdditive === false ? next : [...this.spec.behaviors, ...next];
-    const selected = this.choose(pool, environment);
+    const selected = this.choose(this.nextPool(), environment);
     this.fallbackSelected = selected === void 0;
     return this.previous = selected ?? this.findFallBehavior();
   }
+  /** Tries a weighted transition from a subset without changing history when none applies. */
+  trySelectNext(environment, predicate) {
+    const selected = this.choose(this.nextPool().filter(predicate), environment);
+    if (!selected) return void 0;
+    this.fallbackSelected = false;
+    return this.previous = selected;
+  }
   /** Whether the most recent transition had no effective weighted candidate. */
   usedFallback() {
     return this.fallbackSelected;
@@ -636,6 +641,10 @@ var BehaviorController = class {
     const chosen = selectWeighted(applicable, (behavior) => behavior.frequency, this.random);
     return chosen ? this.resolve(chosen) : void 0;
   }
+  nextPool() {
+    const next = this.previous?.nextBehaviors ?? [];
+    return this.previous && this.previous.nextAdditive === false ? next : [...this.spec.behaviors, ...next];
+  }
   resolve(behavior) {
     if (behavior.type !== "Reference") return behavior;
     const target = this.spec.behaviors.find((candidate) => candidate.type === "Behavior" && candidate.name === behavior.name);
@@ -1590,6 +1599,11 @@ function environmentRectangle(bounds) {
   };
 }
 var PLATFORM_NEARBY_DISTANCE = 400;
+var PLATFORM_EDGE_TOLERANCE = 2;
+var IE_BEHAVIOR_NAME_PATTERN = /wall|climb|crawl|壁|登|よじ/i;
+function isIEBehavior(behavior) {
+  return behavior.conditions.some((condition) => /activeIE/i.test(condition)) || behavior.name.includes("IE") || behavior.name.includes("\uFF29\uFF25") || IE_BEHAVIOR_NAME_PATTERN.test(behavior.name) || behavior.actionName !== void 0 && (behavior.actionName.includes("IE") || behavior.actionName.includes("\uFF29\uFF25") || IE_BEHAVIOR_NAME_PATTERN.test(behavior.actionName));
+}
 function distanceToRectangle(point, rectangle) {
   const dx = Math.max(rectangle.x - point.x, 0, point.x - rectangle.x - rectangle.width);
   const dy = Math.max(rectangle.y - point.y, 0, point.y - rectangle.y - rectangle.height);
@@ -1709,7 +1723,7 @@ var Mascot = class {
     if (result === "lost-ground") {
       this.state.dragging = false;
       this.actions.cancel();
-      this.currentBehavior = this.findFallBehavior();
+      this.currentBehavior = this.selectEdgeBehavior(bounds, platforms);
       if (this.currentBehavior) this.startBehavior(this.createEnvironment(bounds, platforms), bounds, platforms);
     } else if (result === "complete") {
       this.currentBehavior = this.selectNextBehavior(this.createEnvironment(bounds, platforms), bounds);
@@ -1735,14 +1749,39 @@ var Mascot = class {
   findFallBehavior() {
     return this.behavior.force("Fall") ?? this.behavior.force("\u843D\u4E0B\u3059\u308B");
   }
-  selectNextBehavior(environment, bounds) {
+  selectNextBehavior(environment, bounds, relocateOnFallback = true) {
     const selected = this.behavior.selectNext(environment);
-    if (this.behavior.usedFallback()) {
+    if (relocateOnFallback && this.behavior.usedFallback()) {
       this.state.x = Math.trunc(bounds.x + this.random() * bounds.width);
       this.state.y = bounds.y - 256;
     }
     return selected;
   }
+  selectEdgeBehavior(bounds, platforms) {
+    const original = { x: this.state.x, y: this.state.y };
+    const platform = platforms.find((candidate) => candidate.element === this.activePlatformElement);
+    if (platform) {
+      const left = platform.x;
+      const right = platform.x + platform.width;
+      const top = platform.y;
+      const bottom = platform.y + platform.height;
+      if (Math.abs(this.state.y - top) <= PLATFORM_EDGE_TOLERANCE || Math.abs(this.state.y - bottom) <= PLATFORM_EDGE_TOLERANCE) {
+        if (this.state.x < left) this.state.x = left;
+        else if (this.state.x > right) this.state.x = right;
+      } else if (Math.abs(this.state.x - left) <= PLATFORM_EDGE_TOLERANCE || Math.abs(this.state.x - right) <= PLATFORM_EDGE_TOLERANCE) {
+        if (this.state.y < top) this.state.y = top;
+        else if (this.state.y > bottom) this.state.y = bottom;
+      }
+    }
+    const environment = this.createEnvironment(bounds, platforms);
+    const interruptedBehavior = this.currentBehavior;
+    const selected = this.behavior.trySelectNext(environment, (candidate) => candidate.name !== interruptedBehavior?.name && isIEBehavior(candidate)) ?? this.selectNextBehavior(environment, bounds, false);
+    if (this.behavior.usedFallback() || selected?.name === "Fall" || selected?.name === "\u843D\u4E0B\u3059\u308B") {
+      this.state.x = original.x;
+      this.state.y = original.y;
+    }
+    return selected ?? this.findFallBehavior();
+  }
   createEnvironment(bounds, platforms = this.platforms) {
     const workArea = environmentRectangle(bounds);
     const inactive = environmentRectangle({ x: -100, y: -100, width: 0, height: 0 });
@@ -1773,7 +1812,7 @@ var Mascot = class {
     }
     const anchor = this.state;
     const current = platforms.find((platform) => platform.element === this.activePlatformElement);
-    if (current && (isOnTop(anchor, current, 2) || isOnBottom(anchor, current, 2) || isOnLeft(anchor, current, 2) || isOnRight(anchor, current, 2))) return current;
+    if (current && (isOnTop(anchor, current, PLATFORM_EDGE_TOLERANCE) || isOnBottom(anchor, current, PLATFORM_EDGE_TOLERANCE) || isOnLeft(anchor, current, PLATFORM_EDGE_TOLERANCE) || isOnRight(anchor, current, PLATFORM_EDGE_TOLERANCE))) return current;
     if (this.state.vy >= 0) {
       const landingPlatform = platforms.filter((platform) => anchor.x >= platform.x && anchor.x <= platform.x + platform.width && platform.y >= anchor.y - 1).sort((left, right) => left.y - right.y)[0];
       if (landingPlatform) {