Add clone shenanigans

src/aac/lhw/m1s/Clones.tsx

@@ -27,7 +27,9 @@ export const BlackCatClones = () => {
         {
           jumpSide: pickOne(["Left", "Right"] as const),
           storeLocation: storeLocs[1],
-        }
+        },
+        pickOne([true, false]),
+        pickOne([true, false])
       );
     },
     () =>

src/aac/lhw/m1s/getJumpLocation.ts

@@ -2,4 +2,4 @@ import { Point } from "@flatten-js/core";
 
 export const getJumpLocation = (position: Point, rotation: number, jumpSide: "Left" | "Right") => position
 .translate(0, jumpSide === "Left" ? -0.25 : 0.25)
-.rotate((Math.PI * rotation) / 180, position);
+    .rotate(-(Math.PI * rotation) / 180, position);

src/aac/lhw/m1s/jumpingOneTwoPaw.tsx

@@ -17,6 +17,7 @@ import {
 } from "../../../gamestate/Mechanics/DangerPuddles";
 import jumpLocPng from "./JumpLocation.png";
 import { Tether } from "../../../components/standard-mechanic-elements/Tether";
+import { getJumpLocation } from "./getJumpLocation";
 
 const finalPositionMechanic = (
   position: Point,
@@ -41,9 +42,7 @@ export const jumpingOneTwoPaw = (
   instant?: boolean
 ): Mechanic<Player> => {
   const rot = rotation + (side === "Left" ? 0 : 180);
-  const jumpLocation = position
-    .translate(0, jumpSide === "Left" ? 0.25 : -0.25)
-    .rotate((Math.PI * rotation) / 180, position);
+  const jumpLocation = getJumpLocation(position, rotation, jumpSide);
   if (instant) {
     return oneTwoPawHit1(side, jumpLocation, rotation, character, nextMechanic);
   }

src/aac/lhw/m1s/jumpingQuadrupleCrossing.tsx

@@ -106,6 +106,7 @@ export const jumpingQuadrupleCrossing = (
   character: (position: Point, rotation: number) => React.ReactElement
 ): Mechanic<Player> => {
   const jumpLocation = getJumpLocation(position, rotation, jumpSide);
+
   return {
     applyDamage: () => ZeroDamage,
     display: () => (
@@ -158,7 +159,7 @@ const jumpingQuadrupleCrossingBait1 = (
     .sort((p1, p2) => distanceTo(position, p1) - distanceTo(position, p2))
     .slice(0, 4)
     .map((p) =>
-      vector(position, position.translate(0, 1)).angleTo(vector(position, p))
+      vector(1, 0).angleTo(vector(p.x - position.x, p.y - position.y))
     );
 
   return sequence2(
@@ -199,9 +200,7 @@ const jumpingQuadrupleCrossingBait2 = (
     .map((p) => p.position)
     .sort((p1, p2) => distanceTo(position, p1) - distanceTo(position, p2))
     .slice(0, 4)
-    .map((p) =>
-      vector(position, position.translate(0, 1)).angleTo(vector(position, p))
-    );
+    .map((p) => vector(0, 1).angleTo(vector(position, p)));
 
   return sequence2(
     withSafeSpot(

src/aac/lhw/m1s/shenanigans/jump1.tsx

@@ -12,7 +12,9 @@ export const shenanigans1Jump = (
   jump2: {
     jumpSide: "Left" | "Right";
     storeLocation: "North" | "South";
-  }
+  },
+  tearFirst: boolean,
+  nailchipperDpsFirst: boolean
 ) => {
   return jumpingOneTwoPaw(
     jump1.jumpSide,
@@ -21,6 +23,14 @@ export const shenanigans1Jump = (
     90,
     (pos, rot) => <BlackCat position={pos} rotation={rot} />,
     (p) =>
-      shenanigansStore1(jump1.jumpSide, jump1.swipeSide, jump1.storeLocation, p, jump2)
+      shenanigansStore1(
+        jump1.jumpSide,
+        jump1.swipeSide,
+        jump1.storeLocation,
+        p,
+        jump2,
+        tearFirst,
+        nailchipperDpsFirst
+      )
   );
 };

src/aac/lhw/m1s/shenanigans/jump2.tsx

@@ -23,9 +23,11 @@ export const shenanigansJump2 = (
   jump2: {
     jumpSide: "Left" | "Right";
     storeLocation: "North" | "South";
-  }
+  },
+  tearFirst: boolean,
+  nailchipperDpsFirst: boolean
 ): Mechanic<Player> => {
-  const bossRot = store1.jumpSide === "Left" ? 180 : 0;
+  const bossRot = store1.jumpSide === "Left" ? 0 : 180;
 
   return sequence2(
     withBackgroundMechanic(
@@ -43,7 +45,9 @@ export const shenanigansJump2 = (
       shenanigansStore2(
         jump2.jumpSide,
         getJumpLocation(bossPosition, bossRot, jump2.jumpSide),
-        store1
+        store1,
+        tearFirst,
+        nailchipperDpsFirst
       )
   );
 };