Merge pull request #641 from JustOnesAndZeros/main

added frog pet

README.md

@@ -70,6 +70,8 @@ The horse animations were adapted by [Chris Kent](https://github.com/thechrisken
 
 [Kennet Shin](https://github.com/WoofWoof0) created the snail media assets.
 
+The frog animations were created by [seethingswarm](https://seethingswarm.itch.io/frogpack).
+
 [Jessie Ferris](https://github.com/jeferris) created the panda media assets.
 
 ## Thank you

package.json

@@ -186,6 +186,7 @@
                             "cockatiel",
                             "dog",
                             "fox",
+                            "frog",
                             "horse",
                             "mod",
                             "rat",

src/common/names.ts

@@ -6,6 +6,7 @@ import { CRAB_NAMES } from '../panel/pets/crab';
 import { DENO_NAMES } from '../panel/pets/deno';
 import { DOG_NAMES } from '../panel/pets/dog';
 import { FOX_NAMES } from '../panel/pets/fox';
+import { FROG_NAMES } from '../panel/pets/frog';
 import { MOD_NAMES } from '../panel/pets/mod';
 import { PANDA_NAMES } from '../panel/pets/panda';
 import { ROCKY_NAMES } from '../panel/pets/rocky';
@@ -27,6 +28,7 @@ export function randomName(type: PetType): string {
                 [PetType.chicken]: CHICKEN_NAMES,
                 [PetType.dog]: DOG_NAMES,
                 [PetType.fox]: FOX_NAMES,
+                [PetType.frog]: FROG_NAMES,
                 [PetType.crab]: CRAB_NAMES,
                 [PetType.clippy]: CLIPPY_NAMES,
                 [PetType.deno]: DENO_NAMES,

src/common/types.ts

@@ -3,6 +3,7 @@ export const enum PetColor {
     lightbrown = 'lightbrown',
     black = 'black',
     green = 'green',
+    blue = 'blue',
     yellow = 'yellow',
     gray = 'gray',
     purple = 'purple',
@@ -30,6 +31,7 @@ export const enum PetType {
     dog = 'dog',
     deno = 'deno',
     fox = 'fox',
+    frog = 'frog',
     horse = 'horse',
     mod = 'mod',
     panda = 'panda',
@@ -97,6 +99,7 @@ export const ALL_PETS = [
     PetType.dog,
     PetType.deno,
     PetType.fox,
+    PetType.frog,
     PetType.horse,
     PetType.mod,
     PetType.panda,

src/panel/pets.ts

@@ -7,6 +7,7 @@ import { Crab } from './pets/crab';
 import { Deno } from './pets/deno';
 import { Dog } from './pets/dog';
 import { Fox } from './pets/fox';
+import { Frog } from './pets/frog';
 import { Horse } from './pets/horse';
 import { Mod } from './pets/mod';
 import { Panda } from './pets/panda';
@@ -207,6 +208,8 @@ export function createPet(
             return new Dog(...standardPetArguments, PetSpeed.normal);
         case PetType.fox:
             return new Fox(...standardPetArguments, PetSpeed.fast);
+        case PetType.frog:
+            return new Frog(...standardPetArguments, PetSpeed.normal);
         case PetType.crab:
             return new Crab(...standardPetArguments, PetSpeed.slow);
         case PetType.clippy:
@@ -252,6 +255,8 @@ export function availableColors(petType: PetType): PetColor[] {
             return Deno.possibleColors;
         case PetType.fox:
             return Fox.possibleColors;
+        case PetType.frog:
+            return Frog.possibleColors;
         case PetType.crab:
             return Crab.possibleColors;
         case PetType.clippy:

src/panel/pets/frog.ts

@@ -0,0 +1,84 @@
+import { PetColor } from '../../common/types';
+import { BasePetType } from '../basepettype';
+import { States } from '../states';
+
+export class Frog extends BasePetType {
+    label = 'frog';
+    static possibleColors = [PetColor.red, PetColor.green, PetColor.blue];
+    sequence = {
+        startingState: States.sitIdle,
+        sequenceStates: [
+            {
+                state: States.sitIdle,
+                possibleNextStates: [States.walkRight, States.runRight],
+            },
+            {
+                state: States.walkRight,
+                possibleNextStates: [States.walkLeft, States.runLeft],
+            },
+            {
+                state: States.runRight,
+                possibleNextStates: [States.walkLeft, States.runLeft],
+            },
+            {
+                state: States.walkLeft,
+                possibleNextStates: [States.sitIdle],
+            },
+            {
+                state: States.runLeft,
+                possibleNextStates: [States.sitIdle],
+            },
+            {
+                state: States.chase,
+                possibleNextStates: [States.idleWithBall],
+            },
+            {
+                state: States.idleWithBall,
+                possibleNextStates: [
+                    States.walkRight,
+                    States.walkLeft,
+                    States.runLeft,
+                    States.runRight,
+                ],
+            },
+        ],
+    };
+    get emoji(): string {
+        return '🐸';
+    }
+    get hello(): string {
+        return Math.random() > 0.5 ? `croak...` : `ribbit!`;
+    }
+}
+
+export const FROG_NAMES: ReadonlyArray<string> = [
+    'Blinky',
+    'Bubbles',
+    'Drift',
+    'Frogger',
+    'Freddy',
+    'Hopper',
+    'Jumpy',
+    'Kermit',
+    'Lily',
+    'Leapster',
+    'Marsh',
+    'Misty',
+    'Moss',
+    'Pebbles',
+    'Pip',
+    'Pondy',
+    'Quagmire',
+    'Rango',
+    'Razor',
+    'Slick',
+    'Swamper',
+    'Swampy',
+    'Sprout',
+    'Thistle',
+    'Tad',
+    'Toady',
+    'Warty',
+    'Willow',
+    'Wiggle',
+];

src/test/gifs.ts

@@ -52,6 +52,10 @@ const pets: { [key: string]: { colors: string[]; states: string[] } } = {
         colors: ['red', 'white'],
         states: ['idle', 'run', 'swipe', 'walk', 'walk_fast', 'with_ball'],
     },
+    frog: {
+        colors: ['green'],
+        states: ['idle', 'run', 'swipe', 'walk', 'walk_fast', 'with_ball'],
+    },
     mod: {
         colors: ['purple'],
         states: ['idle', 'run', 'swipe', 'walk', 'walk_fast', 'with_ball'],