fix(shops): post merge cleanup

This commit is contained in:
Sabe Jones
2024-06-14 18:12:22 -05:00
parent 31e501f65a
commit b49dddeb47
10 changed files with 322 additions and 30 deletions

16
package-lock.json generated
View File

@@ -12031,6 +12031,22 @@
"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
"integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw=="
},
"node_modules/html-entities": {
"version": "2.5.2",
"resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.5.2.tgz",
"integrity": "sha512-K//PSRMQk4FZ78Kyau+mZurHn3FH0Vwr+H36eE0rPbeYkRRi9YxceYPhuN60UwWorxyKHhqoAJl2OFKa4BVtaA==",
"funding": [
{
"type": "github",
"url": "https://github.com/sponsors/mdevils"
},
{
"type": "patreon",
"url": "https://patreon.com/mdevils"
}
],
"optional": true
},
"node_modules/html-escaper": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",

View File

@@ -12792,6 +12792,14 @@
"node": ">= 0.8.0"
}
},
"node_modules/type-detect": {
"version": "4.0.8",
"resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
"integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
"engines": {
"node": ">=4"
}
},
"node_modules/type-fest": {
"version": "0.6.0",
"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",

View File

@@ -1875,6 +1875,11 @@
width: 141px;
height: 147px;
}
.background_river_bottom {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_river_bottom.png');
width: 141px;
height: 147px;
}
.background_river_of_lava {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_river_of_lava.png');
width: 141px;
@@ -3773,6 +3778,11 @@
width: 68px;
height: 68px;
}
.icon_background_river_bottom {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_river_bottom.png');
width: 68px;
height: 68px;
}
.icon_background_river_of_lava {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_river_of_lava.png');
width: 68px;
@@ -31442,6 +31452,11 @@
width: 90px;
height: 90px;
}
.broad_armor_armoire_corsairsCoatAndCape {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_armoire_corsairsCoatAndCape.png');
width: 114px;
height: 90px;
}
.broad_armor_armoire_coverallsOfBookbinding {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_armoire_coverallsOfBookbinding.png');
width: 114px;
@@ -32007,6 +32022,11 @@
width: 114px;
height: 90px;
}
.head_armoire_corsairsBandana {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_armoire_corsairsBandana.png');
width: 114px;
height: 90px;
}
.head_armoire_crownOfDiamonds {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_armoire_crownOfDiamonds.png');
width: 114px;
@@ -32827,8 +32847,8 @@
width: 68px;
height: 68px;
}
.shop_armor_armoire_bluestripedSwimsuit {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_armor_armoire_bluestripedSwimsuit.png');
.shop_armor_armoire_blueStripedSwimsuit {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_armor_armoire_blueStripedSwimsuit.png');
width: 68px;
height: 68px;
}
@@ -32872,6 +32892,11 @@
width: 68px;
height: 68px;
}
.shop_armor_armoire_corsairsCoatAndCape {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_armor_armoire_corsairsCoatAndCape.png');
width: 68px;
height: 68px;
}
.shop_armor_armoire_coverallsOfBookbinding {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_armor_armoire_coverallsOfBookbinding.png');
width: 68px;
@@ -33497,6 +33522,11 @@
width: 68px;
height: 68px;
}
.shop_head_armoire_corsairsBandana {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_head_armoire_corsairsBandana.png');
width: 68px;
height: 68px;
}
.shop_head_armoire_crownOfDiamonds {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_head_armoire_crownOfDiamonds.png');
width: 68px;
@@ -34357,6 +34387,11 @@
width: 68px;
height: 68px;
}
.shop_weapon_armoire_corsairsBlade {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_weapon_armoire_corsairsBlade.png');
width: 68px;
height: 68px;
}
.shop_weapon_armoire_crystalCrescentStaff {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_weapon_armoire_crystalCrescentStaff.png');
width: 68px;
@@ -34872,6 +34907,11 @@
width: 90px;
height: 90px;
}
.slim_armor_armoire_corsairsCoatAndCape {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_armoire_corsairsCoatAndCape.png');
width: 114px;
height: 90px;
}
.slim_armor_armoire_coverallsOfBookbinding {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_armoire_coverallsOfBookbinding.png');
width: 114px;
@@ -35387,6 +35427,11 @@
width: 90px;
height: 90px;
}
.weapon_armoire_corsairsBlade {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_armoire_corsairsBlade.png');
width: 114px;
height: 90px;
}
.weapon_armoire_crystalCrescentStaff {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_armoire_crystalCrescentStaff.png');
width: 90px;
@@ -42032,6 +42077,36 @@
width: 114px;
height: 90px;
}
.broad_armor_mystery_202407 {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_mystery_202407.png');
width: 117px;
height: 120px;
}
.head_mystery_202407 {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_mystery_202407.png');
width: 117px;
height: 120px;
}
.shop_armor_mystery_202407 {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_armor_mystery_202407.png');
width: 68px;
height: 68px;
}
.shop_head_mystery_202407 {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_head_mystery_202407.png');
width: 68px;
height: 68px;
}
.shop_set_mystery_202407 {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_set_mystery_202407.png');
width: 68px;
height: 68px;
}
.slim_armor_mystery_202407 {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_mystery_202407.png');
width: 117px;
height: 120px;
}
.broad_armor_mystery_301404 {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_mystery_301404.png');
width: 90px;
@@ -50475,6 +50550,11 @@
width: 219px;
height: 219px;
}
.quest_chameleon {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/quest_chameleon.png');
width: 216px;
height: 216px;
}
.quest_cheetah {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/quest_cheetah.png');
width: 219px;
@@ -51185,6 +51265,11 @@
width: 68px;
height: 68px;
}
.inventory_quest_scroll_chameleon {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/inventory_quest_scroll_chameleon.png');
width: 60px;
height: 60px;
}
.inventory_quest_scroll_cheetah {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/inventory_quest_scroll_cheetah.png');
width: 68px;
@@ -52060,6 +52145,11 @@
width: 68px;
height: 68px;
}
.Pet_Egg_Chameleon {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet_Egg_Chameleon.png');
width: 68px;
height: 68px;
}
.Pet_Egg_Cheetah {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet_Egg_Cheetah.png');
width: 68px;
@@ -53460,6 +53550,56 @@
width: 105px;
height: 105px;
}
.Mount_Body_Chameleon-Base {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Mount_Body_Chameleon-Base.png');
width: 105px;
height: 105px;
}
.Mount_Body_Chameleon-CottonCandyBlue {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Mount_Body_Chameleon-CottonCandyBlue.png');
width: 105px;
height: 105px;
}
.Mount_Body_Chameleon-CottonCandyPink {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Mount_Body_Chameleon-CottonCandyPink.png');
width: 105px;
height: 105px;
}
.Mount_Body_Chameleon-Desert {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Mount_Body_Chameleon-Desert.png');
width: 105px;
height: 105px;
}
.Mount_Body_Chameleon-Golden {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Mount_Body_Chameleon-Golden.png');
width: 105px;
height: 105px;
}
.Mount_Body_Chameleon-Red {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Mount_Body_Chameleon-Red.png');
width: 105px;
height: 105px;
}
.Mount_Body_Chameleon-Shade {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Mount_Body_Chameleon-Shade.png');
width: 105px;
height: 105px;
}
.Mount_Body_Chameleon-Skeleton {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Mount_Body_Chameleon-Skeleton.png');
width: 105px;
height: 105px;
}
.Mount_Body_Chameleon-White {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Mount_Body_Chameleon-White.png');
width: 105px;
height: 105px;
}
.Mount_Body_Chameleon-Zombie {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Mount_Body_Chameleon-Zombie.png');
width: 105px;
height: 105px;
}
.Mount_Body_Cheetah-Base {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Mount_Body_Cheetah-Base.png');
width: 105px;
@@ -58755,6 +58895,56 @@
width: 105px;
height: 105px;
}
.Mount_Head_Chameleon-Base {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Mount_Head_Chameleon-Base.png');
width: 105px;
height: 105px;
}
.Mount_Head_Chameleon-CottonCandyBlue {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Mount_Head_Chameleon-CottonCandyBlue.png');
width: 105px;
height: 105px;
}
.Mount_Head_Chameleon-CottonCandyPink {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Mount_Head_Chameleon-CottonCandyPink.png');
width: 105px;
height: 105px;
}
.Mount_Head_Chameleon-Desert {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Mount_Head_Chameleon-Desert.png');
width: 105px;
height: 105px;
}
.Mount_Head_Chameleon-Golden {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Mount_Head_Chameleon-Golden.png');
width: 105px;
height: 105px;
}
.Mount_Head_Chameleon-Red {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Mount_Head_Chameleon-Red.png');
width: 105px;
height: 105px;
}
.Mount_Head_Chameleon-Shade {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Mount_Head_Chameleon-Shade.png');
width: 105px;
height: 105px;
}
.Mount_Head_Chameleon-Skeleton {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Mount_Head_Chameleon-Skeleton.png');
width: 105px;
height: 105px;
}
.Mount_Head_Chameleon-White {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Mount_Head_Chameleon-White.png');
width: 105px;
height: 105px;
}
.Mount_Head_Chameleon-Zombie {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Mount_Head_Chameleon-Zombie.png');
width: 105px;
height: 105px;
}
.Mount_Head_Cheetah-Base {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Mount_Head_Cheetah-Base.png');
width: 105px;
@@ -64055,6 +64245,56 @@
width: 81px;
height: 99px;
}
.Mount_Icon_Chameleon-Base {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Mount_Icon_Chameleon-Base.png');
width: 81px;
height: 99px;
}
.Mount_Icon_Chameleon-CottonCandyBlue {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Mount_Icon_Chameleon-CottonCandyBlue.png');
width: 81px;
height: 99px;
}
.Mount_Icon_Chameleon-CottonCandyPink {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Mount_Icon_Chameleon-CottonCandyPink.png');
width: 81px;
height: 99px;
}
.Mount_Icon_Chameleon-Desert {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Mount_Icon_Chameleon-Desert.png');
width: 81px;
height: 99px;
}
.Mount_Icon_Chameleon-Golden {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Mount_Icon_Chameleon-Golden.png');
width: 81px;
height: 99px;
}
.Mount_Icon_Chameleon-Red {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Mount_Icon_Chameleon-Red.png');
width: 81px;
height: 99px;
}
.Mount_Icon_Chameleon-Shade {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Mount_Icon_Chameleon-Shade.png');
width: 81px;
height: 99px;
}
.Mount_Icon_Chameleon-Skeleton {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Mount_Icon_Chameleon-Skeleton.png');
width: 81px;
height: 99px;
}
.Mount_Icon_Chameleon-White {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Mount_Icon_Chameleon-White.png');
width: 81px;
height: 99px;
}
.Mount_Icon_Chameleon-Zombie {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Mount_Icon_Chameleon-Zombie.png');
width: 81px;
height: 99px;
}
.Mount_Icon_Cheetah-Base {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Mount_Icon_Cheetah-Base.png');
width: 81px;
@@ -69415,6 +69655,56 @@
width: 81px;
height: 99px;
}
.Pet-Chameleon-Base {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-Chameleon-Base.png');
width: 81px;
height: 99px;
}
.Pet-Chameleon-CottonCandyBlue {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-Chameleon-CottonCandyBlue.png');
width: 81px;
height: 99px;
}
.Pet-Chameleon-CottonCandyPink {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-Chameleon-CottonCandyPink.png');
width: 81px;
height: 99px;
}
.Pet-Chameleon-Desert {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-Chameleon-Desert.png');
width: 81px;
height: 99px;
}
.Pet-Chameleon-Golden {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-Chameleon-Golden.png');
width: 81px;
height: 99px;
}
.Pet-Chameleon-Red {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-Chameleon-Red.png');
width: 81px;
height: 99px;
}
.Pet-Chameleon-Shade {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-Chameleon-Shade.png');
width: 81px;
height: 99px;
}
.Pet-Chameleon-Skeleton {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-Chameleon-Skeleton.png');
width: 81px;
height: 99px;
}
.Pet-Chameleon-White {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-Chameleon-White.png');
width: 81px;
height: 99px;
}
.Pet-Chameleon-Zombie {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-Chameleon-Zombie.png');
width: 81px;
height: 99px;
}
.Pet-Cheetah-Base {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-Cheetah-Base.png');
width: 81px;
@@ -73985,11 +74275,6 @@
width: 81px;
height: 99px;
}
.Pet_HatchingPotion_Koi {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet_HatchingPotion_Koi.png');
width: 68px;
height: 68px;
}
.Pet_HatchingPotion_Amber {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet_HatchingPotion_Amber.png');
width: 68px;

View File

@@ -158,7 +158,6 @@ function collateItemData (self) {
if (
// ignore items the user owns because we captured them above:
!(key in ownedItems)
&& allItems[key].price > 0
) {
const item = allItems[key];
itemData.push({

View File

@@ -197,6 +197,7 @@
v-for="mountGroup in mountGroups"
v-if="!anyFilterSelected || viewOptions[mountGroup.key].selected"
:key="mountGroup.key"
:class="{ hide: viewOptions[mountGroup.key].animalCount === 0 }"
>
<!-- eslint-enable vue/no-use-v-if-with-v-for -->
<h4 v-if="viewOptions[mountGroup.key].animalCount != 0">

View File

@@ -981,7 +981,7 @@
"backgrounds062024": "SET 121: Released June 2024",
"backgroundShellGateText": "Shell Gate",
"backgroundShellGateNotes": "",
"backgroundShellGateNotes": "March through the decorated coral of a Shell Gate.",
"timeTravelBackgrounds": "Steampunk Backgrounds",
"backgroundAirshipText": "Airship",

View File

@@ -768,8 +768,8 @@
"weaponArmoireOptimistsCloverNotes": "Well, would you look at what you found? It never hurts to have just a little extra good luck on your side. Increases Strength and Constitution by <%= attrs %> each. Enchanted Armoire: Optimist Set (Item 4 of 4).",
"weaponArmoirePottersWheelText": "Potter's Wheel",
"weaponArmoirePottersWheelNotes": "Throw some clay on this wheel and make a bowl or a mug or a vase or a slightly different bowl. If you're lucky, a ghost might visit while you create! Increases Perception by <%= per %>. Enchanted Armoire: Potter Set (Item 4 of 4).",
"weaponArmoireShadyBeachUmbrellaText": "Beach Umbrella",
"weaponArmoireShadyBeachUmbrellaNotes": "The shade of this rainbow-colored umbrella conceals you briefly from the day star and any unwanted bothers. Increases Perception by <%= per %>. Enchanted Armoire: Beachside Set (Item 3 of 4).",
"weaponArmoireBeachUmbrellaText": "Beach Umbrella",
"weaponArmoireBeachUmbrellaNotes": "The shade of this rainbow-colored umbrella conceals you briefly from the day star and any unwanted bothers. Increases Perception by <%= per %>. Enchanted Armoire: Beachside Set (Item 3 of 4).",
"armor": "armor",
"armorCapitalized": "Armor",

View File

@@ -187,7 +187,6 @@ const animalSetAchievs = {
icon: 'achievement-cats',
titleKey: 'achievementCats',
textKey: 'achievementCatsText',
release: '2024-05-16T08:00-04:00',
},
dinosaurDynasty: {
icon: 'achievement-dinosaurDynasty',
@@ -224,13 +223,11 @@ const animalSetAchievs = {
icon: 'achievement-rodentRuler',
titleKey: 'achievementRodentRuler',
textKey: 'achievementRodentRulerText',
release: '2024-03-19T08:00-05:00',
},
roughRider: {
icon: 'achievement-roughRider',
titleKey: 'achievementRoughRider',
textKey: 'achievementRoughRiderText',
release: '2023-11-14T08:00-05:00',
},
woodlandWizard: {
icon: 'achievement-woodlandWizard',

View File

@@ -6,7 +6,7 @@ import upperFirst from 'lodash/upperFirst';
import t from '../translation';
/* eslint-disable camelcase */
const plannedBackgrounds = {
const backgrounds = {
backgrounds062014: {
beach: { },
fairy_ring: { },
@@ -667,22 +667,8 @@ const plannedBackgrounds = {
};
/* eslint-enable quote-props */
const releaseDates = {
backgrounds102023: '2023-10-10T08:00-04:00',
backgrounds112023: '2023-11-07T08:00-05:00',
backgrounds122023: '2023-12-05T08:00-05:00',
backgrounds012024: '2024-01-04T08:00-05:00',
backgrounds022024: '2024-02-06T08:00-05:00',
backgrounds032024: '2024-03-05T08:00-05:00',
backgrounds042024: '2024-04-04T08:00-04:00',
backgrounds052024: '2024-05-07T08:00-04:00',
};
const flat = {};
const backgrounds = omitBy(plannedBackgrounds, (bgSet, key) => releaseDates[key]
&& moment().isBefore(releaseDates[key]));
forOwn(backgrounds, (backgroundsInSet, set) => {
forOwn(backgroundsInSet, (background, bgKey) => {
background.key = bgKey;