Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update theme to lotr #530

Merged
merged 1 commit into from
Dec 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
107 changes: 86 additions & 21 deletions assets/anim.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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
);
64 changes: 64 additions & 0 deletions assets/chat/css/generify.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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
);
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
5 changes: 2 additions & 3 deletions assets/emotes.json
Original file line number Diff line number Diff line change
Expand Up @@ -222,8 +222,7 @@
"CONTEXT",
"Krankenwagen",
"CAUGHT",
"PepoTurkey",
"SNOWBALL",
"SNOWBALLFIGHT"
"DEEEATH",
"GROND"
]
}
Binary file added assets/emotes/emoticons-animated/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-animated/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 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 added assets/emotes/emoticons-animated/2x/GROND.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-animated/2x/PepoWant.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-animated/2x/SPYRON.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-animated/2x/ZOOMER.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-animated/4x/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-animated/4x/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 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 added assets/emotes/emoticons-animated/4x/GROND.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-animated/4x/PepoWant.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-animated/4x/SPYRON.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-animated/4x/ZOOMER.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-animated/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-animated/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 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 added assets/emotes/emoticons-animated/GROND.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-animated/PepoWant.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-animated/SPYRON.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-animated/ZOOMER.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/DEEEATH.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/2x/DuckerZ.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/GimliFlushed.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/2x/KING.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/2x/POKE.png
Binary file modified assets/emotes/emoticons/2x/PepoComfy.png
Binary file added assets/emotes/emoticons/2x/PepoFight.png
Binary file modified assets/emotes/emoticons/2x/SMOrc.png
Binary file modified assets/emotes/emoticons/2x/monkaHmm.png
Binary file added assets/emotes/emoticons/4x/DEEEATH.png
Binary file modified assets/emotes/emoticons/4x/DuckerZ.png
Binary file added assets/emotes/emoticons/4x/GimliFlushed.png
Binary file modified assets/emotes/emoticons/4x/KING.png
Binary file modified assets/emotes/emoticons/4x/POKE.png
Binary file modified assets/emotes/emoticons/4x/PepoComfy.png
Binary file added assets/emotes/emoticons/4x/PepoFight.png
Binary file modified assets/emotes/emoticons/4x/SMOrc.png
Binary file modified assets/emotes/emoticons/4x/monkaHmm.png
Binary file added assets/emotes/emoticons/DEEEATH.png
Binary file modified assets/emotes/emoticons/DuckerZ.png
Binary file added assets/emotes/emoticons/GimliFlushed.png
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 added assets/emotes/emoticons/PepoFight.png
Binary file modified assets/emotes/emoticons/SMOrc.png
Binary file modified assets/emotes/emoticons/monkaHmm.png
Binary file added assets/emotes/modifiers/2x/gondor.png
Binary file added assets/emotes/modifiers/2x/mordor.png
Binary file added assets/emotes/modifiers/2x/rohan.png
Binary file added assets/emotes/modifiers/2x/saruman.png
Binary file added assets/emotes/modifiers/4x/gondor.png
Binary file added assets/emotes/modifiers/4x/mordor.png
Binary file added assets/emotes/modifiers/4x/rohan.png
Binary file added assets/emotes/modifiers/4x/saruman.png
Binary file added assets/emotes/modifiers/gondor.png
Binary file added assets/emotes/modifiers/mordor.png
Binary file added assets/emotes/modifiers/rohan.png
Binary file added assets/emotes/modifiers/saruman.png
Loading