diff --git a/website/common/script/content/appearance/backgrounds.js b/website/common/script/content/appearance/backgrounds.js index efd27142d2..bf2a00e1c8 100644 --- a/website/common/script/content/appearance/backgrounds.js +++ b/website/common/script/content/appearance/backgrounds.js @@ -969,6 +969,20 @@ const backgrounds = { notes: t('backgroundTeaPartyNotes'), }, }, + backgrounds032020: { + among_giant_flowers: { + text: t('backgroundAmongGiantFlowersText'), + notes: t('backgroundAmongGiantFlowersNotes'), + }, + butterfly_garden: { + text: t('backgroundButterflyGardenText'), + notes: t('backgroundButterflyGardenNotes'), + }, + succulent_garden: { + text: t('backgroundSucculentGardenText'), + notes: t('backgroundSucculentGardenNotes'), + }, + }, timeTravelBackgrounds: { airship: { text: t('backgroundAirshipText'), diff --git a/website/common/script/content/gear/sets/armoire.js b/website/common/script/content/gear/sets/armoire.js index dd3d3460f8..2b7469b5b7 100644 --- a/website/common/script/content/gear/sets/armoire.js +++ b/website/common/script/content/gear/sets/armoire.js @@ -534,6 +534,15 @@ const armor = { set: 'matchMaker', canOwn: ownsItem('armor_armoire_matchMakersApron'), }, + baseballUniform: { + text: t('armorArmoireBaseballUniformText'), + notes: t('armorArmoireBaseballUniformNotes', { attrs: 10 }), + value: 100, + con: 10, + str: 10, + set: 'baseball', + canOwn: ownsItem('armor_armoire_baseballUniform'), + }, }; const body = { @@ -1089,6 +1098,15 @@ const head = { set: 'matchMaker', canOwn: ownsItem('head_armoire_matchMakersBeret'), }, + baseballCap: { + text: t('headArmoireBaseballCapText'), + notes: t('headArmoireBaseballCapNotes', { attrs: 8 }), + value: 100, + con: 8, + str: 8, + set: 'baseball', + canOwn: ownsItem('head_armoire_baseballCap'), + }, }; const shield = { @@ -1392,6 +1410,14 @@ const shield = { set: 'matchMaker', canOwn: ownsItem('shield_armoire_perfectMatch'), }, + baseballGlove: { + text: t('shieldArmoireBaseballGloveText'), + notes: t('shieldArmoireBaseballGloveNotes', { str: 9 }), + value: 100, + str: 9, + set: 'baseball', + canOwn: ownsItem('shield_armoire_baseballGlove'), + }, }; const headAccessory = { @@ -1863,6 +1889,14 @@ const weapon = { set: 'matchMaker', canOwn: ownsItem('weapon_armoire_livelyMatch'), }, + baseballBat: { + text: t('weaponArmoireBaseballBatText'), + notes: t('weaponArmoireBaseballBatNotes', { con: 9 }), + value: 100, + con: 9, + set: 'baseball', + canOwn: ownsItem('weapon_armoire_baseballBat'), + }, }; export { diff --git a/website/common/script/content/index.js b/website/common/script/content/index.js index 97e2ff8e5d..1e7666625a 100644 --- a/website/common/script/content/index.js +++ b/website/common/script/content/index.js @@ -164,12 +164,14 @@ api.timeTravelStable = { 'MantisShrimp-Base': t('mantisShrimp'), 'Phoenix-Base': t('phoenix'), 'MagicalBee-Base': t('magicalBee'), + 'Hippogriff-Hopeful': t('hopefulHippogriffPet'), }, mounts: { 'Mammoth-Base': t('mammoth'), 'MantisShrimp-Base': t('mantisShrimp'), 'Phoenix-Base': t('phoenix'), 'MagicalBee-Base': t('magicalBee'), + 'Hippogriff-Hopeful': t('hopefulHippogriffMount'), }, }; diff --git a/website/raw_sprites/spritesmith/backgrounds/background_among_giant_flowers.png b/website/raw_sprites/spritesmith/backgrounds/background_among_giant_flowers.png new file mode 100644 index 0000000000..f3d87741d0 Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/background_among_giant_flowers.png differ diff --git a/website/raw_sprites/spritesmith/backgrounds/background_butterfly_garden.png b/website/raw_sprites/spritesmith/backgrounds/background_butterfly_garden.png new file mode 100644 index 0000000000..c826b5d535 Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/background_butterfly_garden.png differ diff --git a/website/raw_sprites/spritesmith/backgrounds/background_succulent_garden.png b/website/raw_sprites/spritesmith/backgrounds/background_succulent_garden.png new file mode 100644 index 0000000000..f6e4b03173 Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/background_succulent_garden.png differ diff --git a/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_among_giant_flowers.png b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_among_giant_flowers.png new file mode 100644 index 0000000000..0fcbd893a2 Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_among_giant_flowers.png differ diff --git a/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_butterfly_garden.png b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_butterfly_garden.png new file mode 100644 index 0000000000..c5832877b3 Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_butterfly_garden.png differ diff --git a/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_succulent_garden.png b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_succulent_garden.png new file mode 100644 index 0000000000..fd245f21af Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_succulent_garden.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/broad_armor_armoire_baseballUniform.png b/website/raw_sprites/spritesmith/gear/armoire/broad_armor_armoire_baseballUniform.png new file mode 100644 index 0000000000..daface2407 Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/broad_armor_armoire_baseballUniform.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/head_armoire_baseballCap.png b/website/raw_sprites/spritesmith/gear/armoire/head_armoire_baseballCap.png new file mode 100644 index 0000000000..0b2a072afa Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/head_armoire_baseballCap.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/shield_armoire_baseballGlove.png b/website/raw_sprites/spritesmith/gear/armoire/shield_armoire_baseballGlove.png new file mode 100644 index 0000000000..3702aebeda Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/shield_armoire_baseballGlove.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/shop/shop_armor_armoire_baseballUniform.png b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_armor_armoire_baseballUniform.png new file mode 100644 index 0000000000..b4b09567c7 Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_armor_armoire_baseballUniform.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/shop/shop_head_armoire_baseballCap.png b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_head_armoire_baseballCap.png new file mode 100644 index 0000000000..e266704f63 Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_head_armoire_baseballCap.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/shop/shop_shield_armoire_baseballGlove.png b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_shield_armoire_baseballGlove.png new file mode 100644 index 0000000000..3a40af6c74 Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_shield_armoire_baseballGlove.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/shop/shop_weapon_armoire_baseballBat.png b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_weapon_armoire_baseballBat.png new file mode 100644 index 0000000000..c4755674f3 Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_weapon_armoire_baseballBat.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/slim_armor_armoire_baseballUniform.png b/website/raw_sprites/spritesmith/gear/armoire/slim_armor_armoire_baseballUniform.png new file mode 100644 index 0000000000..fcc6ab5d62 Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/slim_armor_armoire_baseballUniform.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/weapon_armoire_baseballBat.png b/website/raw_sprites/spritesmith/gear/armoire/weapon_armoire_baseballBat.png new file mode 100644 index 0000000000..bbf4dee3c2 Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/weapon_armoire_baseballBat.png differ diff --git a/website/raw_sprites/spritesmith_large/promo_armoire_backgrounds_202002.png b/website/raw_sprites/spritesmith_large/promo_armoire_backgrounds_202002.png deleted file mode 100644 index 3561936104..0000000000 Binary files a/website/raw_sprites/spritesmith_large/promo_armoire_backgrounds_202002.png and /dev/null differ diff --git a/website/raw_sprites/spritesmith_large/promo_armoire_backgrounds_202003.png b/website/raw_sprites/spritesmith_large/promo_armoire_backgrounds_202003.png new file mode 100644 index 0000000000..1fdecd0fac Binary files /dev/null and b/website/raw_sprites/spritesmith_large/promo_armoire_backgrounds_202003.png differ diff --git a/website/raw_sprites/spritesmith_large/promo_valentines_2020.png b/website/raw_sprites/spritesmith_large/promo_valentines_2020.png deleted file mode 100644 index d65128389a..0000000000 Binary files a/website/raw_sprites/spritesmith_large/promo_valentines_2020.png and /dev/null differ diff --git a/website/raw_sprites/spritesmith_large/promo_valentines_potions.png b/website/raw_sprites/spritesmith_large/promo_valentines_potions.png deleted file mode 100644 index 1f9ebf596e..0000000000 Binary files a/website/raw_sprites/spritesmith_large/promo_valentines_potions.png and /dev/null differ diff --git a/website/raw_sprites/spritesmith_large/scene_cake.png b/website/raw_sprites/spritesmith_large/scene_cake.png deleted file mode 100644 index 150bd90a7b..0000000000 Binary files a/website/raw_sprites/spritesmith_large/scene_cake.png and /dev/null differ