mirror/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2026-05-08 11:20:04 -05:00
Code Issues Packages Projects Releases 126 Wiki Activity

feat(content): make 2024 default backgroumd, fix errors

Browse Source
This commit is contained in:
CuriousMagpie
2023-12-14 11:37:44 -05:00
parent acc30f044e
commit 8e7f49f253
8 changed files with 36 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
website/client/src/assets/css/sprites/spritesmith-main.css
+20 -20
View File
@@ -19950,11 +19950,6 @@
width: 114px;
height: 90px;
}
.shield_armoire_scholarlyTextbooks {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shield_armoire_scholarlyTextbooks.png');
width: 114px;
height: 90px;
}
.shield_armoire_shieldOfDiamonds {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shield_armoire_shieldOfDiamonds.png');
width: 114px;
@@ -20020,6 +20015,11 @@
width: 114px;
height: 90px;
}
.shield_armoire_trustyPencil {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shield_armoire_trustyPencil.png');
width: 114px;
height: 90px;
}
.shield_armoire_trustyUmbrella {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shield_armoire_trustyUmbrella.png');
width: 114px;
@@ -21365,11 +21365,6 @@
width: 68px;
height: 68px;
}
.shop_shield_armoire_scholarlyTextbooks {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_shield_armoire_scholarlyTextbooks.png');
width: 68px;
height: 68px;
}
.shop_shield_armoire_shieldOfDiamonds {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_shield_armoire_shieldOfDiamonds.png');
width: 68px;
@@ -21435,6 +21430,11 @@
width: 68px;
height: 68px;
}
.shop_shield_armoire_trustyPencil {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_shield_armoire_trustyPencil.png');
width: 68px;
height: 68px;
}
.shop_shield_armoire_trustyUmbrella {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_shield_armoire_trustyUmbrella.png');
width: 68px;
@@ -21880,6 +21880,11 @@
width: 68px;
height: 68px;
}
.shop_weapon_armoire_scholarlyTextbooks {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_weapon_armoire_scholarlyTextbooks.png');
width: 68px;
height: 68px;
}
.shop_weapon_armoire_shadowMastersMace {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_weapon_armoire_shadowMastersMace.png');
width: 68px;
@@ -21910,11 +21915,6 @@
width: 68px;
height: 68px;
}
.shop_weapon_armoire_trustyPencil {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_weapon_armoire_trustyPencil.png');
width: 68px;
height: 68px;
}
.shop_weapon_armoire_vermilionArcherBow {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_weapon_armoire_vermilionArcherBow.png');
width: 68px;
@@ -22860,6 +22860,11 @@
width: 114px;
height: 90px;
}
.weapon_armoire_scholarlyTextbooks {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_armoire_scholarlyTextbooks.png');
width: 114px;
height: 90px;
}
.weapon_armoire_shadowMastersMace {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_armoire_shadowMastersMace.png');
width: 114px;
@@ -22890,11 +22895,6 @@
width: 114px;
height: 90px;
}
.weapon_armoire_trustyPencil {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_armoire_trustyPencil.png');
width: 114px;
height: 90px;
}
.weapon_armoire_vermilionArcherBow {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_armoire_vermilionArcherBow.png');
width: 90px;
website/client/src/components/creatorIntro.vue
+5 -4
View File
@@ -121,7 +121,7 @@
v-if="editing"
class="menu-container col-2"
:class="{active: activeTopPage === 'backgrounds'}"
@click="changeTopPage('backgrounds', '2023')"
@click="changeTopPage('backgrounds', '2024')"
>
<div class="menu-item">
<div
@@ -208,13 +208,13 @@
<div
class="row text-center title-row"
>
<strong>{{ backgroundShopSets[2].text }}</strong>
<strong>{{ backgroundShopSets[1].text }}</strong>
</div>
<div
class="row title-row"
>
<div
v-for="bg in backgroundShopSets[2].items"
v-for="bg in backgroundShopSets[1].items"
:id="bg.key"
:key="bg.key"
class="col-4 text-center customize-option background-button"
@@ -1237,7 +1237,7 @@ export default {
},
],
bgSubMenuItems: ['2023', '2022', '2021', '2020', '2019', '2018', '2017', '2016', '2015', '2014'].map(y => ({
bgSubMenuItems: ['2024', '2023', '2022', '2021', '2020', '2019', '2018', '2017', '2016', '2015', '2014'].map(y => ({
id: y,
label: y,
})),
@@ -1267,6 +1267,7 @@ export default {
2021: [],
2022: [],
2023: [],
2024: [],
};
// Hack to force update for now until we restructure the data
website/client/src/components/header/notifications/itemReceived.vue
+1 -1
View File
@@ -47,7 +47,7 @@ export default {
if (this.notification.data.destination.indexOf('backgrounds') !== -1) {
this.$store.state.avatarEditorOptions.editingUser = true;
this.$store.state.avatarEditorOptions.startingPage = 'backgrounds';
this.$store.state.avatarEditorOptions.subpage = '2023';
this.$store.state.avatarEditorOptions.subpage = '2024';
this.$root.$emit('bv::show::modal', 'avatar-modal');
} else {
this.$router.push(this.notification.data.destination || '/inventory/items');
website/client/src/components/header/userDropdown.vue
+1 -1
View File
@@ -40,7 +40,7 @@
>{{ $t('editAvatar') }}</a>
<a
class="topbar-dropdown-item dropdown-item dropdown-separated"
@click="showAvatar('backgrounds', '2023')"
@click="showAvatar('backgrounds', '2024')"
>{{ $t('backgrounds') }}</a>
<a
class="topbar-dropdown-item dropdown-item"
website/common/locales/en/backgrounds.json
+1 -1
View File
@@ -939,7 +939,7 @@
"backgroundWinterFullMoonText": "WinterFullMoon",
"backgroundWinterFullMoonNotes": "Gaze at the Winter Full Moon.",
"background012014": "SET 116: Released January 2024",
"backgrounds012024": "SET 116: Released January 2024",
"backgroundWinterMountainRangeText": "Winter Mountain Range",
"backgroundWinterMountainRangeNotes": "Climb a Winter Mountain Range.",
"backgroundFrozenBluePondText": "Frozen Blue Pond",
website/common/locales/en/gear.json
+4 -4
View File
@@ -727,8 +727,8 @@
"weaponArmoireRidingBroomNotes": "Run all your most magical errands on this fine broom--or, just take it for a joyride around the neighborhood. Whee! Increases Strength by <%= str %> and Intelligence by <%= int %>. Enchanted Armoire: Spooky Sorcery Set (Item 1 of 3)",
"weaponArmoireRollingPinText": "Rolling Pin",
"weaponArmoireRollingPinNotes": "Roll your dough as thin as you like in-between bonking bad habits when they pop up around you like a certain rodent-bopping game. Increases Strength by <%= str %>. Enchanted Armoire: Cooking Implements Set 2 (Item 2 of 2).",
"weaponArmoireTrustyPencilText": "Trusty Pencil",
"weaponArmoireTrustyPencilNotes": "You know what they say: the pencil is mightier than the sword-cil. Wait... that doesn’t sound quite right... Increases Intelligence by <%= int %>. Enchanted Armoire: School Uniform Set (Item 4 of 4).",
"weaponArmoireScholarlyTextbooksText": "Scholarly Textbooks",
"weaponArmoireScholarlyTextbooksNotes": "Here’s your chance to dive deep and learn about any topic that interests you. What’s your current hyperfixation? Increases Intelligence by <%= int %>. Enchanted Armoire: School Uniform Set (Item 3 of 4).",
"armor": "armor",
"armorCapitalized": "Armor",
@@ -2780,8 +2780,8 @@
"shieldArmoireBucketNotes": "Though this bucket is helpful in holding a mixture of water and cleaning solution, you could also use it to collect, carry, and cart around just about anything that fits inside! Increases Strength and Intelligence by <%= attrs %> each. Enchanted Armoire: Cleaning Supplies Set 2 (Item 1 of 3)",
"shieldArmoireSaucepanText": "Sauce Pan",
"shieldArmoireSaucepanNotes": "Look inside this steaming saucepan for the answer to the most closely guarded secret in life! (Soup. The answer is always soup.) Increases Perception by <%= per %> . Enchanted Armoire: Cooking Implements Set 2 (Item 1 of 2).",
"shieldArmoireScholarlyTextbooksText": "Scholarly Textbooks",
"shieldArmoireScholarlyTextbooksNotes": "Here’s your chance to dive deep and learn about any topic that interests you. What’s your current hyperfixation? Increases Intelligence by <%= int %>. Enchanted Armoire: School Uniform Set (Item 3 of 4).",
"shieldArmoireTrustyPencilText": "Trusty Pencil",
"shieldArmoireTrustyPencilNotes": "You know what they say: the pencil is mightier than the sword-cil. Wait... that doesn’t sound quite right... Increases Intelligence by <%= int %>. Enchanted Armoire: School Uniform Set (Item 4 of 4).",
"back": "Back Accessory",
"backBase0Text": "No Back Accessory",
website/common/script/content/appearance/backgrounds.js
+1 -1
View File
@@ -648,7 +648,7 @@ 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',
// backgrounds012024: '2024-01-04T08:00-05:00',
};
const flat = {};
website/common/script/content/gear/sets/armoire.js
+3 -3
View File
@@ -1271,7 +1271,7 @@ const shield = {
per: 10,
set: 'cookingImplementsTwo',
},
scholarlyTextbooks: {
trustyPencil: {
int: 10,
set: 'schoolUniform',
},
@@ -1740,7 +1740,7 @@ const weapon = {
str: 10,
set: 'cookingImplementsTwo',
},
trustyPencil: {
scholarlyTextbooks: {
int: 10,
set: 'schoolUniform',
},
@@ -1750,7 +1750,7 @@ const releaseDates = {
somethingSpooky: '2023-10-10T08:00-04:00',
cookingImplementsTwo: '2023-11-07T08:00-05:00',
greenTrapper: '2023-12-05T08:00-05:00',
schoolUniform: '2024-01-04T08:00-05:00',
// schoolUniform: '2024-01-04T08:00-05:00',
};
forEach({