Skip to content

Commit

Permalink
reset emote theme
Browse files Browse the repository at this point in the history
  • Loading branch information
slugalisk committed Jul 21, 2024
1 parent a3d824d commit d5b58dd
Show file tree
Hide file tree
Showing 77 changed files with 28 additions and 160 deletions.
108 changes: 22 additions & 86 deletions assets/anim.scss
Original file line number Diff line number Diff line change
Expand Up @@ -814,6 +814,16 @@ $spritesDir : '/assets/emotes/emoticons-animated/';
$can-animate-forever: true
);

@include sprite-animation(
$file-name: ComfyMoobers,
$frame-count: 34,
$sprite-width: 1088px,
$sprite-height: 32px,
$animation-duration: 2550ms,
$iteration-count: 2,
$can-animate-forever: true
);

@include sprite-animation(
$file-name: Cinnabunny,
$frame-count: 5,
Expand Down Expand Up @@ -884,6 +894,18 @@ $spritesDir : '/assets/emotes/emoticons-animated/';
$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
);

@include sprite-animation(
$file-name: modCheck,
$frame-count: 28,
Expand Down Expand Up @@ -1099,89 +1121,3 @@ $spritesDir : '/assets/emotes/emoticons-animated/';
$iteration-count: 3,
$can-animate-forever: 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
);
66 changes: 1 addition & 65 deletions assets/chat/css/generify.scss
Original file line number Diff line number Diff line change
Expand Up @@ -860,68 +860,4 @@

