Merge pull request #79 from SylentButDedly/master

chrisfried · Sep 2, 2023 · bbde08c · bbde08c
2 parents fcf944b + 2f9a10d
commit bbde08c
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 1 deletion.
diff --git a/src/app/guardian/guardian.component.scss b/src/app/guardian/guardian.component.scss
@@ -262,6 +262,12 @@
     mask-image: url('../../assets/icons/exotic-quest.png');
     background-color: inherit;
   }
+
+  &.season-of-the-witch:before {
+    -webkit-mask-image: url('../../assets/icons/season-of-the-witch.png');
+    mask-image: url('../../assets/icons/season-of-the-witch.png');
+    background-color: inherit;
+  }
 }
 
 @media (prefers-reduced-motion) {

diff --git a/src/app/guardian3d/guardian3d.component.scss b/src/app/guardian3d/guardian3d.component.scss
@@ -262,6 +262,12 @@
     mask-image: url('../../assets/icons/exotic-quest.png');
     background-color: inherit;
   }
+
+  &.season-of-the-witch:before {
+    -webkit-mask-image: url('../../assets/icons/season-of-the-witch.png');
+    mask-image: url('../../assets/icons/season-of-the-witch.png');
+    background-color: inherit;
+  }
 }
 
 @media (prefers-reduced-motion) {

diff --git a/src/app/pipes/milestone.pipe.ts b/src/app/pipes/milestone.pipe.ts
@@ -593,9 +593,20 @@ export class MilestonePipe implements PipeTransform {
           case '2023-7-11':
           case '2023-07-11':
             return ' | Iron Banner'
+          case '2023-7-18':
+          case '2023-07-18':
+            return ' | Solstice'
           case '2023-8-22':
           case '2023-08-22':
-            return ' | Season of [REDACTED]'
+            return ' | Season of the Witch'
+          case '2023-9-1':
+          case '2023-09-01':
+            return ' | Crota\'s End Raid'
+          case '2023-9-5':
+          case '2023-09-05':
+          case '2023-10-10':
+          case '2023-11-14':
+            return ' | Iron Banner'
           default:
             return ''
         }
@@ -732,9 +743,15 @@ export class MilestonePipe implements PipeTransform {
           case '2023-06-20':
           case '2023-7-11':
           case '2023-07-11':
+          case '2023-9-5':
+          case '2023-09-05':
+          case '2023-10-10':
+          case '2023-11-14':
             return (classes += 'iron-banner')
           case '2022-7-19':
           case '2022-07-19':
+          case '2023-7-18':
+          case '2023-07-18':
             return (classes += 'solstice2022')
           case '2017-9-13':
           case '2017-09-13':
@@ -755,6 +772,8 @@ export class MilestonePipe implements PipeTransform {
           case '2022-08-26':
           case '2023-3-10':
           case '2023-03-10':
+          case '2023-9-1':
+          case '2023-09-01':
             return (classes += 'raid')
           case '2022-8-23':
           case '2022-08-23':
@@ -813,6 +832,9 @@ export class MilestonePipe implements PipeTransform {
           case '2023-7-4':
           case '2023-07-04':
             return (classes += 'exotic-quest')
+          case '2023-8-22':
+          case '2023-08-22':
+            return (classes += 'season-of-the-witch')
           default:
             return ''
         }

diff --git a/src/assets/icons/season-of-the-witch.png b/src/assets/icons/season-of-the-witch.png