diff --git a/assets/anim.scss b/assets/anim.scss index 79202ed7..9264c7ff 100644 --- a/assets/anim.scss +++ b/assets/anim.scss @@ -917,17 +917,6 @@ $spritesDir : '/assets/emotes/emoticons-animated/'; $can-animate-forever: true ); -@include sprite-animation( - $file-name: DaFeels, - $frame-count: 180, - $sprite-width: 5760px, - $sprite-height: 32px, - $animation-duration: 5s, - $iteration-count: 1, - $end-on-last-frame: true, - $can-animate-forever: true -); - @include sprite-animation( $file-name: WICKEDSTEER, $frame-count: 24, @@ -968,15 +957,15 @@ $spritesDir : '/assets/emotes/emoticons-animated/'; @include sprite-animation( $file-name: PepoCopter, - $frame-count: 30, - $sprite-width: 2280px, + $frame-count: 3, + $sprite-width: 174px, $sprite-height: 32px, - $animation-duration: 1s, - $iteration-count: 8, + $animation-duration: 240ms, + $iteration-count: 37.5, $can-animate-forever: true, $extra-animation: true, - $extra-animation-duration: 500ms, - $extra-animation-iteration-count: 16, + $extra-animation-duration: 480ms, + $extra-animation-iteration-count: 18.75, $extra-animation-timing-function: ease-in-out, $extra-animation-direction: alternate ) { diff --git a/assets/emotecreators.json b/assets/emotecreators.json index 0d2e5e38..0c47dbd7 100644 --- a/assets/emotecreators.json +++ b/assets/emotecreators.json @@ -670,8 +670,8 @@ "december": "" }, "PepoCopter": { - "createdby": "FizzyLongstockings", - "_createdby": "Gehirnchirurg & soadsoap", + "createdby": "Gehirnchirurg & soadsoap", + "dunc": "FizzyLongstockings", "october": "", "december": "" }, diff --git a/assets/emotes/emoticons/2x/MAGE.png b/assets/emotes/emoticons/2x/MAGE.png index 96e8bde7..457afcc4 100644 Binary files a/assets/emotes/emoticons/2x/MAGE.png and b/assets/emotes/emoticons/2x/MAGE.png differ diff --git a/assets/emotes/emoticons/4x/MAGE.png b/assets/emotes/emoticons/4x/MAGE.png index 65a6ceb9..bde558ed 100644 Binary files a/assets/emotes/emoticons/4x/MAGE.png and b/assets/emotes/emoticons/4x/MAGE.png differ diff --git a/assets/emotes/emoticons/MAGE.png b/assets/emotes/emoticons/MAGE.png index 63819b0f..dd7c7e97 100644 Binary files a/assets/emotes/emoticons/MAGE.png and b/assets/emotes/emoticons/MAGE.png differ