Corrected order of backgrounds

This commit is contained in:
Blade Barringer
2015-10-02 14:45:06 -05:00
parent bf7d6dddcc
commit 36cbca380e
2 changed files with 20 additions and 25 deletions

View File

@@ -5,24 +5,24 @@ import {
} from './helpers'; } from './helpers';
let sets = { let sets = {
'062014': ['beach', 'fairy_ring', 'forest'], 'backgrounds062014': ['beach', 'fairy_ring', 'forest'],
'072014': ['open_waters', 'coral_reef', 'seafarer_ship'], 'backgrounds072014': ['open_waters', 'coral_reef', 'seafarer_ship'],
'082014': ['volcano', 'clouds', 'dusty_canyons'], 'backgrounds082014': ['volcano', 'clouds', 'dusty_canyons'],
'092014': ['thunderstorm', 'autumn_forest', 'harvest_fields'], 'backgrounds092014': ['thunderstorm', 'autumn_forest', 'harvest_fields'],
'102014': ['graveyard', 'haunted_house', 'pumpkin_patch'], 'backgrounds102014': ['graveyard', 'haunted_house', 'pumpkin_patch'],
'112014': ['harvest_feast', 'sunset_meadow', 'starry_skies'], 'backgrounds112014': ['harvest_feast', 'sunset_meadow', 'starry_skies'],
'122014': ['iceberg', 'twinkly_lights', 'south_pole'], 'backgrounds122014': ['iceberg', 'twinkly_lights', 'south_pole'],
'012015': ['ice_cave', 'frigid_peak', 'snowy_pines'], 'backgrounds012015': ['ice_cave', 'frigid_peak', 'snowy_pines'],
'022015': ['blacksmithy', 'crystal_cave', 'distant_castle'], 'backgrounds022015': ['blacksmithy', 'crystal_cave', 'distant_castle'],
'032015': ['spring_rain', 'stained_glass', 'rolling_hills'], 'backgrounds032015': ['spring_rain', 'stained_glass', 'rolling_hills'],
'042015': ['cherry_trees', 'floral_meadow', 'gumdrop_land'], 'backgrounds042015': ['cherry_trees', 'floral_meadow', 'gumdrop_land'],
'052015': ['marble_temple', 'mountain_lake', 'pagodas'], 'backgrounds052015': ['marble_temple', 'mountain_lake', 'pagodas'],
'062015': ['drifting_raft', 'shimmery_bubbles', 'island_waterfalls'], 'backgrounds062015': ['drifting_raft', 'shimmery_bubbles', 'island_waterfalls'],
'072015': ['dilatory_ruins', 'giant_wave', 'sunken_ship'], 'backgrounds072015': ['dilatory_ruins', 'giant_wave', 'sunken_ship'],
'082015': ['pyramids', 'sunset_savannah', 'twinkly_party_lights'], 'backgrounds082015': ['pyramids', 'sunset_savannah', 'twinkly_party_lights'],
'092015': ['market', 'stable', 'tavern'], 'backgrounds092015': ['market', 'stable', 'tavern'],
}; };
let backgrounds = generateBackgrounds(sets); generateBackgrounds(sets);
export default backgrounds; export default sets;

View File

@@ -164,23 +164,18 @@ export function setGearSetDefaults(gearSet, options={}) {
//---------------------------------------- //----------------------------------------
export function generateBackgrounds(sets) { export function generateBackgrounds(sets) {
let backgrounds = {};
each(sets, (names, set) => { each(sets, (names, set) => {
let setName = `backgrounds${set}`; sets[set] = {};
backgrounds[setName] = {};
each(names, (name) => { each(names, (name) => {
let formattedName = formatForTranslator(name); let formattedName = formatForTranslator(name);
backgrounds[setName][name] = { sets[set][name] = {
text: translator(`background${formattedName}Text`), text: translator(`background${formattedName}Text`),
notes: translator(`background${formattedName}Notes`), notes: translator(`background${formattedName}Notes`),
}; };
}); });
}); });
return backgrounds;
}; };
export function generateEggs(set, options={}) { export function generateEggs(set, options={}) {