From 0142e332e860f25de25360fc4f4bcb678f89975b Mon Sep 17 00:00:00 2001 From: Sabe Jones Date: Thu, 16 Aug 2018 14:40:09 -0500 Subject: [PATCH] feat(content): Kangaroo Pet Quest --- website/client/components/avatar.vue | 39 +++++++++++------- website/common/locales/en/content.json | 12 ++++-- website/common/locales/en/questsContent.json | 9 +++- website/common/script/content/eggs.js | 6 +++ website/common/script/content/quests.js | 32 ++++++++++++++ .../quests/bosses/quest_kangaroo.png | Bin 0 -> 3004 bytes .../inventory_quest_scroll_kangaroo.png | Bin 0 -> 8664 bytes .../stable/eggs/Pet_Egg_Kangaroo.png | Bin 0 -> 5493 bytes .../mounts/body/Mount_Body_Kangaroo-Base.png | Bin 760 -> 3710 bytes .../Mount_Body_Kangaroo-CottonCandyBlue.png | Bin 773 -> 3726 bytes .../Mount_Body_Kangaroo-CottonCandyPink.png | Bin 795 -> 3766 bytes .../body/Mount_Body_Kangaroo-Desert.png | Bin 786 -> 3718 bytes .../body/Mount_Body_Kangaroo-Golden.png | Bin 802 -> 3800 bytes .../mounts/body/Mount_Body_Kangaroo-Red.png | Bin 802 -> 3767 bytes .../mounts/body/Mount_Body_Kangaroo-Shade.png | Bin 714 -> 3724 bytes .../body/Mount_Body_Kangaroo-Skeleton.png | Bin 864 -> 3794 bytes .../mounts/body/Mount_Body_Kangaroo-White.png | Bin 773 -> 3650 bytes .../body/Mount_Body_Kangaroo-Zombie.png | Bin 806 -> 3938 bytes .../mounts/head/Mount_Head_Kangaroo-Base.png | Bin 1053 -> 3265 bytes .../Mount_Head_Kangaroo-CottonCandyBlue.png | Bin 1091 -> 3274 bytes .../Mount_Head_Kangaroo-CottonCandyPink.png | Bin 1099 -> 3282 bytes .../head/Mount_Head_Kangaroo-Desert.png | Bin 1094 -> 3263 bytes .../head/Mount_Head_Kangaroo-Golden.png | Bin 1115 -> 3268 bytes .../mounts/head/Mount_Head_Kangaroo-Red.png | Bin 1112 -> 3277 bytes .../mounts/head/Mount_Head_Kangaroo-Shade.png | Bin 1065 -> 3224 bytes .../head/Mount_Head_Kangaroo-Skeleton.png | Bin 1083 -> 3308 bytes .../mounts/head/Mount_Head_Kangaroo-White.png | Bin 1005 -> 3243 bytes .../head/Mount_Head_Kangaroo-Zombie.png | Bin 1292 -> 3397 bytes .../mounts/icon/Mount_Icon_Kangaroo-Base.png | Bin 0 -> 756 bytes .../Mount_Icon_Kangaroo-CottonCandyBlue.png | Bin 0 -> 789 bytes .../Mount_Icon_Kangaroo-CottonCandyPink.png | Bin 0 -> 792 bytes .../icon/Mount_Icon_Kangaroo-Desert.png | Bin 0 -> 792 bytes .../icon/Mount_Icon_Kangaroo-Golden.png | Bin 0 -> 783 bytes .../mounts/icon/Mount_Icon_Kangaroo-Red.png | Bin 0 -> 765 bytes .../mounts/icon/Mount_Icon_Kangaroo-Shade.png | Bin 0 -> 744 bytes .../icon/Mount_Icon_Kangaroo-Skeleton.png | Bin 0 -> 834 bytes .../mounts/icon/Mount_Icon_Kangaroo-White.png | Bin 0 -> 759 bytes .../icon/Mount_Icon_Kangaroo-Zombie.png | Bin 0 -> 849 bytes .../stable/pets/Pet-Kangaroo-Base.png | Bin 0 -> 3351 bytes .../pets/Pet-Kangaroo-CottonCandyBlue.png | Bin 0 -> 3410 bytes .../pets/Pet-Kangaroo-CottonCandyPink.png | Bin 0 -> 3424 bytes .../stable/pets/Pet-Kangaroo-Desert.png | Bin 0 -> 3385 bytes .../stable/pets/Pet-Kangaroo-Golden.png | Bin 0 -> 3399 bytes .../stable/pets/Pet-Kangaroo-Red.png | Bin 0 -> 3387 bytes .../stable/pets/Pet-Kangaroo-Shade.png | Bin 0 -> 3288 bytes .../stable/pets/Pet-Kangaroo-Skeleton.png | Bin 0 -> 3313 bytes .../stable/pets/Pet-Kangaroo-White.png | Bin 0 -> 3370 bytes .../stable/pets/Pet-Kangaroo-Zombie.png | Bin 0 -> 3447 bytes .../spritesmith_large/promo_kangaroo.png | Bin 0 -> 12537 bytes .../spritesmith_large/promo_seaserpent.png | Bin 97085 -> 0 bytes .../spritesmith_large/scene_reading.png | Bin 1779 -> 0 bytes .../spritesmith_large/scene_rewards.png | Bin 6004 -> 0 bytes .../spritesmith_large/scene_tavern.png | Bin 0 -> 99918 bytes .../spritesmith_large/scene_todos.png | Bin 5924 -> 0 bytes website/server/controllers/api-v3/news.js | 21 +++++++--- 55 files changed, 94 insertions(+), 25 deletions(-) create mode 100644 website/raw_sprites/spritesmith/quests/bosses/quest_kangaroo.png create mode 100644 website/raw_sprites/spritesmith/quests/scrolls/inventory_quest_scroll_kangaroo.png create mode 100644 website/raw_sprites/spritesmith/stable/eggs/Pet_Egg_Kangaroo.png create mode 100644 website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_Kangaroo-Base.png create mode 100644 website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_Kangaroo-CottonCandyBlue.png create mode 100644 website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_Kangaroo-CottonCandyPink.png create mode 100644 website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_Kangaroo-Desert.png create mode 100644 website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_Kangaroo-Golden.png create mode 100644 website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_Kangaroo-Red.png create mode 100644 website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_Kangaroo-Shade.png create mode 100644 website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_Kangaroo-Skeleton.png create mode 100644 website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_Kangaroo-White.png create mode 100644 website/raw_sprites/spritesmith/stable/mounts/icon/Mount_Icon_Kangaroo-Zombie.png create mode 100644 website/raw_sprites/spritesmith/stable/pets/Pet-Kangaroo-Base.png create mode 100644 website/raw_sprites/spritesmith/stable/pets/Pet-Kangaroo-CottonCandyBlue.png create mode 100644 website/raw_sprites/spritesmith/stable/pets/Pet-Kangaroo-CottonCandyPink.png create mode 100644 website/raw_sprites/spritesmith/stable/pets/Pet-Kangaroo-Desert.png create mode 100644 website/raw_sprites/spritesmith/stable/pets/Pet-Kangaroo-Golden.png create mode 100644 website/raw_sprites/spritesmith/stable/pets/Pet-Kangaroo-Red.png create mode 100644 website/raw_sprites/spritesmith/stable/pets/Pet-Kangaroo-Shade.png create mode 100644 website/raw_sprites/spritesmith/stable/pets/Pet-Kangaroo-Skeleton.png create mode 100644 website/raw_sprites/spritesmith/stable/pets/Pet-Kangaroo-White.png create mode 100644 website/raw_sprites/spritesmith/stable/pets/Pet-Kangaroo-Zombie.png create mode 100644 website/raw_sprites/spritesmith_large/promo_kangaroo.png delete mode 100644 website/raw_sprites/spritesmith_large/promo_seaserpent.png delete mode 100644 website/raw_sprites/spritesmith_large/scene_reading.png delete mode 100644 website/raw_sprites/spritesmith_large/scene_rewards.png create mode 100644 website/raw_sprites/spritesmith_large/scene_tavern.png delete mode 100644 website/raw_sprites/spritesmith_large/scene_todos.png diff --git a/website/client/components/avatar.vue b/website/client/components/avatar.vue index a4acea6cc0..516535cf65 100644 --- a/website/client/components/avatar.vue +++ b/website/client/components/avatar.vue @@ -15,22 +15,22 @@ // Show avatar only if not currently affected by visual buff template(v-if="showAvatar()") - span(:class="'chair_' + member.preferences.chair") - span(:class="getGearClass('back')") - span(:class="skinClass") - span(:class="member.preferences.size + '_shirt_' + member.preferences.shirt") - span.head_0 - span(:class="member.preferences.size + '_' + getGearClass('armor')") - span(:class="getGearClass('back_collar')") + span(:class="['chair_' + member.preferences.chair, specialMountClass]") + span(:class="[getGearClass('back'), specialMountClass]") + span(:class="[skinClass, specialMountClass]") + span(:class="[member.preferences.size + '_shirt_' + member.preferences.shirt, specialMountClass]") + span(:class="['head_0', specialMountClass]") + span(:class="[member.preferences.size + '_' + getGearClass('armor'), specialMountClass]") + span(:class="[getGearClass('back_collar'), specialMountClass]") template(v-for="type in ['bangs', 'base', 'mustache', 'beard']") - span(:class="'hair_' + type + '_' + member.preferences.hair[type] + '_' + member.preferences.hair.color") - span(:class="getGearClass('body')") - span(:class="getGearClass('eyewear')") - span(:class="getGearClass('head')") - span(:class="getGearClass('headAccessory')") - span(:class="'hair_flower_' + member.preferences.hair.flower") - span(v-if="!hideGear('shield')", :class="getGearClass('shield')") - span(v-if="!hideGear('weapon')", :class="getGearClass('weapon')") + span(:class="['hair_' + type + '_' + member.preferences.hair[type] + '_' + member.preferences.hair.color, specialMountClass]") + span(:class="[getGearClass('body'), specialMountClass]") + span(:class="[getGearClass('eyewear'), specialMountClass]") + span(:class="[getGearClass('head'), specialMountClass]") + span(:class="[getGearClass('headAccessory'), specialMountClass]") + span(:class="['hair_flower_' + member.preferences.hair.flower, specialMountClass]") + span(v-if="!hideGear('shield')", :class="[getGearClass('shield'), specialMountClass]") + span(v-if="!hideGear('weapon')", :class="[getGearClass('weapon'), specialMountClass]") // Resting span.zzz(v-if="member.preferences.sleep") @@ -67,6 +67,10 @@ bottom: 0px; left: 0px; } + + .offset-kangaroo { + margin-top: 24px; + }