Skip to content

Commit

Permalink
Merge pull request #80 from SylentButDedly/master
Browse files Browse the repository at this point in the history
 Season of the Wish Dates
  • Loading branch information
chrisfried committed Dec 1, 2023
2 parents 445765f + 42ed17c commit a18e3a6
Show file tree
Hide file tree
Showing 5 changed files with 39 additions and 0 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -44,3 +44,4 @@ Thumbs.db

/utils/defs/*
src/environments/keys.ts
src/environments/environment.ts
6 changes: 6 additions & 0 deletions src/app/guardian/guardian.component.scss
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,12 @@
mask-image: url('../../assets/icons/season-of-the-witch.png');
background-color: inherit;
}

&.season-of-the-wish:before {
-webkit-mask-image: url('../../assets/icons/season-of-the-wish.png');
mask-image: url('../../assets/icons/season-of-the-wish.png');
background-color: inherit;
}
}

@media (prefers-reduced-motion) {
Expand Down
6 changes: 6 additions & 0 deletions src/app/guardian3d/guardian3d.component.scss
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,12 @@
mask-image: url('../../assets/icons/season-of-the-witch.png');
background-color: inherit;
}

&.season-of-the-wish:before {
-webkit-mask-image: url('../../assets/icons/season-of-the-wish.png');
mask-image: url('../../assets/icons/season-of-the-wish.png');
background-color: inherit;
}
}

@media (prefers-reduced-motion) {
Expand Down
26 changes: 26 additions & 0 deletions src/app/pipes/milestone.pipe.ts
Original file line number Diff line number Diff line change
Expand Up @@ -607,6 +607,21 @@ export class MilestonePipe implements PipeTransform {
case '2023-10-10':
case '2023-11-14':
return ' | Iron Banner'
case '2023-11-28':
return ' | Season of the Wish'
case '2023-12-1':
case '2023-12-01':
return ' | Warlord\'s Ruin Dungeon'
case '2023-12-5':
case '2023-12-05':
return ' | Iron Banner'
case '2023-12-12':
return ' | The Dawning'
case '2024-1-2':
case '2024-01-02':
case '2024-1-23':
case '2024-01-23':
return ' | Iron Banner'
default:
return ''
}
Expand All @@ -626,6 +641,7 @@ export class MilestonePipe implements PipeTransform {
case '2020-12-15':
case '2021-12-14':
case '2022-12-13':
case '2023-12-12':
return (classes += 'dawning')
case '2018-2-13':
case '2018-02-13':
Expand Down Expand Up @@ -747,6 +763,12 @@ export class MilestonePipe implements PipeTransform {
case '2023-09-05':
case '2023-10-10':
case '2023-11-14':
case '2023-12-5':
case '2023-12-05':
case '2024-1-2':
case '2024-01-02':
case '2024-1-23':
case '2024-01-23':
return (classes += 'iron-banner')
case '2022-7-19':
case '2022-07-19':
Expand Down Expand Up @@ -786,6 +808,8 @@ export class MilestonePipe implements PipeTransform {
case '2022-12-09':
case '2023-5-26':
case '2023-05-26':
case '2023-12-1':
case '2023-12-01':
return (classes += 'dungeon')
case '2022-12-6':
case '2022-12-06':
Expand Down Expand Up @@ -835,6 +859,8 @@ export class MilestonePipe implements PipeTransform {
case '2023-8-22':
case '2023-08-22':
return (classes += 'season-of-the-witch')
case '2023-11-28':
return (classes += 'season-of-the-wish')
default:
return ''
}
Expand Down
Binary file added src/assets/icons/season-of-the-wish.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit a18e3a6

Please sign in to comment.