sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-05-17 03:08:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'release' into develop

Browse source
This commit is contained in:
SabreCat 2023-01-09 15:53:16 -06:00
commit d85436afbf
7 changed files with 73 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
website/client/src/assets/css/sprites/spritesmith-main.css
View file

@ -1624,6 +1624,11 @@
width: 141px;
height: 147px;
}
.background_rime_ice {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_rime_ice.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;
@ -1729,6 +1734,11 @@
width: 141px;
height: 147px;
}
.background_snowy_temple {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_snowy_temple.png');
width: 141px;
height: 147px;
}
.background_snowy_village {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_snowy_village.png');
width: 141px;
@ -2059,6 +2069,11 @@
width: 141px;
height: 147px;
}
.background_winter_lake_with_swans {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_winter_lake_with_swans.png');
width: 141px;
height: 147px;
}
.background_winter_night {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_winter_night.png');
width: 141px;
@ -2820,6 +2835,11 @@
width: 68px;
height: 68px;
}
.icon_background_habitversary_bash {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_habitversary_bash.png');
width: 68px;
height: 68px;
}
.icon_background_halflings_house {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_halflings_house.png');
width: 68px;
@ -3245,6 +3265,11 @@
width: 68px;
height: 68px;
}
.icon_background_rime_ice {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_rime_ice.png');
width: 60px;
height: 60px;
}
.icon_background_river_of_lava {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_river_of_lava.png');
width: 68px;
@ -3350,6 +3375,11 @@
width: 68px;
height: 68px;
}
.icon_background_snowy_temple {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_snowy_temple.png');
width: 68px;
height: 68px;
}
.icon_background_snowy_village {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_snowy_village.png');
width: 68px;
@ -3685,6 +3715,11 @@
width: 68px;
height: 68px;
}
.icon_background_winter_lake_with_swans {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_winter_lake_with_swans.png');
width: 68px;
height: 68px;
}
.icon_background_winter_night {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_winter_night.png');
width: 68px;
@ -18555,6 +18590,11 @@
width: 114px;
height: 90px;
}
.broad_armor_armoire_shawlCollarCoat {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_armoire_shawlCollarCoat.png');
width: 114px;
height: 90px;
}
.broad_armor_armoire_sheetGhostCostume {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_armoire_sheetGhostCostume.png');
width: 114px;
@ -19790,6 +19830,11 @@
width: 68px;
height: 68px;
}
.shop_armor_armoire_shawlCollarCoat {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_armor_armoire_shawlCollarCoat.png');
width: 68px;
height: 68px;
}
.shop_armor_armoire_sheetGhostCostume {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_armor_armoire_sheetGhostCostume.png');
width: 68px;
@ -21500,6 +21545,11 @@
width: 114px;
height: 90px;
}
.slim_armor_armoire_shawlCollarCoat {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_armoire_shawlCollarCoat.png');
width: 114px;
height: 90px;
}
.slim_armor_armoire_sheetGhostCostume {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_armoire_sheetGhostCostume.png');
width: 114px;

5
website/client/src/components/creatorIntro.vue
View file

@ -121,7 +121,7 @@
v-if="editing"
class="menu-container col-2"
:class="{active: activeTopPage === 'backgrounds'}"
@click="changeTopPage('backgrounds', '2022')"
@click="changeTopPage('backgrounds', '2023')"
>
<div class="menu-item">
<div
@ -1185,7 +1185,7 @@ export default {
},
],
bgSubMenuItems: ['2022', '2021', '2020', '2019', '2018', '2017', '2016', '2015', '2014'].map(y => ({
bgSubMenuItems: ['2023', '2022', '2021', '2020', '2019', '2018', '2017', '2016', '2015', '2014'].map(y => ({
id: y,
label: y,
})),
@ -1214,6 +1214,7 @@ export default {
2020: [],
2021: [],
2022: [],
2023: [],
};
// Hack to force update for now until we restructure the data

2
website/client/src/components/header/userDropdown.vue
View file

@ -40,7 +40,7 @@
>{{ $t('editAvatar') }}</a>
<a
class="topbar-dropdown-item dropdown-item dropdown-separated"
@click="showAvatar('backgrounds', '2022')"
@click="showAvatar('backgrounds', '2023')"
>{{ $t('backgrounds') }}</a>
<a
class="topbar-dropdown-item dropdown-item"

8
website/common/locales/en/backgrounds.json
View file

@ -843,6 +843,14 @@
"backgroundSnowyVillageText": "Snowy Village",
"backgroundSnowyVillageNotes": "Admire a Snowy Village.",
"backgrounds012023": "SET 104: Released January 2023",
"backgroundRimeIceText": "Rime Ice",
"backgroundRimeIceNotes": "Admire Sparkly Rime Ice.",
"backgroundSnowyTempleText": "Snowy Temple",
"backgroundSnowyTempleNotes": "View a Serene Snowy Temple.",
"backgroundWinterLakeWithSwansText": "Winter Lake With Swans",
"backgroundWinterLakeWithSwansNotes": "Enjoy Nature at a Winter Lake With Swans.",
"timeTravelBackgrounds": "Steampunk Backgrounds",
"backgroundAirshipText": "Airship",
"backgroundAirshipNotes": "Become a sky sailor on board your very own Airship.",

4
website/common/locales/en/gear.json
View file

@ -1425,7 +1425,9 @@
"armorArmoireSheetGhostCostumeNotes": "Boo! This is the scariest costume in all of Habitica, so wear it wisely... and watch your step so you don’t trip. Increases Constitution by <%= con %>. Enchanted Armoire: Independent Item.",
"armorArmoireJewelersApronText": "Jeweler's Apron",
"armorArmoireJewelersApronNotes": "This heavy-duty apron is just the thing to wear when you feel creative. Best of all, there are dozens of small pockets to hold everything you need. Increases Intelligence by <%= int %>. Enchanted Armoire: Jeweler Set (Item 1 of 4).",
"armorArmoireShawlCollarCoatText": "Shawl-Collar Coat",
"armorArmoireShawlCollarCoatNotes": "A wise wizard once said there’s nothing better than being both cozy and productive! Wear this warm and stylish coat as you conquer the year’s challenges. Increases Constitution by <%= con %>. Enchanted Armoire: Independent Item.",
"headgear": "helm",
"headgearCapitalized": "Headgear",

5
website/common/script/content/appearance/backgrounds.js
View file

@ -535,6 +535,11 @@ const backgrounds = {
inside_a_crystal: { },
snowy_village: { },
},
backgrounds012023: {
rime_ice: { },
snowy_temple: { },
winter_lake_with_swans: { },
},
timeTravelBackgrounds: {
airship: {
price: 1,

3
website/common/script/content/gear/sets/armoire.js
View file

@ -408,6 +408,9 @@ const armor = {
int: 10,
set: 'jewelers',
},
shawlCollarCoat: {
con: 8,
},
};
const body = {