diff --git a/website/assets/sprites/spritesmith/gear/events/mystery_3014/mystery_301404/broad_armor_mystery_301404.png b/website/assets/sprites/spritesmith/gear/events/mystery_301404/broad_armor_mystery_301404.png similarity index 100% rename from website/assets/sprites/spritesmith/gear/events/mystery_3014/mystery_301404/broad_armor_mystery_301404.png rename to website/assets/sprites/spritesmith/gear/events/mystery_301404/broad_armor_mystery_301404.png diff --git a/website/assets/sprites/spritesmith/gear/events/mystery_3014/mystery_301404/eyewear_mystery_301404.png b/website/assets/sprites/spritesmith/gear/events/mystery_301404/eyewear_mystery_301404.png similarity index 100% rename from website/assets/sprites/spritesmith/gear/events/mystery_3014/mystery_301404/eyewear_mystery_301404.png rename to website/assets/sprites/spritesmith/gear/events/mystery_301404/eyewear_mystery_301404.png diff --git a/website/assets/sprites/spritesmith/gear/events/mystery_3014/mystery_301404/head_mystery_301404.png b/website/assets/sprites/spritesmith/gear/events/mystery_301404/head_mystery_301404.png similarity index 100% rename from website/assets/sprites/spritesmith/gear/events/mystery_3014/mystery_301404/head_mystery_301404.png rename to website/assets/sprites/spritesmith/gear/events/mystery_301404/head_mystery_301404.png diff --git a/website/assets/sprites/spritesmith/gear/events/mystery_3014/mystery_301404/shop_armor_mystery_301404.png b/website/assets/sprites/spritesmith/gear/events/mystery_301404/shop_armor_mystery_301404.png similarity index 100% rename from website/assets/sprites/spritesmith/gear/events/mystery_3014/mystery_301404/shop_armor_mystery_301404.png rename to website/assets/sprites/spritesmith/gear/events/mystery_301404/shop_armor_mystery_301404.png diff --git a/website/assets/sprites/spritesmith/gear/events/mystery_3014/mystery_301404/shop_eyewear_mystery_301404.png b/website/assets/sprites/spritesmith/gear/events/mystery_301404/shop_eyewear_mystery_301404.png similarity index 100% rename from website/assets/sprites/spritesmith/gear/events/mystery_3014/mystery_301404/shop_eyewear_mystery_301404.png rename to website/assets/sprites/spritesmith/gear/events/mystery_301404/shop_eyewear_mystery_301404.png diff --git a/website/assets/sprites/spritesmith/gear/events/mystery_3014/mystery_301404/shop_head_mystery_301404.png b/website/assets/sprites/spritesmith/gear/events/mystery_301404/shop_head_mystery_301404.png similarity index 100% rename from website/assets/sprites/spritesmith/gear/events/mystery_3014/mystery_301404/shop_head_mystery_301404.png rename to website/assets/sprites/spritesmith/gear/events/mystery_301404/shop_head_mystery_301404.png diff --git a/website/assets/sprites/spritesmith/gear/events/mystery_3014/mystery_301404/shop_weapon_mystery_301404.png b/website/assets/sprites/spritesmith/gear/events/mystery_301404/shop_weapon_mystery_301404.png similarity index 100% rename from website/assets/sprites/spritesmith/gear/events/mystery_3014/mystery_301404/shop_weapon_mystery_301404.png rename to website/assets/sprites/spritesmith/gear/events/mystery_301404/shop_weapon_mystery_301404.png diff --git a/website/assets/sprites/spritesmith/gear/events/mystery_3014/mystery_301404/slim_armor_mystery_301404.png b/website/assets/sprites/spritesmith/gear/events/mystery_301404/slim_armor_mystery_301404.png similarity index 100% rename from website/assets/sprites/spritesmith/gear/events/mystery_3014/mystery_301404/slim_armor_mystery_301404.png rename to website/assets/sprites/spritesmith/gear/events/mystery_301404/slim_armor_mystery_301404.png diff --git a/website/assets/sprites/spritesmith/gear/events/mystery_3014/mystery_301404/weapon_mystery_301404.png b/website/assets/sprites/spritesmith/gear/events/mystery_301404/weapon_mystery_301404.png similarity index 100% rename from website/assets/sprites/spritesmith/gear/events/mystery_3014/mystery_301404/weapon_mystery_301404.png rename to website/assets/sprites/spritesmith/gear/events/mystery_301404/weapon_mystery_301404.png diff --git a/website/assets/sprites/spritesmith/gear/events/mystery_3014/mystery_301405/eyewear_mystery_301405.png b/website/assets/sprites/spritesmith/gear/events/mystery_301405/eyewear_mystery_301405.png similarity index 100% rename from website/assets/sprites/spritesmith/gear/events/mystery_3014/mystery_301405/eyewear_mystery_301405.png rename to website/assets/sprites/spritesmith/gear/events/mystery_301405/eyewear_mystery_301405.png diff --git a/website/assets/sprites/spritesmith/gear/events/mystery_3014/mystery_301405/headAccessory_mystery_301405.png b/website/assets/sprites/spritesmith/gear/events/mystery_301405/headAccessory_mystery_301405.png similarity index 100% rename from website/assets/sprites/spritesmith/gear/events/mystery_3014/mystery_301405/headAccessory_mystery_301405.png rename to website/assets/sprites/spritesmith/gear/events/mystery_301405/headAccessory_mystery_301405.png diff --git a/website/assets/sprites/spritesmith/gear/events/mystery_3014/mystery_301405/head_mystery_301405.png b/website/assets/sprites/spritesmith/gear/events/mystery_301405/head_mystery_301405.png similarity index 100% rename from website/assets/sprites/spritesmith/gear/events/mystery_3014/mystery_301405/head_mystery_301405.png rename to website/assets/sprites/spritesmith/gear/events/mystery_301405/head_mystery_301405.png diff --git a/website/assets/sprites/spritesmith/gear/events/mystery_3014/mystery_301405/shield_mystery_301405.png b/website/assets/sprites/spritesmith/gear/events/mystery_301405/shield_mystery_301405.png similarity index 100% rename from website/assets/sprites/spritesmith/gear/events/mystery_3014/mystery_301405/shield_mystery_301405.png rename to website/assets/sprites/spritesmith/gear/events/mystery_301405/shield_mystery_301405.png diff --git a/website/assets/sprites/spritesmith/gear/events/mystery_3014/mystery_301405/shop_eyewear_mystery_301405.png b/website/assets/sprites/spritesmith/gear/events/mystery_301405/shop_eyewear_mystery_301405.png similarity index 100% rename from website/assets/sprites/spritesmith/gear/events/mystery_3014/mystery_301405/shop_eyewear_mystery_301405.png rename to website/assets/sprites/spritesmith/gear/events/mystery_301405/shop_eyewear_mystery_301405.png diff --git a/website/assets/sprites/spritesmith/gear/events/mystery_3014/mystery_301405/shop_headAccessory_mystery_301405.png b/website/assets/sprites/spritesmith/gear/events/mystery_301405/shop_headAccessory_mystery_301405.png similarity index 100% rename from website/assets/sprites/spritesmith/gear/events/mystery_3014/mystery_301405/shop_headAccessory_mystery_301405.png rename to website/assets/sprites/spritesmith/gear/events/mystery_301405/shop_headAccessory_mystery_301405.png diff --git a/website/assets/sprites/spritesmith/gear/events/mystery_3014/mystery_301405/shop_head_mystery_301405.png b/website/assets/sprites/spritesmith/gear/events/mystery_301405/shop_head_mystery_301405.png similarity index 100% rename from website/assets/sprites/spritesmith/gear/events/mystery_3014/mystery_301405/shop_head_mystery_301405.png rename to website/assets/sprites/spritesmith/gear/events/mystery_301405/shop_head_mystery_301405.png diff --git a/website/assets/sprites/spritesmith/gear/events/mystery_3014/mystery_301405/shop_shield_mystery_301405.png b/website/assets/sprites/spritesmith/gear/events/mystery_301405/shop_shield_mystery_301405.png similarity index 100% rename from website/assets/sprites/spritesmith/gear/events/mystery_3014/mystery_301405/shop_shield_mystery_301405.png rename to website/assets/sprites/spritesmith/gear/events/mystery_301405/shop_shield_mystery_301405.png diff --git a/website/assets/sprites/spritesmith/gear/events/mystery_301703/broad_armor_mystery_301703.png b/website/assets/sprites/spritesmith/gear/events/mystery_301703/broad_armor_mystery_301703.png new file mode 100644 index 0000000000..d88d66695b Binary files /dev/null and b/website/assets/sprites/spritesmith/gear/events/mystery_301703/broad_armor_mystery_301703.png differ diff --git a/website/assets/sprites/spritesmith/gear/events/mystery_301703/eyewear_mystery_301703.png b/website/assets/sprites/spritesmith/gear/events/mystery_301703/eyewear_mystery_301703.png new file mode 100644 index 0000000000..d15ff96c08 Binary files /dev/null and b/website/assets/sprites/spritesmith/gear/events/mystery_301703/eyewear_mystery_301703.png differ diff --git a/website/assets/sprites/spritesmith/gear/events/mystery_301703/head_mystery_301703.png b/website/assets/sprites/spritesmith/gear/events/mystery_301703/head_mystery_301703.png new file mode 100644 index 0000000000..0abc6f2cae Binary files /dev/null and b/website/assets/sprites/spritesmith/gear/events/mystery_301703/head_mystery_301703.png differ diff --git a/website/assets/sprites/spritesmith/gear/events/mystery_301703/shop_armor_mystery_301703.png b/website/assets/sprites/spritesmith/gear/events/mystery_301703/shop_armor_mystery_301703.png new file mode 100644 index 0000000000..6f787d76cd Binary files /dev/null and b/website/assets/sprites/spritesmith/gear/events/mystery_301703/shop_armor_mystery_301703.png differ diff --git a/website/assets/sprites/spritesmith/gear/events/mystery_301703/shop_eyewear_mystery_301703.png b/website/assets/sprites/spritesmith/gear/events/mystery_301703/shop_eyewear_mystery_301703.png new file mode 100644 index 0000000000..a5cebab851 Binary files /dev/null and b/website/assets/sprites/spritesmith/gear/events/mystery_301703/shop_eyewear_mystery_301703.png differ diff --git a/website/assets/sprites/spritesmith/gear/events/mystery_301703/shop_head_mystery_301703.png b/website/assets/sprites/spritesmith/gear/events/mystery_301703/shop_head_mystery_301703.png new file mode 100644 index 0000000000..1b492f0468 Binary files /dev/null and b/website/assets/sprites/spritesmith/gear/events/mystery_301703/shop_head_mystery_301703.png differ diff --git a/website/assets/sprites/spritesmith/gear/events/mystery_301703/slim_armor_mystery_301703.png b/website/assets/sprites/spritesmith/gear/events/mystery_301703/slim_armor_mystery_301703.png new file mode 100644 index 0000000000..1cd462d92d Binary files /dev/null and b/website/assets/sprites/spritesmith/gear/events/mystery_301703/slim_armor_mystery_301703.png differ diff --git a/website/assets/sprites/spritesmith/gear/events/mystery_301704/broad_armor_mystery_301704.png b/website/assets/sprites/spritesmith/gear/events/mystery_301704/broad_armor_mystery_301704.png new file mode 100644 index 0000000000..c8a88db4a1 Binary files /dev/null and b/website/assets/sprites/spritesmith/gear/events/mystery_301704/broad_armor_mystery_301704.png differ diff --git a/website/assets/sprites/spritesmith/gear/events/mystery_301704/head_mystery_301704.png b/website/assets/sprites/spritesmith/gear/events/mystery_301704/head_mystery_301704.png new file mode 100644 index 0000000000..2e9acf1433 Binary files /dev/null and b/website/assets/sprites/spritesmith/gear/events/mystery_301704/head_mystery_301704.png differ diff --git a/website/assets/sprites/spritesmith/gear/events/mystery_301704/shield_mystery_301704.png b/website/assets/sprites/spritesmith/gear/events/mystery_301704/shield_mystery_301704.png new file mode 100644 index 0000000000..8834533b47 Binary files /dev/null and b/website/assets/sprites/spritesmith/gear/events/mystery_301704/shield_mystery_301704.png differ diff --git a/website/assets/sprites/spritesmith/gear/events/mystery_301704/shop_armor_mystery_301704.png b/website/assets/sprites/spritesmith/gear/events/mystery_301704/shop_armor_mystery_301704.png new file mode 100644 index 0000000000..0984f6c93b Binary files /dev/null and b/website/assets/sprites/spritesmith/gear/events/mystery_301704/shop_armor_mystery_301704.png differ diff --git a/website/assets/sprites/spritesmith/gear/events/mystery_301704/shop_head_mystery_301704.png b/website/assets/sprites/spritesmith/gear/events/mystery_301704/shop_head_mystery_301704.png new file mode 100644 index 0000000000..4d65644644 Binary files /dev/null and b/website/assets/sprites/spritesmith/gear/events/mystery_301704/shop_head_mystery_301704.png differ diff --git a/website/assets/sprites/spritesmith/gear/events/mystery_301704/shop_shield_mystery_301704.png b/website/assets/sprites/spritesmith/gear/events/mystery_301704/shop_shield_mystery_301704.png new file mode 100644 index 0000000000..9d603527ed Binary files /dev/null and b/website/assets/sprites/spritesmith/gear/events/mystery_301704/shop_shield_mystery_301704.png differ diff --git a/website/assets/sprites/spritesmith/gear/events/mystery_301704/slim_armor_mystery_301704.png b/website/assets/sprites/spritesmith/gear/events/mystery_301704/slim_armor_mystery_301704.png new file mode 100644 index 0000000000..501ee5bd05 Binary files /dev/null and b/website/assets/sprites/spritesmith/gear/events/mystery_301704/slim_armor_mystery_301704.png differ diff --git a/website/assets/sprites/spritesmith/quests/bosses/quest_peacock.png b/website/assets/sprites/spritesmith/quests/bosses/quest_peacock.png new file mode 100644 index 0000000000..6129dfa47b Binary files /dev/null and b/website/assets/sprites/spritesmith/quests/bosses/quest_peacock.png differ diff --git a/website/assets/sprites/spritesmith/quests/scrolls/inventory_quest_scroll_peacock.png b/website/assets/sprites/spritesmith/quests/scrolls/inventory_quest_scroll_peacock.png new file mode 100644 index 0000000000..24398939a9 Binary files /dev/null and b/website/assets/sprites/spritesmith/quests/scrolls/inventory_quest_scroll_peacock.png differ diff --git a/website/assets/sprites/spritesmith/stable/eggs/Pet_Egg_Peacock.png b/website/assets/sprites/spritesmith/stable/eggs/Pet_Egg_Peacock.png new file mode 100644 index 0000000000..cc893c3de5 Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/eggs/Pet_Egg_Peacock.png differ diff --git a/website/assets/sprites/spritesmith/stable/mounts/body/Mount_Body_Peacock-Base.png b/website/assets/sprites/spritesmith/stable/mounts/body/Mount_Body_Peacock-Base.png new file mode 100644 index 0000000000..ae9ae94dca Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/mounts/body/Mount_Body_Peacock-Base.png differ diff --git a/website/assets/sprites/spritesmith/stable/mounts/body/Mount_Body_Peacock-CottonCandyBlue.png b/website/assets/sprites/spritesmith/stable/mounts/body/Mount_Body_Peacock-CottonCandyBlue.png new file mode 100644 index 0000000000..6f74e68642 Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/mounts/body/Mount_Body_Peacock-CottonCandyBlue.png differ diff --git a/website/assets/sprites/spritesmith/stable/mounts/body/Mount_Body_Peacock-CottonCandyPink.png b/website/assets/sprites/spritesmith/stable/mounts/body/Mount_Body_Peacock-CottonCandyPink.png new file mode 100644 index 0000000000..2fa6266fb3 Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/mounts/body/Mount_Body_Peacock-CottonCandyPink.png differ diff --git a/website/assets/sprites/spritesmith/stable/mounts/body/Mount_Body_Peacock-Desert.png b/website/assets/sprites/spritesmith/stable/mounts/body/Mount_Body_Peacock-Desert.png new file mode 100644 index 0000000000..2341cd279f Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/mounts/body/Mount_Body_Peacock-Desert.png differ diff --git a/website/assets/sprites/spritesmith/stable/mounts/body/Mount_Body_Peacock-Golden.png b/website/assets/sprites/spritesmith/stable/mounts/body/Mount_Body_Peacock-Golden.png new file mode 100644 index 0000000000..4d76862129 Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/mounts/body/Mount_Body_Peacock-Golden.png differ diff --git a/website/assets/sprites/spritesmith/stable/mounts/body/Mount_Body_Peacock-Red.png b/website/assets/sprites/spritesmith/stable/mounts/body/Mount_Body_Peacock-Red.png new file mode 100644 index 0000000000..bf87ef82af Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/mounts/body/Mount_Body_Peacock-Red.png differ diff --git a/website/assets/sprites/spritesmith/stable/mounts/body/Mount_Body_Peacock-Shade.png b/website/assets/sprites/spritesmith/stable/mounts/body/Mount_Body_Peacock-Shade.png new file mode 100644 index 0000000000..71fdf73e91 Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/mounts/body/Mount_Body_Peacock-Shade.png differ diff --git a/website/assets/sprites/spritesmith/stable/mounts/body/Mount_Body_Peacock-Skeleton.png b/website/assets/sprites/spritesmith/stable/mounts/body/Mount_Body_Peacock-Skeleton.png new file mode 100644 index 0000000000..93af134813 Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/mounts/body/Mount_Body_Peacock-Skeleton.png differ diff --git a/website/assets/sprites/spritesmith/stable/mounts/body/Mount_Body_Peacock-White.png b/website/assets/sprites/spritesmith/stable/mounts/body/Mount_Body_Peacock-White.png new file mode 100644 index 0000000000..3e95fe0428 Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/mounts/body/Mount_Body_Peacock-White.png differ diff --git a/website/assets/sprites/spritesmith/stable/mounts/body/Mount_Body_Peacock-Zombie.png b/website/assets/sprites/spritesmith/stable/mounts/body/Mount_Body_Peacock-Zombie.png new file mode 100644 index 0000000000..882051c499 Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/mounts/body/Mount_Body_Peacock-Zombie.png differ diff --git a/website/assets/sprites/spritesmith/stable/mounts/head/Mount_Head_Peacock-Base.png b/website/assets/sprites/spritesmith/stable/mounts/head/Mount_Head_Peacock-Base.png new file mode 100644 index 0000000000..575ee03af1 Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/mounts/head/Mount_Head_Peacock-Base.png differ diff --git a/website/assets/sprites/spritesmith/stable/mounts/head/Mount_Head_Peacock-CottonCandyBlue.png b/website/assets/sprites/spritesmith/stable/mounts/head/Mount_Head_Peacock-CottonCandyBlue.png new file mode 100644 index 0000000000..5fd99e5b13 Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/mounts/head/Mount_Head_Peacock-CottonCandyBlue.png differ diff --git a/website/assets/sprites/spritesmith/stable/mounts/head/Mount_Head_Peacock-CottonCandyPink.png b/website/assets/sprites/spritesmith/stable/mounts/head/Mount_Head_Peacock-CottonCandyPink.png new file mode 100644 index 0000000000..8545b22691 Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/mounts/head/Mount_Head_Peacock-CottonCandyPink.png differ diff --git a/website/assets/sprites/spritesmith/stable/mounts/head/Mount_Head_Peacock-Desert.png b/website/assets/sprites/spritesmith/stable/mounts/head/Mount_Head_Peacock-Desert.png new file mode 100644 index 0000000000..5f25f79f9f Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/mounts/head/Mount_Head_Peacock-Desert.png differ diff --git a/website/assets/sprites/spritesmith/stable/mounts/head/Mount_Head_Peacock-Golden.png b/website/assets/sprites/spritesmith/stable/mounts/head/Mount_Head_Peacock-Golden.png new file mode 100644 index 0000000000..2b3e172c4c Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/mounts/head/Mount_Head_Peacock-Golden.png differ diff --git a/website/assets/sprites/spritesmith/stable/mounts/head/Mount_Head_Peacock-Red.png b/website/assets/sprites/spritesmith/stable/mounts/head/Mount_Head_Peacock-Red.png new file mode 100644 index 0000000000..4443f02657 Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/mounts/head/Mount_Head_Peacock-Red.png differ diff --git a/website/assets/sprites/spritesmith/stable/mounts/head/Mount_Head_Peacock-Shade.png b/website/assets/sprites/spritesmith/stable/mounts/head/Mount_Head_Peacock-Shade.png new file mode 100644 index 0000000000..6c2c3570df Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/mounts/head/Mount_Head_Peacock-Shade.png differ diff --git a/website/assets/sprites/spritesmith/stable/mounts/head/Mount_Head_Peacock-Skeleton.png b/website/assets/sprites/spritesmith/stable/mounts/head/Mount_Head_Peacock-Skeleton.png new file mode 100644 index 0000000000..2f324edfb4 Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/mounts/head/Mount_Head_Peacock-Skeleton.png differ diff --git a/website/assets/sprites/spritesmith/stable/mounts/head/Mount_Head_Peacock-White.png b/website/assets/sprites/spritesmith/stable/mounts/head/Mount_Head_Peacock-White.png new file mode 100644 index 0000000000..087a6ac322 Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/mounts/head/Mount_Head_Peacock-White.png differ diff --git a/website/assets/sprites/spritesmith/stable/mounts/head/Mount_Head_Peacock-Zombie.png b/website/assets/sprites/spritesmith/stable/mounts/head/Mount_Head_Peacock-Zombie.png new file mode 100644 index 0000000000..923e1d50d0 Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/mounts/head/Mount_Head_Peacock-Zombie.png differ diff --git a/website/assets/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Peacock-Base.png b/website/assets/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Peacock-Base.png new file mode 100644 index 0000000000..f7d478d1f6 Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Peacock-Base.png differ diff --git a/website/assets/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Peacock-CottonCandyBlue.png b/website/assets/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Peacock-CottonCandyBlue.png new file mode 100644 index 0000000000..025af5d100 Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Peacock-CottonCandyBlue.png differ diff --git a/website/assets/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Peacock-CottonCandyPink.png b/website/assets/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Peacock-CottonCandyPink.png new file mode 100644 index 0000000000..97bae3a298 Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Peacock-CottonCandyPink.png differ diff --git a/website/assets/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Peacock-Desert.png b/website/assets/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Peacock-Desert.png new file mode 100644 index 0000000000..b02bc37b10 Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Peacock-Desert.png differ diff --git a/website/assets/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Peacock-Golden.png b/website/assets/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Peacock-Golden.png new file mode 100644 index 0000000000..3169464a66 Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Peacock-Golden.png differ diff --git a/website/assets/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Peacock-Red.png b/website/assets/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Peacock-Red.png new file mode 100644 index 0000000000..5e671296f1 Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Peacock-Red.png differ diff --git a/website/assets/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Peacock-Shade.png b/website/assets/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Peacock-Shade.png new file mode 100644 index 0000000000..8f94baaba9 Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Peacock-Shade.png differ diff --git a/website/assets/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Peacock-Skeleton.png b/website/assets/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Peacock-Skeleton.png new file mode 100644 index 0000000000..a38efe6e9a Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Peacock-Skeleton.png differ diff --git a/website/assets/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Peacock-White.png b/website/assets/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Peacock-White.png new file mode 100644 index 0000000000..0b692aaef6 Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Peacock-White.png differ diff --git a/website/assets/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Peacock-Zombie.png b/website/assets/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Peacock-Zombie.png new file mode 100644 index 0000000000..18238337b8 Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Peacock-Zombie.png differ diff --git a/website/assets/sprites/spritesmith/stable/pets/Pet-Peacock-Base.png b/website/assets/sprites/spritesmith/stable/pets/Pet-Peacock-Base.png new file mode 100644 index 0000000000..0711ea68d4 Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/pets/Pet-Peacock-Base.png differ diff --git a/website/assets/sprites/spritesmith/stable/pets/Pet-Peacock-CottonCandyBlue.png b/website/assets/sprites/spritesmith/stable/pets/Pet-Peacock-CottonCandyBlue.png new file mode 100644 index 0000000000..067c0362c1 Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/pets/Pet-Peacock-CottonCandyBlue.png differ diff --git a/website/assets/sprites/spritesmith/stable/pets/Pet-Peacock-CottonCandyPink.png b/website/assets/sprites/spritesmith/stable/pets/Pet-Peacock-CottonCandyPink.png new file mode 100644 index 0000000000..6735c3c358 Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/pets/Pet-Peacock-CottonCandyPink.png differ diff --git a/website/assets/sprites/spritesmith/stable/pets/Pet-Peacock-Desert.png b/website/assets/sprites/spritesmith/stable/pets/Pet-Peacock-Desert.png new file mode 100644 index 0000000000..bcd5bcb962 Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/pets/Pet-Peacock-Desert.png differ diff --git a/website/assets/sprites/spritesmith/stable/pets/Pet-Peacock-Golden.png b/website/assets/sprites/spritesmith/stable/pets/Pet-Peacock-Golden.png new file mode 100644 index 0000000000..4839dea75f Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/pets/Pet-Peacock-Golden.png differ diff --git a/website/assets/sprites/spritesmith/stable/pets/Pet-Peacock-Red.png b/website/assets/sprites/spritesmith/stable/pets/Pet-Peacock-Red.png new file mode 100644 index 0000000000..f5d8562301 Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/pets/Pet-Peacock-Red.png differ diff --git a/website/assets/sprites/spritesmith/stable/pets/Pet-Peacock-Shade.png b/website/assets/sprites/spritesmith/stable/pets/Pet-Peacock-Shade.png new file mode 100644 index 0000000000..b3a70a7c45 Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/pets/Pet-Peacock-Shade.png differ diff --git a/website/assets/sprites/spritesmith/stable/pets/Pet-Peacock-Skeleton.png b/website/assets/sprites/spritesmith/stable/pets/Pet-Peacock-Skeleton.png new file mode 100644 index 0000000000..1c1d55a163 Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/pets/Pet-Peacock-Skeleton.png differ diff --git a/website/assets/sprites/spritesmith/stable/pets/Pet-Peacock-White.png b/website/assets/sprites/spritesmith/stable/pets/Pet-Peacock-White.png new file mode 100644 index 0000000000..cd91316730 Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/pets/Pet-Peacock-White.png differ diff --git a/website/assets/sprites/spritesmith/stable/pets/Pet-Peacock-Zombie.png b/website/assets/sprites/spritesmith/stable/pets/Pet-Peacock-Zombie.png new file mode 100644 index 0000000000..296e31d32b Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/pets/Pet-Peacock-Zombie.png differ diff --git a/website/common/locales/en/content.json b/website/common/locales/en/content.json index 7887c3bcac..f6f32c7c41 100644 --- a/website/common/locales/en/content.json +++ b/website/common/locales/en/content.json @@ -203,6 +203,10 @@ "questEggGuineaPigMountText": "Guinea Pig", "questEggGuineaPigAdjective": "a giddy", + "questEggPeacockText": "Peacock", + "questEggPeacockMountText": "Peacock", + "questEggPeacockAdjective": "a proud", + "eggNotes": "Find a hatching potion to pour on this egg, and it will hatch into <%= eggAdjective(locale) %> <%= eggText(locale) %>.", "hatchingPotionBase": "Base", diff --git a/website/common/locales/en/gear.json b/website/common/locales/en/gear.json index ee5a28b7cc..8cd02b851e 100644 --- a/website/common/locales/en/gear.json +++ b/website/common/locales/en/gear.json @@ -522,6 +522,10 @@ "armorMystery201612Notes": "Crack nuts in style in this spectacular holiday ensemble. Be careful not to pinch your fingers! Confers no benefit. December 2016 Subscriber Item.", "armorMystery301404Text": "Steampunk Suit", "armorMystery301404Notes": "Dapper and dashing, wot! Confers no benefit. February 3015 Subscriber Item.", + "armorMystery301703Text": "Steampunk Peacock Gown", + "armorMystery301703Notes": "This elegant gown is well-suited for even the most extravagant gala! Confers no benefit. March 3017 Subscriber Item.", + "armorMystery301704Text": "Steampunk Pheasant Dress", + "armorMystery301704Notes": "This fine outfit is perfect for a night out and about or a day in your gadget workshop! Confers no benefit. April 3017 Subscriber Item.", "armorArmoireLunarArmorText": "Soothing Lunar Armor", "armorArmoireLunarArmorNotes": "The light of the moon will make you strong and savvy. Increases Strength by <%= str %> and Intelligence by <%= int %>. Enchanted Armoire: Soothing Lunar Set (Item 2 of 3).", @@ -831,6 +835,10 @@ "headMystery301404Notes": "A fancy top hat for the finest of gentlefolk! January 3015 Subscriber Item. Confers no benefit.", "headMystery301405Text": "Basic Top Hat", "headMystery301405Notes": "A basic top hat, just begging to be paired with some fancy head accessories. Confers no benefit. May 3015 Subscriber Item.", + "headMystery301703Text": "Fancy Feather Hat", + "headMystery301703Notes": "The feathers for this hat were donated by Miss Prue's Finishing School for Fancy Peacocks. Wear them with pride! Confers no benefit. March 3017 Subscriber Item.", + "headMystery301704Text": "Pheasant Plume Hat", + "headMystery301704Notes": "What could be more pleasant than a plume from a pheasant? Confers no benefit. April 3017 Subscriber Item.", "headArmoireLunarCrownText": "Soothing Lunar Crown", "headArmoireLunarCrownNotes": "This crown strengthens health and sharpens senses, especially when the moon is full. Increases Constitution by <%= con %> and Perception by <%= per %>. Enchanted Armoire: Soothing Lunar Set (Item 1 of 3).", @@ -1038,6 +1046,8 @@ "shieldMystery201701Notes": "Freeze time in its tracks and conquer your tasks! Confers no benefit. January 2017 Subscriber Item.", "shieldMystery301405Text": "Clock Shield", "shieldMystery301405Notes": "Time is on your side with this towering clock shield! Confers no benefit. June 3015 Subscriber Item.", + "shieldMystery301704Text": "Fluttery Fan", + "shieldMystery301704Notes": "This fine fan will keep you feeling cool and looking fancy! Confers no benefit. April 3017 Subscriber Item.", "shieldArmoireGladiatorShieldText": "Gladiator Shield", "shieldArmoireGladiatorShieldNotes": "To be a gladiator you must.... eh, whatever, just bash them with your shield. Increases Constitution by <%= con %> and Strength by <%= str %>. Enchanted Armoire: Gladiator Set (Item 3 of 3).", @@ -1228,6 +1238,8 @@ "eyewearMystery301404Notes": "No eyewear could be fancier than a pair of goggles - except, perhaps, for a monocle. Confers no benefit. April 3015 Subscriber Item.", "eyewearMystery301405Text": "Monocle", "eyewearMystery301405Notes": "No eyewear could be fancier than a monocle - except, perhaps, for a pair of goggles. Confers no benefit. July 3015 Subscriber Item.", + "eyewearMystery301703Text": "Peacock Masquerade Mask", + "eyewearMystery301703Notes": "Perfect for a fancy masquerade or for stealthily moving through a particularly well-dressed crowd. Confers no benefit. March 3017 Subscriber Item.", "eyewearArmoirePlagueDoctorMaskText": "Plague Doctor Mask", "eyewearArmoirePlagueDoctorMaskNotes": "An authentic mask worn by the doctors who battle the Plague of Procrastination. Confers no benefit. Enchanted Armoire: Plague Doctor Set (Item 2 of 3)." diff --git a/website/common/locales/en/questsContent.json b/website/common/locales/en/questsContent.json index 177114b250..e629345c6f 100644 --- a/website/common/locales/en/questsContent.json +++ b/website/common/locales/en/questsContent.json @@ -512,5 +512,12 @@ "questGuineaPigCompletion": "\"We submit!\" The Guinea Pig Gang Boss waves his paws at you, fluffy head hanging in shame. From underneath his hat falls a list, and @snazzyorange quickly swipes it for evidence. \"Wait a minute,\" you say. \"It's no wonder you've been getting hurt! You've got way too many Dailies. You don't need health potions -- you just need help organizing.\"

