translations and error handling

20 files changed, 92 insertions, 173 deletions

diff --git a/db/areas/candy-town.json b/db/areas/candy-town.json
index 59ddca0..f89370b 100644
--- a/db/areas/candy-town.json
+++ b/db/areas/candy-town.json
@@ -1,6 +1,4 @@
 {
-  "name": "Candy Town",
-
   "locations": {
     "hospital": {
       "type": "healingCenter",
@@ -9,8 +7,8 @@
 
     "scoop_store": {
       "type": "shop",
-      "economy": "spyder_candy_scoop",
-      "items": []
+      "items": [],
+      "modules/tuxemon.economy": "spyder_candy_scoop"
     }
   },
 
@@ -22,5 +20,7 @@
     "sea-route-c": {
       "conditions": []
     }
-  }
+  },
+
+  "modules/tuxemon.slug": "candy_town"
 }
diff --git a/db/areas/city-park.json b/db/areas/city-park.json
index 865df3c..3579342 100644
--- a/db/areas/city-park.json
+++ b/db/areas/city-park.json
@@ -1,10 +1,4 @@
 {
-  "name": "City Park",
-
-  "encounter_slug": "citypark",
-
-  "encounters": [],
-
   "requiredEncounters": 10,
 
   "trainers": [
@@ -24,8 +18,6 @@
     }
   ],
 
-  "environment_slug": "forest",
-
   "connections": {
     "route2": {
       "conditions": []
@@ -37,5 +29,9 @@
         "trainers"
       ]
     }
-  }
+  },
+
+  "modules/tuxemon.slug": "citypark",
+  "modules/tuxemon.encounter": "citypark",
+  "modules/tuxemon.environment": "forest"
 }
diff --git a/db/areas/cotton-town.json b/db/areas/cotton-town.json
index 1f12f73..cd83eae 100644
--- a/db/areas/cotton-town.json
+++ b/db/areas/cotton-town.json
@@ -1,16 +1,4 @@
 {
-  "name": "Cotton Town",
-
-  "encounter_slug": "",
-
-  "encounters": [],
-
-  "requiredEncounters": 0,
-
-  "trainers": [],
-
-  "environment_slug": "interior",
-
   "locations": {
     "healing_center": {
       "type": "healingCenter",
@@ -18,7 +6,7 @@
     },
     "cotton_scoop": {
       "type": "shop",
-      "economy": "cotton_scoop",
+      "modules/tuxemon.economy": "cotton_scoop",
       "items": []
     }
   },
@@ -41,5 +29,7 @@
         "event.dryads-grove"
       ]
     }
-  }
+  },
+
+  "modules/tuxemon.slug": "cotton_town"
 }
diff --git a/db/areas/dryads-grove.json b/db/areas/dryads-grove.json
index a0a75cc..0842384 100644
--- a/db/areas/dryads-grove.json
+++ b/db/areas/dryads-grove.json
@@ -1,15 +1,5 @@
 {
-  "name": "Dryad's Grove",
+  "connections": {},
 
-  "encounter_slug": "",
-
-  "encounters": [],
-
-  "requiredEncounters": 0,
-
-  "trainers": [],
-
-  "environment_slug": "interior",
-
-  "connections": {}
+  "modules/tuxemon.slug": "dryadsgrove"
 }
