update theme to lotr

Signed-off-by: jbpratt <[email protected]>

assets/anim.scss

@@ -1209,16 +1209,6 @@ $spritesDir : '/assets/emotes/emoticons-animated/';
     $iteration-count: 1
 );
 
-@include sprite-animation(
-    $file-name: ComfyMoobers,
-    $frame-count: 34,
-    $sprite-width: 1122px,
-    $sprite-height: 32px,
-    $animation-duration: 2550ms,
-    $iteration-count: 2,
-    $can-animate-forever: true
-);
-
 @include sprite-animation(
     $file-name: HocusPocus,
     $frame-count: 53,
@@ -1340,17 +1330,6 @@ $spritesDir : '/assets/emotes/emoticons-animated/';
     $end-on-last-frame: true
 );
 
-@include sprite-animation(
-    $file-name: DOGGO,
-    $frame-count: 181,
-    $sprite-width: 6154px,
-    $sprite-height: 32px,
-    $animation-duration: 3s,
-    $iteration-count: 2,
-    $can-animate-forever: true,
-    $end-on-last-frame: true
-);
-
 @include sprite-animation(
     $file-name: ApeHands,
     $frame-count: 91,
@@ -1458,3 +1437,89 @@ $spritesDir : '/assets/emotes/emoticons-animated/';
     $can-animate-forever: true,
     $end-on-last-frame: true
 );
+
+@include sprite-animation(
+    $file-name: DOGGO,
+    $frame-count: 76,
+    $sprite-width: 2432px,
+    $sprite-height: 32px,
+    $animation-duration: 2s,
+    $iteration-count: 2,
+    $can-animate-forever: true,
+    $end-on-last-frame: true
+);
+
+@include sprite-animation(
+    $file-name: ComfyMoobers,
+    $frame-count: 34,
+    $sprite-width: 1122px,
+    $sprite-height: 32px,
+    $animation-duration: 2550ms,
+    $iteration-count: 2,
+    $can-animate-forever: true
+);
+
+@include sprite-animation(
+    $file-name: CampFire,
+    $frame-count: 90,
+    $sprite-width: 3780px,
+    $sprite-height: 32px,
+    $animation-duration: 3s,
+    $iteration-count: 1,
+    $can-animate-forever: true,
+    $end-on-last-frame: true
+);
+
+@include sprite-animation(
+    $file-name: ZOOMER,
+    $frame-count: 30,
+    $sprite-width: 1500px,
+    $sprite-height: 32px,
+    $animation-duration: 1s,
+    $iteration-count: 7,
+    $can-animate-forever: true
+);
+
+@include sprite-animation(
+    $file-name: GROND,
+    $frame-count: 149,
+    $sprite-width: 7450px,
+    $sprite-height: 32px,
+    $animation-duration: 6.208s,
+    $iteration-count: 1,
+    $can-animate-forever: true,
+    $end-on-last-frame: true
+);
+
+@include sprite-animation(
+    $file-name: BOOMER,
+    $frame-count: 90,
+    $sprite-width: 4050px,
+    $sprite-height: 32px,
+    $animation-duration: 3s,
+    $iteration-count: 2,
+    $can-animate-forever: true,
+    $end-on-last-frame: true
+);
+
+@include sprite-animation(
+    $file-name: SPYRON,
+    $frame-count: 90,
+    $sprite-width: 3960px,
+    $sprite-height: 32px,
+    $animation-duration: 3s,
+    $iteration-count: 2,
+    $can-animate-forever: true,
+);
+
+@include sprite-animation(
+    $file-name: PepoWant,
+    $frame-count: 150,
+    $sprite-width: 7050px,
+    $sprite-height: 32px,
+    $animation-duration: 2.5s,
+    $animation-direction: alternate,
+    $iteration-count: 2,
+    $end-on-frame: 1,
+    $can-animate-forever: true
+);

assets/chat/css/generify.scss

@@ -861,3 +861,67 @@
 .golden-modifier-Gigachad {
     -webkit-mask-position-x: -3068px !important;
 }
+
+@mixin lotr-flag($name, $width, $duration, $frame-count) {
+    $frame-width: $width / $frame-count;
+
+    .generify-#{$name} {
+        margin-left: $frame-width;
+
+        &::before {
+            position: absolute;
+            background-image: image-set(url("/assets/emotes/lotr/modifiers/4x/#{$name}.png") 4x, url("/assets/emotes/lotr/modifiers/2x/#{$name}.png") 2x, url("/assets/emotes/lotr/modifiers/#{$name}.png") 1x);
+            overflow: hidden;
+            width: $frame-width;
+            height: 32px;
+            bottom: 0;
+            right: 93%;
+            z-index: 0;
+            content: "";
+            transform: rotate(-10deg);
+            transform-origin: 100% 100%;
+            animation: anim-flag-#{$name} $duration steps($frame-count) 5;
+        }
+
+        @at-root .pref-animateforever &::before, &:hover::before {
+            animation-iteration-count: infinite;
+        }
+    }
+
+    @keyframes anim-flag-#{$name} {
+        0% {
+            background-position-x: 0px;
+        }
+        100% {
+            background-position-x: calc(100% - #{$frame-width});
+        }
+    }
+}
+
+@include lotr-flag(
+    $name: rohan,
+    $width: 2040px,
+    $duration: 1333ms,
+    $frame-count: 40
+);
+
+@include lotr-flag(
+    $name: gondor,
+    $width: 2300px,
+    $duration: 1533ms,
+    $frame-count: 46
+);
+
+@include lotr-flag(
+    $name: mordor,
+    $width: 480px,
+    $duration: 1333ms,
+    $frame-count: 30
+);
+
+@include lotr-flag(
+    $name: saruman,
+    $width: 480px,
+    $duration: 1333ms,
+    $frame-count: 30
+);

assets/chat/js/const.js

@@ -78,10 +78,10 @@ const GENERIFY_OPTIONS = {
     peek: "generify-peek",
     gray: "generify-gray",
     noir: "generify-noir weather rain anim-fix",
-    // rohan: "generify-rohan",
-    // gondor: "generify-gondor",
-    // mordor: "generify-mordor",
-    // saruman: "generify-saruman",
+    rohan: "generify-rohan",
+    gondor: "generify-gondor",
+    mordor: "generify-mordor",
+    saruman: "generify-saruman",
 };
 
 const CUSTOM_AUTOCOMPLETE_ORDER = [

assets/emotes.json

@@ -222,8 +222,7 @@
         "CONTEXT",
         "Krankenwagen",
         "CAUGHT",
-        "PepoTurkey",
-        "SNOWBALL",
-        "SNOWBALLFIGHT"
+        "DEEEATH",
+        "GROND"
     ]
 }