\"Really?\" squeaks the Guinea Pig Gang Boss. \"We've robbed so many people because of this! Please take our eggs as an apology for our crooked ways.\"", "questGuineaPigBoss": "Guinea Pig Gang", "questGuineaPigDropGuineaPigEgg": "Guinea Pig (Egg)", - "questGuineaPigUnlockText": "Unlocks purchasable Guinea Pig eggs in the Market" + "questGuineaPigUnlockText": "Unlocks purchasable Guinea Pig eggs in the Market", + + "questPeacockText": "The Push-and-Pull Peacock", + "questPeacockNotes": "You trek through the Taskwoods, wondering which of the enticing new goals you should pick. As you go deeper into the forest, you realize that you're not alone in your indecision. \"I could learn a new language, or go to the gym...\" @Cecily Perez mutters. \"I could sleep more,\" muses @Lilith of Alfheim, \"or spend time with my friends...\" It looks like @PainterProphet, @Pfeffernusse, and @Draayder are equally paralyzed by the overwhelming options.

You realize that these ever-more-demanding feelings aren't really your own... you've stumbled straight into the trap of the pernicious Push-and-Pull Peacock! Before you can run, it leaps from the bushes. With each head pulling you in conflicting directions, you start to feel burnout overcoming you. You can't defeat both foes at once, so you only have one option -- concentrate on the nearest task to fight back!", + "questPeacockCompletion": "The Push-and-Pull Peacock is caught off guard by your sudden conviction. Defeated by your single-minded drive, its heads merge back into one, revealing the most beautiful creature you've ever seen. \"Thank you,\" the peacock says. \"I’ve spent so long pulling myself in different directions that I lost sight of what I truly wanted. Please accept these eggs as a token of my gratitude.\"", + "questPeacockBoss": "Push-and-Pull Peacock", + "questPeacockDropPeacockEgg": "Peacock (Egg)", + "questPeacockUnlockText": "Unlocks purchasable Peacock eggs in the Market" } diff --git a/website/common/locales/en/subscriber.json b/website/common/locales/en/subscriber.json index 145017a574..b8fa9e2e95 100644 --- a/website/common/locales/en/subscriber.json +++ b/website/common/locales/en/subscriber.json @@ -125,6 +125,8 @@ "mysterySet201702": "Heartstealer Set", "mysterySet301404": "Steampunk Standard Set", "mysterySet301405": "Steampunk Accessories Set", + "mysterySet301703": "Peacock Steampunk Set", + "mysterySet301704": "Pheasant Steampunk Set", "mysterySetwondercon": "Wondercon", diff --git a/website/common/script/content/eggs.js b/website/common/script/content/eggs.js index 14865445e2..fc4ac56dbd 100644 --- a/website/common/script/content/eggs.js +++ b/website/common/script/content/eggs.js @@ -267,6 +267,11 @@ let quests = { adjective: t('questEggGuineaPigAdjective'), canBuy: hasQuestAchievementFunction('guineapig'), }, + Peacock: { + text: t('questEggPeacockText'), + adjective: t('questEggPeacockAdjective'), + canBuy: hasQuestAchievementFunction('peacock'), + }, }; applyEggDefaults(drops, { diff --git a/website/common/script/content/gear/sets/mystery.js b/website/common/script/content/gear/sets/mystery.js index 863f256c23..0d94b4acd7 100644 --- a/website/common/script/content/gear/sets/mystery.js +++ b/website/common/script/content/gear/sets/mystery.js @@ -157,6 +157,18 @@ let armor = { mystery: '301404', value: 0, }, + 301703: { + text: t('armorMystery301703Text'), + notes: t('armorMystery301703Notes'), + mystery: '301703', + value: 0, + }, + 301704: { + text: t('armorMystery301704Text'), + notes: t('armorMystery301704Notes'), + mystery: '301704', + value: 0, + }, }; let back = { @@ -253,6 +265,12 @@ let eyewear = { mystery: '301405', value: 0, }, + 301703: { + text: t('eyewearMystery301703Text'), + notes: t('eyewearMystery301703Notes'), + mystery: '301703', + value: 0, + }, }; let head = { @@ -424,6 +442,18 @@ let head = { mystery: '301405', value: 0, }, + 301703: { + text: t('headMystery301703Text'), + notes: t('headMystery301703Notes'), + mystery: '301703', + value: 0, + }, + 301704: { + text: t('headMystery301704Text'), + notes: t('headMystery301704Notes'), + mystery: '301704', + value: 0, + }, }; let headAccessory = { @@ -484,6 +514,12 @@ let shield = { mystery: '301405', value: 0, }, + 301704: { + text: t('shieldMystery301704Text'), + notes: t('shieldMystery301704Notes'), + mystery: '301704', + value: 0, + }, }; let weapon = { diff --git a/website/common/script/content/index.js b/website/common/script/content/index.js index 85a535880b..356f6cc123 100644 --- a/website/common/script/content/index.js +++ b/website/common/script/content/index.js @@ -2957,6 +2957,38 @@ api.quests = { unlock: t('questGuineaPigUnlockText'), }, }, + peacock: { + text: t('questPeacockText'), + notes: t('questPeacockNotes'), + completion: t('questPeacockCompletion'), + value: 4, + category: 'pet', + boss: { + name: t('questPeacockBoss'), + hp: 300, + str: 1.5, + }, + drop: { + items: [ + { + type: 'eggs', + key: 'Peacock', + text: t('questPeacockDropPeacockEgg'), + }, { + type: 'eggs', + key: 'Peacock', + text: t('questPeacockDropPeacockEgg'), + }, { + type: 'eggs', + key: 'Peacock', + text: t('questPeacockDropPeacockEgg'), + }, + ], + gp: 25, + exp: 125, + unlock: t('questPeacockUnlockText'), + }, + }, }; each(api.quests, (v, key) => { diff --git a/website/common/script/content/mystery-sets.js b/website/common/script/content/mystery-sets.js index c4d29833bc..cc47d6851d 100644 --- a/website/common/script/content/mystery-sets.js +++ b/website/common/script/content/mystery-sets.js @@ -158,6 +158,14 @@ let mysterySets = { start: '3014-04-24', end: '3014-05-02', }, + 301703: { + start: '3017-03-14', + end: '3017-04-02', + }, + 301704: { + start: '3017-04-14', + end: '3017-05-02', + }, // @TODO: Remove wondercon from mystery-sets wondercon: { start: '2014-03-24',