diff --git a/website/client/assets/images/npc/summer/market_background.png b/website/client/assets/images/npc/summer/market_background.png new file mode 100644 index 0000000000..d8727a62d0 Binary files /dev/null and b/website/client/assets/images/npc/summer/market_background.png differ diff --git a/website/client/assets/images/npc/summer/market_banner_npc.png b/website/client/assets/images/npc/summer/market_banner_npc.png new file mode 100644 index 0000000000..e7096d0bc9 Binary files /dev/null and b/website/client/assets/images/npc/summer/market_banner_npc.png differ diff --git a/website/raw_sprites/spritesmith/gear/events/summer/promo/SummerRogue14.png b/website/client/assets/images/npc/summer/npc_bailey.png old mode 100755 new mode 100644 similarity index 69% rename from website/raw_sprites/spritesmith/gear/events/summer/promo/SummerRogue14.png rename to website/client/assets/images/npc/summer/npc_bailey.png index e892eb8273..f6ce232f91 Binary files a/website/raw_sprites/spritesmith/gear/events/summer/promo/SummerRogue14.png and b/website/client/assets/images/npc/summer/npc_bailey.png differ diff --git a/website/raw_sprites/spritesmith/gear/events/summer/promo/Healer_Summer.png b/website/client/assets/images/npc/summer/npc_justin.png old mode 100755 new mode 100644 similarity index 59% rename from website/raw_sprites/spritesmith/gear/events/summer/promo/Healer_Summer.png rename to website/client/assets/images/npc/summer/npc_justin.png index f103a15b10..28a58235d3 Binary files a/website/raw_sprites/spritesmith/gear/events/summer/promo/Healer_Summer.png and b/website/client/assets/images/npc/summer/npc_justin.png differ diff --git a/website/client/assets/images/npc/summer/npc_matt.png b/website/client/assets/images/npc/summer/npc_matt.png new file mode 100644 index 0000000000..d29232d6ff Binary files /dev/null and b/website/client/assets/images/npc/summer/npc_matt.png differ diff --git a/website/client/assets/images/npc/summer/quest_shop_background.png b/website/client/assets/images/npc/summer/quest_shop_background.png new file mode 100644 index 0000000000..edd6e144cb Binary files /dev/null and b/website/client/assets/images/npc/summer/quest_shop_background.png differ diff --git a/website/client/assets/images/npc/summer/quest_shop_npc.png b/website/client/assets/images/npc/summer/quest_shop_npc.png new file mode 100644 index 0000000000..85af96e4f1 Binary files /dev/null and b/website/client/assets/images/npc/summer/quest_shop_npc.png differ diff --git a/website/client/assets/images/npc/summer/seasonal_shop_closed_background.png b/website/client/assets/images/npc/summer/seasonal_shop_closed_background.png new file mode 100644 index 0000000000..9367206b62 Binary files /dev/null and b/website/client/assets/images/npc/summer/seasonal_shop_closed_background.png differ diff --git a/website/client/assets/images/npc/summer/seasonal_shop_closed_npc.png b/website/client/assets/images/npc/summer/seasonal_shop_closed_npc.png new file mode 100644 index 0000000000..861ffad211 Binary files /dev/null and b/website/client/assets/images/npc/summer/seasonal_shop_closed_npc.png differ diff --git a/website/client/assets/images/npc/summer/seasonal_shop_opened_background.png b/website/client/assets/images/npc/summer/seasonal_shop_opened_background.png new file mode 100644 index 0000000000..6caf805cd9 Binary files /dev/null and b/website/client/assets/images/npc/summer/seasonal_shop_opened_background.png differ diff --git a/website/client/assets/images/npc/summer/seasonal_shop_opened_npc.png b/website/client/assets/images/npc/summer/seasonal_shop_opened_npc.png new file mode 100644 index 0000000000..a4e465f1e6 Binary files /dev/null and b/website/client/assets/images/npc/summer/seasonal_shop_opened_npc.png differ diff --git a/website/client/assets/images/npc/summer/tavern_background.png b/website/client/assets/images/npc/summer/tavern_background.png new file mode 100644 index 0000000000..1f344836a2 Binary files /dev/null and b/website/client/assets/images/npc/summer/tavern_background.png differ diff --git a/website/client/assets/images/npc/summer/tavern_npc.png b/website/client/assets/images/npc/summer/tavern_npc.png new file mode 100644 index 0000000000..eca570c497 Binary files /dev/null and b/website/client/assets/images/npc/summer/tavern_npc.png differ diff --git a/website/client/assets/images/npc/summer/time_travelers_background.png b/website/client/assets/images/npc/summer/time_travelers_background.png new file mode 100644 index 0000000000..2ea6fc68cc Binary files /dev/null and b/website/client/assets/images/npc/summer/time_travelers_background.png differ diff --git a/website/client/assets/images/npc/summer/time_travelers_closed_banner.png b/website/client/assets/images/npc/summer/time_travelers_closed_banner.png new file mode 100644 index 0000000000..d6346979ac Binary files /dev/null and b/website/client/assets/images/npc/summer/time_travelers_closed_banner.png differ diff --git a/website/client/assets/images/npc/summer/time_travelers_open_banner.png b/website/client/assets/images/npc/summer/time_travelers_open_banner.png new file mode 100644 index 0000000000..502af9e696 Binary files /dev/null and b/website/client/assets/images/npc/summer/time_travelers_open_banner.png differ diff --git a/website/client/assets/scss/variables.scss b/website/client/assets/scss/variables.scss index 4345e8fd25..89958c4bec 100644 --- a/website/client/assets/scss/variables.scss +++ b/website/client/assets/scss/variables.scss @@ -1,9 +1,9 @@ // this variables are used to determine which shop npc/backgrounds should be loaded -// possible values are: normal, fall, habitoween, thanksgiving, winter, nye, birthday, valentines, spring +// possible values are: normal, fall, habitoween, thanksgiving, winter, nye, birthday, valentines, spring, summer // more to be added on future seasons -$npc_market_flavor: 'normal'; -$npc_quests_flavor: 'normal'; -$npc_seasonal_flavor: 'normal'; -$npc_timetravelers_flavor: 'normal'; -$npc_tavern_flavor: 'normal'; +$npc_market_flavor: 'summer'; +$npc_quests_flavor: 'summer'; +$npc_seasonal_flavor: 'summer'; +$npc_timetravelers_flavor: 'summer'; +$npc_tavern_flavor: 'summer'; diff --git a/website/client/components/achievements/chooseClass.vue b/website/client/components/achievements/chooseClass.vue index d6dcccf56d..9099396858 100644 --- a/website/client/components/achievements/chooseClass.vue +++ b/website/client/components/achievements/chooseClass.vue @@ -164,30 +164,30 @@ export default { classGear (heroClass) { if (heroClass === 'rogue') { return { - armor: 'armor_rogue_5', - head: 'head_rogue_5', - shield: 'shield_rogue_6', - weapon: 'weapon_rogue_6', + armor: 'armor_special_summer2018Rogue', + head: 'head_special_summer2018Rogue', + shield: 'shield_special_summer2018Rogue', + weapon: 'weapon_special_summer2018Rogue', }; } else if (heroClass === 'wizard') { return { - armor: 'armor_wizard_5', - head: 'head_wizard_5', - weapon: 'weapon_wizard_6', + armor: 'armor_special_summer2018Mage', + head: 'head_special_summer2018Mage', + weapon: 'weapon_special_summer2018Mage', }; } else if (heroClass === 'healer') { return { - armor: 'armor_healer_5', - head: 'head_healer_5', - shield: 'shield_healer_5', - weapon: 'weapon_healer_6', + armor: 'armor_special_summer2018Healer', + head: 'head_special_summer2018Healer', + shield: 'shield_special_summer2018Healer', + weapon: 'weapon_special_summer2018Healer', }; } else { return { - armor: 'armor_warrior_5', - head: 'head_warrior_5', - shield: 'shield_warrior_5', - weapon: 'weapon_warrior_6', + armor: 'armor_special_summer2018Warrior', + head: 'head_special_summer2018Warrior', + shield: 'shield_special_summer2018Warrior', + weapon: 'weapon_special_summer2018Warrior', }; } }, diff --git a/website/client/components/shops/market/index.vue b/website/client/components/shops/market/index.vue index 0171015400..c075987fed 100644 --- a/website/client/components/shops/market/index.vue +++ b/website/client/components/shops/market/index.vue @@ -131,7 +131,7 @@ div( v-for="category in categories", - v-if="viewOptions[category.identifier].selected" + v-if="viewOptions[category.identifier].selected && category.identifier !== 'equipment'" ) h4 {{ category.text }} diff --git a/website/client/components/shops/shopItem.vue b/website/client/components/shops/shopItem.vue index fb229cd85f..15daa6097e 100644 --- a/website/client/components/shops/shopItem.vue +++ b/website/client/components/shops/shopItem.vue @@ -38,7 +38,7 @@ div h4.popover-content-title(v-once) {{ item.text }} .popover-content-text(v-if='showNotes && item.key !== "armoire"', v-once) {{ item.notes }} .popover-content-text(v-if='showNotes && item.key === "armoire"') {{ item.notes }} - div(v-if="item.event") {{ limitedString }} + div.mt-4(v-if="item.event") {{ limitedString }}