krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-17 06:37:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(event): CSS build, small fixes

Browse Source
This commit is contained in:
SabreCat
2022-03-22 10:34:44 -05:00
parent e141e2407c
commit ad9c468e77
5 changed files with 183 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

174
website/client/src/assets/css/sprites/spritesmith-main.css
View File

@@ -50,8 +50,8 @@
}
.achievement-birdsOfAFeather2x {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/achievement-birdsOfAFeather2x.png');
width: 68px;
height: 68px;
width: 60px;
height: 64px;
}
.achievement-birthday2x {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/achievement-birthday2x.png');
@@ -25543,6 +25543,26 @@
width: 114px;
height: 90px;
}
.broad_armor_special_spring2022Healer {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_special_spring2022Healer.png');
width: 114px;
height: 90px;
}
.broad_armor_special_spring2022Mage {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_special_spring2022Mage.png');
width: 114px;
height: 90px;
}
.broad_armor_special_spring2022Rogue {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_special_spring2022Rogue.png');
width: 114px;
height: 117px;
}
.broad_armor_special_spring2022Warrior {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_special_spring2022Warrior.png');
width: 114px;
height: 90px;
}
.broad_armor_special_springHealer {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_special_springHealer.png');
width: 90px;
@@ -25783,6 +25803,26 @@
width: 114px;
height: 90px;
}
.head_special_spring2022Healer {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_special_spring2022Healer.png');
width: 114px;
height: 90px;
}
.head_special_spring2022Mage {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_special_spring2022Mage.png');
width: 114px;
height: 90px;
}
.head_special_spring2022Rogue {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_special_spring2022Rogue.png');
width: 114px;
height: 117px;
}
.head_special_spring2022Warrior {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_special_spring2022Warrior.png');
width: 114px;
height: 90px;
}
.head_special_springHealer {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_special_springHealer.png');
width: 90px;
@@ -25908,6 +25948,21 @@
width: 114px;
height: 90px;
}
.shield_special_spring2022Healer {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shield_special_spring2022Healer.png');
width: 114px;
height: 90px;
}
.shield_special_spring2022Mage {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shield_special_spring2022Mage.png');
width: 114px;
height: 117px;
}
.shield_special_spring2022Warrior {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shield_special_spring2022Warrior.png');
width: 114px;
height: 90px;
}
.shield_special_springHealer {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shield_special_springHealer.png');
width: 90px;
@@ -26063,6 +26118,26 @@
width: 68px;
height: 68px;
}
.shop_armor_special_spring2022Healer {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_armor_special_spring2022Healer.png');
width: 68px;
height: 68px;
}
.shop_armor_special_spring2022Mage {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_armor_special_spring2022Mage.png');
width: 68px;
height: 68px;
}
.shop_armor_special_spring2022Rogue {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_armor_special_spring2022Rogue.png');
width: 68px;
height: 68px;
}
.shop_armor_special_spring2022Warrior {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_armor_special_spring2022Warrior.png');
width: 68px;
height: 68px;
}
.shop_armor_special_springHealer {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_armor_special_springHealer.png');
width: 68px;
@@ -26303,6 +26378,26 @@
width: 68px;
height: 68px;
}
.shop_head_special_spring2022Healer {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_head_special_spring2022Healer.png');
width: 68px;
height: 68px;
}
.shop_head_special_spring2022Mage {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_head_special_spring2022Mage.png');
width: 68px;
height: 68px;
}
.shop_head_special_spring2022Rogue {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_head_special_spring2022Rogue.png');
width: 68px;
height: 68px;
}
.shop_head_special_spring2022Warrior {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_head_special_spring2022Warrior.png');
width: 68px;
height: 68px;
}
.shop_head_special_springHealer {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_head_special_springHealer.png');
width: 68px;
@@ -26428,6 +26523,21 @@
width: 68px;
height: 68px;
}
.shop_shield_special_spring2022Healer {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_shield_special_spring2022Healer.png');
width: 68px;
height: 68px;
}
.shop_shield_special_spring2022Rogue {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_shield_special_spring2022Rogue.png');
width: 68px;
height: 68px;
}
.shop_shield_special_spring2022Warrior {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_shield_special_spring2022Warrior.png');
width: 68px;
height: 68px;
}
.shop_shield_special_springHealer {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_shield_special_springHealer.png');
width: 68px;
@@ -26583,6 +26693,26 @@
width: 68px;
height: 68px;
}
.shop_weapon_special_spring2022Healer {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_weapon_special_spring2022Healer.png');
width: 68px;
height: 68px;
}
.shop_weapon_special_spring2022Mage {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_weapon_special_spring2022Mage.png');
width: 68px;
height: 68px;
}
.shop_weapon_special_spring2022Rogue {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_weapon_special_spring2022Rogue.png');
width: 68px;
height: 68px;
}
.shop_weapon_special_spring2022Warrior {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_weapon_special_spring2022Warrior.png');
width: 68px;
height: 68px;
}
.shop_weapon_special_springHealer {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_weapon_special_springHealer.png');
width: 68px;
@@ -26743,6 +26873,26 @@
width: 114px;
height: 90px;
}
.slim_armor_special_spring2022Healer {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_special_spring2022Healer.png');
width: 114px;
height: 90px;
}
.slim_armor_special_spring2022Mage {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_special_spring2022Mage.png');
width: 114px;
height: 90px;
}
.slim_armor_special_spring2022Rogue {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_special_spring2022Rogue.png');
width: 114px;
height: 117px;
}
.slim_armor_special_spring2022Warrior {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_special_spring2022Warrior.png');
width: 114px;
height: 90px;
}
.slim_armor_special_springHealer {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_special_springHealer.png');
width: 90px;
@@ -26903,6 +27053,26 @@
width: 114px;
height: 90px;
}
.weapon_special_spring2022Healer {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_special_spring2022Healer.png');
width: 114px;
height: 90px;
}
.weapon_special_spring2022Mage {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_special_spring2022Mage.png');
width: 114px;
height: 90px;
}
.weapon_special_spring2022Rogue {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_special_spring2022Rogue.png');
width: 114px;
height: 117px;
}
.weapon_special_spring2022Warrior {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_special_spring2022Warrior.png');
width: 114px;
height: 90px;
}
.weapon_special_springHealer {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_special_springHealer.png');
width: 90px;

2
website/common/script/content/constants/events.js
View File

@@ -10,7 +10,7 @@ const gemsPromo = {
export const EVENTS = {
noCurrentEvent: {
start: '2022-05-01T20:00-05:00',
start: '2022-04-30T20:00-05:00',
end: '2022-06-30T20:00-05:00',
season: 'normal',
npcImageSuffix: '',

6
website/common/script/content/constants/seasonalSets.js
View File

@@ -67,37 +67,31 @@ const SEASONAL_SETS = {
'cleverDogSet',
'braveMouseSet',
// spring 2017
'spring2017FelineWarriorSet',
'spring2017CanineConjurorSet',
'spring2017FloralMouseSet',
'spring2017SneakyBunnySet',
// spring 2018
'spring2018TulipMageSet',
'spring2018SunriseWarriorSet',
'spring2018DucklingRogueSet',
'spring2018GarnetHealerSet',
// spring 2019
'spring2019AmberMageSet',
'spring2019OrchidWarriorSet',
'spring2019CloudRogueSet',
'spring2019RobinHealerSet',
// spring 2020
'spring2020BeetleWarriorSet',
'spring2020IrisHealerSet',
'spring2020LapisLazuliRogueSet',
'spring2020PuddleMageSet',
// spring 2021
'spring2021SwanMageSet',
'spring2021WillowHealerSet',
'spring2021SunstoneWarriorSet',
'spring2021TwinFlowerRogueSet',
// spring 2022
'spring2022ForsythiaMageSet',
'spring2022PeridotHealerSet',
'spring2022RainstormWarriorSet',

2
website/common/script/content/shop-featuredItems.js
View File

@@ -52,7 +52,7 @@ const featuredItems = {
},
{
type: 'quests',
path: 'quests.turquoise',
path: 'quests.egg',
},
{
type: 'quests',

14
website/common/script/libs/shops-seasonal.config.js
View File

@@ -15,7 +15,7 @@ const SHOP_OPEN = CURRENT_EVENT && ['winter', 'spring', 'summer', 'fall'].includ
export default {
opened: SHOP_OPEN,
currentSeason: SHOP_OPEN ? upperFirst(CURRENT_EVENT.season) : 'Spring',
currentSeason: SHOP_OPEN ? upperFirst(CURRENT_EVENT.season) : 'Closed',
dateRange: {
start: CURRENT_EVENT ? moment(CURRENT_EVENT.start) : moment().subtract(1, 'days').toDate(),
@@ -37,13 +37,17 @@ export default {
}
: {},
availableSpells: SHOP_OPEN && moment().isBetween('2021-12-30T08:00-04:00', CURRENT_EVENT.end)
availableSpells: SHOP_OPEN && moment().isBetween('2022-04-12T08:00-05:00', CURRENT_EVENT.end)
? [
'snowball',
'shinySeed',
]
: [],
availableQuests: [],
availableQuests: SHOP_OPEN && CURRENT_EVENT.season === 'spring'
? [
'egg',
]
: [],
featuredSet: 'spring2022PeridotHealerSet',
featuredSet: 'spring2021TwinFlowerRogueSet',
};