diff --git a/website/common/locales/en/backgrounds.json b/website/common/locales/en/backgrounds.json index 2839a8fb29..0f912f444e 100644 --- a/website/common/locales/en/backgrounds.json +++ b/website/common/locales/en/backgrounds.json @@ -409,5 +409,13 @@ "backgroundRowboatText": "Rowboat", "backgroundRowboatNotes": "Sing rounds in a Rowboat.", "backgroundPirateFlagText": "Pirate Flag", - "backgroundPirateFlagNotes": "Fly a fearsome Pirate Flag." + "backgroundPirateFlagNotes": "Fly a fearsome Pirate Flag.", + + "backgrounds072018": "SET 50: Released July 2018", + "backgroundDarkDeepText": "Dark Deep", + "backgroundDarkDeepNotes": "Swim in the Dark Deep among bioluminescent critters.", + "backgroundDilatoryCityText": "City of Dilatory", + "backgroundDilatoryCityNotes": "Meander through the undersea City of Dilatory.", + "backgroundTidePoolText": "Tide Pool", + "backgroundTidePoolNotes": "Observe the ocean life near a Tide Pool." } diff --git a/website/common/locales/en/gear.json b/website/common/locales/en/gear.json index 8659217e3e..c5c040eaf5 100644 --- a/website/common/locales/en/gear.json +++ b/website/common/locales/en/gear.json @@ -375,6 +375,8 @@ "weaponArmoireCobblersHammerNotes": "This hammer is specially made for leatherwork. It can do a real number on a red Daily in a pinch, though. Increases Constitution and Strength by <%= attrs %> each. Enchanted Armoire: Cobbler Set (Item 2 of 3).", "weaponArmoireGlassblowersBlowpipeText": "Glassblower's Blowpipe", "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).", "armor": "armor", "armorCapitalized": "Armor", @@ -802,6 +804,8 @@ "armorArmoireGlassblowersCoverallsNotes": "These coveralls will protect you while you're making masterpieces with hot molten glass. Increases Constitution by <%= con %>. Enchanted Armoire: Glassblower Set (Item 2 of 4).", "armorArmoireBluePartyDressText": "Blue Party Dress", "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).", "headgear": "helm", "headgearCapitalized": "Headgear", @@ -1245,6 +1249,8 @@ "headArmoireBigWigNotes": "Some powdered wigs are for looking more authoritative, but this one is just for laughs! Increases Strength by <%= str %>. Enchanted Armoire: Independent Item.", "headArmoireGlassblowersHatText": "Glassblower's Hat", "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).", "offhand": "off-hand item", "offhandCapitalized": "Off-Hand Item", @@ -1485,6 +1491,8 @@ "shieldArmoireFancyShoeNotes": "A very special shoe you're working on. It's fit for royalty! Increases Intelligence and Perception by <%= attrs %> each. Enchanted Armoire: Cobbler Set (Item 3 of 3).", "shieldArmoireFancyBlownGlassVaseText": "Fancy Blown Glass Vase", "shieldArmoireFancyBlownGlassVaseNotes": "What a fancy vase you've made! What will you put inside? Increases Intelligence by <%= int %>. Enchanted Armoire: Glassblower Set (Item 4 of 4).", + "shieldArmoirePiraticalSkullShieldText": "Piratical Skull Shield", + "shieldArmoirePiraticalSkullShieldNotes": "This enchanted shield will whisper the secret locations of your enemies' treasures- listen closely! Increases Perception and Intelligence by <%= attrs %> each. Enchanted Armoire: Piratical Princess Set (Item 4 of 4).", "back": "Back Accessory", "backCapitalized": "Back Accessory", diff --git a/website/common/script/content/appearance/backgrounds.js b/website/common/script/content/appearance/backgrounds.js index 8b1794e225..ec921b3729 100644 --- a/website/common/script/content/appearance/backgrounds.js +++ b/website/common/script/content/appearance/backgrounds.js @@ -689,6 +689,20 @@ let backgrounds = { notes: t('backgroundPirateFlagNotes'), }, }, + backgrounds072018: { + dark_deep: { + text: t('backgroundDarkDeepText'), + notes: t('backgroundDarkDeepNotes'), + }, + dilatory_city: { + text: t('backgroundDilatoryCityText'), + notes: t('backgroundDilatoryCityNotes'), + }, + tide_pool: { + text: t('backgroundTidePoolText'), + notes: t('backgroundTidePoolNotes'), + }, + }, 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 7e71c2405f..12992e9e2a 100644 --- a/website/common/script/content/gear/sets/armoire.js +++ b/website/common/script/content/gear/sets/armoire.js @@ -367,6 +367,14 @@ let armor = { set: 'blueHairbow', canOwn: ownsItem('armor_armoire_bluePartyDress'), }, + piraticalPrincessGown: { + text: t('armorArmoirePiraticalPrincessGownText'), + notes: t('armorArmoirePiraticalPrincessGownNotes', { per: 7 }), + value: 100, + per: 7, + set: 'piraticalPrincess', + canOwn: ownsItem('armor_armoire_piraticalPrincessGown'), + }, }; let body = { @@ -794,6 +802,15 @@ let head = { set: 'glassblower', canOwn: ownsItem('head_armoire_glassblowersHat'), }, + piraticalPrincessHeaddress: { + text: t('headArmoirePiraticalPrincessHeaddressText'), + notes: t('headArmoirePiraticalPrincessHeaddressNotes', { attrs: 8 }), + value: 100, + per: 8, + int: 8, + set: 'piraticalPrincess', + canOwn: ownsItem('head_armoire_piraticalPrincessHeaddress'), + }, }; let shield = { @@ -990,6 +1007,15 @@ let shield = { set: 'glassblower', canOwn: ownsItem('shield_armoire_fancyBlownGlassVase'), }, + piraticalSkullShield: { + text: t('shieldArmoirePiraticalSkullShieldText'), + notes: t('shieldArmoirePiraticalSkullShieldNotes', { attrs: 4 }), + value: 100, + per: 4, + int: 4, + set: 'piraticalPrincess', + canOwn: ownsItem('shield_armoire_piraticalSkullShield'), + }, }; let headAccessory = { @@ -1299,6 +1325,14 @@ let weapon = { set: 'glassblower', canOwn: ownsItem('weapon_armoire_glassblowersBlowpipe'), }, + poisonedGoblet: { + text: t('weaponArmoirePoisonedGobletText'), + notes: t('weaponArmoirePoisonedGobletNotes', { int: 7 }), + value: 100, + int: 7, + set: 'piraticalPrincess', + canOwn: ownsItem('weapon_armoire_poisonedGoblet'), + }, }; let armoireSet = { diff --git a/website/raw_sprites/spritesmith/backgrounds/background_dark_deep.png b/website/raw_sprites/spritesmith/backgrounds/background_dark_deep.png new file mode 100644 index 0000000000..2f17beea46 Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/background_dark_deep.png differ diff --git a/website/raw_sprites/spritesmith/backgrounds/background_dilatory_city.png b/website/raw_sprites/spritesmith/backgrounds/background_dilatory_city.png new file mode 100644 index 0000000000..7f583b57c2 Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/background_dilatory_city.png differ diff --git a/website/raw_sprites/spritesmith/backgrounds/background_tide_pool.png b/website/raw_sprites/spritesmith/backgrounds/background_tide_pool.png new file mode 100644 index 0000000000..0ca8482b84 Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/background_tide_pool.png differ diff --git a/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_dark_deep.png b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_dark_deep.png new file mode 100644 index 0000000000..d3c98087e4 Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_dark_deep.png differ diff --git a/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_dilatory_city.png b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_dilatory_city.png new file mode 100644 index 0000000000..aaea1e9d5b Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_dilatory_city.png differ diff --git a/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_tide_pool.png b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_tide_pool.png new file mode 100644 index 0000000000..fdbdf2df85 Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_tide_pool.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/broad_armor_armoire_piraticalPrincessGown.png b/website/raw_sprites/spritesmith/gear/armoire/broad_armor_armoire_piraticalPrincessGown.png new file mode 100644 index 0000000000..a5d29b1d6e Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/broad_armor_armoire_piraticalPrincessGown.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/head_armoire_piraticalPrincessHeaddress.png b/website/raw_sprites/spritesmith/gear/armoire/head_armoire_piraticalPrincessHeaddress.png new file mode 100644 index 0000000000..d4032f5f5b Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/head_armoire_piraticalPrincessHeaddress.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/shield_armoire_piraticalSkullShield.png b/website/raw_sprites/spritesmith/gear/armoire/shield_armoire_piraticalSkullShield.png new file mode 100644 index 0000000000..f8e253d790 Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/shield_armoire_piraticalSkullShield.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/shop_armor_armoire_piraticalPrincessGown.png b/website/raw_sprites/spritesmith/gear/armoire/shop_armor_armoire_piraticalPrincessGown.png new file mode 100644 index 0000000000..b771d4b864 Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/shop_armor_armoire_piraticalPrincessGown.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/shop_head_armoire_piraticalPrincessHeaddress.png b/website/raw_sprites/spritesmith/gear/armoire/shop_head_armoire_piraticalPrincessHeaddress.png new file mode 100644 index 0000000000..8dcc8eec0e Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/shop_head_armoire_piraticalPrincessHeaddress.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/shop_shield_armoire_piraticalSkullShield.png b/website/raw_sprites/spritesmith/gear/armoire/shop_shield_armoire_piraticalSkullShield.png new file mode 100644 index 0000000000..c6ef16c8e9 Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/shop_shield_armoire_piraticalSkullShield.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/shop_weapon_armoire_poisonedGoblet.png b/website/raw_sprites/spritesmith/gear/armoire/shop_weapon_armoire_poisonedGoblet.png new file mode 100644 index 0000000000..16047ec70b Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/shop_weapon_armoire_poisonedGoblet.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/slim_armor_armoire_piraticalPrincessGown.png b/website/raw_sprites/spritesmith/gear/armoire/slim_armor_armoire_piraticalPrincessGown.png new file mode 100644 index 0000000000..0273c08a41 Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/slim_armor_armoire_piraticalPrincessGown.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/weapon_armoire_poisonedGoblet.png b/website/raw_sprites/spritesmith/gear/armoire/weapon_armoire_poisonedGoblet.png new file mode 100644 index 0000000000..8c1999b341 Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/weapon_armoire_poisonedGoblet.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 new file mode 100644 index 0000000000..456ba98f41 Binary files /dev/null and b/website/raw_sprites/spritesmith_large/promo_armoire_backgrounds_201807.png differ diff --git a/website/server/controllers/api-v3/news.js b/website/server/controllers/api-v3/news.js index 951ab60a04..f98990e31a 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 = 'JULY HABITICA CHALLENGES: RESOLUTION SUCCESS AND TAKE THIS'; +const LAST_ANNOUNCEMENT_TITLE = 'JULY BACKGROUNDS AND ARMOIRE ITEMS!'; const worldDmg = { // @TODO bailey: false, }; @@ -26,30 +26,22 @@ api.getNews = { res.status(200).send({ html: `
-
-
-
-

${res.t('newStuff')}

-

7/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, Convene Your Companions, we're focusing on building accountability with your friends in Habitica's social spaces! It has a 15 Gem prize, which will be awarded to five lucky winners on August 1st.

-

Congratulations to the winners of the June Challenge, Pyrrh Pianissimo, Stephable, Lizzie, zoefcunningham, and Tortoise!

+
+
+
+

${res.t('newStuff')}

+

7/3/2018 - ${LAST_ANNOUNCEMENT_TITLE}

+
+
+
+

We’ve added three new backgrounds to the Background Shop! Now your avatar can observe the ocean life near a Tide Pool, meander through the undersea City of Dilatory, or swim in the Dark Deep among bioluminescent critters. Check them out under User Icon > Backgrounds!

+

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

+
by AnnDeLune, gully, Great and Powerful, Irrevenant, GeraldThePixel, AwsamSwazzy, and RandomGryffindor
-
+
-
-
-
-

The next Take This Challenge has also launched, "Multi-Player Co-Op Exercise!", with a focus on partnering up with others for fitness accountability. Be sure to check it out to earn additional pieces of the Take This armor set!

-
-
-

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, "Hero's Triumph!": grand prize winner StormyMudd, and runners-up MrPandaChao, likesevenspoon, Maira Severo, Laylah, and panzerkroete. 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
`, });