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

Added farm theme and halloween theme #624

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open
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
Binary file added media/backgrounds/farm/background-dark-large.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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/backgrounds/farm/background-dark-nano.png
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/backgrounds/farm/background-dark-small.png
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/backgrounds/farm/background-light-large.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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/backgrounds/farm/background-light-nano.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,9 @@
"none",
"forest",
"castle",
"beach"
"beach",
"halloween",
"farm"
],
"default": "none",
"description": "Background theme assets for your pets"
Expand Down
11 changes: 10 additions & 1 deletion src/common/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,8 @@ export const enum Theme {
forest = 'forest',
castle = 'castle',
beach = 'beach',
halloween = 'halloween',
farm = 'farm',
}

export const enum ColorThemeKind {
Expand Down Expand Up @@ -135,4 +137,11 @@ export const ALL_SCALES = [
PetSize.medium,
PetSize.large,
];
export const ALL_THEMES = [Theme.none, Theme.forest, Theme.castle, Theme.beach];
export const ALL_THEMES = [
Theme.none,
Theme.forest,
Theme.castle,
Theme.beach,
Theme.halloween,
Theme.farm,
];
24 changes: 24 additions & 0 deletions src/panel/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,30 @@ function calculateFloor(size: PetSize, theme: Theme): number {
default:
return 45;
}
case Theme.halloween:
switch (size) {
case PetSize.small:
return 30;
case PetSize.medium:
return 40;
case PetSize.large:
return 65;
case PetSize.nano:
default:
return 23;
}
case Theme.farm:
switch (size) {
case PetSize.small:
return 30;
case PetSize.medium:
return 40;
case PetSize.large:
return 65;
case PetSize.nano:
default:
return 23;
}
}
return 0;
}
Expand Down
Loading