diff --git a/common/img/sprites/spritesmith/stable/mounts/Mount_Body_Egg-Base.png b/common/img/sprites/spritesmith/stable/mounts/Mount_Body_Egg-Base.png new file mode 100644 index 0000000000..3a7be51797 Binary files /dev/null and b/common/img/sprites/spritesmith/stable/mounts/Mount_Body_Egg-Base.png differ diff --git a/common/img/sprites/spritesmith/stable/mounts/Mount_Body_Egg-CottonCandyBlue.png b/common/img/sprites/spritesmith/stable/mounts/Mount_Body_Egg-CottonCandyBlue.png new file mode 100644 index 0000000000..e9f4fe0423 Binary files /dev/null and b/common/img/sprites/spritesmith/stable/mounts/Mount_Body_Egg-CottonCandyBlue.png differ diff --git a/common/img/sprites/spritesmith/stable/mounts/Mount_Body_Egg-CottonCandyPink.png b/common/img/sprites/spritesmith/stable/mounts/Mount_Body_Egg-CottonCandyPink.png new file mode 100644 index 0000000000..8da9e137b4 Binary files /dev/null and b/common/img/sprites/spritesmith/stable/mounts/Mount_Body_Egg-CottonCandyPink.png differ diff --git a/common/img/sprites/spritesmith/stable/mounts/Mount_Body_Egg-Desert.png b/common/img/sprites/spritesmith/stable/mounts/Mount_Body_Egg-Desert.png new file mode 100644 index 0000000000..7acbe8b3f2 Binary files /dev/null and b/common/img/sprites/spritesmith/stable/mounts/Mount_Body_Egg-Desert.png differ diff --git a/common/img/sprites/spritesmith/stable/mounts/Mount_Body_Egg-Golden.png b/common/img/sprites/spritesmith/stable/mounts/Mount_Body_Egg-Golden.png new file mode 100644 index 0000000000..840252d515 Binary files /dev/null and b/common/img/sprites/spritesmith/stable/mounts/Mount_Body_Egg-Golden.png differ diff --git a/common/img/sprites/spritesmith/stable/mounts/Mount_Body_Egg-Red.png b/common/img/sprites/spritesmith/stable/mounts/Mount_Body_Egg-Red.png new file mode 100644 index 0000000000..750d864dfa Binary files /dev/null and b/common/img/sprites/spritesmith/stable/mounts/Mount_Body_Egg-Red.png differ diff --git a/common/img/sprites/spritesmith/stable/mounts/Mount_Body_Egg-Shade.png b/common/img/sprites/spritesmith/stable/mounts/Mount_Body_Egg-Shade.png new file mode 100644 index 0000000000..91c1552405 Binary files /dev/null and b/common/img/sprites/spritesmith/stable/mounts/Mount_Body_Egg-Shade.png differ diff --git a/common/img/sprites/spritesmith/stable/mounts/Mount_Body_Egg-Skeleton.png b/common/img/sprites/spritesmith/stable/mounts/Mount_Body_Egg-Skeleton.png new file mode 100644 index 0000000000..e0b6256e3d Binary files /dev/null and b/common/img/sprites/spritesmith/stable/mounts/Mount_Body_Egg-Skeleton.png differ diff --git a/common/img/sprites/spritesmith/stable/mounts/Mount_Body_Egg-White.png b/common/img/sprites/spritesmith/stable/mounts/Mount_Body_Egg-White.png new file mode 100644 index 0000000000..892bac10bb Binary files /dev/null and b/common/img/sprites/spritesmith/stable/mounts/Mount_Body_Egg-White.png differ diff --git a/common/img/sprites/spritesmith/stable/mounts/Mount_Body_Egg-Zombie.png b/common/img/sprites/spritesmith/stable/mounts/Mount_Body_Egg-Zombie.png new file mode 100644 index 0000000000..1cebe94b57 Binary files /dev/null and b/common/img/sprites/spritesmith/stable/mounts/Mount_Body_Egg-Zombie.png differ diff --git a/common/img/sprites/spritesmith/stable/mounts/Mount_Head_Egg-Base.png b/common/img/sprites/spritesmith/stable/mounts/Mount_Head_Egg-Base.png new file mode 100644 index 0000000000..0aeb55866b Binary files /dev/null and b/common/img/sprites/spritesmith/stable/mounts/Mount_Head_Egg-Base.png differ diff --git a/common/img/sprites/spritesmith/stable/mounts/Mount_Head_Egg-CottonCandyBlue.png b/common/img/sprites/spritesmith/stable/mounts/Mount_Head_Egg-CottonCandyBlue.png new file mode 100644 index 0000000000..70b5a1c5eb Binary files /dev/null and b/common/img/sprites/spritesmith/stable/mounts/Mount_Head_Egg-CottonCandyBlue.png differ diff --git a/common/img/sprites/spritesmith/stable/mounts/Mount_Head_Egg-CottonCandyPink.png b/common/img/sprites/spritesmith/stable/mounts/Mount_Head_Egg-CottonCandyPink.png new file mode 100644 index 0000000000..021d12f2f5 Binary files /dev/null and b/common/img/sprites/spritesmith/stable/mounts/Mount_Head_Egg-CottonCandyPink.png differ diff --git a/common/img/sprites/spritesmith/stable/mounts/Mount_Head_Egg-Desert.png b/common/img/sprites/spritesmith/stable/mounts/Mount_Head_Egg-Desert.png new file mode 100644 index 0000000000..18045eff14 Binary files /dev/null and b/common/img/sprites/spritesmith/stable/mounts/Mount_Head_Egg-Desert.png differ diff --git a/common/img/sprites/spritesmith/stable/mounts/Mount_Head_Egg-Golden.png b/common/img/sprites/spritesmith/stable/mounts/Mount_Head_Egg-Golden.png new file mode 100644 index 0000000000..963da97bd5 Binary files /dev/null and b/common/img/sprites/spritesmith/stable/mounts/Mount_Head_Egg-Golden.png differ diff --git a/common/img/sprites/spritesmith/stable/mounts/Mount_Head_Egg-Red.png b/common/img/sprites/spritesmith/stable/mounts/Mount_Head_Egg-Red.png new file mode 100644 index 0000000000..3a4d5276f2 Binary files /dev/null and b/common/img/sprites/spritesmith/stable/mounts/Mount_Head_Egg-Red.png differ diff --git a/common/img/sprites/spritesmith/stable/mounts/Mount_Head_Egg-Shade.png b/common/img/sprites/spritesmith/stable/mounts/Mount_Head_Egg-Shade.png new file mode 100644 index 0000000000..b3d595a77b Binary files /dev/null and b/common/img/sprites/spritesmith/stable/mounts/Mount_Head_Egg-Shade.png differ diff --git a/common/img/sprites/spritesmith/stable/mounts/Mount_Head_Egg-Skeleton.png b/common/img/sprites/spritesmith/stable/mounts/Mount_Head_Egg-Skeleton.png new file mode 100644 index 0000000000..9564b4c63b Binary files /dev/null and b/common/img/sprites/spritesmith/stable/mounts/Mount_Head_Egg-Skeleton.png differ diff --git a/common/img/sprites/spritesmith/stable/mounts/Mount_Head_Egg-White.png b/common/img/sprites/spritesmith/stable/mounts/Mount_Head_Egg-White.png new file mode 100644 index 0000000000..5464bc60bc Binary files /dev/null and b/common/img/sprites/spritesmith/stable/mounts/Mount_Head_Egg-White.png differ diff --git a/common/img/sprites/spritesmith/stable/mounts/Mount_Head_Egg-Zombie.png b/common/img/sprites/spritesmith/stable/mounts/Mount_Head_Egg-Zombie.png new file mode 100644 index 0000000000..874c776bbd Binary files /dev/null and b/common/img/sprites/spritesmith/stable/mounts/Mount_Head_Egg-Zombie.png differ diff --git a/common/locales/en/gear.json b/common/locales/en/gear.json index 4d62c2dd17..2dfe023c44 100644 --- a/common/locales/en/gear.json +++ b/common/locales/en/gear.json @@ -273,6 +273,8 @@ "armorMystery201412Notes": "You're a penguin! Confers no benefit. December 2014 Subscriber Item.", "armorMystery201501Text": "Starry Armor", "armorMystery201501Notes": "Galaxies shimmer in the metal of this armor, strengthening the wearer's resolve. Confers no benefit. January 2015 Subscriber Item.", + "armorMystery201503Text": "Aquamarine Armor", + "armorMystery201503Notes": "This blue mineral symbolizes good luck, happiness, and eternal productivity. Confers no benefit. March 2015 Subscriber Item.", "armorMystery301404Text": "Steampunk Suit", "armorMystery301404Notes": "Dapper and dashing, wot! Confers no benefit. February 3015 Subscriber Item.", @@ -569,6 +571,8 @@ "eyewearSpecialWonderconBlackText": "Sneaky Mask", "eyewearSpecialWonderconBlackNotes": "Your motives are definitely legitimate. Confers no benefit. Special Edition Convention Item.", + "eyewearMystery201503Text": "Aquamarine Eyewear", + "eyewearMystery201503Notes": "Don't get poked in the eye by these shimmering gems! Confers no benefit. March 2015 Subscriber Item.", "eyewearMystery301404Text": "Eyewear Goggles", "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", diff --git a/common/script/content.coffee b/common/script/content.coffee index 8f905f284e..2e3eb6b758 100644 --- a/common/script/content.coffee +++ b/common/script/content.coffee @@ -40,12 +40,13 @@ api.mystery = 201406: {start:'2014-06-23',end:'2014-07-02', text:'Octomage Set'} 201407: {start:'2014-07-23',end:'2014-08-02', text:'Undersea Explorer Set'} 201408: {start:'2014-08-23',end:'2014-09-02', text:'Sun Sorcerer Set'} - 201409: {start:'2014-09-24',end:'2014-10-02', text:'Autumn Strider Item Set'} + 201409: {start:'2014-09-24',end:'2014-10-02', text:'Autumn Strider Set'} 201410: {start:'2014-10-24',end:'2014-11-02', text:'Winged Goblin Set'} 201411: {start:'2014-11-24',end:'2014-12-02', text:'Feast and Fun Set'} 201412: {start:'2014-12-25',end:'2015-01-02', text:'Penguin Set'} 201501: {start:'2015-01-26',end:'2015-02-02', text:'Starry Knight Set'} 201502: {start:'2015-02-24',end:'2015-03-02', text:'Winged Enchanter Set'} + 201503: {start:'2015-03-25',end:'2015-04-02', text:'Aquamarine Set'} 301404: {start:'3014-03-24',end:'3014-04-02', text:'Steampunk Standard Set'} 301405: {start:'3014-04-24',end:'3014-05-02', text:'Steampunk Accessories Set'} wondercon: {start:'2014-03-24',end:'2014-04-01'} # not really, but the mechanic works @@ -217,6 +218,7 @@ gear = 201410: text: t('armorMystery201410Text'), notes: t('armorMystery201410Notes'), mystery:'201410', value: 0 201412: text: t('armorMystery201412Text'), notes: t('armorMystery201412Notes'), mystery:'201412', value: 0 201501: text: t('armorMystery201501Text'), notes: t('armorMystery201501Notes'), mystery:'201501', value: 0 + 201503: text: t('armorMystery201503Text'), notes: t('armorMystery201503Notes'), mystery:'201503', value: 0 301404: text: t('armorMystery301404Text'), notes: t('armorMystery301404Notes'), mystery:'301404', value: 0 head: @@ -413,6 +415,7 @@ gear = summerRogue: event: events.summer, specialClass: 'rogue', text: t('eyewearSpecialSummerRogueText'), notes: t('eyewearSpecialSummerRogueNotes'), value: 20 summerWarrior: event: events.summer, specialClass: 'warrior', text: t('eyewearSpecialSummerWarriorText'), notes: t('eyewearSpecialSummerWarriorNotes'), value: 20 mystery: + 201503: text: t('eyewearMystery201503Text'), notes: t('eyewearMystery201503Notes'), mystery:'201503', value: 0 301404: text: t('eyewearMystery301404Text'), notes: t('eyewearMystery301404Notes'), mystery:'301404', value: 0 301405: text: t('eyewearMystery301405Text'), notes: t('eyewearMystery301405Notes'), mystery:'301405', value: 0 @@ -816,7 +819,7 @@ api.questEggs = Gryphon: text: t('questEggGryphonText'), adjective: t('questEggGryphonAdjective'), canBuy: false Hedgehog: text: t('questEggHedgehogText'), adjective: t('questEggHedgehogAdjective'), canBuy: false Deer: text: t('questEggDeerText'), adjective: t('questEggDeerAdjective'), canBuy: false - Egg: text: t('questEggEggText'), adjective: t('questEggEggAdjective'), canBuy: false, noMount: true + Egg: text: t('questEggEggText'), adjective: t('questEggEggAdjective'), canBuy: false Rat: text: t('questEggRatText'), adjective: t('questEggRatAdjective'), canBuy: false Octopus: text: t('questEggOctopusText'), adjective: t('questEggOctopusAdjective'), canBuy: false Seahorse: text: t('questEggSeahorseText'), adjective: t('questEggSeahorseAdjective'), canBuy: false diff --git a/website/views/options/inventory/inventory.jade b/website/views/options/inventory/inventory.jade index 2a5840b80d..a5a5d599c9 100644 --- a/website/views/options/inventory/inventory.jade +++ b/website/views/options/inventory/inventory.jade @@ -47,7 +47,7 @@ script(type='text/ng-template', id='partials/options.inventory.seasonalshop.html .text-left | {{((item.specialClass == "wizard") && (item.type == "weapon")) + 1}}  span.Pet_Currency_Gem1x.inline-gems - // menu.pets-menu(label=env.t('quests')) + menu.pets-menu(label=env.t('quests')) div(ng-repeat='quest in ::getSeasonalShopQuests()') button.customize-option(data-popover-html="{{::quest.previous && !user.achievements.quests[quest.previous] ? env.t('scrollsPre') : questPopover(quest) | markdown}}", popover-append-to-body='true', popover-title='{{::quest.text()}}', popover-trigger='mouseenter', popover-placement='right', ng-click='buyQuest(quest.key)', ng-class='(quest.previous && !user.achievements.quests[quest.previous]) ? "inventory_quest_scroll_locked inventory_quest_scroll_{{::quest.key}}_locked locked" : "inventory_quest_scroll inventory_quest_scroll_{{::quest.key}}"') p