diff --git a/db/areas/flower-city.json b/db/areas/flower-city.json
index 1e7ebf9..215ac84 100644
--- a/db/areas/flower-city.json
+++ b/db/areas/flower-city.json
@@ -1,16 +1,4 @@
 {
-  "name": "Flower City",
-
-  "encounter_slug": "",
-
-  "encounters": [],
-
-  "requiredEncounters": 0,
-
-  "trainers": [],
-
-  "environment_slug": "interior",
-
   "locations": {
     "healing_center": {
       "type": "healingCenter",
@@ -19,13 +7,11 @@
 
     "scoop_store": {
       "type": "shop",
-      "economy": "spyder_flower_scoop",
+      "modules/tuxemon.economy": "spyder_flower_scoop",
       "items": []
     }
   },
 
-  "events": {},
-
   "connections": {
     "route4": {
       "conditions": []
@@ -38,5 +24,7 @@
     "side-route-a": {
       "conditions": []
     }
-  }
+  },
+
+  "modules/tuxemon.slug": "flower_city"
 }
diff --git a/db/areas/leather-town.json b/db/areas/leather-town.json
index 5cb24d7..8177ad6 100644
--- a/db/areas/leather-town.json
+++ b/db/areas/leather-town.json
@@ -1,16 +1,4 @@
 {
-  "name": "Leather Town",
-
-  "encounter_slug": "",
-
-  "encounters": [],
-
-  "requiredEncounters": 0,
-
-  "trainers": [],
-
-  "environment_slug": "interior",
-
   "locations": {
     "healing_center": {
       "type": "healingCenter",
@@ -18,7 +6,7 @@
     },
     "leather_scoop": {
       "type": "shop",
-      "economy": "leather_scoop",
+      "modules/tuxemon.economy": "leather_scoop",
       "items": []
     }
   },
@@ -31,5 +19,7 @@
     "route3": {
       "conditions": []
     }
-  }
+  },
+
+  "modules/tuxemon.slug": "leather_town"
 }
diff --git a/db/areas/lion-mountain.json b/db/areas/lion-mountain.json
index fc804f8..e1b5081 100644
--- a/db/areas/lion-mountain.json
+++ b/db/areas/lion-mountain.json
@@ -1,10 +1,4 @@
 {
-  "name": "Lion Mountain",
-
-  "encounter_slug": "lion_mountain",
-
-  "encounters": [],
-
   "requiredEncounters": 10,
 
   "trainers": [
@@ -24,11 +18,14 @@
     }
   ],
 
-  "environment_slug": "snow",
-
   "connections": {
     "sphalian-town": {
       "conditions": []
     }
-  }
+  },
+
+  "modules/tuxemon.slug": "lion_mountain",
+  "modules/tuxemon.encounter": "lion_mountain",
+  "modules/tuxemon.environment": "snow"
+
 }
diff --git a/db/areas/paper-town.json b/db/areas/paper-town.json
index f3d3255..cc897b9 100644
--- a/db/areas/paper-town.json
+++ b/db/areas/paper-town.json
@@ -1,6 +1,4 @@
 {
-  "name": "Paper Town",
-
   "locations": {
     "home": {
       "type": "healingCenter",
@@ -9,8 +7,8 @@
 
     "scoop_store": {
       "type": "shop",
-      "economy": "spyder_paper_mart",
-      "items": []
+      "items": [],
+      "modules/tuxemon.economy": "spyder_paper_mart"
     }
   },
 
@@ -27,5 +25,7 @@
         "area.sea-route-c"
       ]
     }
-  }
+  },
+
+  "modules/tuxemon.slug": "paper_town"
 }
diff --git a/db/areas/route1.json b/db/areas/route1.json
index 0c9523f..2fad568 100644
--- a/db/areas/route1.json
+++ b/db/areas/route1.json
@@ -1,10 +1,4 @@
 {
-  "name": "Route 1",
-
-  "encounter_slug": "route1",
-
-  "encounters": [],
-
   "requiredEncounters": 10,
 
   "trainers": [
@@ -30,8 +24,6 @@
     }
   ],
 
-  "environment_slug": "forest",
-
   "connections": {
     "paper-town": {
       "conditions": []
@@ -43,5 +35,9 @@
         "trainers"
       ]
     }
-  }
+  },
+
+  "modules/tuxemon.slug": "route1",
+  "modules/tuxemon.encounter": "route1",
+  "modules/tuxemon.environment": "forest"
 }
diff --git a/db/areas/route2.json b/db/areas/route2.json
index 5e56ad9..f753a70 100644
--- a/db/areas/route2.json
+++ b/db/areas/route2.json
@@ -1,10 +1,4 @@
 {
-  "name": "Route 2",
-
-  "encounter_slug": "route2",
-
-  "encounters": [],
-
   "requiredEncounters": 10,
 
   "trainers": [
@@ -28,8 +22,6 @@
     }
   ],
 
