diff --git a/assets/anim.scss b/assets/anim.scss index afb463c6..6c4f19b6 100644 --- a/assets/anim.scss +++ b/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 +); diff --git a/assets/chat/css/generify.scss b/assets/chat/css/generify.scss index c0df061d..d47cd6fc 100644 --- a/assets/chat/css/generify.scss +++ b/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 +); diff --git a/assets/chat/js/const.js b/assets/chat/js/const.js index d2cb1573..582c34ba 100644 --- a/assets/chat/js/const.js +++ b/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 = [ diff --git a/assets/emotes.json b/assets/emotes.json index 08d35f5d..531ab281 100644 --- a/assets/emotes.json +++ b/assets/emotes.json @@ -222,8 +222,7 @@ "CONTEXT", "Krankenwagen", "CAUGHT", - "PepoTurkey", - "SNOWBALL", - "SNOWBALLFIGHT" + "DEEEATH", + "GROND" ] } diff --git a/assets/emotes/emoticons-animated/2x/BOOMER.png b/assets/emotes/emoticons-animated/2x/BOOMER.png new file mode 100644 index 00000000..6b148040 Binary files /dev/null and b/assets/emotes/emoticons-animated/2x/BOOMER.png differ diff --git a/assets/emotes/emoticons-animated/2x/CampFire.png b/assets/emotes/emoticons-animated/2x/CampFire.png new file mode 100644 index 00000000..053cc712 Binary files /dev/null and b/assets/emotes/emoticons-animated/2x/CampFire.png differ diff --git a/assets/emotes/emoticons-animated/2x/DOGGO.png b/assets/emotes/emoticons-animated/2x/DOGGO.png index c7232748..0c3ffa1f 100644 Binary files a/assets/emotes/emoticons-animated/2x/DOGGO.png and b/assets/emotes/emoticons-animated/2x/DOGGO.png differ diff --git a/assets/emotes/emoticons-animated/2x/GROND.png b/assets/emotes/emoticons-animated/2x/GROND.png new file mode 100644 index 00000000..a368056a Binary files /dev/null and b/assets/emotes/emoticons-animated/2x/GROND.png differ diff --git a/assets/emotes/emoticons-animated/2x/PepoWant.png b/assets/emotes/emoticons-animated/2x/PepoWant.png new file mode 100644 index 00000000..298ee18f Binary files /dev/null and b/assets/emotes/emoticons-animated/2x/PepoWant.png differ diff --git a/assets/emotes/emoticons-animated/2x/SPYRON.png b/assets/emotes/emoticons-animated/2x/SPYRON.png new file mode 100644 index 00000000..72011d86 Binary files /dev/null and b/assets/emotes/emoticons-animated/2x/SPYRON.png differ diff --git a/assets/emotes/emoticons-animated/2x/ZOOMER.png b/assets/emotes/emoticons-animated/2x/ZOOMER.png new file mode 100644 index 00000000..42f8edde Binary files /dev/null and b/assets/emotes/emoticons-animated/2x/ZOOMER.png differ diff --git a/assets/emotes/emoticons-animated/4x/BOOMER.png b/assets/emotes/emoticons-animated/4x/BOOMER.png new file mode 100644 index 00000000..74e3834c Binary files /dev/null and b/assets/emotes/emoticons-animated/4x/BOOMER.png differ diff --git a/assets/emotes/emoticons-animated/4x/CampFire.png b/assets/emotes/emoticons-animated/4x/CampFire.png new file mode 100644 index 00000000..779dd909 Binary files /dev/null and b/assets/emotes/emoticons-animated/4x/CampFire.png differ diff --git a/assets/emotes/emoticons-animated/4x/DOGGO.png b/assets/emotes/emoticons-animated/4x/DOGGO.png index ffe15c79..6bb253e2 100644 Binary files a/assets/emotes/emoticons-animated/4x/DOGGO.png and b/assets/emotes/emoticons-animated/4x/DOGGO.png differ diff --git a/assets/emotes/emoticons-animated/4x/GROND.png b/assets/emotes/emoticons-animated/4x/GROND.png new file mode 100644 index 00000000..99435cd8 Binary files /dev/null and b/assets/emotes/emoticons-animated/4x/GROND.png differ diff --git a/assets/emotes/emoticons-animated/4x/PepoWant.png b/assets/emotes/emoticons-animated/4x/PepoWant.png new file mode 100644 index 00000000..0c0c043f Binary files /dev/null and b/assets/emotes/emoticons-animated/4x/PepoWant.png differ diff --git a/assets/emotes/emoticons-animated/4x/SPYRON.png b/assets/emotes/emoticons-animated/4x/SPYRON.png new file mode 100644 index 00000000..ea101b74 Binary files /dev/null and b/assets/emotes/emoticons-animated/4x/SPYRON.png differ diff --git a/assets/emotes/emoticons-animated/4x/ZOOMER.png b/assets/emotes/emoticons-animated/4x/ZOOMER.png new file mode 100644 index 00000000..66fb3c3b Binary files /dev/null and b/assets/emotes/emoticons-animated/4x/ZOOMER.png differ diff --git a/assets/emotes/emoticons-animated/BOOMER.png b/assets/emotes/emoticons-animated/BOOMER.png new file mode 100644 index 00000000..bd88a611 Binary files /dev/null and b/assets/emotes/emoticons-animated/BOOMER.png differ diff --git a/assets/emotes/emoticons-animated/CampFire.png b/assets/emotes/emoticons-animated/CampFire.png new file mode 100644 index 00000000..bd772441 Binary files /dev/null and b/assets/emotes/emoticons-animated/CampFire.png differ diff --git a/assets/emotes/emoticons-animated/DOGGO.png b/assets/emotes/emoticons-animated/DOGGO.png index 97c460ee..94d33130 100644 Binary files a/assets/emotes/emoticons-animated/DOGGO.png and b/assets/emotes/emoticons-animated/DOGGO.png differ diff --git a/assets/emotes/emoticons-animated/GROND.png b/assets/emotes/emoticons-animated/GROND.png new file mode 100644 index 00000000..eb8b59ff Binary files /dev/null and b/assets/emotes/emoticons-animated/GROND.png differ diff --git a/assets/emotes/emoticons-animated/PepoWant.png b/assets/emotes/emoticons-animated/PepoWant.png new file mode 100644 index 00000000..54e4ff6b Binary files /dev/null and b/assets/emotes/emoticons-animated/PepoWant.png differ diff --git a/assets/emotes/emoticons-animated/SPYRON.png b/assets/emotes/emoticons-animated/SPYRON.png new file mode 100644 index 00000000..3d2621f9 Binary files /dev/null and b/assets/emotes/emoticons-animated/SPYRON.png differ diff --git a/assets/emotes/emoticons-animated/ZOOMER.png b/assets/emotes/emoticons-animated/ZOOMER.png new file mode 100644 index 00000000..cb64664c Binary files /dev/null and b/assets/emotes/emoticons-animated/ZOOMER.png differ diff --git a/assets/emotes/emoticons/2x/DEEEATH.png b/assets/emotes/emoticons/2x/DEEEATH.png new file mode 100644 index 00000000..9043f2c7 Binary files /dev/null and b/assets/emotes/emoticons/2x/DEEEATH.png differ diff --git a/assets/emotes/emoticons/2x/DuckerZ.png b/assets/emotes/emoticons/2x/DuckerZ.png index 619c3b13..9b25a09a 100644 Binary files a/assets/emotes/emoticons/2x/DuckerZ.png and b/assets/emotes/emoticons/2x/DuckerZ.png differ diff --git a/assets/emotes/emoticons/2x/GimliFlushed.png b/assets/emotes/emoticons/2x/GimliFlushed.png new file mode 100644 index 00000000..caabe6e0 Binary files /dev/null and b/assets/emotes/emoticons/2x/GimliFlushed.png differ diff --git a/assets/emotes/emoticons/2x/KING.png b/assets/emotes/emoticons/2x/KING.png index 4918d006..3b06c1c3 100644 Binary files a/assets/emotes/emoticons/2x/KING.png and b/assets/emotes/emoticons/2x/KING.png differ diff --git a/assets/emotes/emoticons/2x/POKE.png b/assets/emotes/emoticons/2x/POKE.png index ae66e2b2..25e69191 100644 Binary files a/assets/emotes/emoticons/2x/POKE.png and b/assets/emotes/emoticons/2x/POKE.png differ diff --git a/assets/emotes/emoticons/2x/PepoComfy.png b/assets/emotes/emoticons/2x/PepoComfy.png index c93fb4d7..36466878 100644 Binary files a/assets/emotes/emoticons/2x/PepoComfy.png and b/assets/emotes/emoticons/2x/PepoComfy.png differ diff --git a/assets/emotes/emoticons/2x/PepoFight.png b/assets/emotes/emoticons/2x/PepoFight.png new file mode 100644 index 00000000..589e523b Binary files /dev/null and b/assets/emotes/emoticons/2x/PepoFight.png differ diff --git a/assets/emotes/emoticons/2x/SMOrc.png b/assets/emotes/emoticons/2x/SMOrc.png index 56a8a8f2..7effd00c 100644 Binary files a/assets/emotes/emoticons/2x/SMOrc.png and b/assets/emotes/emoticons/2x/SMOrc.png differ diff --git a/assets/emotes/emoticons/2x/monkaHmm.png b/assets/emotes/emoticons/2x/monkaHmm.png index b2e2e6d4..a6b545a5 100644 Binary files a/assets/emotes/emoticons/2x/monkaHmm.png and b/assets/emotes/emoticons/2x/monkaHmm.png differ diff --git a/assets/emotes/emoticons/4x/DEEEATH.png b/assets/emotes/emoticons/4x/DEEEATH.png new file mode 100644 index 00000000..69ea2f65 Binary files /dev/null and b/assets/emotes/emoticons/4x/DEEEATH.png differ diff --git a/assets/emotes/emoticons/4x/DuckerZ.png b/assets/emotes/emoticons/4x/DuckerZ.png index dbd2a4bd..9fafaba8 100644 Binary files a/assets/emotes/emoticons/4x/DuckerZ.png and b/assets/emotes/emoticons/4x/DuckerZ.png differ diff --git a/assets/emotes/emoticons/4x/GimliFlushed.png b/assets/emotes/emoticons/4x/GimliFlushed.png new file mode 100644 index 00000000..31d8106f Binary files /dev/null and b/assets/emotes/emoticons/4x/GimliFlushed.png differ diff --git a/assets/emotes/emoticons/4x/KING.png b/assets/emotes/emoticons/4x/KING.png index d1a96de0..54a20bef 100644 Binary files a/assets/emotes/emoticons/4x/KING.png and b/assets/emotes/emoticons/4x/KING.png differ diff --git a/assets/emotes/emoticons/4x/POKE.png b/assets/emotes/emoticons/4x/POKE.png index 8373599b..39a5a238 100644 Binary files a/assets/emotes/emoticons/4x/POKE.png and b/assets/emotes/emoticons/4x/POKE.png differ diff --git a/assets/emotes/emoticons/4x/PepoComfy.png b/assets/emotes/emoticons/4x/PepoComfy.png index 1b11e090..4066d6cb 100644 Binary files a/assets/emotes/emoticons/4x/PepoComfy.png and b/assets/emotes/emoticons/4x/PepoComfy.png differ diff --git a/assets/emotes/emoticons/4x/PepoFight.png b/assets/emotes/emoticons/4x/PepoFight.png new file mode 100644 index 00000000..dc4eb2ce Binary files /dev/null and b/assets/emotes/emoticons/4x/PepoFight.png differ diff --git a/assets/emotes/emoticons/4x/SMOrc.png b/assets/emotes/emoticons/4x/SMOrc.png index d6d8662c..bebb4cbe 100644 Binary files a/assets/emotes/emoticons/4x/SMOrc.png and b/assets/emotes/emoticons/4x/SMOrc.png differ diff --git a/assets/emotes/emoticons/4x/monkaHmm.png b/assets/emotes/emoticons/4x/monkaHmm.png index dfac8985..e3d01bf1 100644 Binary files a/assets/emotes/emoticons/4x/monkaHmm.png and b/assets/emotes/emoticons/4x/monkaHmm.png differ diff --git a/assets/emotes/emoticons/DEEEATH.png b/assets/emotes/emoticons/DEEEATH.png new file mode 100644 index 00000000..26186b6b Binary files /dev/null and b/assets/emotes/emoticons/DEEEATH.png differ diff --git a/assets/emotes/emoticons/DuckerZ.png b/assets/emotes/emoticons/DuckerZ.png index 03f50b5b..77d94bbb 100644 Binary files a/assets/emotes/emoticons/DuckerZ.png and b/assets/emotes/emoticons/DuckerZ.png differ diff --git a/assets/emotes/emoticons/GimliFlushed.png b/assets/emotes/emoticons/GimliFlushed.png new file mode 100644 index 00000000..a36e35bb Binary files /dev/null and b/assets/emotes/emoticons/GimliFlushed.png differ diff --git a/assets/emotes/emoticons/KING.png b/assets/emotes/emoticons/KING.png index e1d7dae2..31a0db63 100644 Binary files a/assets/emotes/emoticons/KING.png and b/assets/emotes/emoticons/KING.png differ diff --git a/assets/emotes/emoticons/POKE.png b/assets/emotes/emoticons/POKE.png index 573b74a9..f31b4af4 100644 Binary files a/assets/emotes/emoticons/POKE.png and b/assets/emotes/emoticons/POKE.png differ diff --git a/assets/emotes/emoticons/PepoComfy.png b/assets/emotes/emoticons/PepoComfy.png index 2ac76899..b3b924e3 100644 Binary files a/assets/emotes/emoticons/PepoComfy.png and b/assets/emotes/emoticons/PepoComfy.png differ diff --git a/assets/emotes/emoticons/PepoFight.png b/assets/emotes/emoticons/PepoFight.png new file mode 100644 index 00000000..fc06ca9d Binary files /dev/null and b/assets/emotes/emoticons/PepoFight.png differ diff --git a/assets/emotes/emoticons/SMOrc.png b/assets/emotes/emoticons/SMOrc.png index 1a5a10fb..b5ea731f 100644 Binary files a/assets/emotes/emoticons/SMOrc.png and b/assets/emotes/emoticons/SMOrc.png differ diff --git a/assets/emotes/emoticons/monkaHmm.png b/assets/emotes/emoticons/monkaHmm.png index 8703482d..4e8df48c 100644 Binary files a/assets/emotes/emoticons/monkaHmm.png and b/assets/emotes/emoticons/monkaHmm.png differ diff --git a/assets/emotes/modifiers/2x/gondor.png b/assets/emotes/modifiers/2x/gondor.png new file mode 100644 index 00000000..4a6990cd Binary files /dev/null and b/assets/emotes/modifiers/2x/gondor.png differ diff --git a/assets/emotes/modifiers/2x/mordor.png b/assets/emotes/modifiers/2x/mordor.png new file mode 100644 index 00000000..95aaddb5 Binary files /dev/null and b/assets/emotes/modifiers/2x/mordor.png differ diff --git a/assets/emotes/modifiers/2x/rohan.png b/assets/emotes/modifiers/2x/rohan.png new file mode 100644 index 00000000..c0bd6e74 Binary files /dev/null and b/assets/emotes/modifiers/2x/rohan.png differ diff --git a/assets/emotes/modifiers/2x/saruman.png b/assets/emotes/modifiers/2x/saruman.png new file mode 100644 index 00000000..9723d3fc Binary files /dev/null and b/assets/emotes/modifiers/2x/saruman.png differ diff --git a/assets/emotes/modifiers/4x/gondor.png b/assets/emotes/modifiers/4x/gondor.png new file mode 100644 index 00000000..78d76aa7 Binary files /dev/null and b/assets/emotes/modifiers/4x/gondor.png differ diff --git a/assets/emotes/modifiers/4x/mordor.png b/assets/emotes/modifiers/4x/mordor.png new file mode 100644 index 00000000..683d8626 Binary files /dev/null and b/assets/emotes/modifiers/4x/mordor.png differ diff --git a/assets/emotes/modifiers/4x/rohan.png b/assets/emotes/modifiers/4x/rohan.png new file mode 100644 index 00000000..48d27758 Binary files /dev/null and b/assets/emotes/modifiers/4x/rohan.png differ diff --git a/assets/emotes/modifiers/4x/saruman.png b/assets/emotes/modifiers/4x/saruman.png new file mode 100644 index 00000000..f727769e Binary files /dev/null and b/assets/emotes/modifiers/4x/saruman.png differ diff --git a/assets/emotes/modifiers/gondor.png b/assets/emotes/modifiers/gondor.png new file mode 100644 index 00000000..c6bc0c69 Binary files /dev/null and b/assets/emotes/modifiers/gondor.png differ diff --git a/assets/emotes/modifiers/mordor.png b/assets/emotes/modifiers/mordor.png new file mode 100644 index 00000000..9a08c2fa Binary files /dev/null and b/assets/emotes/modifiers/mordor.png differ diff --git a/assets/emotes/modifiers/rohan.png b/assets/emotes/modifiers/rohan.png new file mode 100644 index 00000000..a352373e Binary files /dev/null and b/assets/emotes/modifiers/rohan.png differ diff --git a/assets/emotes/modifiers/saruman.png b/assets/emotes/modifiers/saruman.png new file mode 100644 index 00000000..9a655c09 Binary files /dev/null and b/assets/emotes/modifiers/saruman.png differ