Merge branch 'release' into sabrecat/chat-warning

habitica-images

@@ -1 +1 @@
-Subproject commit 306496f9de18e68e81041764ec0cdc895a24a885
+Subproject commit 99829256042943a2c87b2c9a958486046fa0a804

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "habitica",
-  "version": "4.274.0",
+  "version": "4.276.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "habitica",
   "description": "A habit tracker app which treats your goals like a Role Playing Game.",
-  "version": "4.274.0",
+  "version": "4.276.0",
   "main": "./website/server/index.js",
   "dependencies": {
     "@babel/core": "^7.22.5",

website/client/src/assets/css/sprites/spritesmith-main.css

@@ -710,6 +710,11 @@
   width: 141px;
   height: 147px;
 }
+.background_boardwalk_into_sunset {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_boardwalk_into_sunset.png');
+  width: 141px;
+  height: 147px;
+}
 .background_branches_of_a_holiday_tree {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_branches_of_a_holiday_tree.png');
   width: 141px;
@@ -785,6 +790,11 @@
   width: 141px;
   height: 147px;
 }
+.background_colorful_coral {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_colorful_coral.png');
+  width: 141px;
+  height: 147px;
+}
 .background_coral_reef {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_coral_reef.png');
   width: 141px;
@@ -1579,6 +1589,11 @@
   width: 141px;
   height: 147px;
 }
+.background_on_a_paddlewheel_boat {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_on_a_paddlewheel_boat.png');
+  width: 141px;
+  height: 147px;
+}
 .background_on_tree_branch {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_on_tree_branch.png');
   width: 141px;
@@ -2421,6 +2436,11 @@
   width: 68px;
   height: 68px;
 }
+.icon_background_boardwalk_into_sunset {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_boardwalk_into_sunset.png');
+  width: 68px;
+  height: 68px;
+}
 .icon_background_branches_of_a_holiday_tree {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_branches_of_a_holiday_tree.png');
   width: 68px;
@@ -2501,6 +2521,11 @@
   width: 68px;
   height: 68px;
 }
+.icon_background_colorful_coral {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_colorful_coral.png');
+  width: 68px;
+  height: 68px;
+}
 .icon_background_coral_reef {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_coral_reef.png');
   width: 68px;
@@ -3295,6 +3320,11 @@
   width: 68px;
   height: 68px;
 }
+.icon_background_on_a_paddlewheel_boat {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_on_a_paddlewheel_boat.png');
+  width: 68px;
+  height: 68px;
+}
 .icon_background_on_tree_branch {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_on_tree_branch.png');
   width: 68px;
@@ -18415,6 +18445,11 @@
   width: 114px;
   height: 90px;
 }
+.broad_armor_armoire_admiralsUniform {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_armoire_admiralsUniform.png');
+  width: 114px;
+  height: 90px;
+}
 .broad_armor_armoire_alchemistsRobe {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_armoire_alchemistsRobe.png');
   width: 114px;
@@ -18920,6 +18955,11 @@
   width: 114px;
   height: 90px;
 }
+.head_armoire_admiralsBicorne {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_armoire_admiralsBicorne.png');
+  width: 114px;
+  height: 90px;
+}
 .head_armoire_alchemistsHat {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_armoire_alchemistsHat.png');
   width: 114px;
@@ -19710,6 +19750,11 @@
   width: 114px;
   height: 90px;
 }
+.shop_armor_armoire_admiralsUniform {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_armor_armoire_admiralsUniform.png');
+  width: 68px;
+  height: 68px;
+}
 .shop_armor_armoire_alchemistsRobe {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_armor_armoire_alchemistsRobe.png');
   width: 68px;
@@ -20230,6 +20275,11 @@
   width: 68px;
   height: 68px;
 }
+.shop_head_armoire_admiralsBicorne {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_head_armoire_admiralsBicorne.png');
+  width: 68px;
+  height: 68px;
+}
 .shop_head_armoire_alchemistsHat {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_head_armoire_alchemistsHat.png');
   width: 68px;
@@ -21485,6 +21535,11 @@
   width: 68px;
   height: 68px;
 }
