diff --git a/website/client/assets/scss/variables.scss b/website/client/assets/scss/variables.scss index 11124495dd..4345e8fd25 100644 --- a/website/client/assets/scss/variables.scss +++ b/website/client/assets/scss/variables.scss @@ -2,8 +2,8 @@ // possible values are: normal, fall, habitoween, thanksgiving, winter, nye, birthday, valentines, spring // more to be added on future seasons -$npc_market_flavor: 'spring'; -$npc_quests_flavor: 'spring'; -$npc_seasonal_flavor: 'spring'; -$npc_timetravelers_flavor: 'spring'; -$npc_tavern_flavor: 'spring'; +$npc_market_flavor: 'normal'; +$npc_quests_flavor: 'normal'; +$npc_seasonal_flavor: 'normal'; +$npc_timetravelers_flavor: 'normal'; +$npc_tavern_flavor: 'normal'; diff --git a/website/common/script/content/shop-featuredItems.js b/website/common/script/content/shop-featuredItems.js index dd24ca9e53..2cab7818a1 100644 --- a/website/common/script/content/shop-featuredItems.js +++ b/website/common/script/content/shop-featuredItems.js @@ -8,12 +8,12 @@ const featuredItems = { path: 'armoire', }, { - type: 'premiumHatchingPotion', - path: 'premiumHatchingPotions.Shimmer', + type: 'hatchingPotions', + path: 'hatchingPotions.Red', }, { - type: 'premiumHatchingPotion', - path: 'premiumHatchingPotions.Rainbow', + type: 'hatchingPotions', + path: 'hatchingPotions.Golden', }, { type: 'card', @@ -29,16 +29,12 @@ const featuredItems = { type: 'quests', path: 'quests.taskwoodsTerror1', }, - { - type: 'quests', - path: 'quests.egg', - }, { type: 'quests', path: 'quests.bunny', }, ], - seasonal: 'springHealer', + seasonal: '', timeTravelers: [ // TODO ], diff --git a/website/common/script/libs/shops-seasonal.config.js b/website/common/script/libs/shops-seasonal.config.js index 068c0650b1..c1ec9fbe14 100644 --- a/website/common/script/libs/shops-seasonal.config.js +++ b/website/common/script/libs/shops-seasonal.config.js @@ -1,29 +1,22 @@ -import { SEASONAL_SETS } from '../content/constants'; +// import { SEASONAL_SETS } from '../content/constants'; module.exports = { - opened: true, + opened: false, - currentSeason: 'Spring', + currentSeason: 'Closed', dateRange: { start: '2018-03-20', end: '2018-04-30' }, availableSets: [ - ...SEASONAL_SETS.spring, ], pinnedSets: { - wizard: 'spring2018TulipMageSet', - warrior: 'spring2018SunriseWarriorSet', - rogue: 'spring2018DucklingRogueSet', - healer: 'spring2018GarnetHealerSet', }, availableSpells: [ - 'shinySeed', ], availableQuests: [ - 'egg', ], featuredSet: 'comfortingKittySet', diff --git a/website/raw_sprites/spritesmith/npcs/npc_bailey.png b/website/raw_sprites/spritesmith/npcs/npc_bailey.png index 0fe6763311..d5940b986b 100644 Binary files a/website/raw_sprites/spritesmith/npcs/npc_bailey.png and b/website/raw_sprites/spritesmith/npcs/npc_bailey.png differ diff --git a/website/raw_sprites/spritesmith/npcs/npc_justin.png b/website/raw_sprites/spritesmith/npcs/npc_justin.png index 9365bc12c9..08ba7025c2 100644 Binary files a/website/raw_sprites/spritesmith/npcs/npc_justin.png and b/website/raw_sprites/spritesmith/npcs/npc_justin.png differ diff --git a/website/raw_sprites/spritesmith/npcs/npc_matt.png b/website/raw_sprites/spritesmith/npcs/npc_matt.png index e129d6e43e..2531f1084b 100644 Binary files a/website/raw_sprites/spritesmith/npcs/npc_matt.png and b/website/raw_sprites/spritesmith/npcs/npc_matt.png differ