From 87b26c4cfb9a3666836a597140bf9524c0b3a07a Mon Sep 17 00:00:00 2001 From: Sabe Jones Date: Thu, 2 Apr 2020 15:09:30 -0500 Subject: [PATCH] chore(event): end Foolishness --- website/client/src/assets/scss/animals.scss | 9 ++- website/client/src/assets/scss/variables.scss | 10 ++-- website/client/src/components/avatar.vue | 52 +----------------- .../components/inventory/stable/petItem.vue | 7 +-- website/client/src/libs/createAnimal.js | 15 +---- .../tests/unit/components/avatar.spec.js | 2 +- .../raw_sprites/spritesmith/npcs/npc_matt.png | Bin 6811 -> 6700 bytes 7 files changed, 20 insertions(+), 75 deletions(-) diff --git a/website/client/src/assets/scss/animals.scss b/website/client/src/assets/scss/animals.scss index 2ef5d5a24a..91d3e7acdf 100644 --- a/website/client/src/assets/scss/animals.scss +++ b/website/client/src/assets/scss/animals.scss @@ -5,7 +5,14 @@ right: 0; bottom: 0; left: 0; - top: -28px !important; + + &:not([class*="FlyingPig"]) { + top: -28px !important; + } +} + +.Pet[class*="FlyingPig"] { + top: 7px !important; } .Pet.Pet-Dragon-Hydra { diff --git a/website/client/src/assets/scss/variables.scss b/website/client/src/assets/scss/variables.scss index 9d6f95f2e0..65f9ebf339 100644 --- a/website/client/src/assets/scss/variables.scss +++ b/website/client/src/assets/scss/variables.scss @@ -2,11 +2,11 @@ // possible values are: normal, fall, habitoween, thanksgiving, winter, nye, birthday, valentines, spring, summer // more to be added on future seasons -$npc_market_flavor: 'aprilfools'; -$npc_quests_flavor: 'aprilfools'; -$npc_seasonal_flavor: 'aprilfools'; -$npc_timetravelers_flavor: 'aprilfools'; -$npc_tavern_flavor: 'aprilfools'; +$npc_market_flavor: 'spring'; +$npc_quests_flavor: 'spring'; +$npc_seasonal_flavor: 'spring'; +$npc_timetravelers_flavor: 'spring'; +$npc_tavern_flavor: 'spring'; $restingToolbarHeight: 40px; $menuToolbarHeight: 56px; diff --git a/website/client/src/components/avatar.vue b/website/client/src/components/avatar.vue index a5b7328f51..93609b7dd8 100644 --- a/website/client/src/components/avatar.vue +++ b/website/client/src/components/avatar.vue @@ -79,8 +79,9 @@ > @@ -123,7 +124,6 @@ diff --git a/website/client/src/components/inventory/stable/petItem.vue b/website/client/src/components/inventory/stable/petItem.vue index de4e44170a..8d6b158471 100644 --- a/website/client/src/components/inventory/stable/petItem.vue +++ b/website/client/src/components/inventory/stable/petItem.vue @@ -161,10 +161,7 @@ export default { }, getPetItemClass () { if (this.isOwned() || (this.mountOwned() && this.isHatchable())) { - if (this.isSpecial()) { - return 'Pet Pet-LionCub-Dessert'; - } - return `${this.item.class} ${this.item.eggKey}`; + return `Pet Pet-${this.item.key} ${this.item.eggKey}`; } if (!this.isOwned() && this.isSpecial()) { @@ -176,7 +173,7 @@ export default { } if (this.mountOwned()) { - return `GreyedOut ${this.item.class} ${this.item.eggKey}`; + return `GreyedOut Pet Pet-${this.item.key} ${this.item.eggKey}`; } // Can't hatch diff --git a/website/client/src/libs/createAnimal.js b/website/client/src/libs/createAnimal.js index 06b80a389e..8eebf2eb58 100644 --- a/website/client/src/libs/createAnimal.js +++ b/website/client/src/libs/createAnimal.js @@ -2,9 +2,6 @@ import content from '@/../../common/script/content'; const specialPets = Object.keys(content.specialPets); const wackyPets = Object.keys(content.wackyPets); -const questPets = Object.keys(content.questPets); -const premiumPets = Object.keys(content.premiumPets); -const dropPets = Object.keys(content.pets); function getText (textOrFunction) { if (textOrFunction instanceof Function) { @@ -36,20 +33,10 @@ export function isSpecial (animal) { export function createAnimal (egg, potion, type, _content, userItems) { const animalKey = `${egg.key}-${potion.key}`; - let fooledKey = ''; - if (questPets.includes(animalKey)) { - fooledKey = 'FlyingPig-Dessert'; - } else if (dropPets.includes(animalKey) - || premiumPets.includes(animalKey) - || wackyPets.includes(animalKey)) { - fooledKey = `${egg.key}-Dessert`; - } else { - fooledKey = animalKey; - } return { key: animalKey, - class: type === 'pet' ? `Pet Pet-${fooledKey}` : `Mount_Icon_${animalKey}`, + class: type === 'pet' ? `Pet Pet-${animalKey}` : `Mount_Icon_${animalKey}`, eggKey: egg.key, eggName: getText(egg.text), potionKey: potion.key, diff --git a/website/client/tests/unit/components/avatar.spec.js b/website/client/tests/unit/components/avatar.spec.js index c1f49322df..49e6f8398d 100644 --- a/website/client/tests/unit/components/avatar.spec.js +++ b/website/client/tests/unit/components/avatar.spec.js @@ -78,7 +78,7 @@ context('avatar.vue', () => { }; }); - xit('defaults to 27px', () => { + it('defaults to 27px', () => { vm.avatarOnly = true; expect(vm.paddingTop).to.equal('27px'); }); diff --git a/website/raw_sprites/spritesmith/npcs/npc_matt.png b/website/raw_sprites/spritesmith/npcs/npc_matt.png index 2a6aabb0a12d635df1d4727ba4edaeef014dd018..e129d6e43e63b61fb0a65d576480aa724e5c25d2 100644 GIT binary patch literal 6700 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 LEoiOcvxxr#kWsx8 literal 6811 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