.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
);
}
8 changes: 4 additions & 4 deletions assets/chat/js/const.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand Down
6 changes: 1 addition & 5 deletions assets/emotes.json
Original file line number Diff line number Diff line change
Expand Up @@ -217,10 +217,6 @@
"LOGGERS",
"STIR",
"GRUG",
"CLASSIC",
"DEEEATH",
"GROND",
"SPYRON",
"GimliFlushed"
"CLASSIC"
]
}
Binary file removed assets/emotes/emoticons-animated/2x/BOOMER.png
Binary file not shown.
Binary file removed assets/emotes/emoticons-animated/2x/CampFire.png
Binary file not shown.
Binary file modified assets/emotes/emoticons-animated/2x/ComfyMoobers.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 modified assets/emotes/emoticons-animated/2x/DOGGO.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 removed assets/emotes/emoticons-animated/2x/GROND.png
Binary file not shown.
Binary file removed assets/emotes/emoticons-animated/2x/SPYRON.png
Binary file not shown.
Binary file removed assets/emotes/emoticons-animated/2x/ZOOMER.png
Binary file not shown.
Binary file removed assets/emotes/emoticons-animated/4x/BOOMER.png
Binary file not shown.
Binary file removed assets/emotes/emoticons-animated/4x/CampFire.png
Binary file not shown.
Binary file modified assets/emotes/emoticons-animated/4x/ComfyMoobers.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 modified assets/emotes/emoticons-animated/4x/DOGGO.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 removed assets/emotes/emoticons-animated/4x/GROND.png
Binary file not shown.
Binary file removed assets/emotes/emoticons-animated/4x/SPYRON.png
Binary file not shown.
Binary file removed assets/emotes/emoticons-animated/4x/ZOOMER.png
Binary file not shown.
Binary file removed assets/emotes/emoticons-animated/BOOMER.png
Binary file not shown.
Binary file removed assets/emotes/emoticons-animated/CampFire.png
Binary file not shown.
Binary file modified assets/emotes/emoticons-animated/ComfyMoobers.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 modified assets/emotes/emoticons-animated/DOGGO.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 removed assets/emotes/emoticons-animated/GROND.png
Binary file not shown.
Binary file removed assets/emotes/emoticons-animated/SPYRON.png
Binary file not shown.
Binary file removed assets/emotes/emoticons-animated/ZOOMER.png
Binary file not shown.
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 assets/emotes/emoticons/2x/BOOMER.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 assets/emotes/emoticons/2x/CampFire.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 removed assets/emotes/emoticons/2x/DEEEATH.png
Binary file not shown.
Binary file added assets/emotes/emoticons/2x/DOGGO.png
Binary file modified assets/emotes/emoticons/2x/DuckerZ.png
Binary file removed assets/emotes/emoticons/2x/GimliFlushed.png
Diff not rendered.
Binary file removed assets/emotes/emoticons/2x/KING.png
Diff not rendered.
Binary file modified assets/emotes/emoticons/2x/POKE.png
Binary file modified assets/emotes/emoticons/2x/PepoComfy.png
Binary file removed assets/emotes/emoticons/2x/PepoFight.png
Diff not rendered.
Binary file modified assets/emotes/emoticons/2x/SMOrc.png
Binary file added assets/emotes/emoticons/2x/ZOOMER.png
Binary file modified assets/emotes/emoticons/2x/monkaHmm.png
Binary file added assets/emotes/emoticons/4x/BOOMER.png
Binary file added assets/emotes/emoticons/4x/CampFire.png
Binary file removed assets/emotes/emoticons/4x/DEEEATH.png
Diff not rendered.
Binary file added assets/emotes/emoticons/4x/DOGGO.png
Binary file modified assets/emotes/emoticons/4x/DuckerZ.png
Binary file removed assets/emotes/emoticons/4x/GimliFlushed.png
Diff not rendered.
Binary file removed assets/emotes/emoticons/4x/KING.png
Diff not rendered.
Binary file modified assets/emotes/emoticons/4x/POKE.png
Binary file modified assets/emotes/emoticons/4x/PepoComfy.png
Binary file removed assets/emotes/emoticons/4x/PepoFight.png
Diff not rendered.
Binary file modified assets/emotes/emoticons/4x/SMOrc.png
Binary file added assets/emotes/emoticons/4x/ZOOMER.png
Binary file modified assets/emotes/emoticons/4x/monkaHmm.png
Binary file added assets/emotes/emoticons/BOOMER.png
Binary file added assets/emotes/emoticons/CampFire.png
Binary file removed assets/emotes/emoticons/DEEEATH.png
Diff not rendered.
Binary file added assets/emotes/emoticons/DOGGO.png
Binary file modified assets/emotes/emoticons/DuckerZ.png
Binary file removed assets/emotes/emoticons/GimliFlushed.png
Diff not rendered.
Binary file modified assets/emotes/emoticons/KING.png
Binary file modified assets/emotes/emoticons/POKE.png
Binary file modified assets/emotes/emoticons/PepoComfy.png
Binary file modified assets/emotes/emoticons/PepoFight.png
Binary file modified assets/emotes/emoticons/SMOrc.png
100644 → 100755
Binary file added assets/emotes/emoticons/ZOOMER.png
Binary file modified assets/emotes/emoticons/monkaHmm.png
Binary file removed assets/emotes/modifiers/2x/gondor.png
Diff not rendered.
Binary file removed assets/emotes/modifiers/2x/mordor.png
Diff not rendered.
Binary file removed assets/emotes/modifiers/2x/rohan.png
Diff not rendered.
Binary file removed assets/emotes/modifiers/2x/saruman.png
Diff not rendered.
Binary file removed assets/emotes/modifiers/4x/gondor.png
Diff not rendered.
Binary file removed assets/emotes/modifiers/4x/mordor.png
Diff not rendered.
Binary file removed assets/emotes/modifiers/4x/rohan.png
Diff not rendered.
Binary file removed assets/emotes/modifiers/4x/saruman.png
Diff not rendered.
Binary file removed assets/emotes/modifiers/gondor.png
Diff not rendered.
Binary file removed assets/emotes/modifiers/mordor.png
Diff not rendered.
Binary file removed assets/emotes/modifiers/rohan.png
Diff not rendered.
Binary file removed assets/emotes/modifiers/saruman.png
Diff not rendered.

0 comments on commit d5b58dd

Please sign in to comment.