Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2022 Summer Gala Content (#14067)

Browse Source 
* merge upstream/release into origin/release

* Revert "merge upstream/release into origin/release"

This reverts commit 902ed08cc3.

* Summer Splash 2022 Content

* added magic hatching potions

* updated events for testing

* fix whitespace

* various corrections

* fix(gear): mage set, healer set, event start date

* update: habitica-images

* fix(events): include normal/empty season data outside of gala

* fix(string): missing attribute and event verbiage for warrior item

Co-authored-by: SabreCat <sabe@habitica.com>
This commit is contained in:
Natalie L
2022-06-21 10:29:53 -04:00
committed by GitHub
parent 170146f91e
commit f0c25dab05
10 changed files with 309 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
website/client/src/assets/css/sprites/spritesmith-main.css
+170
View File
@@ -28885,6 +28885,26 @@
width: 117px;
height: 120px;
}
.broad_armor_special_summer2022Healer {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_special_summer2022Healer.png');
width: 117px;
height: 120px;
}
.broad_armor_special_summer2022Mage {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_special_summer2022Mage.png');
width: 124px;
height: 120px;
}
.broad_armor_special_summer2022Rogue {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_special_summer2022Rogue.png');
width: 114px;
height: 90px;
}
.broad_armor_special_summer2022Warrior {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_special_summer2022Warrior.png');
width: 117px;
height: 120px;
}
.broad_armor_special_summerHealer {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_special_summerHealer.png');
width: 90px;
@@ -29055,6 +29075,26 @@
width: 117px;
height: 120px;
}
.head_special_summer2022Healer {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_special_summer2022Healer.png');
width: 117px;
height: 120px;
}
.head_special_summer2022Mage {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_special_summer2022Mage.png');
width: 117px;
height: 120px;
}
.head_special_summer2022Rogue {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_special_summer2022Rogue.png');
width: 114px;
height: 90px;
}
.head_special_summer2022Warrior {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_special_summer2022Warrior.png');
width: 117px;
height: 120px;
}
.head_special_summerHealer {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_special_summerHealer.png');
width: 90px;
@@ -29185,6 +29225,21 @@
width: 114px;
height: 117px;
}
.shield_special_summer2022Healer {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shield_special_summer2022Healer.png');
width: 117px;
height: 120px;
}
.shield_special_summer2022Rogue {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shield_special_summer2022Rogue.png');
width: 114px;
height: 90px;
}
.shield_special_summer2022Warrior {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shield_special_summer2022Warrior.png');
width: 117px;
height: 120px;
}
.shield_special_summerHealer {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shield_special_summerHealer.png');
width: 90px;
@@ -29340,6 +29395,26 @@
width: 68px;
height: 68px;
}
.shop_armor_special_summer2022Healer {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_armor_special_summer2022Healer.png');
width: 68px;
height: 68px;
}
.shop_armor_special_summer2022Mage {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_armor_special_summer2022Mage.png');
width: 68px;
height: 68px;
}
.shop_armor_special_summer2022Rogue {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_armor_special_summer2022Rogue.png');
width: 68px;
height: 68px;
}
.shop_armor_special_summer2022Warrior {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_armor_special_summer2022Warrior.png');
width: 68px;
height: 68px;
}
.shop_armor_special_summerHealer {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_armor_special_summerHealer.png');
width: 68px;
@@ -29540,6 +29615,26 @@
width: 68px;
height: 68px;
}
.shop_head_special_summer2022Healer {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_head_special_summer2022Healer.png');
width: 68px;
height: 68px;
}
.shop_head_special_summer2022Mage {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_head_special_summer2022Mage.png');
width: 68px;
height: 68px;
}
.shop_head_special_summer2022Rogue {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_head_special_summer2022Rogue.png');
width: 68px;
height: 68px;
}
.shop_head_special_summer2022Warrior {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_head_special_summer2022Warrior.png');
width: 68px;
height: 68px;
}
.shop_head_special_summerHealer {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_head_special_summerHealer.png');
width: 68px;
@@ -29670,6 +29765,21 @@
width: 68px;
height: 68px;
}
.shop_shield_special_summer2022Healer {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_shield_special_summer2022Healer.png');
width: 68px;
height: 68px;
}
.shop_shield_special_summer2022Rogue {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_shield_special_summer2022Rogue.png');
width: 68px;
height: 68px;
}
.shop_shield_special_summer2022Warrior {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_shield_special_summer2022Warrior.png');
width: 68px;
height: 68px;
}
.shop_shield_special_summerHealer {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_shield_special_summerHealer.png');
width: 68px;
@@ -29825,6 +29935,26 @@
width: 68px;
height: 68px;
}
.shop_weapon_special_summer2022Healer {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_weapon_special_summer2022Healer.png');
width: 68px;
height: 68px;
}
.shop_weapon_special_summer2022Mage {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_weapon_special_summer2022Mage.png');
width: 68px;
height: 68px;
}
.shop_weapon_special_summer2022Rogue {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_weapon_special_summer2022Rogue.png');
width: 68px;
height: 68px;
}
.shop_weapon_special_summer2022Warrior {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_weapon_special_summer2022Warrior.png');
width: 68px;
height: 68px;
}
.shop_weapon_special_summerHealer {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_weapon_special_summerHealer.png');
width: 68px;
@@ -29985,6 +30115,26 @@
width: 117px;
height: 120px;
}
.slim_armor_special_summer2022Healer {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_special_summer2022Healer.png');
width: 117px;
height: 120px;
}
.slim_armor_special_summer2022Mage {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_special_summer2022Mage.png');
width: 117px;
height: 120px;
}
.slim_armor_special_summer2022Rogue {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_special_summer2022Rogue.png');
width: 114px;
height: 90px;
}
.slim_armor_special_summer2022Warrior {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_special_summer2022Warrior.png');
width: 117px;
height: 120px;
}
.slim_armor_special_summerHealer {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_special_summerHealer.png');
width: 90px;
@@ -30145,6 +30295,26 @@
width: 141px;
height: 147px;
}
.weapon_special_summer2022Healer {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_special_summer2022Healer.png');
width: 117px;
height: 120px;
}
.weapon_special_summer2022Mage {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_special_summer2022Mage.png');
width: 117px;
height: 120px;
}
.weapon_special_summer2022Rogue {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_special_summer2022Rogue.png');
width: 114px;
height: 90px;
}
.weapon_special_summer2022Warrior {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_special_summer2022Warrior.png');
width: 117px;
height: 120px;
}
.weapon_special_summerHealer {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_special_summerHealer.png');
width: 90px;