Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(content): September 2023 subscriber items #14844

Merged
merged 11 commits into from
Aug 30, 2023
Merged

feat(content): September 2023 subscriber items #14844

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
fbc8f11
feat(content): add June subscriber items
CuriousMagpie May 25, 2023
e5dddac
Merge branch 'CuriousMagpie-2023-june-subscriber-items' into release
CuriousMagpie May 25, 2023
1e73e62
Merge branch 'release' of https://github.com/CuriousMagpie/habitica i…
CuriousMagpie Jun 12, 2023
0bbe423
Merge branch 'HabitRPG:release' into release
CuriousMagpie Jun 28, 2023
53aec81
Merge remote-tracking branch 'origin/release' into release
CuriousMagpie Jul 24, 2023
01375eb
feat(content): September subscriber items
CuriousMagpie Aug 28, 2023
3a02445
Merge branch 'CuriousMagpie-2023-09-subscriber-items' into release
CuriousMagpie Aug 28, 2023
f10d492
fix(image)
CuriousMagpie Aug 28, 2023
6cdbbde
Merge branch 'release' into 2023-09-subscriber-items
CuriousMagpie Aug 28, 2023
ba83404
chore(sprites): update habitica-images
Aug 30, 2023
0e08ccb
fix(images): add missing subscriber items
Aug 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion habitica-images
Open in desktop
Submodule habitica-images updated 32 files
+ − backgrounds/background_baobab_forest.png
+ − backgrounds/background_covered_bridge_in_autumn.png
+ − backgrounds/background_moving_day.png
+ − backgrounds/icons/icon_background_baobab_forest.png
+ − backgrounds/icons/icon_background_covered_bridge_in_autumn.png
+ − backgrounds/icons/icon_background_moving_day.png
+ − gear/armoire/shield_armoire_bucket.png
+ − gear/armoire/shop/shop_shield_armoire_bucket.png
+ − gear/armoire/shop/shop_weapon_armoire_cleaningCloth.png
+ − gear/armoire/shop/shop_weapon_armoire_mop.png
+ − gear/armoire/weapon_armoire_cleaningCloth.png
+ − gear/armoire/weapon_armoire_mop.png
+ − gear/armor/broad_armor_special_heroicTunic.png
+ − gear/armor/shop/shop_armor_special_heroicTunic.png
+ − gear/armor/slim_armor_special_heroicTunic.png
+ − gear/back/back_special_heroicAureole.gif
+ − gear/back/shop/shop_back_special_heroicAureole.png
+ − gear/events/mystery_202309/back_mystery_202309.png
+ − gear/events/mystery_202309/headAccessory_mystery_202309.png
+ − gear/events/mystery_202309/shop_back_mystery_202309.png
+ − gear/events/mystery_202309/shop_headAccessory_mystery_202309.png
+ − gear/events/mystery_202309/shop_set_mystery_202309.png
+ − gear/headAccessory/headAccessory_special_heroicCirclet.png
+ − gear/headAccessory/shop/shop_headAccessory_special_heroicCirclet.png
+ − notifications/heroic_set_icon.png
+ − notifications/icon_pet_veteran_bear.png
+ − notifications/icon_pet_veteran_dragon.png
+ − notifications/icon_pet_veteran_fox.png
+ − notifications/icon_pet_veteran_lion.png
+ − notifications/icon_pet_veteran_tiger.png
+ − notifications/icon_pet_veteran_wolf.png
+ − stable/pets/Pet-Dragon-Veteran.png
85 changes: 85 additions & 0 deletions website/client/src/assets/css/sprites/spritesmith-main.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -635,6 +635,11 @@
width: 141px;
height: 147px;
}
.background_baobab_forest {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_baobab_forest.png');
width: 141px;
height: 147px;
}
.background_bayou {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_bayou.png');
width: 141px;
Expand Down Expand Up @@ -820,6 +825,11 @@
width: 141px;
height: 147px;
}
.background_covered_bridge_in_autumn {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_covered_bridge_in_autumn.png');
width: 141px;
height: 147px;
}
.background_cozy_barn {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_cozy_barn.png');
width: 141px;
Expand Down Expand Up @@ -1569,6 +1579,11 @@
width: 141px;
height: 147px;
}
.background_moving_day {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_moving_day.png');
width: 141px;
height: 147px;
}
.background_mystical_observatory {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_mystical_observatory.png');
width: 141px;
Expand Down Expand Up @@ -2376,6 +2391,11 @@
width: 68px;
height: 68px;
}
.icon_background_baobab_forest {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_baobab_forest.png');
width: 68px;
height: 68px;
}
.icon_background_bayou {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_bayou.png');
width: 68px;
Expand Down Expand Up @@ -2566,6 +2586,11 @@
width: 68px;
height: 68px;
}
.icon_background_covered_bridge_in_autumn {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_covered_bridge_in_autumn.png');
width: 60px;
height: 60px;
}
.icon_background_cozy_barn {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_cozy_barn.png');
width: 68px;
Expand Down Expand Up @@ -3315,6 +3340,11 @@
width: 68px;
height: 68px;
}
.icon_background_moving_day {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_moving_day.png');
width: 68px;
height: 68px;
}
.icon_background_mystical_observatory {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_mystical_observatory.png');
width: 68px;
Expand Down Expand Up @@ -19525,6 +19555,11 @@
width: 114px;
height: 90px;
}
.shield_armoire_bucket {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shield_armoire_bucket.png');
width: 114px;
height: 90px;
}
.shield_armoire_chocolateFood {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shield_armoire_chocolateFood.png');
width: 90px;
Expand Down Expand Up @@ -20895,6 +20930,11 @@
width: 68px;
height: 68px;
}
.shop_shield_armoire_bucket {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_shield_armoire_bucket.png');
width: 68px;
height: 68px;
}
.shop_shield_armoire_chocolateFood {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_shield_armoire_chocolateFood.png');
width: 68px;
Expand Down Expand Up @@ -21290,6 +21330,11 @@
width: 68px;
height: 68px;
}
.shop_weapon_armoire_cleaningCloth {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_weapon_armoire_cleaningCloth.png');
width: 68px;
height: 68px;
}
.shop_weapon_armoire_clubOfClubs {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_weapon_armoire_clubOfClubs.png');
width: 68px;
Expand Down Expand Up @@ -21480,6 +21525,11 @@
width: 68px;
height: 68px;
}
.shop_weapon_armoire_mop {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_weapon_armoire_mop.png');
width: 68px;
height: 68px;
}
.shop_weapon_armoire_mythmakerSword {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_weapon_armoire_mythmakerSword.png');
width: 68px;
Expand Down Expand Up @@ -22230,6 +22280,11 @@
width: 114px;
height: 90px;
}
.weapon_armoire_cleaningCloth {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_armoire_cleaningCloth.png');
width: 114px;
height: 90px;
}
.weapon_armoire_clubOfClubs {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_armoire_clubOfClubs.png');
width: 114px;
Expand Down Expand Up @@ -22420,6 +22475,11 @@
width: 90px;
height: 90px;
}
.weapon_armoire_mop {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_armoire_mop.png');
width: 114px;
height: 90px;
}
.weapon_armoire_mythmakerSword {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_armoire_mythmakerSword.png');
width: 90px;
Expand Down Expand Up @@ -28375,6 +28435,31 @@
width: 68px;
height: 68px;
}
.back_mystery_202309 {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/back_mystery_202309.png');
width: 117px;
height: 120px;
}
.headAccessory_mystery_202309 {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/headAccessory_mystery_202309.png');
width: 117px;
height: 120px;
}
.shop_back_mystery_202309 {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_back_mystery_202309.png');
width: 68px;
height: 68px;
}
.shop_headAccessory_mystery_202309 {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_headAccessory_mystery_202309.png');
width: 68px;
height: 68px;
}
.shop_set_mystery_202309 {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_set_mystery_202309.png');
width: 68px;
height: 68px;
}
.broad_armor_mystery_301404 {
background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_mystery_301404.png');
width: 90px;
Expand Down
4 changes: 4 additions & 0 deletions website/common/locales/en/gear.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2779,6 +2779,8 @@
"backMystery202302Notes": "Anytime you wear this tail it's sure to be a frabjous day! Callooh! Callay! Confers no benefit. February 2023 Subscriber Item.",
"backMystery202305Text": "Eventide Wings",
"backMystery202305Notes": "Catch the sparkle of the evening star and soar to strange realms on these wings. Confers no benefit. May 2023 Subscriber Item.",
"backMystery202309Text": "Colossal Comet Moth Wings",
"backMystery202309Notes": "Flutter across forests, glide over mountains, and soar over oceans on these bright and beautiful wings. Confers no benefit. September 2023 Subscriber Item.",

"backSpecialWonderconRedText": "Mighty Cape",
"backSpecialWonderconRedNotes": "Swishes with strength and beauty. Confers no benefit. Special Edition Convention Item.",
Expand Down Expand Up @@ -3016,6 +3018,8 @@
"headAccessoryMystery202305Notes": "These horns glow with reflected moonlight. Confers no benefit. May 2023 Subscriber Item.",
"headAccessoryMystery202307Text": "Kraken's Crown",
"headAccessoryMystery202307Notes": "This mighty circlet summons cyclones and stormy weather! Confers no benefit. July 2023 Subscriber Item.",
"headAccessoryMystery202309Text": "Colossal Comet Moth Antennae",
"headAccessoryMystery202309Notes": "These antennae are fashionable and feathery, but also help you navigate! Confers no benefit. September 2023 Subscriber Item.",

"headAccessoryMystery301405Text": "Headwear Goggles",
"headAccessoryMystery301405Notes": "\"Goggles are for your eyes,\" they said. \"Nobody wants goggles that you can only wear on your head,\" they said. Hah! You sure showed them! Confers no benefit. August 3015 Subscriber Item.",
Expand Down
1 change: 1 addition & 0 deletions website/common/locales/en/subscriber.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,7 @@
"mysterySet202306": "Razzle Dazzle Rainbow Set",
"mysterySet202307": "Perilous Kraken Set",
"mysterySet202308": "Purple Protagonist Set",
"mysterySet202309": "Colossal Comet Moth Set",
"mysterySet301404": "Steampunk Standard Set",
"mysterySet301405": "Steampunk Accessories Set",
"mysterySet301703": "Peacock Steampunk Set",
Expand Down
2 changes: 2 additions & 0 deletions website/common/script/content/gear/sets/mystery.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ const back = {
202301: { },
202302: { },
202305: { },
202309: { },
};

const body = {
Expand Down Expand Up @@ -240,6 +241,7 @@ const headAccessory = {
202307: { },
202302: { },
202305: { },
202309: { },
301405: { },
};

Expand Down
Loading