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

feat(content): enable bug hugging

Browse Source
This commit is contained in:
Sabe Jones
2020-03-09 09:29:08 -05:00
parent 010da977a4
commit 86951916e8
6 changed files with 46 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
website/client/src/assets/css/sprites/spritesmith-largeSprites-0.css
View File

@@ -1,6 +1,6 @@
.promo_achievement_CottonCandyPink {
background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
background-position: -424px -277px;
background-position: -668px -296px;
width: 204px;
height: 102px;
}
@@ -10,15 +10,21 @@
width: 423px;
height: 147px;
}
.promo_mystery_202003 {
.promo_hugabug_bundle {
background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
background-position: 0px -425px;
width: 420px;
height: 147px;
}
.promo_mystery_202003 {
background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
background-position: -668px 0px;
width: 282px;
height: 147px;
}
.promo_take_this {
background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
background-position: -566px -425px;
background-position: -668px -399px;
width: 96px;
height: 69px;
}
@@ -36,7 +42,7 @@
}
.scene_shanaqui {
background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
background-position: -283px -425px;
background-position: -668px -148px;
width: 282px;
height: 147px;
}

BIN
website/client/src/assets/images/sprites/spritesmith-largeSprites-0.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 35 KiB

After

Width:  |  Height:  |  Size: 46 KiB

2
website/common/script/content/bundles.js
View File

@@ -96,7 +96,7 @@ const bundles = {
'butterfly',
],
canBuy () {
return moment().isBetween('2018-02-06', '2018-04-02');
return moment().isBetween('2020-03-09', '2020-04-02');
},
type: 'quests',
value: 7,

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

@@ -5,26 +5,6 @@ import moment from 'moment';
// path: 'premiumHatchingPotions.Rainbow',
const featuredItems = {
market () {
if (moment().isBefore('2020-03-02')) {
return [
{
type: 'card',
path: 'cardTypes.valentine',
},
{
type: 'premiumHatchingPotion',
path: 'premiumHatchingPotions.Cupid',
},
{
type: 'premiumHatchingPotion',
path: 'premiumHatchingPotions.RoseQuartz',
},
{
type: 'eggs',
path: 'eggs.Fox',
},
];
}
return [
{
type: 'armoire',
@@ -45,18 +25,34 @@ const featuredItems = {
];
},
quests () {
if (moment().isBefore('2020-04-02')) {
return [
{
type: 'bundles',
path: 'bundles.hugabug',
},
{
type: 'quests',
path: 'quests.velociraptor',
},
{
type: 'quests',
path: 'quests.taskwoodsTerror1',
},
];
}
return [
{
type: 'quests',
path: 'quests.treeling',
path: 'quests.badger',
},
{
type: 'quests',
path: 'quests.stoikalmCalamity1',
path: 'quests.ferret',
},
{
type: 'quests',
path: 'quests.ruby',
path: 'quests.sloth',
},
];
},

BIN
website/raw_sprites/spritesmith_large/promo_hugabug_bundle.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 15 KiB

36
website/server/controllers/api-v3/news.js
View File

@@ -4,7 +4,7 @@ const api = {};
// @TODO export this const, cannot export it from here because only routes are exported from
// controllers
const LAST_ANNOUNCEMENT_TITLE = 'MARCH BACKGROUNDS AND ARMOIRE ITEMS! HOPEFUL HIPPOGRIFFS IN THE TIME TRAVELERS SHOP!';
const LAST_ANNOUNCEMENT_TITLE = 'DISCOUNTED QUEST BUNDLE: HUG A BUG!';
const worldDmg = { // @TODO
bailey: false,
};
@@ -31,33 +31,29 @@ api.getNews = {
<div class="mr-3 ${baileyClass}"></div>
<div class="media-body">
<h1 class="align-self-center">${res.t('newStuff')}</h1>
<h2>3/3/2020 - ${LAST_ANNOUNCEMENT_TITLE}</h2>
<h2>3/10/2020 - ${LAST_ANNOUNCEMENT_TITLE}</h2>
</div>
</div>
<hr/>
<div class="promo_armoire_backgrounds_202003 center-block"></div>
<h3>March Backgrounds and Armoire Items!</h3>
<div class="promo_hugabug_bundle center-block"></div>
<p>
We’ve added three new backgrounds to the Background Shop! Now your avatar can dally among
Giant Flowers, admire a fancy Succulent Garden, and party with pollinators in the
Butterfly Garden. Check them out under User Icon > Backgrounds!
If you're looking to add some insect friends to your Habitica stable, you're in luck!
From now until March 31, you can purchase the Hug a Bug Pet Quest Bundle and receive the
Snail, Beetle, and Butterfly quests, all for only 7 Gems! That's a discount of 5 Gems
from the price of purchasing them separately. Check it out in the <a
href='/shops/quests'>Quest Shop</a> today!
</p>
<p>
Plus, there’s new Gold-purchasable equipment in the Enchanted Armoire, including the
Baseball Set. Better work hard on your real-life tasks to earn all the pieces! Enjoy :)
If you’d prefer not to see bugs in Habitica due to a phobia, check out the <a
href='http://habitica.wikia.com/wiki/Phobia_Protection_Extension' target='_blank'>Phobia
Protection Extension</a> and enable the option for hiding "Beetles"!
</p>
<div class="small mb-3">
by Vikte, Mantichore, FolleMente, Aspiring Advocate, QuartzFox, katieslug, and SabreCat
<div class="small">By Lemoness, SabreCat, and Beffymaroo</div>
<div class="small">
Art by Pfeffernusse, Megan, Pocketmole, overomega, Misceo, UncommonCriminal, Zorella,
Anna Glassman, Leephon, Lilith of Alfheim, Ac, starsystemic, and Karithina
</div>
<div class="Pet-Hippogriff-Hopeful center-block"></div>
<h3>Hopeful Hippogriffs in the Time Travelers' Shop!</h3>
<p>
The <a href='/shops/time'>Time Travelers</a> have traveled back in time to obtain some
rare Hopeful Hippogriff pets and mounts! You can buy them with Mystic Hourglasses, which
are awarded to <a href='/user/settings/subscription'>long-term subscribers</a>. Thanks
for helping us to keep Habitica running!
</p>
<div class="small mb-3">by Lemoness and SabreCat</div>
<div class="small mb-3">Writing by arachnidstardis, emiausti, and AnnDeLune</div>
</div>
`,
});