@react-shimeji/core 0.3.2 → 0.3.4

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,13 @@ function environmentRectangle(bounds) {
 }
 var PLATFORM_NEARBY_DISTANCE = 400;
 var PLATFORM_EDGE_TOLERANCE = 2;
+var MASCOT_HITBOX_MAX_WIDTH = 32;
+var MASCOT_HITBOX_MAX_HEIGHT = 64;
+var MASCOT_COLLISION_LOOKAHEAD = 4;
+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);
@@ -1653,7 +1669,7 @@ var Mascot = class {
   random;
   forceInitialFall;
   /** Advances behavior, animation, physics, and rendering by one clock tick. */
-  tick(deltaMs, bounds, platforms = []) {
+  tick(deltaMs, bounds, platforms = [], siblings = []) {
     if (this.destroyed) return;
     this.platforms = platforms;
     try {
@@ -1661,7 +1677,7 @@ var Mascot = class {
       this.accumulatedMs += Math.max(0, deltaMs);
       while (this.accumulatedMs >= this.frameDuration && !this.destroyed) {
         this.accumulatedMs -= this.frameDuration;
-        this.legacyTick(bounds, platforms);
+        this.legacyTick(bounds, platforms, siblings);
       }
     } catch (error) {
       this.callbacks.error(error instanceof Error ? error : new Error(String(error)));
@@ -1674,6 +1690,24 @@ var Mascot = class {
   snapshot() {
     return { ...this.state };
   }
+  /** Returns the mascot's compact, feet-aligned behavioral collision box. */
+  collisionBox() {
+    const sprite = this.spec.sprites[this.state.sprite];
+    const spriteWidth = typeof sprite === "object" && sprite.width !== void 0 ? sprite.width : 128;
+    const spriteHeight = typeof sprite === "object" && sprite.height !== void 0 ? sprite.height : 128;
+    const width = Math.min(spriteWidth, MASCOT_HITBOX_MAX_WIDTH);
+    const height = Math.min(spriteHeight, MASCOT_HITBOX_MAX_HEIGHT);
+    const anchorX = this.state.lookRight ? spriteWidth - this.state.anchorX : this.state.anchorX;
+    const visualLeft = this.state.x - anchorX;
+    const visualTop = this.state.y - this.state.anchorY;
+    return {
+      id: this.id,
+      x: visualLeft + (spriteWidth - width) / 2,
+      y: visualTop + spriteHeight - height,
+      width,
+      height
+    };
+  }
   /** Removes listeners, DOM nodes, and object URLs owned by this mascot. */
   destroy() {
     if (this.destroyed) return;
@@ -1702,11 +1736,13 @@ var Mascot = class {
       if (!this.startBehavior(this.createEnvironment(bounds, platforms), bounds, platforms)) return;
     }
   }
-  legacyTick(bounds, platforms) {
+  legacyTick(bounds, platforms, siblings) {
     this.ensureBehavior(bounds, platforms, false);
     if (!this.currentBehavior) return;
+    const previous = { x: this.state.x, y: this.state.y };
     const result = this.actions.step(this.createEnvironment(bounds, platforms), bounds, platforms);
     if (this.destroyed) return;
+    this.avoidSiblingCollision(previous, bounds, platforms, siblings);
     if (result === "lost-ground") {
       this.state.dragging = false;
       this.actions.cancel();
@@ -1724,6 +1760,31 @@ var Mascot = class {
       if (this.currentBehavior) this.startBehavior(this.createEnvironment(bounds, platforms), bounds, platforms);
     }
   }
+  avoidSiblingCollision(previous, bounds, platforms, siblings) {
+    const dx = this.state.x - previous.x;
+    if (this.state.dragging || dx === 0 || this.state.y !== previous.y) return;
+    const onHorizontalSurface = isOnFloor(previous, bounds, platforms) || isOnTop(previous, bounds) || platforms.some((platform) => isOnBottom(previous, platform));
+    if (!onHorizontalSurface) return;
+    const currentBox = this.collisionBox();
+    const offsetX = currentBox.x - this.state.x;
+    const previousBox = { ...currentBox, x: previous.x + offsetX };
+    const movingRight = dx > 0;
+    const sweptLeft = Math.min(previousBox.x, currentBox.x) - (movingRight ? 0 : MASCOT_COLLISION_LOOKAHEAD);
+    const sweptRight = Math.max(previousBox.x + previousBox.width, currentBox.x + currentBox.width) + (movingRight ? MASCOT_COLLISION_LOOKAHEAD : 0);
+    const previousCenterX = previousBox.x + previousBox.width / 2;
+    const collision = siblings.some((sibling) => {
+      if (sibling.id === this.id) return false;
+      const siblingCenterX = sibling.x + sibling.width / 2;
+      const isAhead = movingRight ? siblingCenterX >= previousCenterX : siblingCenterX <= previousCenterX;
+      const overlapsVertically = currentBox.y < sibling.y + sibling.height && sibling.y < currentBox.y + currentBox.height;
+      const crossesHorizontally = sweptLeft <= sibling.x + sibling.width && sibling.x <= sweptRight;
+      return isAhead && overlapsVertically && crossesHorizontally;
+    });
+    if (!collision) return;
+    this.state.x = previous.x;
+    this.state.vx = 0;
+    this.state.lookRight = !this.state.lookRight;
+  }
   isOutsideVisibleBounds(bounds) {
     const sprite = this.spec.sprites[this.state.sprite];
     const width = typeof sprite === "object" && "width" in sprite && sprite.width !== void 0 ? sprite.width : 128;
@@ -1760,7 +1821,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;
@@ -2143,7 +2206,9 @@ var ShimejiEngine = class {
     this.lastFrameTime = timestamp;
     const delta = Math.max(0, Math.min(rawDelta, this.options.maxDeltaTime));
     const { bounds, platforms } = this.readFrameGeometry();
-    for (const mascot of [...this.mascots.values()]) mascot.tick(delta, bounds, platforms);
+    const mascots = [...this.mascots.values()];
+    const collisionBoxes = mascots.map((mascot) => mascot.collisionBox());
+    for (const mascot of mascots) mascot.tick(delta, bounds, platforms, collisionBoxes);
     this.emitState();
     this.animationFrame = this.container.ownerDocument.defaultView?.requestAnimationFrame(this.onAnimationFrame);
   };