-  "environment_slug": "forest",
-
   "connections": {
     "cotton-town": {
       "conditions": []
@@ -41,5 +33,9 @@
         "trainers"
       ]
     }
-  }
+  },
+
+  "modules/tuxemon.slug": "route2",
+  "modules/tuxemon.encounter": "route2",
+  "modules/tuxemon.environment": "forest"
 }
diff --git a/db/areas/route3.json b/db/areas/route3.json
index 5dbcba3..947206e 100644
--- a/db/areas/route3.json
+++ b/db/areas/route3.json
@@ -1,10 +1,4 @@
 {
-  "name": "Route 3",
-
-  "encounter_slug": "route3",
-
-  "encounters": [],
-
   "requiredEncounters": 10,
 
   "trainers": [
@@ -24,8 +18,6 @@
     }
   ],
 
-  "environment_slug": "forest",
-
   "connections": {
     "leather-town": {
       "conditions": []
@@ -37,5 +29,9 @@
         "trainers"
       ]
     }
-  }
+  },
+
+  "modules/tuxemon.slug": "route3",
+  "modules/tuxemon.encounter": "route3",
+  "modules/tuxemon.environment": "forest"
 }
diff --git a/db/areas/route4.json b/db/areas/route4.json
index a0c4a97..225a884 100644
--- a/db/areas/route4.json
+++ b/db/areas/route4.json
@@ -1,10 +1,4 @@
 {
-  "name": "Route 4",
-
-  "encounter_slug": "route4",
-
-  "encounters": [],
-
   "requiredEncounters": 10,
 
   "trainers": [
@@ -46,8 +40,6 @@
     }
   ],
 
-  "environment_slug": "forest",
-
   "connections": {
     "route3": {
       "conditions": []
@@ -59,5 +51,9 @@
         "trainers"
       ]
     }
-  }
+  },
+
+  "modules/tuxemon.slug": "route4",
+  "modules/tuxemon.encounter": "route4",
+  "modules/tuxemon.environment": "forest"
 }
diff --git a/db/areas/route5.json b/db/areas/route5.json
index 368ddbc..7d4b7d8 100644
--- a/db/areas/route5.json
+++ b/db/areas/route5.json
@@ -1,10 +1,4 @@
 {
-  "name": "Route 5",
-
-  "encounter_slug": "route5",
-
-  "encounters": [],
-
   "requiredEncounters": 10,
 
   "trainers": [
@@ -28,8 +22,6 @@
     }
   ],
 
-  "environment_slug": "forest",
-
   "connections": {
     "flower-city": {
       "conditions": []
@@ -41,5 +33,9 @@
         "trainers"
       ]
     }
-  }
+  },
+
+  "modules/tuxemon.slug": "route5",
+  "modules/tuxemon.encounter": "route5",
+  "modules/tuxemon.environment": "forest"
 }
diff --git a/db/areas/route6.json b/db/areas/route6.json
index f30d050..c828830 100644
--- a/db/areas/route6.json
+++ b/db/areas/route6.json
@@ -1,10 +1,4 @@
 {
-  "name": "Route 6",
-
-  "encounter_slug": "route6",
-
-  "encounters": [],
-
   "requiredEncounters": 10,
 
   "trainers": [
@@ -28,8 +22,6 @@
     }
   ],
 
-  "environment_slug": "forest",
-
   "connections": {
     "tunnel-b": {
       "conditions": []
@@ -41,5 +33,9 @@
         "trainers"
       ]
     }
-  }
+  },
+
+  "modules/tuxemon.slug": "route6",
+  "modules/tuxemon.encounter": "route6",
+  "modules/tuxemon.environment": "forest"
 }
