diff --git a/website/common/locales/en/backgrounds.json b/website/common/locales/en/backgrounds.json index 0f912f444e..224f42f04a 100644 --- a/website/common/locales/en/backgrounds.json +++ b/website/common/locales/en/backgrounds.json @@ -417,5 +417,13 @@ "backgroundDilatoryCityText": "City of Dilatory", "backgroundDilatoryCityNotes": "Meander through the undersea City of Dilatory.", "backgroundTidePoolText": "Tide Pool", - "backgroundTidePoolNotes": "Observe the ocean life near a Tide Pool." + "backgroundTidePoolNotes": "Observe the ocean life near a Tide Pool.", + + "backgrounds082018": "SET 51: Released August 2018", + "backgroundTrainingGroundsText": "Training Grounds", + "backgroundTrainingGroundsNotes": "Spar on the Training Grounds.", + "backgroundFlyingOverRockyCanyonText": "Rocky Canyon", + "backgroundFlyingOverRockyCanyonNotes": "Look down into a breathtaking scene as you fly over a Rocky Canyon.", + "backgroundBridgeText": "Bridge", + "backgroundBridgeNotes": "Cross a charming Bridge." } diff --git a/website/common/locales/en/gear.json b/website/common/locales/en/gear.json index 857c978efe..3331ecd2da 100644 --- a/website/common/locales/en/gear.json +++ b/website/common/locales/en/gear.json @@ -377,6 +377,8 @@ "weaponArmoireGlassblowersBlowpipeNotes": "Use this tube to blow molten glass into beautiful vases, ornaments, and other fancy things. Increases Strength by <%= str %>. Enchanted Armoire: Glassblower Set (Item 1 of 4).", "weaponArmoirePoisonedGobletText": "Poisoned Goblet", "weaponArmoirePoisonedGobletNotes": "Use this to build your resistance to iocane powder and other inconceivably dangerous poisons. Increases Intelligence by <%= int %>. Enchanted Armoire: Piratical Princess Set (Item 3 of 4).", + "weaponArmoireJeweledArcherBowText": "Jeweled Archer Bow", + "weaponArmoireJeweledArcherBowNotes": "This bow of gold and gems will send your arrows to their targets at incredible speed. Increases Intelligence by <%= int %>. Enchanted Armoire: Jeweled Archer Set (Item 3 of 3).", "armor": "armor", "armorCapitalized": "Armor", @@ -808,6 +810,8 @@ "armorArmoireBluePartyDressNotes": "You're perceptive, tough, smart, and so fashionable! Increases Perception, Strength, and Constitution by <%= attrs %> each. Enchanted Armoire: Blue Hairbow Set (Item 2 of 2).", "armorArmoirePiraticalPrincessGownText": "Piratical Princess Gown", "armorArmoirePiraticalPrincessGownNotes": "This luxuriant garment has many pockets for concealing weapons and loot! Increases Perception by <%= per %>. Enchanted Armoire: Piratical Princess Set (Item 2 of 4).", + "armorArmoireJeweledArcherArmorText": "Jeweled Archer Armor", + "armorArmoireJeweledArcherArmorNotes": "This finely crafted armor will protect you from projectiles or errant red Dailies! Increases Constitution by <%= con %>. Enchanted Armoire: Jeweled Archer Set (Item 2 of 3).", "headgear": "helm", "headgearCapitalized": "Headgear", @@ -1255,6 +1259,8 @@ "headArmoireGlassblowersHatNotes": "This hat mainly just looks good with your other protective glassblowing gear! Increases Perception by <%= per %>. Enchanted Armoire: Glassblower Set (Item 3 of 4).", "headArmoirePiraticalPrincessHeaddressText": "Piratical Princess Headdress", "headArmoirePiraticalPrincessHeaddressNotes": "Fancy buccaneers are known for their fancy headwear! Increases Perception and Intelligence by <%= attrs %> each. Enchanted Armoire: Piratical Princess Set (Item 1 of 4).", + "headArmoireJeweledArcherHelmText": "Jeweled Archer Helm", + "headArmoireJeweledArcherHelmNotes": "This helm may look ornate, but it's also exceedingly light and strong. Increases Intelligence by <%= int %>. Enchanted Armoire: Jeweled Archer Set (Item 1 of 3).", "offhand": "off-hand item", "offhandCapitalized": "Off-Hand Item", diff --git a/website/common/script/content/appearance/backgrounds.js b/website/common/script/content/appearance/backgrounds.js index ec921b3729..384d858b6d 100644 --- a/website/common/script/content/appearance/backgrounds.js +++ b/website/common/script/content/appearance/backgrounds.js @@ -703,6 +703,20 @@ let backgrounds = { notes: t('backgroundTidePoolNotes'), }, }, + backgrounds082018: { + training_grounds: { + text: t('backgroundTrainingGroundsText'), + notes: t('backgroundTrainingGroundsNotes'), + }, + flying_over_rocky_canyon: { + text: t('backgroundFlyingOverRockyCanyonText'), + notes: t('backgroundFlyingOverRockyCanyonNotes'), + }, + bridge: { + text: t('backgroundBridgeText'), + notes: t('backgroundBridgeNotes'), + }, + }, incentiveBackgrounds: { violet: { text: t('backgroundVioletText'), diff --git a/website/common/script/content/gear/sets/armoire.js b/website/common/script/content/gear/sets/armoire.js index 12992e9e2a..9763dcd57a 100644 --- a/website/common/script/content/gear/sets/armoire.js +++ b/website/common/script/content/gear/sets/armoire.js @@ -375,6 +375,14 @@ let armor = { set: 'piraticalPrincess', canOwn: ownsItem('armor_armoire_piraticalPrincessGown'), }, + jeweledArcherArmor: { + text: t('armorArmoireJeweledArcherArmorText'), + notes: t('armorArmoireJeweledArcherArmorNotes', { con: 15 }), + value: 100, + con: 15, + set: 'jeweledArcher', + canOwn: ownsItem('armor_armoire_JeweledArcherArmor'), + }, }; let body = { @@ -811,6 +819,14 @@ let head = { set: 'piraticalPrincess', canOwn: ownsItem('head_armoire_piraticalPrincessHeaddress'), }, + jeweledArcherHelm: { + text: t('headArmoireJeweledArcherHelmText'), + notes: t('headArmoireJeweledArcherHelmNotes', { int: 15 }), + value: 100, + int: 15, + set: 'jeweledArcher', + canOwn: ownsItem('head_armoire_JeweledArcherHelm'), + }, }; let shield = { @@ -1333,6 +1349,15 @@ let weapon = { set: 'piraticalPrincess', canOwn: ownsItem('weapon_armoire_poisonedGoblet'), }, + jeweledArcherBow: { + text: t('weaponArmoireJeweledArcherBowText'), + notes: t('weaponArmoireJeweledArcherBowNotes', { int: 15 }), + twoHanded: true, + value: 100, + int: 15, + set: 'jeweledArcher', + canOwn: ownsItem('weapon_armoire_JeweledArcherBow'), + }, }; let armoireSet = { diff --git a/website/raw_sprites/spritesmith/backgrounds/background_bridge.png b/website/raw_sprites/spritesmith/backgrounds/background_bridge.png new file mode 100644 index 0000000000..f958adf9d1 Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/background_bridge.png differ diff --git a/website/raw_sprites/spritesmith/backgrounds/background_flying_over_rocky_canyon.png b/website/raw_sprites/spritesmith/backgrounds/background_flying_over_rocky_canyon.png new file mode 100644 index 0000000000..d34ae29235 Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/background_flying_over_rocky_canyon.png differ diff --git a/website/raw_sprites/spritesmith/backgrounds/background_training_grounds.png b/website/raw_sprites/spritesmith/backgrounds/background_training_grounds.png new file mode 100644 index 0000000000..40f719dc6f Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/background_training_grounds.png differ diff --git a/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_bridge.png b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_bridge.png new file mode 100644 index 0000000000..0654bb6418 Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_bridge.png differ diff --git a/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_flying_over_rocky_canyon.png b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_flying_over_rocky_canyon.png new file mode 100644 index 0000000000..8adafb1c5f Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_flying_over_rocky_canyon.png differ diff --git a/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_training_grounds.png b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_training_grounds.png new file mode 100644 index 0000000000..567e6d9b06 Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_training_grounds.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/broad_armor_armoire_jeweledArcherArmor.png b/website/raw_sprites/spritesmith/gear/armoire/broad_armor_armoire_jeweledArcherArmor.png new file mode 100644 index 0000000000..2af4158504 Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/broad_armor_armoire_jeweledArcherArmor.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/head_armoire_jeweledArcherHelm.png b/website/raw_sprites/spritesmith/gear/armoire/head_armoire_jeweledArcherHelm.png new file mode 100644 index 0000000000..598299ac53 Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/head_armoire_jeweledArcherHelm.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/shop/shop_armor_armoire_jeweledArcherArmor.png b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_armor_armoire_jeweledArcherArmor.png new file mode 100644 index 0000000000..04aa538d98 Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_armor_armoire_jeweledArcherArmor.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/shop/shop_head_armoire_jeweledArcherHelm.png b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_head_armoire_jeweledArcherHelm.png new file mode 100644 index 0000000000..dd33499c0b Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_head_armoire_jeweledArcherHelm.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/shop/shop_head_armoire_swanFeatherCrown.png b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_head_armoire_swanFeatherCrown.png index 320c9604a3..1c129d0ee3 100755 Binary files a/website/raw_sprites/spritesmith/gear/armoire/shop/shop_head_armoire_swanFeatherCrown.png and b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_head_armoire_swanFeatherCrown.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/shop/shop_weapon_armoire_jeweledArcherBow.png b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_weapon_armoire_jeweledArcherBow.png new file mode 100644 index 0000000000..f0d89804ca Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_weapon_armoire_jeweledArcherBow.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/slim_armor_armoire_jeweledArcherArmor.png b/website/raw_sprites/spritesmith/gear/armoire/slim_armor_armoire_jeweledArcherArmor.png new file mode 100644 index 0000000000..d1884925de Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/slim_armor_armoire_jeweledArcherArmor.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/weapon_armoire_jeweledArcherBow.png b/website/raw_sprites/spritesmith/gear/armoire/weapon_armoire_jeweledArcherBow.png new file mode 100644 index 0000000000..20c1369958 Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/weapon_armoire_jeweledArcherBow.png differ diff --git a/website/raw_sprites/spritesmith/stable/pets/Pet-SeaSerpent-Base.png b/website/raw_sprites/spritesmith/stable/pets/Pet-SeaSerpent-Base.png index 2aed85ccb4..6e6426ce93 100644 Binary files a/website/raw_sprites/spritesmith/stable/pets/Pet-SeaSerpent-Base.png and b/website/raw_sprites/spritesmith/stable/pets/Pet-SeaSerpent-Base.png differ diff --git a/website/raw_sprites/spritesmith/stable/pets/Pet-SeaSerpent-CottonCandyBlue.png b/website/raw_sprites/spritesmith/stable/pets/Pet-SeaSerpent-CottonCandyBlue.png index 6d036dca53..1ed87934ab 100644 Binary files a/website/raw_sprites/spritesmith/stable/pets/Pet-SeaSerpent-CottonCandyBlue.png and b/website/raw_sprites/spritesmith/stable/pets/Pet-SeaSerpent-CottonCandyBlue.png differ diff --git a/website/raw_sprites/spritesmith/stable/pets/Pet-SeaSerpent-CottonCandyPink.png b/website/raw_sprites/spritesmith/stable/pets/Pet-SeaSerpent-CottonCandyPink.png index 37a89ce51d..a280161d02 100644 Binary files a/website/raw_sprites/spritesmith/stable/pets/Pet-SeaSerpent-CottonCandyPink.png and b/website/raw_sprites/spritesmith/stable/pets/Pet-SeaSerpent-CottonCandyPink.png differ diff --git a/website/raw_sprites/spritesmith/stable/pets/Pet-SeaSerpent-Desert.png b/website/raw_sprites/spritesmith/stable/pets/Pet-SeaSerpent-Desert.png index 16c50bbf0e..4a05466099 100644 Binary files a/website/raw_sprites/spritesmith/stable/pets/Pet-SeaSerpent-Desert.png and b/website/raw_sprites/spritesmith/stable/pets/Pet-SeaSerpent-Desert.png differ diff --git a/website/raw_sprites/spritesmith/stable/pets/Pet-SeaSerpent-Golden.png b/website/raw_sprites/spritesmith/stable/pets/Pet-SeaSerpent-Golden.png index c9df152d2d..1fdb633358 100644 Binary files a/website/raw_sprites/spritesmith/stable/pets/Pet-SeaSerpent-Golden.png and b/website/raw_sprites/spritesmith/stable/pets/Pet-SeaSerpent-Golden.png differ diff --git a/website/raw_sprites/spritesmith/stable/pets/Pet-SeaSerpent-Red.png b/website/raw_sprites/spritesmith/stable/pets/Pet-SeaSerpent-Red.png index c9f90d4327..bf7c53295c 100644 Binary files a/website/raw_sprites/spritesmith/stable/pets/Pet-SeaSerpent-Red.png and b/website/raw_sprites/spritesmith/stable/pets/Pet-SeaSerpent-Red.png differ diff --git a/website/raw_sprites/spritesmith/stable/pets/Pet-SeaSerpent-Shade.png b/website/raw_sprites/spritesmith/stable/pets/Pet-SeaSerpent-Shade.png index f0432b6896..9cce989d45 100644 Binary files a/website/raw_sprites/spritesmith/stable/pets/Pet-SeaSerpent-Shade.png and b/website/raw_sprites/spritesmith/stable/pets/Pet-SeaSerpent-Shade.png differ diff --git a/website/raw_sprites/spritesmith/stable/pets/Pet-SeaSerpent-White.png b/website/raw_sprites/spritesmith/stable/pets/Pet-SeaSerpent-White.png index a2bf20eabd..590639ae4e 100644 Binary files a/website/raw_sprites/spritesmith/stable/pets/Pet-SeaSerpent-White.png and b/website/raw_sprites/spritesmith/stable/pets/Pet-SeaSerpent-White.png differ diff --git a/website/raw_sprites/spritesmith/stable/pets/Pet-SeaSerpent-Zombie.png b/website/raw_sprites/spritesmith/stable/pets/Pet-SeaSerpent-Zombie.png index 4f88d8e4c7..a07b8ed8e3 100644 Binary files a/website/raw_sprites/spritesmith/stable/pets/Pet-SeaSerpent-Zombie.png and b/website/raw_sprites/spritesmith/stable/pets/Pet-SeaSerpent-Zombie.png differ diff --git a/website/raw_sprites/spritesmith_large/promo_armoire_backgrounds_201807.png b/website/raw_sprites/spritesmith_large/promo_armoire_backgrounds_201807.png deleted file mode 100644 index 456ba98f41..0000000000 Binary files a/website/raw_sprites/spritesmith_large/promo_armoire_backgrounds_201807.png and /dev/null differ diff --git a/website/raw_sprites/spritesmith_large/promo_armoire_backgrounds_201808.png b/website/raw_sprites/spritesmith_large/promo_armoire_backgrounds_201808.png new file mode 100644 index 0000000000..9b5a824a01 Binary files /dev/null and b/website/raw_sprites/spritesmith_large/promo_armoire_backgrounds_201808.png differ diff --git a/website/server/controllers/api-v3/news.js b/website/server/controllers/api-v3/news.js index 7bafb18140..e6e87e802d 100644 --- a/website/server/controllers/api-v3/news.js +++ b/website/server/controllers/api-v3/news.js @@ -3,7 +3,7 @@ import { authWithHeaders } from '../../middlewares/auth'; let api = {}; // @TODO export this const, cannot export it from here because only routes are exported from controllers -const LAST_ANNOUNCEMENT_TITLE = 'AUGUST 2018 RESOLUTION SUCCESS CHALLENGE AND NEW TAKE THIS CHALLENGE'; +const LAST_ANNOUNCEMENT_TITLE = 'AUGUST BACKGROUNDS AND ARMOIRE ITEMS, AND QUEST PARTICIPANTS VIEW!'; const worldDmg = { // @TODO bailey: false, }; @@ -30,27 +30,22 @@ api.getNews = {

${res.t('newStuff')}

-

8/1/2018 - ${LAST_ANNOUNCEMENT_TITLE}

+

8/2/2018 - ${LAST_ANNOUNCEMENT_TITLE}

-

The Habitica team has launched a special official Challenge series hosted in the Official New Year's Resolution Guild. These Challenges are designed to help you build and maintain goals that are destined for success and then stick with them as the year progresses. For this month's Challenge, Count Your Treasure, we're focusing on the importance of rewards! It has a 15 Gem prize, which will be awarded to five lucky winners on September 3rd.

+

New Backgrounds and Armoire Items!

+

We’ve added three new backgrounds to the Background Shop! Now your avatar can fly over a Rocky Canyon, spar on the Training Grounds, and cross a charming Bridge. Check them out under User Icon > Backgrounds!

+

Plus, there’s new Gold-purchasable equipment in the Enchanted Armoire, including the Jeweled Archer Set. Better work hard on your real-life tasks to earn all the pieces! Enjoy :)

+
by Lalaitha, Kiwibot, Balduranne, Irrevenant, DialFforFunky, RandomGryffindor, Mewrose, and CitrineQuartzFox
+

New! Quest Partipant List

+

There's a new feature on your Party Page! If you're in a Quest, you can now view all Party members who have joined the Quest via the Participants link in the box where you can see your progress. Enjoy!

+
by Alys
-
+
-

Congratulations to the winners of July's Challenge: Krilae, catliyon, cemelee, Rafael Moura, and Eduardo The Invincible!

-
-
-
-

The next Take This Challenge has also launched, "Notice Me, Senpai!", with a focus on seeking help when we're struggling. Be sure to check it out to earn additional pieces of the Take This armor set!

-
-
-

Long-time Take This Challenge participants may notice that recent Challenges have been reprises of early ones. Great news, though: next month, we'll begin debuting brand new mental health and self-care Challenges from the Take This team! Stay tuned!

-

Take This is a nonprofit that seeks to inform the gamer community about mental health issues, to provide education about mental disorders and mental illness prevention, and to reduce the stigma of mental illness.

-

Congratulations to the winners of the last Take This Challenge, "Multi-Player Co-Op Exercise!": grand prize winner Lex Talion, and runners-up wcampospro, KorJik_3, FortemFiducia, DanDee, and Xander Scott! Plus, all participants in that Challenge have received a piece of the Take This item set if they hadn't completed it already. It is located in your Rewards column. Enjoy!

-
by Doctor B, the Take This team, Lemoness, Beffymaroo, and SabreCat
`, });