Reworked States

Added a Stand state used for grazing with the horses. Now they eat facing either direction. Also reworked states to slow them down a bit and emphasize grazing. Wowee!
tonybaloney · Jun 3, 2024 · 3f11edc · 3f11edc
1 parent 923e433
commit 3f11edc
Show file tree

Hide file tree

Showing 26 changed files with 78 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -66,7 +66,7 @@ The forest theme was designed by [edermunizz](https://edermunizz.itch.io/free-pi
 
 The turtle animations were designed by enkeefe using [Pixelart](https://www.pixilart.com/draw).
 
-The tiny-horse animations were adapted by [Chris Kent](https://github.com/thechriskent) from assets by [Onfe](https://onfe.itch.io/horse-sprite-with-rider-asset-pack). 
+The horse animations were adapted by [Chris Kent](https://github.com/thechriskent) from assets by [Onfe](https://onfe.itch.io/horse-sprite-with-rider-asset-pack). 
 
 ## Thank you
 

diff --git a/media/horse/black_idle_8fps.gif b/media/horse/black_idle_8fps.gif
diff --git a/media/horse/black_stand_8fps.gif b/media/horse/black_stand_8fps.gif
diff --git a/media/horse/brown_idle_8fps.gif b/media/horse/brown_idle_8fps.gif
diff --git a/media/horse/brown_stand_8fps.gif b/media/horse/brown_stand_8fps.gif
diff --git a/media/horse/magical_idle_8fps.gif b/media/horse/magical_idle_8fps.gif
diff --git a/media/horse/magical_stand_8fps.gif b/media/horse/magical_stand_8fps.gif
diff --git a/media/horse/paint_beige_idle_8fps.gif b/media/horse/paint_beige_idle_8fps.gif
diff --git a/media/horse/paint_beige_stand_8fps.gif b/media/horse/paint_beige_stand_8fps.gif
diff --git a/media/horse/paint_black_idle_8fps.gif b/media/horse/paint_black_idle_8fps.gif
diff --git a/media/horse/paint_black_stand_8fps.gif b/media/horse/paint_black_stand_8fps.gif
diff --git a/media/horse/paint_brown_idle_8fps.gif b/media/horse/paint_brown_idle_8fps.gif
diff --git a/media/horse/paint_brown_stand_8fps.gif b/media/horse/paint_brown_stand_8fps.gif
diff --git a/media/horse/socks_beige_idle_8fps.gif b/media/horse/socks_beige_idle_8fps.gif
diff --git a/media/horse/socks_beige_stand_8fps.gif b/media/horse/socks_beige_stand_8fps.gif
diff --git a/media/horse/socks_black_idle_8fps.gif b/media/horse/socks_black_idle_8fps.gif
diff --git a/media/horse/socks_black_stand_8fps.gif b/media/horse/socks_black_stand_8fps.gif
diff --git a/media/horse/socks_brown_idle_8fps.gif b/media/horse/socks_brown_idle_8fps.gif
diff --git a/media/horse/socks_brown_stand_8fps.gif b/media/horse/socks_brown_stand_8fps.gif
diff --git a/media/horse/warrior_idle_8fps.gif b/media/horse/warrior_idle_8fps.gif
diff --git a/media/horse/warrior_stand_8fps.gif b/media/horse/warrior_stand_8fps.gif
diff --git a/media/horse/white_idle_8fps.gif b/media/horse/white_idle_8fps.gif
diff --git a/media/horse/white_stand_8fps.gif b/media/horse/white_stand_8fps.gif
diff --git a/src/panel/pets/horse.ts b/src/panel/pets/horse.ts
@@ -51,47 +51,84 @@ export class Horse extends BasePetType {
         PetColor.warrior,
     ];
     sequence = {
-        startingState: States.sitIdle,
+        startingState: States.standRight,
         sequenceStates: [
             {
                 state: States.sitIdle,
-                possibleNextStates: [States.walkRight, States.runRight],
+                // Only on first adding the horse
+                possibleNextStates: [States.walkRight],
+            },
+            {
+                state: States.standRight,
+                // Can start walking either direction (twice as likely to keep going right), or just keep on eating
+                possibleNextStates: [
+                    States.walkRight,
+                    States.walkRight,
+                    States.walkLeft,
+                    States.standRight,
+                ],
+            },
+            {
+                state: States.standLeft,
+                // Can start walking either direction (twice as likely to keep going left), or just keep on eating
+                possibleNextStates: [
+                    States.walkRight,
+                    States.walkLeft,
+                    States.walkLeft,
+                    States.standLeft,
+                ],
             },
             {
                 state: States.walkRight,
-                possibleNextStates: [States.walkLeft, States.runLeft],
+                // Can switch directions, start running the same direction, or start eating (twice as likely)
+                possibleNextStates: [
+                    States.walkLeft,
+                    States.runRight,
+                    States.standRight,
+                    States.standRight,
+                ],
             },
             {
                 state: States.runRight,
-                possibleNextStates: [States.walkLeft, States.runLeft],
+                // Can switch directions or slow down to a walk (twice as likely)
+                possibleNextStates: [
+                    States.walkRight,
+                    States.walkRight,
+                    States.runLeft,
+                ],
             },
             {
                 state: States.walkLeft,
+                // Can switch directions, start running the same direciton, or start eating (twice as likely)
                 possibleNextStates: [
-                    States.sitIdle,
                     States.walkRight,
-                    States.runRight,
+                    States.runLeft,
+                    States.standLeft,
+                    States.standLeft,
                 ],
             },
             {
                 state: States.runLeft,
+                // Can switch directions or slow down to a walk (twice as likely)
                 possibleNextStates: [
-                    States.sitIdle,
-                    States.walkRight,
+                    States.walkLeft,
+                    States.walkLeft,
                     States.runRight,
                 ],
             },
             {
                 state: States.chase,
+                // After the chase, the horse has the ball!
                 possibleNextStates: [States.idleWithBall],
             },
             {
                 state: States.idleWithBall,
+                // Can go back to running or have a bite to eat
                 possibleNextStates: [
-                    States.walkRight,
-                    States.walkLeft,
-                    States.runLeft,
                     States.runRight,
+                    States.runLeft,
+                    States.standRight,
+                    States.standLeft,
                 ],
             },
         ],

diff --git a/src/panel/states.ts b/src/panel/states.ts
@@ -76,6 +76,8 @@ export const enum States {
     idleWithBall = 'idle-with-ball',
     chase = 'chase',
     chaseFriend = 'chase-friend',
+    standRight = 'stand-right',
+    standLeft = 'stand-left',
 }
 
 export enum FrameResult {
@@ -138,6 +140,10 @@ export function resolveState(state: string, pet: IPetType): IState {
             return new IdleWithBallState(pet);
         case States.chaseFriend:
             return new ChaseFriendState(pet);
+        case States.standRight:
+            return new StandRightState(pet);
+        case States.standLeft:
+            return new StandLeftState(pet);
     }
     return new SitIdleState(pet);
 }
@@ -399,3 +405,17 @@ export class JumpDownLeftState implements IState {
         return FrameResult.stateContinue;
     }
 }
+
+export class StandRightState extends AbstractStaticState {
+    label = States.standRight;
+    spriteLabel = 'stand';
+    horizontalDirection = HorizontalDirection.right;
+    holdTime = 60;
+}
+
+export class StandLeftState extends AbstractStaticState {
+    label = States.standRight;
+    spriteLabel = 'stand';
+    horizontalDirection = HorizontalDirection.left;
+    holdTime = 60;
+}
diff --git a/src/test/gifs.ts b/src/test/gifs.ts
@@ -107,7 +107,15 @@ const pets: { [key: string]: { colors: string[]; states: string[] } } = {
             'magical',
             'warrior',
         ],
-        states: ['idle', 'run', 'swipe', 'walk', 'walk_fast', 'with_ball'],
+        states: [
+            'idle',
+            'run',
+            'swipe',
+            'walk',
+            'walk_fast',
+            'with_ball',
+            'stand',
+        ],
     },
 };