mirror of
https://github.com/HabitRPG/habitica.git
synced 2025-12-17 14:47:53 +01:00
Revert "Revert "allow hatching potions to have a release date""
This reverts commit 485584c144.
# Conflicts:
# website/common/script/content/hatching-potions.js
This commit is contained in:
@@ -1,7 +1,10 @@
|
||||
import each from 'lodash/each';
|
||||
import moment from 'moment';
|
||||
import { EVENTS } from './constants/events';
|
||||
import allEggs from './eggs';
|
||||
import {
|
||||
drops as dropEggs,
|
||||
quests as questEggs,
|
||||
} from './eggs';
|
||||
import {
|
||||
drops as dropPotions,
|
||||
premium as premiumPotions,
|
||||
@@ -9,14 +12,10 @@ import {
|
||||
} from './hatching-potions';
|
||||
import t from './translation';
|
||||
|
||||
const STABLE_RELEASE_DATES = {
|
||||
|
||||
};
|
||||
|
||||
const petInfo = {};
|
||||
const mountInfo = {};
|
||||
|
||||
function constructSet (type, eggs, potions, hasMounts = true) {
|
||||
function constructSet (type, eggs, potions) {
|
||||
const pets = {};
|
||||
const mounts = {};
|
||||
|
||||
@@ -38,24 +37,52 @@ function constructSet (type, eggs, potions, hasMounts = true) {
|
||||
potion: potion.text,
|
||||
egg: egg.text,
|
||||
}));
|
||||
pets[key] = true;
|
||||
mountInfo[key] = getAnimalData(t('mountName', {
|
||||
potion: potion.text,
|
||||
mount: egg.mountText,
|
||||
}));
|
||||
|
||||
if (hasMounts) {
|
||||
mountInfo[key] = getAnimalData(t('mountName', {
|
||||
potion: potion.text,
|
||||
mount: egg.mountText,
|
||||
}));
|
||||
mounts[key] = true;
|
||||
}
|
||||
pets[key] = true;
|
||||
mounts[key] = true;
|
||||
});
|
||||
});
|
||||
|
||||
return [pets, mounts];
|
||||
}
|
||||
|
||||
function constructPetOnlySet (type, eggs, potions) {
|
||||
const pets = {};
|
||||
|
||||
each(eggs, egg => {
|
||||
each(potions, potion => {
|
||||
const key = `${egg.key}-${potion.key}`;
|
||||
|
||||
function getAnimalData (text) {
|
||||
return {
|
||||
key,
|
||||
type,
|
||||
potion: potion.key,
|
||||
egg: egg.key,
|
||||
text,
|
||||
};
|
||||
}
|
||||
|
||||
petInfo[key] = getAnimalData(t('petName', {
|
||||
potion: potion.text,
|
||||
egg: egg.text,
|
||||
}));
|
||||
pets[key] = true;
|
||||
});
|
||||
});
|
||||
|
||||
if (hasMounts) {
|
||||
return [pets, mounts];
|
||||
}
|
||||
return pets;
|
||||
}
|
||||
|
||||
const [dropPets, dropMounts] = constructSet('drop', dropEggs, dropPotions);
|
||||
const [premiumPets, premiumMounts] = constructSet('premium', dropEggs, premiumPotions);
|
||||
const [questPets, questMounts] = constructSet('quest', questEggs, dropPotions);
|
||||
const wackyPets = constructPetOnlySet('wacky', dropEggs, wackyPotions);
|
||||
|
||||
const canFindSpecial = {
|
||||
pets: {
|
||||
// Veteran Pet Ladder - awarded on major updates
|
||||
@@ -131,11 +158,6 @@ const canFindSpecial = {
|
||||
},
|
||||
};
|
||||
|
||||
const [dropPets, dropMounts] = constructSet('drop', allEggs.drops, dropPotions);
|
||||
const [premiumPets, premiumMounts] = constructSet('premium', allEggs.drops, premiumPotions);
|
||||
const [questPets, questMounts] = constructSet('quest', allEggs.quests, dropPotions);
|
||||
const wackyPets = constructSet('wacky', allEggs.drops, wackyPotions, false);
|
||||
|
||||
const specialPets = {
|
||||
'Wolf-Veteran': 'veteranWolf',
|
||||
'Wolf-Cerberus': 'cerberusPup',
|
||||
|
||||
Reference in New Issue
Block a user