@react-shimeji/core 0.3.1 → 0.3.2

package/dist/index.cjs

@@ -1637,6 +1637,7 @@ function environmentRectangle(bounds) {
   };
 }
 var PLATFORM_NEARBY_DISTANCE = 400;
+var PLATFORM_EDGE_TOLERANCE = 2;
 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);
@@ -1756,7 +1757,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);
@@ -1782,14 +1783,37 @@ 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 selected = this.selectNextBehavior(this.createEnvironment(bounds, platforms), 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 });
@@ -1820,7 +1844,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) {