krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-16 22:27:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Squashed commit of the following:

Browse Source 
commit f461c07ca7997362512a366eebc7d3a8fba854ee
Author: Sabe Jones <sabrecat@gmail.com>
Date:   Thu Jun 11 16:37:14 2020 -0500

    fix(sprites): wolf alignment

commit 6ceb4ba6d1ea62892e9b335307043d78971328d0
Author: Sabe Jones <sabrecat@gmail.com>
Date:   Thu Jun 11 14:53:07 2020 -0500

    chore(sprites): compile

commit 8b517309f531c7f151c5c18a5ca9847ab7aa5dbb
Author: Sabe Jones <sabrecat@gmail.com>
Date:   Thu Jun 11 14:52:49 2020 -0500

    feat(content): Fluorite Magic Hatching Potion and quest
This commit is contained in:
Sabe Jones
2020-06-11 16:38:05 -05:00
parent 51d20ef7e8
commit 873ac53e27
75 changed files with 9002 additions and 8770 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
website/common/script/content/hatching-potions.js
View File

@@ -298,6 +298,13 @@ const premium = {
date: t('dateEndMarch'),
}),
},
Fluorite: {
value: 2,
text: t('hatchingPotionFluorite'),
limited: true,
canBuy: hasQuestAchievementFunction('fluorite'),
_addlNotes: t('premiumPotionUnlimitedNotes'),
},
};
const wacky = {

32
website/common/script/content/quests.js
View File

@@ -3615,6 +3615,38 @@ const quests = {
unlock: t('questWaffleUnlockText'),
},
},
fluorite: {
text: t('questFluoriteText'),
notes: t('questFluoriteNotes'),
completion: t('questFluoriteCompletion'),
value: 4,
category: 'hatchingPotion',
boss: {
name: t('questFluoriteBoss'),
hp: 1200,
str: 2,
},
drop: {
items: [
{
type: 'hatchingPotions',
key: 'Fluorite',
text: t('questFluoriteDropFluoritePotion'),
}, {
type: 'hatchingPotions',
key: 'Fluorite',
text: t('questFluoriteDropFluoritePotion'),
}, {
type: 'hatchingPotions',
key: 'Fluorite',
text: t('questFluoriteDropFluoritePotion'),
},
],
gp: 70,
exp: 750,
unlock: t('questFluoriteUnlockText'),
},
},
};
each(quests, (v, key) => {

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

@@ -1,34 +1,8 @@
import moment from 'moment';
// Magic Hatching Potions are configured like this:
// type: 'premiumHatchingPotion', // note no "s" at the end
// path: 'premiumHatchingPotions.Rainbow',
const featuredItems = {
market () {
if (moment().isBefore('2020-05-02')) {
return [
{
type: 'armoire',
path: 'armoire',
},
{
type: 'premiumHatchingPotion',
path: 'premiumHatchingPotions.BirchBark',
},
{
type: 'premiumHatchingPotion',
path: 'premiumHatchingPotions.Shimmer',
},
{
type: 'premiumHatchingPotion',
path: 'premiumHatchingPotions.Celestial',
},
{
type: 'premiumHatchingPotion',
path: 'hatchingPotions.Veggie',
},
];
}
return [
{
type: 'armoire',
@@ -49,34 +23,18 @@ const featuredItems = {
];
},
quests () {
if (moment().isBefore('2020-05-02')) {
return [
{
type: 'quests',
path: 'quests.waffle',
},
{
type: 'quests',
path: 'quests.trex_undead',
},
{
type: 'quests',
path: 'quests.bunny',
},
];
}
return [
{
type: 'quests',
path: 'quests.sheep',
path: 'quests.rock',
},
{
type: 'quests',
path: 'quests.seaserpent',
path: 'quests.peacock',
},
{
type: 'quests',
path: 'quests.silver',
path: 'quests.fluorite',
},
];
},