Merge pull request #572 from thechriskent/master

Horses!

README.md

@@ -66,6 +66,8 @@ 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 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
 
 Thanks to all the [contributors](https://github.com/tonybaloney/vscode-pets/graphs/contributors) to this project.

l10n/bundle.l10n.json

@@ -9,6 +9,7 @@
 	"Cancelled Spawning Pet": "Cancelled Spawning Pet",
 	"A Pet Playground has been created. You can now use the \"Spawn Additional Pet\" Command to add more pets.": "A Pet Playground has been created. You can now use the \"Spawn Additional Pet\" Command to add more pets.",
 	"A Pet Playground has been created. You can now use the \"Remove All Pets\" Command to remove all pets.": "A Pet Playground has been created. You can now use the \"Remove All Pets\" Command to remove all pets.",
+
 	"black": "Black",
 	"brown": "Brown",
 	"lightbrown": "Light Brown",
@@ -18,6 +19,18 @@
 	"purple": "Purple",
 	"red": "Red",
 	"white": "White",
+	"orange": "Orange",
+	"blue": "Blue",
+	"akita": "Akita",
+	"socks black": "Black (Socks)",
+	"socks brown": "Brown (Socks)",
+	"socks beige": "Beige (Socks)",
+	"paint black": "Black (Paint)",
+	"paint brown": "Brown (Paint)",
+	"paint beige": "Beige (Paint)",
+	"magical": "Magical",
+	"warrior": "Warrior",
+
 	"cat": "Cat",
 	"clippy": "Clippy",
 	"cockatiel": "Cockatiel",
@@ -29,5 +42,6 @@
 	"rubber-duck": "Rubber Duck",
 	"snake": "Snake",
 	"totoro": "Totoro",
-	"zappy": "Zappy"
+	"zappy": "Zappy",
+	"horse": "Horse"
 }

media/pets.css

@@ -145,7 +145,7 @@ img.pet {
 	margin: 0px auto;
 	border: 2px solid #333;
 	border-radius: 10px;
-	padding: 10px;
+	padding: 10px 0;
 }
 
 .bubble-nano {

package.json

@@ -24,7 +24,8 @@
         "dog",
         "pets",
         "clippy",
-        "rubber duck"
+        "rubber duck",
+        "horse"
     ],
     "license": "MIT",
     "icon": "icon.png",
@@ -160,7 +161,15 @@
                             "red",
                             "white",
                             "orange",
-                            "akita"
+                            "akita",
+                            "socks black",
+                            "socks beige",
+                            "socks brown",
+                            "paint beige",
+                            "paint black",
+                            "paint brown",
+                            "magical",
+                            "warrior"
                         ],
                         "default": "brown",
                         "description": "Pet color",
@@ -176,6 +185,7 @@
                             "cockatiel",
                             "dog",
                             "fox",
+                            "horse",
                             "mod",
                             "rat",
                             "rocky",

src/common/names.ts

@@ -13,6 +13,7 @@ import { TOTORO_NAMES } from '../panel/pets/totoro';
 import { ZAPPY_NAMES } from '../panel/pets/zappy';
 import { RAT_NAMES } from '../panel/pets/rat';
 import { TURTLE_NAMES } from '../panel/pets/turtle';
+import { HORSE_NAMES } from '../panel/pets/horse';
 import { PetType } from './types';
 
 export function randomName(type: PetType): string {
@@ -34,6 +35,7 @@ export function randomName(type: PetType): string {
                 [PetType.cockatiel]: COCKATIEL_NAMES,
                 [PetType.rat]: RAT_NAMES,
                 [PetType.turtle]: TURTLE_NAMES,
+                [PetType.horse]: HORSE_NAMES,
             } as Record<PetType, ReadonlyArray<string>>
         )[type] ?? CAT_NAMES;
 

src/common/types.ts

@@ -10,6 +10,14 @@ export const enum PetColor {
     white = 'white',
     orange = 'orange',
     akita = 'akita',
+    socksblack = 'socks black',
+    socksbeige = 'socks beige',
+    socksbrown = 'socks brown',
+    paintbeige = 'paint beige',
+    paintblack = 'paint black',
+    paintbrown = 'paint brown',
+    magical = 'magical',
+    warrior = 'warrior',
     null = 'null',
 }
 
@@ -21,6 +29,7 @@ export const enum PetType {
     crab = 'crab',
     dog = 'dog',
     fox = 'fox',
+    horse = 'horse',
     mod = 'mod',
     rat = 'rat',
     rocky = 'rocky',
@@ -84,6 +93,7 @@ export const ALL_PETS = [
     PetType.crab,
     PetType.dog,
     PetType.fox,
+    PetType.horse,
     PetType.mod,
     PetType.rat,
     PetType.rocky,
@@ -105,6 +115,14 @@ export const ALL_COLORS = [
     PetColor.white,
     PetColor.orange,
     PetColor.akita,
+    PetColor.socksblack,
+    PetColor.socksbeige,
+    PetColor.socksbrown,
+    PetColor.paintbeige,
+    PetColor.paintblack,
+    PetColor.paintbrown,
+    PetColor.magical,
+    PetColor.warrior,
     PetColor.null,
 ];
 export const ALL_SCALES = [

src/panel/pets.ts

@@ -6,14 +6,15 @@ import { Cockatiel } from './pets/cockatiel';
 import { Crab } from './pets/crab';
 import { Dog } from './pets/dog';
 import { Fox } from './pets/fox';
+import { Horse } from './pets/horse';
 import { Mod } from './pets/mod';
+import { Rat } from './pets/rat';
 import { Rocky } from './pets/rocky';
 import { RubberDuck } from './pets/rubberduck';
 import { Snake } from './pets/snake';
 import { Totoro } from './pets/totoro';
-import { Zappy } from './pets/zappy';
-import { Rat } from './pets/rat';
 import { Turtle } from './pets/turtle';
+import { Zappy } from './pets/zappy';
 import { IPetType } from './states';
 
 export class PetElement {
@@ -204,6 +205,8 @@ export function createPet(
             return new Rat(...standardPetArguments, PetSpeed.normal);
         case PetType.turtle:
             return new Turtle(...standardPetArguments, PetSpeed.verySlow);
+        case PetType.horse:
+            return new Horse(...standardPetArguments, PetSpeed.normal);
         default:
             throw new InvalidPetException("Pet type doesn't exist");
     }
@@ -241,6 +244,8 @@ export function availableColors(petType: PetType): PetColor[] {
             return Rat.possibleColors;
         case PetType.turtle:
             return Turtle.possibleColors;
+        case PetType.horse:
+            return Horse.possibleColors;
         default:
             throw new InvalidPetException("Pet type doesn't exist");
     }