diff --git a/db/areas/route7.json b/db/areas/route7.json
index 647227a..bb94676 100644
--- a/db/areas/route7.json
+++ b/db/areas/route7.json
@@ -1,10 +1,4 @@
 {
-  "name": "Route 7",
-
-  "encounter_slug": "route7",
-
-  "encounters": [],
-
   "requiredEncounters": 10,
 
   "trainers": [
@@ -45,5 +39,9 @@
         "trainers"
       ]
     }
-  }
+  },
+
+  "modules/tuxemon.slug": "route7",
+  "modules/tuxemon.encounter": "route7",
+  "modules/tuxemon.environment": "forest"
 }
diff --git a/db/areas/sea-route-c.json b/db/areas/sea-route-c.json
index 34526f5..e6082db 100644
--- a/db/areas/sea-route-c.json
+++ b/db/areas/sea-route-c.json
@@ -1,10 +1,4 @@
 {
-  "name": "Sea Route C",
-
-  "encounter_slug": "default_encounter",
-
-  "encounters": [],
-
   "requiredEncounters": 10,
 
   "trainers": [
@@ -33,5 +27,9 @@
         "trainers"
       ]
     }
-  }
+  },
+
+  "modules/tuxemon.slug": "routec",
+  "modules/tuxemon.encounter": "default_encounter",
+  "modules/tuxemon.environment": "sea"
 }
diff --git a/db/areas/side-route-a.json b/db/areas/side-route-a.json
index b83c51b..78514b8 100644
--- a/db/areas/side-route-a.json
+++ b/db/areas/side-route-a.json
@@ -1,10 +1,4 @@
 {
-  "name": "Side Route A",
-
-  "encounter_slug": "default_encounter",
-
-  "encounters": [],
-
   "requiredEncounters": 10,
 
   "trainers": [
@@ -45,5 +39,9 @@
         "trainers"
       ]
     }
-  }
+  },
+
+  "modules/tuxemon.slug": "routea",
+  "modules/tuxemon.encounter": "default_encounter",
+  "modules/tuxemon.environment": "forest"
 }
diff --git a/db/areas/sphalian-town.json b/db/areas/sphalian-town.json
index 4c70aa5..6245659 100644
--- a/db/areas/sphalian-town.json
+++ b/db/areas/sphalian-town.json
@@ -1,6 +1,4 @@
 {
-  "name": "Sphalian Town",
-
   "locations": {
     "healing_center": {
       "type": "healingCenter",
@@ -16,5 +14,7 @@
     "lion-mountain": {
       "conditions": []
     }
-  }
+  },
+
+  "modules/tuxemon.slug": "sphalian_town"
 }
diff --git a/db/areas/timber-town.json b/db/areas/timber-town.json
index bfb9ca7..093633e 100644
--- a/db/areas/timber-town.json
+++ b/db/areas/timber-town.json
@@ -1,6 +1,4 @@
 {
-  "name": "Timber Town",
-
   "locations": {
     "healing_center": {
       "type": "healingCenter",
@@ -9,7 +7,7 @@
 
     "scoop_store": {
       "type": "shop",
-      "economy": "spyder_timber_scoop",
+      "modules/tuxemon.economy": "spyder_timber_scoop",
       "items": []
     }
   },
@@ -22,5 +20,7 @@
     "tunnel-b": {
       "conditions": []
     }
-  }
+  },
+
+  "modules/tuxemon.slug": "timber_town"
 }
diff --git a/db/areas/tunnel-b.json b/db/areas/tunnel-b.json
index 0e7954c..be85c96 100644
--- a/db/areas/tunnel-b.json
+++ b/db/areas/tunnel-b.json
@@ -1,10 +1,4 @@
 {
-  "name": "Tunnel B",
-
-  "encounter_slug": "default_encounter",
-
-  "encounters": [],
-
   "requiredEncounters": 10,
 
   "trainers": [
@@ -41,5 +35,9 @@
         "trainers"
       ]
     }
-  }
+  },
+
+  "modules/tuxemon.slug": "tunnel",
+  "modules/tuxemon.encounter": "default_encounter",
+  "modules/tuxemon.environment": "forest"
 }