From 36cbca380e651ed79e964e07fd5a9dba79bca4aa Mon Sep 17 00:00:00 2001
From: Blade Barringer <blade@crookedneighbor.com>
Date: Fri, 2 Oct 2015 14:45:06 -0500
Subject: [PATCH] Corrected order of backgrounds

---
 common/script/src/content/backgrounds.js | 36 ++++++++++++------------
 common/script/src/content/helpers.js     |  9 ++----
 2 files changed, 20 insertions(+), 25 deletions(-)

diff --git a/common/script/src/content/backgrounds.js b/common/script/src/content/backgrounds.js
index 2b1e661722..4d607ba4e0 100644
--- a/common/script/src/content/backgrounds.js
+++ b/common/script/src/content/backgrounds.js
@@ -5,24 +5,24 @@ import {
 } from './helpers';
 
 let sets = {
-  '062014': ['beach', 'fairy_ring', 'forest'],
-  '072014': ['open_waters', 'coral_reef', 'seafarer_ship'],
-  '082014': ['volcano', 'clouds', 'dusty_canyons'],
-  '092014': ['thunderstorm', 'autumn_forest', 'harvest_fields'],
-  '102014': ['graveyard', 'haunted_house', 'pumpkin_patch'],
-  '112014': ['harvest_feast', 'sunset_meadow', 'starry_skies'],
-  '122014': ['iceberg', 'twinkly_lights', 'south_pole'],
-  '012015': ['ice_cave', 'frigid_peak', 'snowy_pines'],
-  '022015': ['blacksmithy', 'crystal_cave', 'distant_castle'],
-  '032015': ['spring_rain', 'stained_glass', 'rolling_hills'],
-  '042015': ['cherry_trees', 'floral_meadow', 'gumdrop_land'],
-  '052015': ['marble_temple', 'mountain_lake', 'pagodas'],
-  '062015': ['drifting_raft', 'shimmery_bubbles', 'island_waterfalls'],
-  '072015': ['dilatory_ruins', 'giant_wave', 'sunken_ship'],
-  '082015': ['pyramids', 'sunset_savannah', 'twinkly_party_lights'],
-  '092015': ['market', 'stable', 'tavern'],
+  'backgrounds062014': ['beach', 'fairy_ring', 'forest'],
+  'backgrounds072014': ['open_waters', 'coral_reef', 'seafarer_ship'],
+  'backgrounds082014': ['volcano', 'clouds', 'dusty_canyons'],
+  'backgrounds092014': ['thunderstorm', 'autumn_forest', 'harvest_fields'],
+  'backgrounds102014': ['graveyard', 'haunted_house', 'pumpkin_patch'],
+  'backgrounds112014': ['harvest_feast', 'sunset_meadow', 'starry_skies'],
+  'backgrounds122014': ['iceberg', 'twinkly_lights', 'south_pole'],
+  'backgrounds012015': ['ice_cave', 'frigid_peak', 'snowy_pines'],
+  'backgrounds022015': ['blacksmithy', 'crystal_cave', 'distant_castle'],
+  'backgrounds032015': ['spring_rain', 'stained_glass', 'rolling_hills'],
+  'backgrounds042015': ['cherry_trees', 'floral_meadow', 'gumdrop_land'],
+  'backgrounds052015': ['marble_temple', 'mountain_lake', 'pagodas'],
+  'backgrounds062015': ['drifting_raft', 'shimmery_bubbles', 'island_waterfalls'],
+  'backgrounds072015': ['dilatory_ruins', 'giant_wave', 'sunken_ship'],
+  'backgrounds082015': ['pyramids', 'sunset_savannah', 'twinkly_party_lights'],
+  'backgrounds092015': ['market', 'stable', 'tavern'],
 };
 
-let backgrounds = generateBackgrounds(sets);
+generateBackgrounds(sets);
 
-export default backgrounds;
+export default sets;
diff --git a/common/script/src/content/helpers.js b/common/script/src/content/helpers.js
index e74e06229d..7413ac84d6 100644
--- a/common/script/src/content/helpers.js
+++ b/common/script/src/content/helpers.js
@@ -164,23 +164,18 @@ export function setGearSetDefaults(gearSet, options={}) {
 //----------------------------------------
 
 export function generateBackgrounds(sets) {
-  let backgrounds = {};
-
   each(sets, (names, set) => {
-    let setName = `backgrounds${set}`;
-    backgrounds[setName] = {};
+    sets[set] = {};
 
     each(names, (name) => {
       let formattedName = formatForTranslator(name);
 
-      backgrounds[setName][name] = {
+      sets[set][name] = {
         text: translator(`background${formattedName}Text`),
         notes: translator(`background${formattedName}Notes`),
       };
     });
   });
-
-  return backgrounds;
 };
 
 export function generateEggs(set, options={}) {