diff --git a/website/assets/sprites/spritesmith/stable/mounts/body/Mount_Body_BearCub-Holly.png b/website/assets/sprites/spritesmith/stable/mounts/body/Mount_Body_BearCub-Holly.png new file mode 100644 index 0000000000..c48f3a41fb Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/mounts/body/Mount_Body_BearCub-Holly.png differ diff --git a/website/assets/sprites/spritesmith/stable/mounts/body/Mount_Body_Cactus-Holly.png b/website/assets/sprites/spritesmith/stable/mounts/body/Mount_Body_Cactus-Holly.png new file mode 100644 index 0000000000..cc223f233b Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/mounts/body/Mount_Body_Cactus-Holly.png differ diff --git a/website/assets/sprites/spritesmith/stable/mounts/body/Mount_Body_Dragon-Holly.png b/website/assets/sprites/spritesmith/stable/mounts/body/Mount_Body_Dragon-Holly.png new file mode 100644 index 0000000000..bd84ecacfd Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/mounts/body/Mount_Body_Dragon-Holly.png differ diff --git a/website/assets/sprites/spritesmith/stable/mounts/body/Mount_Body_FlyingPig-Holly.png b/website/assets/sprites/spritesmith/stable/mounts/body/Mount_Body_FlyingPig-Holly.png new file mode 100644 index 0000000000..faac8bd188 Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/mounts/body/Mount_Body_FlyingPig-Holly.png differ diff --git a/website/assets/sprites/spritesmith/stable/mounts/body/Mount_Body_Fox-Holly.png b/website/assets/sprites/spritesmith/stable/mounts/body/Mount_Body_Fox-Holly.png new file mode 100644 index 0000000000..7df52d7f81 Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/mounts/body/Mount_Body_Fox-Holly.png differ diff --git a/website/assets/sprites/spritesmith/stable/mounts/body/Mount_Body_LionCub-Holly.png b/website/assets/sprites/spritesmith/stable/mounts/body/Mount_Body_LionCub-Holly.png new file mode 100644 index 0000000000..71efbbbbbc Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/mounts/body/Mount_Body_LionCub-Holly.png differ diff --git a/website/assets/sprites/spritesmith/stable/mounts/body/Mount_Body_PandaCub-Holly.png b/website/assets/sprites/spritesmith/stable/mounts/body/Mount_Body_PandaCub-Holly.png new file mode 100644 index 0000000000..54a093eaa1 Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/mounts/body/Mount_Body_PandaCub-Holly.png differ diff --git a/website/assets/sprites/spritesmith/stable/mounts/body/Mount_Body_Rock-Base.png b/website/assets/sprites/spritesmith/stable/mounts/body/Mount_Body_Rock-Base.png old mode 100755 new mode 100644 diff --git a/website/assets/sprites/spritesmith/stable/mounts/body/Mount_Body_Rock-CottonCandyBlue.png b/website/assets/sprites/spritesmith/stable/mounts/body/Mount_Body_Rock-CottonCandyBlue.png old mode 100755 new mode 100644 diff --git a/website/assets/sprites/spritesmith/stable/mounts/body/Mount_Body_Rock-CottonCandyPink.png b/website/assets/sprites/spritesmith/stable/mounts/body/Mount_Body_Rock-CottonCandyPink.png old mode 100755 new mode 100644 diff --git a/website/assets/sprites/spritesmith/stable/mounts/body/Mount_Body_Rock-Desert.png b/website/assets/sprites/spritesmith/stable/mounts/body/Mount_Body_Rock-Desert.png old mode 100755 new mode 100644 diff --git a/website/assets/sprites/spritesmith/stable/mounts/body/Mount_Body_Rock-Red.png b/website/assets/sprites/spritesmith/stable/mounts/body/Mount_Body_Rock-Red.png old mode 100755 new mode 100644 diff --git a/website/assets/sprites/spritesmith/stable/mounts/body/Mount_Body_Rock-Shade.png b/website/assets/sprites/spritesmith/stable/mounts/body/Mount_Body_Rock-Shade.png old mode 100755 new mode 100644 diff --git a/website/assets/sprites/spritesmith/stable/mounts/body/Mount_Body_Rock-Skeleton.png b/website/assets/sprites/spritesmith/stable/mounts/body/Mount_Body_Rock-Skeleton.png old mode 100755 new mode 100644 diff --git a/website/assets/sprites/spritesmith/stable/mounts/body/Mount_Body_Rock-White.png b/website/assets/sprites/spritesmith/stable/mounts/body/Mount_Body_Rock-White.png old mode 100755 new mode 100644 diff --git a/website/assets/sprites/spritesmith/stable/mounts/body/Mount_Body_Rock-Zombie.png b/website/assets/sprites/spritesmith/stable/mounts/body/Mount_Body_Rock-Zombie.png old mode 100755 new mode 100644 diff --git a/website/assets/sprites/spritesmith/stable/mounts/body/Mount_Body_TigerCub-Holly.png b/website/assets/sprites/spritesmith/stable/mounts/body/Mount_Body_TigerCub-Holly.png new file mode 100644 index 0000000000..371618c89a Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/mounts/body/Mount_Body_TigerCub-Holly.png differ diff --git a/website/assets/sprites/spritesmith/stable/mounts/body/Mount_Body_Wolf-Holly.png b/website/assets/sprites/spritesmith/stable/mounts/body/Mount_Body_Wolf-Holly.png new file mode 100644 index 0000000000..d685aff3d5 Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/mounts/body/Mount_Body_Wolf-Holly.png differ diff --git a/website/assets/sprites/spritesmith/stable/mounts/head/Mount_Head_BearCub-Holly.png b/website/assets/sprites/spritesmith/stable/mounts/head/Mount_Head_BearCub-Holly.png new file mode 100644 index 0000000000..0c4eb2d1cd Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/mounts/head/Mount_Head_BearCub-Holly.png differ diff --git a/website/assets/sprites/spritesmith/stable/mounts/head/Mount_Head_Cactus-Holly.png b/website/assets/sprites/spritesmith/stable/mounts/head/Mount_Head_Cactus-Holly.png new file mode 100644 index 0000000000..e835e6d6da Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/mounts/head/Mount_Head_Cactus-Holly.png differ diff --git a/website/assets/sprites/spritesmith/stable/mounts/head/Mount_Head_Dragon-Holly.png b/website/assets/sprites/spritesmith/stable/mounts/head/Mount_Head_Dragon-Holly.png new file mode 100644 index 0000000000..9ac827ec7c Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/mounts/head/Mount_Head_Dragon-Holly.png differ diff --git a/website/assets/sprites/spritesmith/stable/mounts/head/Mount_Head_FlyingPig-Holly.png b/website/assets/sprites/spritesmith/stable/mounts/head/Mount_Head_FlyingPig-Holly.png new file mode 100644 index 0000000000..bf700f8a19 Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/mounts/head/Mount_Head_FlyingPig-Holly.png differ diff --git a/website/assets/sprites/spritesmith/stable/mounts/head/Mount_Head_Fox-Holly.png b/website/assets/sprites/spritesmith/stable/mounts/head/Mount_Head_Fox-Holly.png new file mode 100644 index 0000000000..f581142e8a Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/mounts/head/Mount_Head_Fox-Holly.png differ diff --git a/website/assets/sprites/spritesmith/stable/mounts/head/Mount_Head_LionCub-Holly.png b/website/assets/sprites/spritesmith/stable/mounts/head/Mount_Head_LionCub-Holly.png new file mode 100644 index 0000000000..7d77a54ece Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/mounts/head/Mount_Head_LionCub-Holly.png differ diff --git a/website/assets/sprites/spritesmith/stable/mounts/head/Mount_Head_PandaCub-Holly.png b/website/assets/sprites/spritesmith/stable/mounts/head/Mount_Head_PandaCub-Holly.png new file mode 100644 index 0000000000..238a9f1b86 Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/mounts/head/Mount_Head_PandaCub-Holly.png differ diff --git a/website/assets/sprites/spritesmith/stable/mounts/head/Mount_Head_TigerCub-Holly.png b/website/assets/sprites/spritesmith/stable/mounts/head/Mount_Head_TigerCub-Holly.png new file mode 100644 index 0000000000..ddc6a9d4c9 Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/mounts/head/Mount_Head_TigerCub-Holly.png differ diff --git a/website/assets/sprites/spritesmith/stable/mounts/head/Mount_Head_Wolf-Holly.png b/website/assets/sprites/spritesmith/stable/mounts/head/Mount_Head_Wolf-Holly.png new file mode 100644 index 0000000000..709f1f8b05 Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/mounts/head/Mount_Head_Wolf-Holly.png differ diff --git a/website/assets/sprites/spritesmith/stable/mounts/icon/Mount_Icon_BearCub-Holly.png b/website/assets/sprites/spritesmith/stable/mounts/icon/Mount_Icon_BearCub-Holly.png new file mode 100644 index 0000000000..ddae332a4b Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/mounts/icon/Mount_Icon_BearCub-Holly.png differ diff --git a/website/assets/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Cactus-Holly.png b/website/assets/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Cactus-Holly.png new file mode 100644 index 0000000000..cd0b904f58 Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Cactus-Holly.png differ diff --git a/website/assets/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Dragon-Holly.png b/website/assets/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Dragon-Holly.png new file mode 100644 index 0000000000..f322a9609a Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Dragon-Holly.png differ diff --git a/website/assets/sprites/spritesmith/stable/mounts/icon/Mount_Icon_FlyingPig-Holly.png b/website/assets/sprites/spritesmith/stable/mounts/icon/Mount_Icon_FlyingPig-Holly.png new file mode 100644 index 0000000000..875949e937 Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/mounts/icon/Mount_Icon_FlyingPig-Holly.png differ diff --git a/website/assets/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Fox-Holly.png b/website/assets/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Fox-Holly.png new file mode 100644 index 0000000000..33a59300f2 Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Fox-Holly.png differ diff --git a/website/assets/sprites/spritesmith/stable/mounts/icon/Mount_Icon_LionCub-Holly.png b/website/assets/sprites/spritesmith/stable/mounts/icon/Mount_Icon_LionCub-Holly.png new file mode 100644 index 0000000000..f3a5e8fd9e Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/mounts/icon/Mount_Icon_LionCub-Holly.png differ diff --git a/website/assets/sprites/spritesmith/stable/mounts/icon/Mount_Icon_PandaCub-Holly.png b/website/assets/sprites/spritesmith/stable/mounts/icon/Mount_Icon_PandaCub-Holly.png new file mode 100644 index 0000000000..1d4cdba7b6 Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/mounts/icon/Mount_Icon_PandaCub-Holly.png differ diff --git a/website/assets/sprites/spritesmith/stable/mounts/icon/Mount_Icon_TigerCub-Holly.png b/website/assets/sprites/spritesmith/stable/mounts/icon/Mount_Icon_TigerCub-Holly.png new file mode 100644 index 0000000000..47f5c3f04f Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/mounts/icon/Mount_Icon_TigerCub-Holly.png differ diff --git a/website/assets/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Wolf-Holly.png b/website/assets/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Wolf-Holly.png new file mode 100644 index 0000000000..29f0b2e1c3 Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/mounts/icon/Mount_Icon_Wolf-Holly.png differ diff --git a/website/assets/sprites/spritesmith/stable/pets/Pet-BearCub-Holly.png b/website/assets/sprites/spritesmith/stable/pets/Pet-BearCub-Holly.png new file mode 100644 index 0000000000..c7364f4530 Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/pets/Pet-BearCub-Holly.png differ diff --git a/website/assets/sprites/spritesmith/stable/pets/Pet-Cactus-Holly.png b/website/assets/sprites/spritesmith/stable/pets/Pet-Cactus-Holly.png new file mode 100644 index 0000000000..4fb9e40647 Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/pets/Pet-Cactus-Holly.png differ diff --git a/website/assets/sprites/spritesmith/stable/pets/Pet-Dragon-Holly.png b/website/assets/sprites/spritesmith/stable/pets/Pet-Dragon-Holly.png new file mode 100644 index 0000000000..39bd9e582a Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/pets/Pet-Dragon-Holly.png differ diff --git a/website/assets/sprites/spritesmith/stable/pets/Pet-FlyingPig-Holly.png b/website/assets/sprites/spritesmith/stable/pets/Pet-FlyingPig-Holly.png new file mode 100644 index 0000000000..557d5249fe Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/pets/Pet-FlyingPig-Holly.png differ diff --git a/website/assets/sprites/spritesmith/stable/pets/Pet-Fox-Holly.png b/website/assets/sprites/spritesmith/stable/pets/Pet-Fox-Holly.png new file mode 100644 index 0000000000..3521d7dfd2 Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/pets/Pet-Fox-Holly.png differ diff --git a/website/assets/sprites/spritesmith/stable/pets/Pet-LionCub-Holly.png b/website/assets/sprites/spritesmith/stable/pets/Pet-LionCub-Holly.png new file mode 100644 index 0000000000..2a3331590e Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/pets/Pet-LionCub-Holly.png differ diff --git a/website/assets/sprites/spritesmith/stable/pets/Pet-PandaCub-Holly.png b/website/assets/sprites/spritesmith/stable/pets/Pet-PandaCub-Holly.png new file mode 100644 index 0000000000..5c569ee358 Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/pets/Pet-PandaCub-Holly.png differ diff --git a/website/assets/sprites/spritesmith/stable/pets/Pet-TigerCub-Holly.png b/website/assets/sprites/spritesmith/stable/pets/Pet-TigerCub-Holly.png new file mode 100644 index 0000000000..bc42a472bc Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/pets/Pet-TigerCub-Holly.png differ diff --git a/website/assets/sprites/spritesmith/stable/pets/Pet-Wolf-Holly.png b/website/assets/sprites/spritesmith/stable/pets/Pet-Wolf-Holly.png new file mode 100644 index 0000000000..3436731c81 Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/pets/Pet-Wolf-Holly.png differ diff --git a/website/assets/sprites/spritesmith/stable/potions/Pet_HatchingPotion_Holly.png b/website/assets/sprites/spritesmith/stable/potions/Pet_HatchingPotion_Holly.png new file mode 100644 index 0000000000..09f30f7223 Binary files /dev/null and b/website/assets/sprites/spritesmith/stable/potions/Pet_HatchingPotion_Holly.png differ diff --git a/website/assets/sprites/spritesmith_large/promo/promo_holly_potions.png b/website/assets/sprites/spritesmith_large/promo/promo_holly_potions.png new file mode 100644 index 0000000000..1fd72f1cdc Binary files /dev/null and b/website/assets/sprites/spritesmith_large/promo/promo_holly_potions.png differ diff --git a/website/common/locales/en/content.json b/website/common/locales/en/content.json index 0744126d6d..ba34eba739 100644 --- a/website/common/locales/en/content.json +++ b/website/common/locales/en/content.json @@ -213,6 +213,7 @@ "hatchingPotionThunderstorm": "Thunderstorm", "hatchingPotionGhost": "Ghost", "hatchingPotionRoyalPurple": "Royal Purple", + "hatchingPotionHolly": "Holly", "hatchingPotionNotes": "Pour this on an egg, and it will hatch as a <%= potText(locale) %> pet.", "premiumPotionAddlNotes": "Not usable on quest pet eggs.", diff --git a/website/common/locales/en/gear.json b/website/common/locales/en/gear.json index 44954a9e41..09ebb222fc 100644 --- a/website/common/locales/en/gear.json +++ b/website/common/locales/en/gear.json @@ -200,6 +200,15 @@ "weaponSpecialFall2016HealerText": "Venomous Serpent", "weaponSpecialFall2016HealerNotes": "One bite harms, and another bite heals. Increases Intelligence by <%= int %>. Limited Edition 2016 Autumn Gear.", + "weaponSpecialWinter2017RogueText": "Ice Axe", + "weaponSpecialWinter2017RogueNotes": "This axe is great for attack, defense, and ice-climbing! Increases Strength by <%= str %>. Limited Edition 2016-2017 Winter Gear.", + "weaponSpecialWinter2017WarriorText": "Stick of Might", + "weaponSpecialWinter2017WarriorNotes": "Conquer your goals by whacking them with this mighty stick! Increases Strength by <%= str %>. Limited Edition 2016-2017 Winter Gear.", + "weaponSpecialWinter2017MageText": "Winter Wolf Crystal Staff", + "weaponSpecialWinter2017MageNotes": "The glowing blue crystal set in the end of this staff is called the Winter Wolf's Eye! It channels magic from snow and ice. Increases Intelligence by <%= int %> and Perception by <%= per %>. Limited Edition 2016-2017 Winter Gear.", + "weaponSpecialWinter2017HealerText": "Sugar-Spun Wand", + "weaponSpecialWinter2017HealerNotes": "This wand can reach into your dreams and bring you visions of dancing sugarplums. Increases Intelligence by <%= int %>. Limited Edition 2016-2017 Winter Gear.", + "weaponMystery201411Text": "Pitchfork of Feasting", "weaponMystery201411Notes": "Stab your enemies or dig in to your favorite foods - this versatile pitchfork does it all! Confers no benefit. November 2014 Subscriber Item.", "weaponMystery201502Text": "Shimmery Winged Staff of Love and Also Truth", @@ -438,6 +447,15 @@ "armorSpecialFall2016HealerText": "Gorgon Robes", "armorSpecialFall2016HealerNotes": "These robes are actually made of stone. How are they so comfortable? Increases Constitution by <%= con %>. Limited Edition 2016 Autumn Gear.", + "armorSpecialWinter2017RogueText": "Frosty Armor", + "armorSpecialWinter2017RogueNotes": "This stealthy suit reflects light to dazzle unsuspecting tasks as you take your rewards from them! Increases Perception by <%= per %>. Limited Edition 2016-2017 Winter Gear.", + "armorSpecialWinter2017WarriorText": "Ice Hockey Armor", + "armorSpecialWinter2017WarriorNotes": "Show your team spirit and strength in this warm, padded armor. Increases Constitution by <%= con %>. Limited Edition 2016-2017 Winter Gear.", + "armorSpecialWinter2017MageText": "Wolfish Armor", + "armorSpecialWinter2017MageNotes": "Made of winter's warmest wool and woven with spells by the mystical Winter Wolf, these robes stave off the chill and keep your mind alert! Increases Intelligence by <%= int %>. Limited Edition 2016-2017 Winter Gear.", + "armorSpecialWinter2017HealerText": "Shimmer Petal Armor", + "armorSpecialWinter2017HealerNotes": "Though soft, this armor of petals has fantastic protective power. Increases Constitution by <%= con %>. Limited Edition 2016-2017 Winter Gear.", + "armorMystery201402Text": "Messenger Robes", "armorMystery201402Notes": "Shimmering and strong, these robes have many pockets to carry letters. Confers no benefit. February 2014 Subscriber Item.", "armorMystery201403Text": "Forest Walker Armor", @@ -486,6 +504,8 @@ "armorMystery201609Notes": "Fit in with the rest of the herd in this snuggly armor! Confers no benefit. September 2016 Subscriber Item.", "armorMystery201610Text": "Spectral Armor", "armorMystery201610Notes": "Mysterious armor that will cause you to float like a ghost! Confers no benefit. October 2016 Subscriber Item.", + "armorMystery201612Text": "Nutcracker Armor", + "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.", @@ -717,6 +737,15 @@ "headSpecialFall2016HealerText": "Medusa's Crown", "headSpecialFall2016HealerNotes": "Woe to anyone who looks you in the eyes... Increases Intelligence by <%= int %>. Limited Edition 2016 Autumn Gear.", + "headSpecialWinter2017RogueText": "Frosty Helm", + "headSpecialWinter2017RogueNotes": "Fashioned from ice crystals, this helm will help you move unnoticed through wintry landscapes. Increases Perception by <%= per %>. Limited Edition 2016-2017 Winter Gear.", + "headSpecialWinter2017WarriorText": "Hockey Helm", + "headSpecialWinter2017WarriorNotes": "This is a hard and durable helmet, made to withstand impacts from ice or even dark red dailies! Increases Strength by <%= str %>. Limited Edition 2016-2017 Winter Gear.", + "headSpecialWinter2017MageText": "Winter Wolf Helm", + "headSpecialWinter2017MageNotes": "This helm, fashioned in the image of the legendary Winter Wolf, will keep your head warm and your vision sharp. Increases Perception by <%= per %>. Limited Edition 2016-2017 Winter Gear.", + "headSpecialWinter2017HealerText": "Sparkling Blossom Helm", + "headSpecialWinter2017HealerNotes": "These glittering petals focus brainpower! Increases Intelligence by <%= int %>. Limited Edition 2016-2017 Winter Gear.", + "headSpecialGaymerxText": "Rainbow Warrior Helm", "headSpecialGaymerxNotes": "In celebration of the GaymerX Conference, this special helmet is decorated with a radiant, colorful rainbow pattern! GaymerX is a game convention celebrating LGTBQ and gaming and is open to everyone.", @@ -768,6 +797,8 @@ "headMystery201610Notes": "These flames will awaken your ghostly power. Confers no benefit. October 2016 Subscriber Item.", "headMystery201611Text": "Fancy Feasting Hat", "headMystery201611Notes": "You're guaranteed to be the fanciest person at the feast in this plumed chapeau. Confers no benefit. November 2016 Subscriber Item.", + "headMystery201612Text": "Nutcracker Helm", + "headMystery201612Notes": "This tall and splended helm adds a magnificent element to your holiday apparel! Confers no benefit. December 2016 Subscriber Item.", "headMystery301404Text": "Fancy Top Hat", "headMystery301404Notes": "A fancy top hat for the finest of gentlefolk! January 3015 Subscriber Item. Confers no benefit.", "headMystery301405Text": "Basic Top Hat", @@ -956,6 +987,13 @@ "shieldSpecialFall2016HealerText": "Gorgon Shield", "shieldSpecialFall2016HealerNotes": "Don't admire your own reflection in this. Increases Constitution by <%= con %>. Limited Edition 2016 Autumn Gear.", + "shieldSpecialWinter2017RogueText": "Ice Axe", + "shieldSpecialWinter2017RogueNotes": "This axe is great for attack, defense, and ice-climbing! Increases Strength by <%= str %>. Limited Edition 2016-2017 Winter Gear.", + "shieldSpecialWinter2017WarriorText": "Puck Shield", + "shieldSpecialWinter2017WarriorNotes": "Made from a giant hockey puck, this shield can stand up to quite a beating. Increases Constitution by <%= con %>. Limited Edition 2016-2017 Winter Gear.", + "shieldSpecialWinter2017HealerText": "Sugarplum Shield", + "shieldSpecialWinter2017HealerNotes": "This fibrous armament will help protect you from even the sourest of tasks! Increases Constitution by <%= con %>. Limited Edition 2016-2017 Winter Gear.", + "shieldMystery201601Text": "Resolution Slayer", "shieldMystery201601Notes": "This blade can be used to parry away all distractions. Confers no benefit. January 2016 Subscriber Item.", "shieldMystery301405Text": "Clock Shield", diff --git a/website/common/locales/en/limited.json b/website/common/locales/en/limited.json index 04acbe1c71..41838256f7 100644 --- a/website/common/locales/en/limited.json +++ b/website/common/locales/en/limited.json @@ -81,7 +81,7 @@ "potionerSet": "Potioner (Healer)", "battleRogueSet": "Bat-tle Rogue (Rogue)", "fallEventAvailability": "Available for purchase until October 31.", - "winterEventAvailability": "Available for purchase until December 31.", + "winterEventAvailability": "Available for purchase until January 31.", "springEventAvailability": "Available for purchase until May 31.", "summerEventAvailability": "Available for purchase until August 31." } diff --git a/website/common/script/content/hatching-potions.js b/website/common/script/content/hatching-potions.js index f8210ceb3f..39ad6b1a65 100644 --- a/website/common/script/content/hatching-potions.js +++ b/website/common/script/content/hatching-potions.js @@ -84,6 +84,12 @@ let premium = { text: t('hatchingPotionRoyalPurple'), limited: true, }, + Holly: { + value: 2, + text: t('hatchingPotionHolly'), + limited: true, + _season: 'winter', + }, }; each(drops, (pot, key) => { @@ -112,7 +118,7 @@ each(premium, (pot, key) => { premium: true, limited: false, canBuy () { - return false; + return pot._season === 'winter'; }, }); }); diff --git a/website/views/shared/new-stuff.jade b/website/views/shared/new-stuff.jade index 28a4084eee..40e598dc95 100644 --- a/website/views/shared/new-stuff.jade +++ b/website/views/shared/new-stuff.jade @@ -1,23 +1,43 @@ -h2 12/12/2016 - LAST CHANCE FOR HABITICA T-SHIRTS AND MUGS; STAFF SPOTLIGHT +h2 12/13/2016 - MOBILE APP UPDATES AND HOLIDAY HATCHING POTIONS! + .promo_holly_potions.pull-right hr tr td - .promo_coffee_mug.pull-left.slight-right-margin - h3 Last Chance for Habitica T-Shirts and Mugs! - p Today's the final day to get our Habitica T-shirts and mugs if you live in the EU, and tomorrow's the final day if you live in the USA, so if you want one, be sure to grab it now! Thanks again for all your support -- you're all awesome. - .promo_contrib_spotlight_Keith.pull-right - p.small.muted by Redphoenix and Beffymaroo + h3 Mobile App Updates: Use Gems for Social Good + p We've released a new iOS update and a new Android update with a super exciting feature. + br + p We’ve partnered with Seeds, an organization that sends micro-loans to entrepreneurs in developing countries. Now when you buy the 84-gem pack, a portion of the proceeds will go directly to small business owners in developing countries to help improve their lives! You can learn more about how it works by tapping the gem icon in your app. + br + p We've also introduced bug fixes on iOS, and on Android we now also have sound effects and a To-Do widget! + br + p If you like the improvements that we’ve been making to our app, please consider reviewing this new version. It really helps us out! We hope you enjoy the updates. + p.small.muted by viirus, negue, AlbRoehm, d954mas, anitawoodruff, caipivara, and the Seeds team tr td - h3 Staff Spotlight: Keith - p We've posted a new Staff Spotlight on the blog! Check out our latest interview with Keith AKA TheHollidayInn, our newest staff member and awesome engineer. - p.small.muted by Lemoness, Beffymaroo, and TheHollidayInn + h3 Holly and Peppermint Hatching Potions + p Need something to spend those newly-purchased gems on? Between now and January 31st, you can buy Holly and Peppermint Hatching Potions from the Market and use them to hatch any standard pet egg. (Magic Hatching Potions do not work on Quest Pet eggs.) + br + p After they're gone, it will be at least a year before the Holly and Peppermint Hatching Potions are available again, so be sure to get them now! + p.small.muted by Vampitch, Lemoness, and SabreCat if menuItem !== 'oldNews' hr a(href='/static/old-news', target='_blank') Read older news mixin oldNews + h2 12/12/2016 - LAST CHANCE FOR HABITICA T-SHIRTS AND MUGS; STAFF SPOTLIGHT + tr + td + .promo_coffee_mug.pull-left.slight-right-margin + h3 Last Chance for Habitica T-Shirts and Mugs! + p Today's the final day to get our Habitica T-shirts and mugs if you live in the EU, and tomorrow's the final day if you live in the USA, so if you want one, be sure to grab it now! Thanks again for all your support -- you're all awesome. + .promo_contrib_spotlight_Keith.pull-right + p.small.muted by Redphoenix and Beffymaroo + tr + td + h3 Staff Spotlight: Keith + p We've posted a new Staff Spotlight on the blog! Check out our latest interview with Keith AKA TheHollidayInn, our newest staff member and awesome engineer. + p.small.muted by Lemoness, Beffymaroo, and TheHollidayInn h2 12/8/2016 - GIFT-1-GET-1 SUBSCRIPTIONS, NEW PET QUEST, AND HOLIDAY PREP TIPS tr td