@react-shimeji/core 0.3.2 → 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);
@@ -1591,6 +1600,10 @@ 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);
@@ -1760,7 +1773,9 @@ var Mascot = class {
         else if (this.state.y > bottom) this.state.y = bottom;
       }
     }
-    const selected = this.selectNextBehavior(this.createEnvironment(bounds, platforms), bounds, false);
+    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;