Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Horses! 🐎🐎🐎 #572

Merged
merged 9 commits into from
Jun 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# VS Code Pets

![icon](https://github.com/tonybaloney/vscode-pets/raw/master/icon.png)

Check warning on line 5 in README.md

View workflow job for this annotation

GitHub Actions / Analyze (javascript)

Consider replacing term "master" with an alternative such as "primary", "main", "default", "leader"

</div>

<p align="center">
Expand All @@ -18,7 +18,7 @@
[![Visual Studio Marketplace Installs](https://img.shields.io/visual-studio-marketplace/i/tonybaloney.vscode-pets?logo=visualstudio)](https://marketplace.visualstudio.com/items?itemName=tonybaloney.vscode-pets&WT.mc_id=python-17801-anthonyshaw)
[![Visual Studio Marketplace Downloads](https://img.shields.io/visual-studio-marketplace/d/tonybaloney.vscode-pets?logo=visualstudio)](https://marketplace.visualstudio.com/items?itemName=tonybaloney.vscode-pets&WT.mc_id=python-17801-anthonyshaw)

![screenshot](https://github.com/tonybaloney/vscode-pets/raw/master/docs/source/_static/screenshot.gif)

Check warning on line 21 in README.md

View workflow job for this annotation

GitHub Actions / Analyze (javascript)

Consider replacing term "master" with an alternative such as "primary", "main", "default", "leader"


## Installation

Expand All @@ -42,7 +42,7 @@

Run the "Start pet coding session" command (`vscode-pets.start`) to see a cat in VS Code:

![Default view](https://github.com/tonybaloney/vscode-pets/raw/master/docs/source/_static/pet-in-default-explorer.png)

Check warning on line 45 in README.md

View workflow job for this annotation

GitHub Actions / Analyze (javascript)

Consider replacing term "master" with an alternative such as "primary", "main", "default", "leader"


[Now checkout the documentation to see what else is possible!](https://tonybaloney.github.io/vscode-pets)

Expand All @@ -66,6 +66,8 @@

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.
16 changes: 15 additions & 1 deletion l10n/bundle.l10n.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -18,6 +19,18 @@
"purple": "Purple",
"red": "Red",
"white": "White",
"orange": "Orange",
"blue": "Blue",
"akita": "Akita",
"socks black": "Black (Socks)",
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added the new colours so people can add the translations later

"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",
Expand All @@ -29,5 +42,6 @@
"rubber-duck": "Rubber Duck",
"snake": "Snake",
"totoro": "Totoro",
"zappy": "Zappy"
"zappy": "Zappy",
"horse": "Horse"
}
Binary file added media/horse/black_idle_8fps.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added media/horse/black_run_8fps.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added media/horse/black_stand_8fps.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added media/horse/black_swipe_8fps.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added media/horse/black_walk_8fps.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added media/horse/black_walk_fast_8fps.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added media/horse/black_with_ball_8fps.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added media/horse/brown_idle_8fps.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added media/horse/brown_run_8fps.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added media/horse/brown_stand_8fps.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added media/horse/brown_swipe_8fps.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added media/horse/brown_walk_8fps.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added media/horse/brown_walk_fast_8fps.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added media/horse/brown_with_ball_8fps.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added media/horse/magical_idle_8fps.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added media/horse/magical_run_8fps.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added media/horse/magical_stand_8fps.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added media/horse/magical_swipe_8fps.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added media/horse/magical_walk_8fps.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added media/horse/magical_walk_fast_8fps.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added media/horse/magical_with_ball_8fps.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added media/horse/paint_beige_idle_8fps.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added media/horse/paint_beige_run_8fps.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added media/horse/paint_beige_stand_8fps.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added media/horse/paint_beige_swipe_8fps.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added media/horse/paint_beige_walk_8fps.gif
Binary file added media/horse/paint_beige_walk_fast_8fps.gif
Binary file added media/horse/paint_beige_with_ball_8fps.gif
Binary file added media/horse/paint_black_idle_8fps.gif
Binary file added media/horse/paint_black_run_8fps.gif
Binary file added media/horse/paint_black_stand_8fps.gif
Binary file added media/horse/paint_black_swipe_8fps.gif
Binary file added media/horse/paint_black_walk_8fps.gif
Binary file added media/horse/paint_black_walk_fast_8fps.gif
Binary file added media/horse/paint_black_with_ball_8fps.gif
Binary file added media/horse/paint_brown_idle_8fps.gif
Binary file added media/horse/paint_brown_run_8fps.gif
Binary file added media/horse/paint_brown_stand_8fps.gif
Binary file added media/horse/paint_brown_swipe_8fps.gif
Binary file added media/horse/paint_brown_walk_8fps.gif
Binary file added media/horse/paint_brown_walk_fast_8fps.gif
Binary file added media/horse/paint_brown_with_ball_8fps.gif
Binary file added media/horse/socks_beige_idle_8fps.gif
Binary file added media/horse/socks_beige_run_8fps.gif
Binary file added media/horse/socks_beige_stand_8fps.gif
Binary file added media/horse/socks_beige_swipe_8fps.gif
Binary file added media/horse/socks_beige_walk_8fps.gif
Binary file added media/horse/socks_beige_walk_fast_8fps.gif
Binary file added media/horse/socks_beige_with_ball_8fps.gif
Binary file added media/horse/socks_black_idle_8fps.gif
Binary file added media/horse/socks_black_run_8fps.gif
Binary file added media/horse/socks_black_stand_8fps.gif
Binary file added media/horse/socks_black_swipe_8fps.gif
Binary file added media/horse/socks_black_walk_8fps.gif
Binary file added media/horse/socks_black_walk_fast_8fps.gif
Binary file added media/horse/socks_black_with_ball_8fps.gif
Binary file added media/horse/socks_brown_idle_8fps.gif
Binary file added media/horse/socks_brown_run_8fps.gif
Binary file added media/horse/socks_brown_stand_8fps.gif
Binary file added media/horse/socks_brown_swipe_8fps.gif
Binary file added media/horse/socks_brown_walk_8fps.gif
Binary file added media/horse/socks_brown_walk_fast_8fps.gif
Binary file added media/horse/socks_brown_with_ball_8fps.gif
Binary file added media/horse/warrior_idle_8fps.gif
Binary file added media/horse/warrior_run_8fps.gif
Binary file added media/horse/warrior_stand_8fps.gif
Binary file added media/horse/warrior_swipe_8fps.gif
Binary file added media/horse/warrior_walk_8fps.gif
Binary file added media/horse/warrior_walk_fast_8fps.gif
Binary file added media/horse/warrior_with_ball_8fps.gif
Binary file added media/horse/white_idle_8fps.gif
Binary file added media/horse/white_run_8fps.gif
Binary file added media/horse/white_stand_8fps.gif
Binary file added media/horse/white_swipe_8fps.gif
Binary file added media/horse/white_walk_8fps.gif
Binary file added media/horse/white_walk_fast_8fps.gif
Binary file added media/horse/white_with_ball_8fps.gif
2 changes: 1 addition & 1 deletion media/pets.css
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ img.pet {
margin: 0px auto;
border: 2px solid #333;
border-radius: 10px;
padding: 10px;
padding: 10px 0;
}

.bubble-nano {
Expand Down
14 changes: 12 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@
"dog",
"pets",
"clippy",
"rubber duck"
"rubber duck",
"horse"
],
"license": "MIT",
"icon": "icon.png",
Expand Down Expand Up @@ -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",
Expand All @@ -176,6 +185,7 @@
"cockatiel",
"dog",
"fox",
"horse",
"mod",
"rat",
"rocky",
Expand Down
2 changes: 2 additions & 0 deletions src/common/names.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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;

Expand Down
18 changes: 18 additions & 0 deletions src/common/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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',
}

Expand All @@ -21,6 +29,7 @@ export const enum PetType {
crab = 'crab',
dog = 'dog',
fox = 'fox',
horse = 'horse',
mod = 'mod',
rat = 'rat',
rocky = 'rocky',
Expand Down Expand Up @@ -84,6 +93,7 @@ export const ALL_PETS = [
PetType.crab,
PetType.dog,
PetType.fox,
PetType.horse,
PetType.mod,
PetType.rat,
PetType.rocky,
Expand All @@ -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 = [
Expand Down
9 changes: 7 additions & 2 deletions src/panel/pets.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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");
}
Expand Down Expand Up @@ -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");
}
Expand Down
Loading
Loading