+.slim_armor_armoire_admiralsUniform {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_armoire_admiralsUniform.png');
+  width: 114px;
+  height: 90px;
+}
 .slim_armor_armoire_alchemistsRobe {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_armoire_alchemistsRobe.png');
   width: 114px;

website/common/locales/en/backgrounds.json

@@ -891,6 +891,14 @@
   "backgroundCraterLakeText": "Crater Lake",
   "backgroundCraterLakeNotes": "Admire a lovely Crater Lake.",
 
+  "backgrounds072023": "SET 110: Released July 2023",
+  "backgroundOnAPaddlewheelBoatText": "On a Paddlewheel Boat",
+  "backgroundOnAPaddlewheelBoatNotes": "Ride on a Paddlewheel Boat.",
+  "backgroundColorfulCoralText": "Colorful Coral",
+  "backgroundColorfulCoralNotes": "Dive among Colorful Coral.",
+  "backgroundBoardwalkIntoSunsetText": "Boardwalk into the Sunset",
+  "backgroundBoardwalkIntoSunsetNotes": "Stroll on a Boardwalk into the Sunset.",
+
   "timeTravelBackgrounds": "Steampunk Backgrounds",
   "backgroundAirshipText": "Airship",
   "backgroundAirshipNotes": "Become a sky sailor on board your very own Airship.",

website/common/locales/en/gear.json

@@ -1485,6 +1485,8 @@
   "armorArmoireStripedRainbowShirtNotes": "The colors of the rainbow have never looked so good before. Be bold! Increases Strength and Intelligence by <%= attrs %> each. Enchanted Armoire: Rainbow Set (Item 1 of 2).",
   "armorArmoireDiagonalRainbowShirtText": "Diagonal Rainbow Shirt",
   "armorArmoireDiagonalRainbowShirtNotes": "A splash of color with a dash of style. Be joyful! Increases Constitution and Perception by <%= attrs %> each. Enchanted Armoire: Rainbow Set (Item 2 of 2).",
+  "armorArmoireAdmiralsUniformText": "Admiral's Uniform",
+  "armorArmoireAdmiralsUniformNotes": "We salute you! This naval uniform signals that you’re ready to take command of your tasks as well as a ship. Increases Constitution and Strength by <%= attrs %> each. Enchanted Armoire: Admiral’s Set (Item 2 of 2).",
 
   "headgear": "helm",
   "headgearCapitalized": "Headgear",
@@ -2274,7 +2276,9 @@
   "headArmoireBeaniePropellerHatText": "Beanie Propeller Hat",
   "headArmoireBeaniePropellerHatNotes": "This isn’t the time to keep your feet on the ground! Spin this little propeller and rise as high as your ambitions will take you. Increases all stats by <%= attrs %>. Enchanted Armoire: Independent Item.",
   "headArmoirePaintersBeretText": "Painter's Beret",
-  "headArmoirePaintersBeretNotes": "See the world with a more artistic eye when you wear this jaunty beret. Increases Perception by <%= per %>. Enchanted Armoire: Painter Set (Item 2 of 4).",  
+  "headArmoirePaintersBeretNotes": "See the world with a more artistic eye when you wear this jaunty beret. Increases Perception by <%= per %>. Enchanted Armoire: Painter Set (Item 2 of 4).",
+  "headArmoireAdmiralsBicorneText": "Admiral's Bicorne Hat",
+  "headArmoireAdmiralsBicorneNotes": "Hats off to you! Wearing this two-cornered hat will make you wiser, brighter, braver...and taller. Increases Intelligence and Perception by <%= attrs %> each. Enchanted Armoire: Admiral’s Set (Item 1 of 2).",
 
   "offhand": "off-hand item",
   "offHandCapitalized": "Off-Hand Item",

website/common/script/content/appearance/backgrounds.js

@@ -565,6 +565,11 @@ const backgrounds = {
     inside_adventurers_hideout: { },
     crater_lake: { },
   },
+  backgrounds072023: {
+    on_a_paddlewheel_boat: { },
+    colorful_coral: { },
+    boardwalk_into_sunset: { },
+  },
   eventBackgrounds: {
     birthday_bash: {
       price: 0,

website/common/script/content/gear/sets/armoire.js

@@ -434,6 +434,11 @@ const armor = {
     per: 7,
     set: 'rainbow',
   },
+  admiralsUniform: {
+    con: 7,
+    str: 7,
+    set: 'admiralsSet',
+  },
 };
 
 const body = {
@@ -869,6 +874,11 @@ const head = {
     per: 9,
     set: 'painters',
   },
+  admiralsBicorne: {
+    int: 7,
+    per: 7,
+    set: 'admiralsSet',
+  },
 };
 
 const shield = {