translations and error handling

20 files changed, 20 insertions, 20 deletions

diff --git a/db/_generated/areas/candy-town.json b/db/_generated/areas/candy-town.json
index a11f4b4..1a165e8 100644
--- a/db/_generated/areas/candy-town.json
+++ b/db/_generated/areas/candy-town.json
@@ -1 +1 @@
-{"name":"Candy Town","locations":{"hospital":{"type":"healingCenter","price":30},"scoop_store":{"type":"shop","economy":"spyder_candy_scoop","items":[{"item_name":"potion","price":20,"cost":5},{"item_name":"revive","price":100,"cost":20},{"item_name":"tuxeball","price":50,"cost":10}]}},"connections":{"route6":{"conditions":[],"name":"Route 6"},"sea-route-c":{"conditions":[],"name":"Sea Route C"}},"encounters":[],"requiredEncounters":0,"trainers":[],"environment":null,"map":"<svg\n  version=\"1.1\"\n  xmlns=\"http:\/\/www.w3.org\/2000\/svg\"\n  viewbox=\"0 0 640 640\"\n>\n  <image href=\"\/db\/maps\/Candy_Town.png\" \/>\n\n  <rect data-location=\"hospital\" x=\"127\" y=\"431\" width=\"210\" height=\"130\" stroke=\"red\" fill=\"transparent\" \/>\n  <rect data-location=\"scoop_store\" x=\"17\" y=\"144\" width=\"80\" height=\"64\" stroke=\"red\" fill=\"transparent\" \/>\n<\/svg>\n"}
\ No newline at end of file
+{"locations":{"hospital":{"type":"healingCenter","price":30},"scoop_store":{"type":"shop","items":[{"item_name":"potion","price":20,"cost":5},{"item_name":"revive","price":100,"cost":20},{"item_name":"tuxeball","price":50,"cost":10}],"modules\/tuxemon.economy":"spyder_candy_scoop"}},"connections":{"route6":{"conditions":[],"modules\/tuxemon.slug":"route6"},"sea-route-c":{"conditions":[],"modules\/tuxemon.slug":"routec"}},"modules\/tuxemon.slug":"candy_town","encounters":[],"requiredEncounters":0,"trainers":[],"environment":null,"map":"<svg\n  version=\"1.1\"\n  xmlns=\"http:\/\/www.w3.org\/2000\/svg\"\n  viewbox=\"0 0 640 640\"\n>\n  <image href=\"\/db\/maps\/Candy_Town.png\" \/>\n\n  <rect data-location=\"hospital\" x=\"127\" y=\"431\" width=\"210\" height=\"130\" stroke=\"red\" fill=\"transparent\" \/>\n  <rect data-location=\"scoop_store\" x=\"17\" y=\"144\" width=\"80\" height=\"64\" stroke=\"red\" fill=\"transparent\" \/>\n<\/svg>\n"}
\ No newline at end of file
diff --git a/db/_generated/areas/city-park.json b/db/_generated/areas/city-park.json
index f6621fb..f7dbd7d 100644
--- a/db/_generated/areas/city-park.json
+++ b/db/_generated/areas/city-park.json
@@ -1 +1 @@
-{"name":"City Park","encounter_slug":"citypark","encounters":[{"monster":"cardiling","encounter_rate":3,"daytime":true,"exp_req_mod":1,"level_range":[5,8]},{"monster":"cardiwing","encounter_rate":1,"daytime":true,"exp_req_mod":1,"level_range":[8,11]},{"monster":"cataspike","encounter_rate":3,"daytime":true,"exp_req_mod":1,"level_range":[6,9]},{"monster":"eyenemy","encounter_rate":3,"daytime":true,"exp_req_mod":1,"level_range":[5,8]},{"monster":"axylightl","encounter_rate":3,"daytime":false,"exp_req_mod":1,"level_range":[8,12]},{"monster":"tourbidi","encounter_rate":1,"daytime":false,"exp_req_mod":1,"level_range":[8,12]},{"monster":"squabbit","encounter_rate":3,"daytime":false,"exp_req_mod":1,"level_range":[8,12]},{"monster":"puparmor","encounter_rate":1,"daytime":false,"exp_req_mod":1,"level_range":[9,14]}],"requiredEncounters":10,"trainers":[{"name":"Frances","sprite":"florist.png","monsters":[{"slug":"shybulb","level":8},{"slug":"shybulb","level":8}]}],"environment_slug":"forest","connections":{"route2":{"conditions":[],"name":"Route 2"},"leather-town":{"conditions":["encounters","trainers"],"name":"Leather Town"}},"environment":{"slug":"forest","battle_graphics":{"island_back":"woodland_island.png","island_front":"woodland_island.png","background":"forest_background.png"},"battle_music":"music_battle_loop"},"map":"<svg\n  version=\"1.1\"\n  xmlns=\"http:\/\/www.w3.org\/2000\/svg\"\n  viewbox=\"0 0 640 640\"\n>\n  <image href=\"\/db\/maps\/City_park.png\" \/>\n<\/svg>\n"}
\ No newline at end of file
+{"requiredEncounters":10,"trainers":[{"name":"Frances","sprite":"florist.png","monsters":[{"slug":"shybulb","level":8},{"slug":"shybulb","level":8}]}],"connections":{"route2":{"conditions":[],"modules\/tuxemon.slug":"route2"},"leather-town":{"conditions":["encounters","trainers"],"modules\/tuxemon.slug":"leather_town"}},"modules\/tuxemon.slug":"citypark","modules\/tuxemon.encounter":"citypark","modules\/tuxemon.environment":"forest","encounters":[{"monster":"cardiling","encounter_rate":3,"daytime":true,"exp_req_mod":1,"level_range":[5,8]},{"monster":"cardiwing","encounter_rate":1,"daytime":true,"exp_req_mod":1,"level_range":[8,11]},{"monster":"cataspike","encounter_rate":3,"daytime":true,"exp_req_mod":1,"level_range":[6,9]},{"monster":"eyenemy","encounter_rate":3,"daytime":true,"exp_req_mod":1,"level_range":[5,8]},{"monster":"axylightl","encounter_rate":3,"daytime":false,"exp_req_mod":1,"level_range":[8,12]},{"monster":"tourbidi","encounter_rate":1,"daytime":false,"exp_req_mod":1,"level_range":[8,12]},{"monster":"squabbit","encounter_rate":3,"daytime":false,"exp_req_mod":1,"level_range":[8,12]},{"monster":"puparmor","encounter_rate":1,"daytime":false,"exp_req_mod":1,"level_range":[9,14]}],"environment":{"slug":"forest","battle_graphics":{"island_back":"woodland_island.png","island_front":"woodland_island.png","background":"forest_background.png"},"battle_music":"music_battle_loop"},"map":"<svg\n  version=\"1.1\"\n  xmlns=\"http:\/\/www.w3.org\/2000\/svg\"\n  viewbox=\"0 0 640 640\"\n>\n  <image href=\"\/db\/maps\/City_park.png\" \/>\n<\/svg>\n"}
\ No newline at end of file
diff --git a/db/_generated/areas/cotton-town.json b/db/_generated/areas/cotton-town.json
index 43eb76c..c6bf453 100644
--- a/db/_generated/areas/cotton-town.json
+++ b/db/_generated/areas/cotton-town.json
@@ -1 +1 @@
-{"name":"Cotton Town","encounter_slug":"","encounters":[],"requiredEncounters":0,"trainers":[],"environment_slug":"interior","locations":{"healing_center":{"type":"healingCenter","price":10},"cotton_scoop":{"type":"shop","economy":"cotton_scoop","items":[{"item_name":"potion","price":20,"cost":5},{"item_name":"revive","price":100,"cost":20},{"item_name":"tuxeball","price":50,"cost":10}]}},"events":{"dryads-grove":false},"connections":{"route1":{"conditions":[],"name":"Route 1"},"route2":{"conditions":[],"name":"Route 2"},"dryads-grove":{"conditions":["event.dryads-grove"],"name":"Dryad's Grove"}},"environment":{"slug":"interior","battle_graphics":{"island_back":"paper_back_island.png","island_front":"paper_front_island.png","background":"battle_bg03.png"},"battle_music":"music_battle_loop"},"map":"<svg\n  version=\"1.1\"\n  xmlns=\"http:\/\/www.w3.org\/2000\/svg\"\n  viewbox=\"0 0 640 640\"\n>\n  <image href=\"\/db\/maps\/Cotton_town.png\" \/>\n\n  <text x=\"275\" y=\"445\">Healing Center<\/text>\n  <rect data-location=\"healing_center\" x=\"288\" y=\"368\" width=\"80\" height=\"64\" stroke=\"red\" fill=\"transparent\" \/>\n\n  <text x=\"470\" y=\"573\">Shop<\/text>\n  <rect data-location=\"cotton_scoop\" x=\"448\" y=\"496\" width=\"80\" height=\"64\" stroke=\"red\" fill=\"transparent\" \/>\n<\/svg>\n"}
\ No newline at end of file
+{"locations":{"healing_center":{"type":"healingCenter","price":10},"cotton_scoop":{"type":"shop","modules\/tuxemon.economy":"cotton_scoop","items":[{"item_name":"potion","price":20,"cost":5},{"item_name":"revive","price":100,"cost":20},{"item_name":"tuxeball","price":50,"cost":10}]}},"events":{"dryads-grove":false},"connections":{"route1":{"conditions":[],"modules\/tuxemon.slug":"route1"},"route2":{"conditions":[],"modules\/tuxemon.slug":"route2"},"dryads-grove":{"conditions":["event.dryads-grove"],"modules\/tuxemon.slug":"dryadsgrove"}},"modules\/tuxemon.slug":"cotton_town","encounters":[],"requiredEncounters":0,"trainers":[],"environment":null,"map":"<svg\n  version=\"1.1\"\n  xmlns=\"http:\/\/www.w3.org\/2000\/svg\"\n  viewbox=\"0 0 640 640\"\n>\n  <image href=\"\/db\/maps\/Cotton_town.png\" \/>\n\n  <text x=\"275\" y=\"445\">Healing Center<\/text>\n  <rect data-location=\"healing_center\" x=\"288\" y=\"368\" width=\"80\" height=\"64\" stroke=\"red\" fill=\"transparent\" \/>\n\n  <text x=\"470\" y=\"573\">Shop<\/text>\n  <rect data-location=\"cotton_scoop\" x=\"448\" y=\"496\" width=\"80\" height=\"64\" stroke=\"red\" fill=\"transparent\" \/>\n<\/svg>\n"}
\ No newline at end of file
diff --git a/db/_generated/areas/dryads-grove.json b/db/_generated/areas/dryads-grove.json
index 61275fe..d487005 100644
--- a/db/_generated/areas/dryads-grove.json
+++ b/db/_generated/areas/dryads-grove.json
@@ -1 +1 @@
-{"name":"Dryad's Grove","encounter_slug":"","encounters":[],"requiredEncounters":0,"trainers":[],"environment_slug":"interior","connections":[],"environment":{"slug":"interior","battle_graphics":{"island_back":"paper_back_island.png","island_front":"paper_front_island.png","background":"battle_bg03.png"},"battle_music":"music_battle_loop"},"map":false}
\ No newline at end of file
+{"connections":[],"modules\/tuxemon.slug":"dryadsgrove","encounters":[],"requiredEncounters":0,"trainers":[],"environment":null,"map":false}
\ No newline at end of file
diff --git a/db/_generated/areas/flower-city.json b/db/_generated/areas/flower-city.json
index 477399d..4249165 100644
--- a/db/_generated/areas/flower-city.json
+++ b/db/_generated/areas/flower-city.json
@@ -1 +1 @@
-{"name":"Flower City","encounter_slug":"","encounters":[],"requiredEncounters":0,"trainers":[],"environment_slug":"interior","locations":{"healing_center":{"type":"healingCenter","price":30},"scoop_store":{"type":"shop","economy":"spyder_flower_scoop","items":[{"item_name":"potion","price":20,"cost":5},{"item_name":"revive","price":100,"cost":20},{"item_name":"tuxeball","price":50,"cost":10}]}},"events":[],"connections":{"route4":{"conditions":[],"name":"Route 4"},"route5":{"conditions":[],"name":"Route 5"},"side-route-a":{"conditions":[],"name":"Side Route A"}},"environment":{"slug":"interior","battle_graphics":{"island_back":"paper_back_island.png","island_front":"paper_front_island.png","background":"battle_bg03.png"},"battle_music":"music_battle_loop"},"map":"<svg\n  version=\"1.1\"\n  xmlns=\"http:\/\/www.w3.org\/2000\/svg\"\n  viewbox=\"0 0 640 640\"\n>\n  <image href=\"\/db\/maps\/Flower_City.png\" \/>\n\n  <rect data-location=\"healing_center\" x=\"224\" y=\"192\" width=\"80\" height=\"64\" stroke=\"red\" fill=\"transparent\" \/>\n  <rect data-location=\"scoop_store\" x=\"368\" y=\"320\" width=\"80\" height=\"64\" stroke=\"red\" fill=\"transparent\" \/>\n<\/svg>\n"}
\ No newline at end of file
+{"locations":{"healing_center":{"type":"healingCenter","price":30},"scoop_store":{"type":"shop","modules\/tuxemon.economy":"spyder_flower_scoop","items":[{"item_name":"potion","price":20,"cost":5},{"item_name":"revive","price":100,"cost":20},{"item_name":"tuxeball","price":50,"cost":10}]}},"connections":{"route4":{"conditions":[],"modules\/tuxemon.slug":"route4"},"route5":{"conditions":[],"modules\/tuxemon.slug":"route5"},"side-route-a":{"conditions":[],"modules\/tuxemon.slug":"routea"}},"modules\/tuxemon.slug":"flower_city","encounters":[],"requiredEncounters":0,"trainers":[],"environment":null,"map":"<svg\n  version=\"1.1\"\n  xmlns=\"http:\/\/www.w3.org\/2000\/svg\"\n  viewbox=\"0 0 640 640\"\n>\n  <image href=\"\/db\/maps\/Flower_City.png\" \/>\n\n  <rect data-location=\"healing_center\" x=\"224\" y=\"192\" width=\"80\" height=\"64\" stroke=\"red\" fill=\"transparent\" \/>\n  <rect data-location=\"scoop_store\" x=\"368\" y=\"320\" width=\"80\" height=\"64\" stroke=\"red\" fill=\"transparent\" \/>\n<\/svg>\n"}
\ No newline at end of file
diff --git a/db/_generated/areas/leather-town.json b/db/_generated/areas/leather-town.json
index fc0e69e..d66725b 100644
--- a/db/_generated/areas/leather-town.json
+++ b/db/_generated/areas/leather-town.json
@@ -1 +1 @@
-{"name":"Leather Town","encounter_slug":"","encounters":[],"requiredEncounters":0,"trainers":[],"environment_slug":"interior","locations":{"healing_center":{"type":"healingCenter","price":20},"leather_scoop":{"type":"shop","economy":"leather_scoop","items":[{"item_name":"potion","price":20,"cost":5},{"item_name":"revive","price":100,"cost":20},{"item_name":"tuxeball","price":50,"cost":10}]}},"connections":{"city-park":{"conditions":[],"name":"City Park"},"route3":{"conditions":[],"name":"Route 3"}},"environment":{"slug":"interior","battle_graphics":{"island_back":"paper_back_island.png","island_front":"paper_front_island.png","background":"battle_bg03.png"},"battle_music":"music_battle_loop"},"map":"<svg\n  version=\"1.1\"\n  xmlns=\"http:\/\/www.w3.org\/2000\/svg\"\n  viewbox=\"0 0 640 640\"\n>\n  <image href=\"\/db\/maps\/Leather_Town.png\" \/>\n\n  <text x=\"323\" y=\"174\">Healing Center<\/text>\n  <rect data-location=\"healing_center\" x=\"336\" y=\"97\" width=\"80\" height=\"64\" stroke=\"red\" fill=\"transparent\" \/>\n\n  <text x=\"226\" y=\"174\">Shop<\/text>\n  <rect data-location=\"leather_scoop\" x=\"208\" y=\"97\" width=\"80\" height=\"64\" stroke=\"red\" fill=\"transparent\" \/>\n<\/svg>\n"}
\ No newline at end of file
+{"locations":{"healing_center":{"type":"healingCenter","price":20},"leather_scoop":{"type":"shop","modules\/tuxemon.economy":"leather_scoop","items":[{"item_name":"potion","price":20,"cost":5},{"item_name":"revive","price":100,"cost":20},{"item_name":"tuxeball","price":50,"cost":10}]}},"connections":{"city-park":{"conditions":[],"modules\/tuxemon.slug":"citypark"},"route3":{"conditions":[],"modules\/tuxemon.slug":"route3"}},"modules\/tuxemon.slug":"leather_town","encounters":[],"requiredEncounters":0,"trainers":[],"environment":null,"map":"<svg\n  version=\"1.1\"\n  xmlns=\"http:\/\/www.w3.org\/2000\/svg\"\n  viewbox=\"0 0 640 640\"\n>\n  <image href=\"\/db\/maps\/Leather_Town.png\" \/>\n\n  <text x=\"323\" y=\"174\">Healing Center<\/text>\n  <rect data-location=\"healing_center\" x=\"336\" y=\"97\" width=\"80\" height=\"64\" stroke=\"red\" fill=\"transparent\" \/>\n\n  <text x=\"226\" y=\"174\">Shop<\/text>\n  <rect data-location=\"leather_scoop\" x=\"208\" y=\"97\" width=\"80\" height=\"64\" stroke=\"red\" fill=\"transparent\" \/>\n<\/svg>\n"}
\ No newline at end of file
diff --git a/db/_generated/areas/lion-mountain.json b/db/_generated/areas/lion-mountain.json
index 9edf988..5590dce 100644
--- a/db/_generated/areas/lion-mountain.json
+++ b/db/_generated/areas/lion-mountain.json
@@ -1 +1 @@
-{"name":"Lion Mountain","encounter_slug":"lion_mountain","encounters":[{"monster":"snowrilla","encounter_rate":3.5,"daytime":true,"exp_req_mod":1,"level_range":[55,65]},{"monster":"snowrilla","encounter_rate":3.5,"daytime":false,"exp_req_mod":1,"level_range":[65,75]},{"monster":"tadcool","encounter_rate":3.5,"daytime":true,"exp_req_mod":1,"level_range":[55,65]},{"monster":"tadcool","encounter_rate":3.5,"daytime":false,"exp_req_mod":1,"level_range":[65,75]},{"monster":"chillimp","encounter_rate":3.5,"daytime":true,"exp_req_mod":1,"level_range":[55,65]},{"monster":"chillimp","encounter_rate":3.5,"daytime":false,"exp_req_mod":1,"level_range":[65,75]},{"monster":"tux","encounter_rate":3.5,"daytime":true,"exp_req_mod":1,"level_range":[55,65]},{"monster":"tux","encounter_rate":3.5,"daytime":false,"exp_req_mod":1,"level_range":[65,75]}],"requiredEncounters":10,"trainers":[{"name":"Miner Jacques","sprite":"monk.png","monsters":[{"slug":"heronquak","level":55},{"slug":"jemuar","level":60}]}],"environment_slug":"snow","connections":{"sphalian-town":{"conditions":[],"name":"Sphalian Town"}},"environment":{"slug":"snow","battle_graphics":{"island_back":"snow_island.png","island_front":"snow_island.png","background":"snow_background.png"},"battle_music":"music_battle_loop"},"map":"<svg\n  version=\"1.1\"\n  xmlns=\"http:\/\/www.w3.org\/2000\/svg\"\n  viewbox=\"0 0 720 1600\"\n>\n  <image href=\"\/db\/maps\/Buddha_mountain.png\" \/>\n<\/svg>\n"}
\ No newline at end of file
+{"requiredEncounters":10,"trainers":[{"name":"Miner Jacques","sprite":"monk.png","monsters":[{"slug":"heronquak","level":55},{"slug":"jemuar","level":60}]}],"connections":{"sphalian-town":{"conditions":[],"modules\/tuxemon.slug":"sphalian_town"}},"modules\/tuxemon.slug":"lion_mountain","modules\/tuxemon.encounter":"lion_mountain","modules\/tuxemon.environment":"snow","encounters":[{"monster":"snowrilla","encounter_rate":3.5,"daytime":true,"exp_req_mod":1,"level_range":[55,65]},{"monster":"snowrilla","encounter_rate":3.5,"daytime":false,"exp_req_mod":1,"level_range":[65,75]},{"monster":"tadcool","encounter_rate":3.5,"daytime":true,"exp_req_mod":1,"level_range":[55,65]},{"monster":"tadcool","encounter_rate":3.5,"daytime":false,"exp_req_mod":1,"level_range":[65,75]},{"monster":"chillimp","encounter_rate":3.5,"daytime":true,"exp_req_mod":1,"level_range":[55,65]},{"monster":"chillimp","encounter_rate":3.5,"daytime":false,"exp_req_mod":1,"level_range":[65,75]},{"monster":"tux","encounter_rate":3.5,"daytime":true,"exp_req_mod":1,"level_range":[55,65]},{"monster":"tux","encounter_rate":3.5,"daytime":false,"exp_req_mod":1,"level_range":[65,75]}],"environment":{"slug":"snow","battle_graphics":{"island_back":"snow_island.png","island_front":"snow_island.png","background":"snow_background.png"},"battle_music":"music_battle_loop"},"map":"<svg\n  version=\"1.1\"\n  xmlns=\"http:\/\/www.w3.org\/2000\/svg\"\n  viewbox=\"0 0 720 1600\"\n>\n  <image href=\"\/db\/maps\/Buddha_mountain.png\" \/>\n<\/svg>\n"}
\ No newline at end of file
diff --git a/db/_generated/areas/paper-town.json b/db/_generated/areas/paper-town.json
index 0a763ad..304459b 100644
--- a/db/_generated/areas/paper-town.json
+++ b/db/_generated/areas/paper-town.json
@@ -1 +1 @@
-{"name":"Paper Town","locations":{"scoop_store":{"type":"shop","economy":"spyder_paper_mart","items":[{"item_name":"potion","price":20,"cost":5},{"item_name":"revive","price":100,"cost":20},{"item_name":"tuxeball","price":50,"cost":10}]}},"connections":{"route1":{"conditions":["encounters","trainers"],"name":"Route 1"},"sea-route-c":{"conditions":["area.sea-route-c"],"name":"Sea Route C"}},"encounters":[],"requiredEncounters":0,"trainers":[],"environment":null,"map":"<svg\n  version=\"1.1\"\n  xmlns=\"http:\/\/www.w3.org\/2000\/svg\"\n  viewbox=\"0 0 640 320\"\n>\n  <image href=\"\/db\/maps\/Paper_town.png\" \/>\n\n  <text x=\"294\" y=\"221\">Shop<\/text>\n  <rect data-location=\"scoop_store\" x=\"272\" y=\"144\" width=\"80\" height=\"64\" stroke=\"red\" fill=\"transparent\" \/>\n<\/svg>\n"}
\ No newline at end of file
+{"locations":{"home":{"type":"healingCenter","price":0},"scoop_store":{"type":"shop","items":[{"item_name":"potion","price":20,"cost":5},{"item_name":"revive","price":100,"cost":20},{"item_name":"tuxeball","price":50,"cost":10}],"modules\/tuxemon.economy":"spyder_paper_mart"}},"connections":{"route1":{"conditions":["encounters","trainers"],"modules\/tuxemon.slug":"route1"},"sea-route-c":{"conditions":["area.sea-route-c"],"modules\/tuxemon.slug":"routec"}},"modules\/tuxemon.slug":"paper_town","encounters":[],"requiredEncounters":0,"trainers":[],"environment":null,"map":"<svg\n  version=\"1.1\"\n  xmlns=\"http:\/\/www.w3.org\/2000\/svg\"\n  viewbox=\"0 0 640 320\"\n>\n  <image href=\"\/db\/maps\/Paper_town.png\" \/>\n\n  <rect data-location=\"home\" x=\"113\" y=\"21\" width=\"78\" height=\"92\" stroke=\"red\" fill=\"transparent\" \/>\n  <rect data-location=\"scoop_store\" x=\"272\" y=\"144\" width=\"80\" height=\"64\" stroke=\"red\" fill=\"transparent\" \/>\n<\/svg>\n"}
\ No newline at end of file
diff --git a/db/_generated/areas/route1.json b/db/_generated/areas/route1.json
index d9b88ed..eb4c099 100644
--- a/db/_generated/areas/route1.json
+++ b/db/_generated/areas/route1.json
@@ -1 +1 @@
-{"name":"Route 1","encounter_slug":"route1","encounters":[{"monster":"pairagrin","encounter_rate":3.5,"daytime":true,"exp_req_mod":1,"level_range":[2,4]},{"monster":"aardorn","encounter_rate":3.5,"daytime":true,"exp_req_mod":1,"level_range":[2,4]},{"monster":"cataspike","encounter_rate":3.5,"daytime":true,"exp_req_mod":1,"level_range":[2,4]},{"monster":"pairagrin","encounter_rate":3.5,"daytime":false,"exp_req_mod":1,"level_range":[3,5]},{"monster":"aardorn","encounter_rate":3.5,"daytime":false,"exp_req_mod":1,"level_range":[3,5]},{"monster":"cataspike","encounter_rate":3.5,"daytime":false,"exp_req_mod":1,"level_range":[3,5]}],"requiredEncounters":10,"trainers":[{"name":"Bruder Mikki","sprite":"adventurer.png","monsters":[{"slug":"memnomnom","level":5},{"slug":"jelillow","level":5}],"inventory":[{"slug":"potion","quantity":2}]}],"environment_slug":"forest","connections":{"paper-town":{"conditions":[],"name":"Paper Town"},"cotton-town":{"conditions":["encounters","trainers"],"name":"Cotton Town"}},"environment":{"slug":"forest","battle_graphics":{"island_back":"woodland_island.png","island_front":"woodland_island.png","background":"forest_background.png"},"battle_music":"music_battle_loop"},"map":"<svg\n  version=\"1.1\"\n  xmlns=\"http:\/\/www.w3.org\/2000\/svg\"\n  viewbox=\"0 0 640 320\"\n>\n  <image href=\"\/db\/maps\/Route_1.png\" \/>\n<\/svg>\n"}
\ No newline at end of file
+{"requiredEncounters":10,"trainers":[{"name":"Bruder Mikki","sprite":"adventurer.png","monsters":[{"slug":"memnomnom","level":5},{"slug":"jelillow","level":5}],"inventory":[{"slug":"potion","quantity":2}]}],"connections":{"paper-town":{"conditions":[],"modules\/tuxemon.slug":"paper_town"},"cotton-town":{"conditions":["encounters","trainers"],"modules\/tuxemon.slug":"cotton_town"}},"modules\/tuxemon.slug":"route1","modules\/tuxemon.encounter":"route1","modules\/tuxemon.environment":"forest","encounters":[{"monster":"pairagrin","encounter_rate":3.5,"daytime":true,"exp_req_mod":1,"level_range":[2,4]},{"monster":"aardorn","encounter_rate":3.5,"daytime":true,"exp_req_mod":1,"level_range":[2,4]},{"monster":"cataspike","encounter_rate":3.5,"daytime":true,"exp_req_mod":1,"level_range":[2,4]},{"monster":"pairagrin","encounter_rate":3.5,"daytime":false,"exp_req_mod":1,"level_range":[3,5]},{"monster":"aardorn","encounter_rate":3.5,"daytime":false,"exp_req_mod":1,"level_range":[3,5]},{"monster":"cataspike","encounter_rate":3.5,"daytime":false,"exp_req_mod":1,"level_range":[3,5]}],"environment":{"slug":"forest","battle_graphics":{"island_back":"woodland_island.png","island_front":"woodland_island.png","background":"forest_background.png"},"battle_music":"music_battle_loop"},"map":"<svg\n  version=\"1.1\"\n  xmlns=\"http:\/\/www.w3.org\/2000\/svg\"\n  viewbox=\"0 0 640 320\"\n>\n  <image href=\"\/db\/maps\/Route_1.png\" \/>\n<\/svg>\n"}
\ No newline at end of file
diff --git a/db/_generated/areas/route2.json b/db/_generated/areas/route2.json
index 5511453..c9467de 100644
--- a/db/_generated/areas/route2.json
+++ b/db/_generated/areas/route2.json
@@ -1 +1 @@
-{"name":"Route 2","encounter_slug":"route2","encounters":[{"monster":"cardiling","encounter_rate":2.5,"daytime":true,"exp_req_mod":1,"level_range":[3,6]},{"monster":"aardorn","encounter_rate":2.5,"daytime":true,"exp_req_mod":1,"level_range":[3,6]},{"monster":"eyenemy","encounter_rate":2.5,"daytime":true,"exp_req_mod":1,"level_range":[3,6]},{"monster":"axylightl","encounter_rate":1,"daytime":true,"exp_req_mod":1,"level_range":[4,7]},{"monster":"cataspike","encounter_rate":2.5,"daytime":true,"exp_req_mod":1,"level_range":[3,6]},{"monster":"cardiling","encounter_rate":2.5,"daytime":false,"exp_req_mod":1,"level_range":[3,6]},{"monster":"aardorn","encounter_rate":2.5,"daytime":false,"exp_req_mod":1,"level_range":[4,8]},{"monster":"eyenemy","encounter_rate":2.5,"daytime":false,"exp_req_mod":1,"level_range":[4,8]},{"monster":"axylightl","encounter_rate":1,"daytime":false,"exp_req_mod":1,"level_range":[5,8]},{"monster":"cataspike","encounter_rate":2.5,"daytime":false,"exp_req_mod":1,"level_range":[4,8]}],"requiredEncounters":10,"trainers":[{"name":"Rival Billie","sprite":"fashionista.png","monsters":[{"slug":"cardiling","level":3},{"slug":"eyenemy","level":6},{"slug":"STARTER","level":6}]}],"environment_slug":"forest","connections":{"cotton-town":{"conditions":[],"name":"Cotton Town"},"city-park":{"conditions":["encounters","trainers"],"name":"City Park"}},"environment":{"slug":"forest","battle_graphics":{"island_back":"woodland_island.png","island_front":"woodland_island.png","background":"forest_background.png"},"battle_music":"music_battle_loop"},"map":"<svg\n  version=\"1.1\"\n  xmlns=\"http:\/\/www.w3.org\/2000\/svg\"\n  viewbox=\"0 0 640 320\"\n>\n  <image href=\"\/db\/maps\/Route_2.png\" \/>\n<\/svg>\n"}
\ No newline at end of file
+{"requiredEncounters":10,"trainers":[{"name":"Rival Billie","sprite":"fashionista.png","monsters":[{"slug":"cardiling","level":3},{"slug":"eyenemy","level":6},{"slug":"STARTER","level":6}]}],"connections":{"cotton-town":{"conditions":[],"modules\/tuxemon.slug":"cotton_town"},"city-park":{"conditions":["encounters","trainers"],"modules\/tuxemon.slug":"citypark"}},"modules\/tuxemon.slug":"route2","modules\/tuxemon.encounter":"route2","modules\/tuxemon.environment":"forest","encounters":[{"monster":"cardiling","encounter_rate":2.5,"daytime":true,"exp_req_mod":1,"level_range":[3,6]},{"monster":"aardorn","encounter_rate":2.5,"daytime":true,"exp_req_mod":1,"level_range":[3,6]},{"monster":"eyenemy","encounter_rate":2.5,"daytime":true,"exp_req_mod":1,"level_range":[3,6]},{"monster":"axylightl","encounter_rate":1,"daytime":true,"exp_req_mod":1,"level_range":[4,7]},{"monster":"cataspike","encounter_rate":2.5,"daytime":true,"exp_req_mod":1,"level_range":[3,6]},{"monster":"cardiling","encounter_rate":2.5,"daytime":false,"exp_req_mod":1,"level_range":[3,6]},{"monster":"aardorn","encounter_rate":2.5,"daytime":false,"exp_req_mod":1,"level_range":[4,8]},{"monster":"eyenemy","encounter_rate":2.5,"daytime":false,"exp_req_mod":1,"level_range":[4,8]},{"monster":"axylightl","encounter_rate":1,"daytime":false,"exp_req_mod":1,"level_range":[5,8]},{"monster":"cataspike","encounter_rate":2.5,"daytime":false,"exp_req_mod":1,"level_range":[4,8]}],"environment":{"slug":"forest","battle_graphics":{"island_back":"woodland_island.png","island_front":"woodland_island.png","background":"forest_background.png"},"battle_music":"music_battle_loop"},"map":"<svg\n  version=\"1.1\"\n  xmlns=\"http:\/\/www.w3.org\/2000\/svg\"\n  viewbox=\"0 0 640 320\"\n>\n  <image href=\"\/db\/maps\/Route_2.png\" \/>\n<\/svg>\n"}
\ No newline at end of file
diff --git a/db/_generated/areas/route3.json b/db/_generated/areas/route3.json
index ca197c7..2e12a52 100644
--- a/db/_generated/areas/route3.json
+++ b/db/_generated/areas/route3.json
@@ -1 +1 @@
-{"name":"Route 3","encounter_slug":"route3","encounters":[{"monster":"cardiling","encounter_rate":3,"daytime":true,"exp_req_mod":1,"level_range":[7,10]},{"monster":"elofly","encounter_rate":3,"daytime":true,"exp_req_mod":1,"level_range":[7,10]},{"monster":"squabbit","encounter_rate":1,"daytime":true,"exp_req_mod":1,"level_range":[8,11]},{"monster":"shybulb","encounter_rate":3,"daytime":true,"exp_req_mod":1,"level_range":[7,10]},{"monster":"cardiling","encounter_rate":3,"daytime":false,"exp_req_mod":1,"level_range":[9,12]},{"monster":"elofly","encounter_rate":3,"daytime":false,"exp_req_mod":1,"level_range":[9,12]},{"monster":"squabbit","encounter_rate":1,"daytime":false,"exp_req_mod":1,"level_range":[9,12]},{"monster":"shybulb","encounter_rate":3,"daytime":false,"exp_req_mod":1,"level_range":[9,12]}],"requiredEncounters":10,"trainers":[{"name":"Miner Roxby","sprite":"miner.png","monsters":[{"slug":"rockitten","level":13},{"slug":"ignibus","level":13}]}],"environment_slug":"forest","connections":{"leather-town":{"conditions":[],"name":"Leather Town"},"route4":{"conditions":["encounters","trainers"],"name":"Route 4"}},"environment":{"slug":"forest","battle_graphics":{"island_back":"woodland_island.png","island_front":"woodland_island.png","background":"forest_background.png"},"battle_music":"music_battle_loop"},"map":"<svg\n  version=\"1.1\"\n  xmlns=\"http:\/\/www.w3.org\/2000\/svg\"\n  viewbox=\"0 0 640 640\"\n>\n  <image href=\"\/db\/maps\/Route_3.png\" \/>\n<\/svg>\n"}
\ No newline at end of file
+{"requiredEncounters":10,"trainers":[{"name":"Miner Roxby","sprite":"miner.png","monsters":[{"slug":"rockitten","level":13},{"slug":"ignibus","level":13}]}],"connections":{"leather-town":{"conditions":[],"modules\/tuxemon.slug":"leather_town"},"route4":{"conditions":["encounters","trainers"],"modules\/tuxemon.slug":"route4"}},"modules\/tuxemon.slug":"route3","modules\/tuxemon.encounter":"route3","modules\/tuxemon.environment":"forest","encounters":[{"monster":"cardiling","encounter_rate":3,"daytime":true,"exp_req_mod":1,"level_range":[7,10]},{"monster":"elofly","encounter_rate":3,"daytime":true,"exp_req_mod":1,"level_range":[7,10]},{"monster":"squabbit","encounter_rate":1,"daytime":true,"exp_req_mod":1,"level_range":[8,11]},{"monster":"shybulb","encounter_rate":3,"daytime":true,"exp_req_mod":1,"level_range":[7,10]},{"monster":"cardiling","encounter_rate":3,"daytime":false,"exp_req_mod":1,"level_range":[9,12]},{"monster":"elofly","encounter_rate":3,"daytime":false,"exp_req_mod":1,"level_range":[9,12]},{"monster":"squabbit","encounter_rate":1,"daytime":false,"exp_req_mod":1,"level_range":[9,12]},{"monster":"shybulb","encounter_rate":3,"daytime":false,"exp_req_mod":1,"level_range":[9,12]}],"environment":{"slug":"forest","battle_graphics":{"island_back":"woodland_island.png","island_front":"woodland_island.png","background":"forest_background.png"},"battle_music":"music_battle_loop"},"map":"<svg\n  version=\"1.1\"\n  xmlns=\"http:\/\/www.w3.org\/2000\/svg\"\n  viewbox=\"0 0 640 640\"\n>\n  <image href=\"\/db\/maps\/Route_3.png\" \/>\n<\/svg>\n"}
\ No newline at end of file
diff --git a/db/_generated/areas/route4.json b/db/_generated/areas/route4.json
index 0e2fe11..0a0165a 100644
--- a/db/_generated/areas/route4.json
+++ b/db/_generated/areas/route4.json
@@ -1 +1 @@
-{"name":"Route 4","encounter_slug":"route4","encounters":[{"monster":"elofly","encounter_rate":3,"daytime":true,"exp_req_mod":1,"level_range":[11,14]},{"monster":"sapsnap","encounter_rate":1,"daytime":true,"exp_req_mod":1,"level_range":[12,15]},{"monster":"aardorn","encounter_rate":3,"daytime":true,"exp_req_mod":1,"level_range":[11,14]},{"monster":"katapill","encounter_rate":3,"daytime":true,"exp_req_mod":1,"level_range":[11,14]},{"monster":"elofly","encounter_rate":3,"daytime":false,"exp_req_mod":1,"level_range":[13,16]},{"monster":"sapsnap","encounter_rate":1,"daytime":false,"exp_req_mod":1,"level_range":[13,16]},{"monster":"aardorn","encounter_rate":3,"daytime":false,"exp_req_mod":1,"level_range":[13,16]},{"monster":"katapill","encounter_rate":3,"daytime":false,"exp_req_mod":1,"level_range":[13,16]}],"requiredEncounters":10,"trainers":[{"name":"Soldier Marshall","sprite":"soldier.png","monsters":[{"slug":"puparmor","level":16},{"slug":"puparmor","level":16}]},{"name":"Rival Billie","sprite":"fashionista.png","monsters":[{"slug":"cardiwing","level":16},{"slug":"eyesore","level":16},{"slug":"viviphyta","level":16},{"slug":"STARTER","level":18}]}],"environment_slug":"forest","connections":{"route3":{"conditions":[],"name":"Route 3"},"flower-city":{"conditions":["encounters","trainers"],"name":"Flower City"}},"environment":{"slug":"forest","battle_graphics":{"island_back":"woodland_island.png","island_front":"woodland_island.png","background":"forest_background.png"},"battle_music":"music_battle_loop"},"map":"<svg\n  version=\"1.1\"\n  xmlns=\"http:\/\/www.w3.org\/2000\/svg\"\n  viewbox=\"0 0 320 640\"\n>\n  <image href=\"\/db\/maps\/Route_4.png\" \/>\n<\/svg>\n"}
\ No newline at end of file
+{"requiredEncounters":10,"trainers":[{"name":"Soldier Marshall","sprite":"soldier.png","monsters":[{"slug":"puparmor","level":16},{"slug":"puparmor","level":16}]},{"name":"Rival Billie","sprite":"fashionista.png","monsters":[{"slug":"cardiwing","level":16},{"slug":"eyesore","level":16},{"slug":"viviphyta","level":16},{"slug":"STARTER","level":18}]}],"connections":{"route3":{"conditions":[],"modules\/tuxemon.slug":"route3"},"flower-city":{"conditions":["encounters","trainers"],"modules\/tuxemon.slug":"flower_city"}},"modules\/tuxemon.slug":"route4","modules\/tuxemon.encounter":"route4","modules\/tuxemon.environment":"forest","encounters":[{"monster":"elofly","encounter_rate":3,"daytime":true,"exp_req_mod":1,"level_range":[11,14]},{"monster":"sapsnap","encounter_rate":1,"daytime":true,"exp_req_mod":1,"level_range":[12,15]},{"monster":"aardorn","encounter_rate":3,"daytime":true,"exp_req_mod":1,"level_range":[11,14]},{"monster":"katapill","encounter_rate":3,"daytime":true,"exp_req_mod":1,"level_range":[11,14]},{"monster":"elofly","encounter_rate":3,"daytime":false,"exp_req_mod":1,"level_range":[13,16]},{"monster":"sapsnap","encounter_rate":1,"daytime":false,"exp_req_mod":1,"level_range":[13,16]},{"monster":"aardorn","encounter_rate":3,"daytime":false,"exp_req_mod":1,"level_range":[13,16]},{"monster":"katapill","encounter_rate":3,"daytime":false,"exp_req_mod":1,"level_range":[13,16]}],"environment":{"slug":"forest","battle_graphics":{"island_back":"woodland_island.png","island_front":"woodland_island.png","background":"forest_background.png"},"battle_music":"music_battle_loop"},"map":"<svg\n  version=\"1.1\"\n  xmlns=\"http:\/\/www.w3.org\/2000\/svg\"\n  viewbox=\"0 0 320 640\"\n>\n  <image href=\"\/db\/maps\/Route_4.png\" \/>\n<\/svg>\n"}
\ No newline at end of file
diff --git a/db/_generated/areas/route5.json b/db/_generated/areas/route5.json
index e0677fe..47adfaf 100644
--- a/db/_generated/areas/route5.json
+++ b/db/_generated/areas/route5.json
@@ -1 +1 @@
-{"name":"Route 5","encounter_slug":"route5","encounters":[{"monster":"foofle","encounter_rate":3,"daytime":true,"exp_req_mod":1,"level_range":[19,23]},{"monster":"vamporm","encounter_rate":3,"daytime":true,"exp_req_mod":1,"level_range":[16,20]},{"monster":"dracune","encounter_rate":1,"daytime":true,"exp_req_mod":1,"level_range":[18,22]},{"monster":"anoleaf","encounter_rate":3,"daytime":false,"exp_req_mod":1,"level_range":[18,22]},{"monster":"gectile","encounter_rate":1,"daytime":false,"exp_req_mod":1,"level_range":[22,26]}],"requiredEncounters":10,"trainers":[{"name":"Soldier Hunter","sprite":"soldier.png","monsters":[{"slug":"elofly","level":16},{"slug":"elofly","level":16},{"slug":"elowind","level":18}]}],"environment_slug":"forest","connections":{"flower-city":{"conditions":[],"name":"Flower City"},"timber-town":{"conditions":["encounters","trainers"],"name":"Timber Town"}},"environment":{"slug":"forest","battle_graphics":{"island_back":"woodland_island.png","island_front":"woodland_island.png","background":"forest_background.png"},"battle_music":"music_battle_loop"},"map":"<svg\n  version=\"1.1\"\n  xmlns=\"http:\/\/www.w3.org\/2000\/svg\"\n  viewbox=\"0 0 640 320\"\n>\n  <image href=\"\/db\/maps\/Route_5.png\" \/>\n<\/svg>\n"}
\ No newline at end of file
+{"requiredEncounters":10,"trainers":[{"name":"Soldier Hunter","sprite":"soldier.png","monsters":[{"slug":"elofly","level":16},{"slug":"elofly","level":16},{"slug":"elowind","level":18}]}],"connections":{"flower-city":{"conditions":[],"modules\/tuxemon.slug":"flower_city"},"timber-town":{"conditions":["encounters","trainers"],"modules\/tuxemon.slug":"timber_town"}},"modules\/tuxemon.slug":"route5","modules\/tuxemon.encounter":"route5","modules\/tuxemon.environment":"forest","encounters":[{"monster":"foofle","encounter_rate":3,"daytime":true,"exp_req_mod":1,"level_range":[19,23]},{"monster":"vamporm","encounter_rate":3,"daytime":true,"exp_req_mod":1,"level_range":[16,20]},{"monster":"dracune","encounter_rate":1,"daytime":true,"exp_req_mod":1,"level_range":[18,22]},{"monster":"anoleaf","encounter_rate":3,"daytime":false,"exp_req_mod":1,"level_range":[18,22]},{"monster":"gectile","encounter_rate":1,"daytime":false,"exp_req_mod":1,"level_range":[22,26]}],"environment":{"slug":"forest","battle_graphics":{"island_back":"woodland_island.png","island_front":"woodland_island.png","background":"forest_background.png"},"battle_music":"music_battle_loop"},"map":"<svg\n  version=\"1.1\"\n  xmlns=\"http:\/\/www.w3.org\/2000\/svg\"\n  viewbox=\"0 0 640 320\"\n>\n  <image href=\"\/db\/maps\/Route_5.png\" \/>\n<\/svg>\n"}
\ No newline at end of file
diff --git a/db/_generated/areas/route6.json b/db/_generated/areas/route6.json
index 3c8f520..c30cc96 100644
--- a/db/_generated/areas/route6.json
+++ b/db/_generated/areas/route6.json
@@ -1 +1 @@
-{"name":"Route 6","encounter_slug":"route6","encounters":[{"monster":"dandicub","encounter_rate":10,"daytime":true,"exp_req_mod":1,"level_range":[19,20]},{"monster":"dandylion","encounter_rate":5,"daytime":true,"exp_req_mod":1,"level_range":[21,23]},{"monster":"capiti","encounter_rate":10,"daytime":true,"exp_req_mod":1,"level_range":[19,22]},{"monster":"dandicub","encounter_rate":10,"daytime":false,"exp_req_mod":1,"level_range":[20,24]},{"monster":"dandylion","encounter_rate":5,"daytime":false,"exp_req_mod":1,"level_range":[22,24]},{"monster":"capiti","encounter_rate":10,"daytime":false,"exp_req_mod":1,"level_range":[20,24]}],"requiredEncounters":10,"trainers":[{"name":"Florist Frances","sprite":"florist.png","monsters":[{"slug":"narcileaf","level":30},{"slug":"shybulb","level":30},{"slug":"shybulb","level":30}]}],"environment_slug":"forest","connections":{"tunnel-b":{"conditions":[],"name":"Tunnel B"},"candy-town":{"conditions":["encounters","trainers"],"name":"Candy Town"}},"environment":{"slug":"forest","battle_graphics":{"island_back":"woodland_island.png","island_front":"woodland_island.png","background":"forest_background.png"},"battle_music":"music_battle_loop"},"map":"<svg\n  version=\"1.1\"\n  xmlns=\"http:\/\/www.w3.org\/2000\/svg\"\n  viewbox=\"0 0 640 320\"\n>\n  <image href=\"\/db\/maps\/Route_6.png\" \/>\n<\/svg>\n"}
\ No newline at end of file
+{"requiredEncounters":10,"trainers":[{"name":"Florist Frances","sprite":"florist.png","monsters":[{"slug":"narcileaf","level":30},{"slug":"shybulb","level":30},{"slug":"shybulb","level":30}]}],"connections":{"tunnel-b":{"conditions":[],"modules\/tuxemon.slug":"tunnel"},"candy-town":{"conditions":["encounters","trainers"],"modules\/tuxemon.slug":"candy_town"}},"modules\/tuxemon.slug":"route6","modules\/tuxemon.encounter":"route6","modules\/tuxemon.environment":"forest","encounters":[{"monster":"dandicub","encounter_rate":10,"daytime":true,"exp_req_mod":1,"level_range":[19,20]},{"monster":"dandylion","encounter_rate":5,"daytime":true,"exp_req_mod":1,"level_range":[21,23]},{"monster":"capiti","encounter_rate":10,"daytime":true,"exp_req_mod":1,"level_range":[19,22]},{"monster":"dandicub","encounter_rate":10,"daytime":false,"exp_req_mod":1,"level_range":[20,24]},{"monster":"dandylion","encounter_rate":5,"daytime":false,"exp_req_mod":1,"level_range":[22,24]},{"monster":"capiti","encounter_rate":10,"daytime":false,"exp_req_mod":1,"level_range":[20,24]}],"environment":{"slug":"forest","battle_graphics":{"island_back":"woodland_island.png","island_front":"woodland_island.png","background":"forest_background.png"},"battle_music":"music_battle_loop"},"map":"<svg\n  version=\"1.1\"\n  xmlns=\"http:\/\/www.w3.org\/2000\/svg\"\n  viewbox=\"0 0 640 320\"\n>\n  <image href=\"\/db\/maps\/Route_6.png\" \/>\n<\/svg>\n"}
\ No newline at end of file
diff --git a/db/_generated/areas/route7.json b/db/_generated/areas/route7.json
index dffa7b4..7f27141 100644
--- a/db/_generated/areas/route7.json
+++ b/db/_generated/areas/route7.json
@@ -1 +1 @@
-{"name":"Route 7","encounter_slug":"route7","encounters":[{"monster":"pairagrim","encounter_rate":3.5,"daytime":true,"exp_req_mod":1,"level_range":[35,40]},{"monster":"aardart","encounter_rate":3.5,"daytime":true,"exp_req_mod":1,"level_range":[35,40]},{"monster":"weavifly","encounter_rate":3.5,"daytime":true,"exp_req_mod":1,"level_range":[35,40]},{"monster":"pantherafira","encounter_rate":3.5,"daytime":false,"exp_req_mod":1,"level_range":[35,40]},{"monster":"flacono","encounter_rate":3.5,"daytime":false,"exp_req_mod":1,"level_range":[35,40]},{"monster":"slichen","encounter_rate":3.5,"daytime":false,"exp_req_mod":1,"level_range":[35,40]}],"requiredEncounters":10,"trainers":[{"name":"Monk Statius","sprite":"monk.png","monsters":[{"slug":"aardart","level":30},{"slug":"pairagrim","level":30},{"slug":"bolt","level":30},{"slug":"fribbit","level":30}]}],"environment_slug":"forest","connections":{"side-route-a":{"conditions":[],"name":"Side Route A"},"sphalian-town":{"conditions":["encounters","trainers"],"name":"Sphalian Town"}},"environment":{"slug":"forest","battle_graphics":{"island_back":"woodland_island.png","island_front":"woodland_island.png","background":"forest_background.png"},"battle_music":"music_battle_loop"},"map":"<svg\n  version=\"1.1\"\n  xmlns=\"http:\/\/www.w3.org\/2000\/svg\"\n  viewbox=\"0 0 640 640\"\n>\n  <image href=\"\/db\/maps\/Route_7.png\" \/>\n<\/svg>\n"}
\ No newline at end of file
+{"requiredEncounters":10,"trainers":[{"name":"Monk Statius","sprite":"monk.png","monsters":[{"slug":"aardart","level":30},{"slug":"pairagrim","level":30},{"slug":"bolt","level":30},{"slug":"fribbit","level":30}]}],"environment_slug":"forest","connections":{"side-route-a":{"conditions":[],"modules\/tuxemon.slug":"routea"},"sphalian-town":{"conditions":["encounters","trainers"],"modules\/tuxemon.slug":"sphalian_town"}},"modules\/tuxemon.slug":"route7","modules\/tuxemon.encounter":"route7","modules\/tuxemon.environment":"forest","encounters":[{"monster":"pairagrim","encounter_rate":3.5,"daytime":true,"exp_req_mod":1,"level_range":[35,40]},{"monster":"aardart","encounter_rate":3.5,"daytime":true,"exp_req_mod":1,"level_range":[35,40]},{"monster":"weavifly","encounter_rate":3.5,"daytime":true,"exp_req_mod":1,"level_range":[35,40]},{"monster":"pantherafira","encounter_rate":3.5,"daytime":false,"exp_req_mod":1,"level_range":[35,40]},{"monster":"flacono","encounter_rate":3.5,"daytime":false,"exp_req_mod":1,"level_range":[35,40]},{"monster":"slichen","encounter_rate":3.5,"daytime":false,"exp_req_mod":1,"level_range":[35,40]}],"environment":{"slug":"forest","battle_graphics":{"island_back":"woodland_island.png","island_front":"woodland_island.png","background":"forest_background.png"},"battle_music":"music_battle_loop"},"map":"<svg\n  version=\"1.1\"\n  xmlns=\"http:\/\/www.w3.org\/2000\/svg\"\n  viewbox=\"0 0 640 640\"\n>\n  <image href=\"\/db\/maps\/Route_7.png\" \/>\n<\/svg>\n"}
\ No newline at end of file
diff --git a/db/_generated/areas/sea-route-c.json b/db/_generated/areas/sea-route-c.json
index 5045969..4b83f12 100644
--- a/db/_generated/areas/sea-route-c.json
+++ b/db/_generated/areas/sea-route-c.json
@@ -1 +1 @@
-{"name":"Sea Route C","encounter_slug":"default_encounter","encounters":[{"encounter_rate":0.5,"daytime":true,"exp_req_mod":1,"level_range":[2,4],"monster":"eyenemy"},{"encounter_rate":0.5,"daytime":true,"exp_req_mod":1,"level_range":[2,4],"monster":"dandicub"},{"encounter_rate":0.5,"daytime":true,"exp_req_mod":1,"level_range":[2,4],"monster":"cardiling"},{"encounter_rate":0.5,"daytime":true,"exp_req_mod":1,"level_range":[2,4],"monster":"budaye"},{"encounter_rate":0.5,"daytime":true,"exp_req_mod":1,"level_range":[2,4],"monster":"cataspike"},{"encounter_rate":0.5,"daytime":false,"exp_req_mod":1,"level_range":[3,6],"monster":"elofly"},{"encounter_rate":0.5,"daytime":false,"exp_req_mod":1,"level_range":[3,6],"monster":"aardorn"},{"encounter_rate":0.5,"daytime":false,"exp_req_mod":1,"level_range":[3,6],"monster":"nut"},{"encounter_rate":0.5,"daytime":false,"exp_req_mod":1,"level_range":[3,6],"monster":"grimachin"},{"encounter_rate":0.5,"daytime":false,"exp_req_mod":1,"level_range":[3,6],"monster":"spighter"}],"requiredEncounters":10,"trainers":[{"name":"Dragonrider Nigel","sprite":"dragonrider.png","monsters":[{"slug":"agnigon","level":36}]}],"environment_slug":"sea","connections":{"candy-town":{"conditions":[],"name":"Candy Town"},"paper-town":{"conditions":["encounters","trainers"],"name":"Paper Town"}},"environment":{"slug":"sea","battle_graphics":{"island_back":"water_island.png","island_front":"water_island.png","background":"sea_background.png"},"battle_music":"music_battle_loop"},"map":"<svg\n  version=\"1.1\"\n  xmlns=\"http:\/\/www.w3.org\/2000\/svg\"\n  viewbox=\"0 0 640 640\"\n>\n  <image href=\"\/db\/maps\/Sea_Route_C.png\" \/>\n<\/svg>\n"}
\ No newline at end of file
+{"requiredEncounters":10,"trainers":[{"name":"Dragonrider Nigel","sprite":"dragonrider.png","monsters":[{"slug":"agnigon","level":36}]}],"environment_slug":"sea","connections":{"candy-town":{"conditions":[],"modules\/tuxemon.slug":"candy_town"},"paper-town":{"conditions":["encounters","trainers"],"modules\/tuxemon.slug":"paper_town"}},"modules\/tuxemon.slug":"routec","modules\/tuxemon.encounter":"default_encounter","modules\/tuxemon.environment":"sea","encounters":[{"encounter_rate":0.5,"daytime":true,"exp_req_mod":1,"level_range":[2,4],"monster":"eyenemy"},{"encounter_rate":0.5,"daytime":true,"exp_req_mod":1,"level_range":[2,4],"monster":"dandicub"},{"encounter_rate":0.5,"daytime":true,"exp_req_mod":1,"level_range":[2,4],"monster":"cardiling"},{"encounter_rate":0.5,"daytime":true,"exp_req_mod":1,"level_range":[2,4],"monster":"budaye"},{"encounter_rate":0.5,"daytime":true,"exp_req_mod":1,"level_range":[2,4],"monster":"cataspike"},{"encounter_rate":0.5,"daytime":false,"exp_req_mod":1,"level_range":[3,6],"monster":"elofly"},{"encounter_rate":0.5,"daytime":false,"exp_req_mod":1,"level_range":[3,6],"monster":"aardorn"},{"encounter_rate":0.5,"daytime":false,"exp_req_mod":1,"level_range":[3,6],"monster":"nut"},{"encounter_rate":0.5,"daytime":false,"exp_req_mod":1,"level_range":[3,6],"monster":"grimachin"},{"encounter_rate":0.5,"daytime":false,"exp_req_mod":1,"level_range":[3,6],"monster":"spighter"}],"environment":{"slug":"sea","battle_graphics":{"island_back":"water_island.png","island_front":"water_island.png","background":"sea_background.png"},"battle_music":"music_battle_loop"},"map":"<svg\n  version=\"1.1\"\n  xmlns=\"http:\/\/www.w3.org\/2000\/svg\"\n  viewbox=\"0 0 640 640\"\n>\n  <image href=\"\/db\/maps\/Sea_Route_C.png\" \/>\n<\/svg>\n"}
\ No newline at end of file
diff --git a/db/_generated/areas/side-route-a.json b/db/_generated/areas/side-route-a.json
index 76cb968..55b246e 100644
--- a/db/_generated/areas/side-route-a.json
+++ b/db/_generated/areas/side-route-a.json
@@ -1 +1 @@
-{"name":"Side Route A","encounter_slug":"default_encounter","encounters":[{"encounter_rate":0.5,"daytime":true,"exp_req_mod":1,"level_range":[2,4],"monster":"eyenemy"},{"encounter_rate":0.5,"daytime":true,"exp_req_mod":1,"level_range":[2,4],"monster":"dandicub"},{"encounter_rate":0.5,"daytime":true,"exp_req_mod":1,"level_range":[2,4],"monster":"cardiling"},{"encounter_rate":0.5,"daytime":true,"exp_req_mod":1,"level_range":[2,4],"monster":"budaye"},{"encounter_rate":0.5,"daytime":true,"exp_req_mod":1,"level_range":[2,4],"monster":"cataspike"},{"encounter_rate":0.5,"daytime":false,"exp_req_mod":1,"level_range":[3,6],"monster":"elofly"},{"encounter_rate":0.5,"daytime":false,"exp_req_mod":1,"level_range":[3,6],"monster":"aardorn"},{"encounter_rate":0.5,"daytime":false,"exp_req_mod":1,"level_range":[3,6],"monster":"nut"},{"encounter_rate":0.5,"daytime":false,"exp_req_mod":1,"level_range":[3,6],"monster":"grimachin"},{"encounter_rate":0.5,"daytime":false,"exp_req_mod":1,"level_range":[3,6],"monster":"spighter"}],"requiredEncounters":10,"trainers":[{"name":"Rival Billie","sprite":"fashionista.png","monsters":[{"slug":"cardiwing","level":17},{"slug":"eyesore","level":17},{"slug":"viviphyta","level":17},{"slug":"STARTER","level":20}]}],"environment_slug":"forest","connections":{"flower-city":{"conditions":[],"name":"Flower City"},"route7":{"conditions":["encounters","trainers"],"name":"Route 7"}},"environment":{"slug":"forest","battle_graphics":{"island_back":"woodland_island.png","island_front":"woodland_island.png","background":"forest_background.png"},"battle_music":"music_battle_loop"},"map":"<svg\n  version=\"1.1\"\n  xmlns=\"http:\/\/www.w3.org\/2000\/svg\"\n  viewbox=\"0 0 320 640\"\n>\n  <image href=\"\/db\/maps\/Side_Route_A.png\" \/>\n<\/svg>\n"}
\ No newline at end of file
+{"requiredEncounters":10,"trainers":[{"name":"Rival Billie","sprite":"fashionista.png","monsters":[{"slug":"cardiwing","level":17},{"slug":"eyesore","level":17},{"slug":"viviphyta","level":17},{"slug":"STARTER","level":20}]}],"environment_slug":"forest","connections":{"flower-city":{"conditions":[],"modules\/tuxemon.slug":"flower_city"},"route7":{"conditions":["encounters","trainers"],"modules\/tuxemon.slug":"route7"}},"modules\/tuxemon.slug":"routea","modules\/tuxemon.encounter":"default_encounter","modules\/tuxemon.environment":"forest","encounters":[{"encounter_rate":0.5,"daytime":true,"exp_req_mod":1,"level_range":[2,4],"monster":"eyenemy"},{"encounter_rate":0.5,"daytime":true,"exp_req_mod":1,"level_range":[2,4],"monster":"dandicub"},{"encounter_rate":0.5,"daytime":true,"exp_req_mod":1,"level_range":[2,4],"monster":"cardiling"},{"encounter_rate":0.5,"daytime":true,"exp_req_mod":1,"level_range":[2,4],"monster":"budaye"},{"encounter_rate":0.5,"daytime":true,"exp_req_mod":1,"level_range":[2,4],"monster":"cataspike"},{"encounter_rate":0.5,"daytime":false,"exp_req_mod":1,"level_range":[3,6],"monster":"elofly"},{"encounter_rate":0.5,"daytime":false,"exp_req_mod":1,"level_range":[3,6],"monster":"aardorn"},{"encounter_rate":0.5,"daytime":false,"exp_req_mod":1,"level_range":[3,6],"monster":"nut"},{"encounter_rate":0.5,"daytime":false,"exp_req_mod":1,"level_range":[3,6],"monster":"grimachin"},{"encounter_rate":0.5,"daytime":false,"exp_req_mod":1,"level_range":[3,6],"monster":"spighter"}],"environment":{"slug":"forest","battle_graphics":{"island_back":"woodland_island.png","island_front":"woodland_island.png","background":"forest_background.png"},"battle_music":"music_battle_loop"},"map":"<svg\n  version=\"1.1\"\n  xmlns=\"http:\/\/www.w3.org\/2000\/svg\"\n  viewbox=\"0 0 320 640\"\n>\n  <image href=\"\/db\/maps\/Side_Route_A.png\" \/>\n<\/svg>\n"}
\ No newline at end of file
diff --git a/db/_generated/areas/sphalian-town.json b/db/_generated/areas/sphalian-town.json
index 5f436dd..83a818a 100644
--- a/db/_generated/areas/sphalian-town.json
+++ b/db/_generated/areas/sphalian-town.json
@@ -1 +1 @@
-{"name":"Sphalian Town","locations":{"healing_center":{"type":"healingCenter","price":40}},"connections":{"route7":{"conditions":[],"name":"Route 7"},"lion-mountain":{"conditions":[],"name":"Lion Mountain"}},"encounters":[],"requiredEncounters":0,"trainers":[],"environment":null,"map":"<svg\n  version=\"1.1\"\n  xmlns=\"http:\/\/www.w3.org\/2000\/svg\"\n  viewbox=\"0 0 368 400\"\n>\n  <image href=\"\/db\/maps\/Sphalian_town.png\" \/>\n\n  <rect data-location=\"healing_center\" x=\"240\" y=\"48\" width=\"80\" height=\"64\" stroke=\"red\" fill=\"transparent\" \/>\n<\/svg>\n"}
\ No newline at end of file
+{"locations":{"healing_center":{"type":"healingCenter","price":40}},"connections":{"route7":{"conditions":[],"modules\/tuxemon.slug":"route7"},"lion-mountain":{"conditions":[],"modules\/tuxemon.slug":"lion_mountain"}},"modules\/tuxemon.slug":"sphalian_town","encounters":[],"requiredEncounters":0,"trainers":[],"environment":null,"map":"<svg\n  version=\"1.1\"\n  xmlns=\"http:\/\/www.w3.org\/2000\/svg\"\n  viewbox=\"0 0 368 400\"\n>\n  <image href=\"\/db\/maps\/Sphalian_town.png\" \/>\n\n  <rect data-location=\"healing_center\" x=\"240\" y=\"48\" width=\"80\" height=\"64\" stroke=\"red\" fill=\"transparent\" \/>\n<\/svg>\n"}
\ No newline at end of file
diff --git a/db/_generated/areas/timber-town.json b/db/_generated/areas/timber-town.json
index 041309c..6056f60 100644
--- a/db/_generated/areas/timber-town.json
+++ b/db/_generated/areas/timber-town.json
@@ -1 +1 @@
-{"name":"Timber Town","locations":{"healing_center":{"type":"healingCenter","price":20},"scoop_store":{"type":"shop","economy":"spyder_timber_scoop","items":[{"item_name":"potion","price":20,"cost":5},{"item_name":"revive","price":100,"cost":20},{"item_name":"tuxeball","price":50,"cost":10}]}},"connections":{"route5":{"conditions":[],"name":"Route 5"},"tunnel-b":{"conditions":[],"name":"Tunnel B"}},"encounters":[],"requiredEncounters":0,"trainers":[],"environment":null,"map":"<svg\n  version=\"1.1\"\n  xmlns=\"http:\/\/www.w3.org\/2000\/svg\"\n  viewbox=\"0 0 640 640\"\n>\n  <image href=\"\/db\/maps\/Timber_Town.png\" \/>\n\n  <rect data-location=\"healing_center\" x=\"96\" y=\"48\" width=\"80\" height=\"64\" stroke=\"red\" fill=\"transparent\" \/>\n  <rect data-location=\"scoop_store\" x=\"191\" y=\"127\" width=\"82\" height=\"66\" stroke=\"red\" fill=\"transparent\" \/>\n<\/svg>\n"}
\ No newline at end of file
+{"locations":{"healing_center":{"type":"healingCenter","price":20},"scoop_store":{"type":"shop","modules\/tuxemon.economy":"spyder_timber_scoop","items":[{"item_name":"potion","price":20,"cost":5},{"item_name":"revive","price":100,"cost":20},{"item_name":"tuxeball","price":50,"cost":10}]}},"connections":{"route5":{"conditions":[],"modules\/tuxemon.slug":"route5"},"tunnel-b":{"conditions":[],"modules\/tuxemon.slug":"tunnel"}},"modules\/tuxemon.slug":"timber_town","encounters":[],"requiredEncounters":0,"trainers":[],"environment":null,"map":"<svg\n  version=\"1.1\"\n  xmlns=\"http:\/\/www.w3.org\/2000\/svg\"\n  viewbox=\"0 0 640 640\"\n>\n  <image href=\"\/db\/maps\/Timber_Town.png\" \/>\n\n  <rect data-location=\"healing_center\" x=\"96\" y=\"48\" width=\"80\" height=\"64\" stroke=\"red\" fill=\"transparent\" \/>\n  <rect data-location=\"scoop_store\" x=\"191\" y=\"127\" width=\"82\" height=\"66\" stroke=\"red\" fill=\"transparent\" \/>\n<\/svg>\n"}
\ No newline at end of file
diff --git a/db/_generated/areas/tunnel-b.json b/db/_generated/areas/tunnel-b.json
index bdf3a76..ddf7e85 100644
--- a/db/_generated/areas/tunnel-b.json
+++ b/db/_generated/areas/tunnel-b.json
@@ -1 +1 @@
-{"name":"Tunnel B","encounter_slug":"default_encounter","encounters":[{"encounter_rate":0.5,"daytime":true,"exp_req_mod":1,"level_range":[2,4],"monster":"eyenemy"},{"encounter_rate":0.5,"daytime":true,"exp_req_mod":1,"level_range":[2,4],"monster":"dandicub"},{"encounter_rate":0.5,"daytime":true,"exp_req_mod":1,"level_range":[2,4],"monster":"cardiling"},{"encounter_rate":0.5,"daytime":true,"exp_req_mod":1,"level_range":[2,4],"monster":"budaye"},{"encounter_rate":0.5,"daytime":true,"exp_req_mod":1,"level_range":[2,4],"monster":"cataspike"},{"encounter_rate":0.5,"daytime":false,"exp_req_mod":1,"level_range":[3,6],"monster":"elofly"},{"encounter_rate":0.5,"daytime":false,"exp_req_mod":1,"level_range":[3,6],"monster":"aardorn"},{"encounter_rate":0.5,"daytime":false,"exp_req_mod":1,"level_range":[3,6],"monster":"nut"},{"encounter_rate":0.5,"daytime":false,"exp_req_mod":1,"level_range":[3,6],"monster":"grimachin"},{"encounter_rate":0.5,"daytime":false,"exp_req_mod":1,"level_range":[3,6],"monster":"spighter"}],"requiredEncounters":10,"trainers":[{"name":"Florist Iris","sprite":"florist.png","monsters":[{"slug":"tourbidi","level":18},{"slug":"tourbidi","level":18},{"slug":"tourbidi","level":18}]}],"environment_slug":"forest","connections":{"timber-town":{"conditions":[],"name":"Timber Town"},"route6":{"conditions":["encounters","trainers"],"name":"Route 6"}},"environment":{"slug":"forest","battle_graphics":{"island_back":"woodland_island.png","island_front":"woodland_island.png","background":"forest_background.png"},"battle_music":"music_battle_loop"},"map":"<svg\n  version=\"1.1\"\n  xmlns=\"http:\/\/www.w3.org\/2000\/svg\"\n  viewbox=\"0 0 320 640\"\n>\n  <image href=\"\/db\/maps\/Tunnel_Route_B.png\" \/>\n<\/svg>\n"}
\ No newline at end of file
+{"requiredEncounters":10,"trainers":[{"name":"Florist Iris","sprite":"florist.png","monsters":[{"slug":"tourbidi","level":18},{"slug":"tourbidi","level":18},{"slug":"tourbidi","level":18}]}],"environment_slug":"forest","connections":{"timber-town":{"conditions":[],"modules\/tuxemon.slug":"timber_town"},"route6":{"conditions":["encounters","trainers"],"modules\/tuxemon.slug":"route6"}},"modules\/tuxemon.slug":"tunnel","modules\/tuxemon.encounter":"default_encounter","modules\/tuxemon.environment":"forest","encounters":[{"encounter_rate":0.5,"daytime":true,"exp_req_mod":1,"level_range":[2,4],"monster":"eyenemy"},{"encounter_rate":0.5,"daytime":true,"exp_req_mod":1,"level_range":[2,4],"monster":"dandicub"},{"encounter_rate":0.5,"daytime":true,"exp_req_mod":1,"level_range":[2,4],"monster":"cardiling"},{"encounter_rate":0.5,"daytime":true,"exp_req_mod":1,"level_range":[2,4],"monster":"budaye"},{"encounter_rate":0.5,"daytime":true,"exp_req_mod":1,"level_range":[2,4],"monster":"cataspike"},{"encounter_rate":0.5,"daytime":false,"exp_req_mod":1,"level_range":[3,6],"monster":"elofly"},{"encounter_rate":0.5,"daytime":false,"exp_req_mod":1,"level_range":[3,6],"monster":"aardorn"},{"encounter_rate":0.5,"daytime":false,"exp_req_mod":1,"level_range":[3,6],"monster":"nut"},{"encounter_rate":0.5,"daytime":false,"exp_req_mod":1,"level_range":[3,6],"monster":"grimachin"},{"encounter_rate":0.5,"daytime":false,"exp_req_mod":1,"level_range":[3,6],"monster":"spighter"}],"environment":{"slug":"forest","battle_graphics":{"island_back":"woodland_island.png","island_front":"woodland_island.png","background":"forest_background.png"},"battle_music":"music_battle_loop"},"map":"<svg\n  version=\"1.1\"\n  xmlns=\"http:\/\/www.w3.org\/2000\/svg\"\n  viewbox=\"0 0 320 640\"\n>\n  <image href=\"\/db\/maps\/Tunnel_Route_B.png\" \/>\n<\/svg>\n"}
\ No newline at end of file