more areas!

17 files changed, 722 insertions, 20 deletions

diff --git a/db/areas/candy-town.json b/db/areas/candy-town.json
index f89370b..abdd488 100644
--- a/db/areas/candy-town.json
+++ b/db/areas/candy-town.json
@@ -1,10 +1,5 @@
 {
   "locations": {
-    "hospital": {
-      "type": "healingCenter",
-      "price": 30
-    },
-
     "scoop_store": {
       "type": "shop",
       "items": [],
diff --git a/db/areas/city-park.json b/db/areas/city-park.json
index 3579342..802018c 100644
--- a/db/areas/city-park.json
+++ b/db/areas/city-park.json
@@ -1,6 +1,17 @@
 {
   "requiredEncounters": 10,
 
+  "encounters": [
+    {
+      "monster": "budaye",
+      "encounter_percent": 5,
+      "level_range": [
+        2,
+        5
+      ]
+    }
+  ],
+
   "trainers": [
     {
       "name": "Frances",
diff --git a/db/areas/cotton-town.json b/db/areas/cotton-town.json
index cd83eae..6c55b07 100644
--- a/db/areas/cotton-town.json
+++ b/db/areas/cotton-town.json
@@ -11,10 +11,6 @@
     }
   },
 
-  "events": {
-    "dryads-grove": false
-  },
-
   "connections": {
     "route1": {
       "conditions": []
@@ -26,7 +22,7 @@
 
     "dryads-grove": {
       "conditions": [
-        "event.dryads-grove"
+        "area.hospital-floor-3.complete"
       ]
     }
   },
diff --git a/db/areas/dryads-grove.json b/db/areas/dryads-grove.json
index 0842384..25d5326 100644
--- a/db/areas/dryads-grove.json
+++ b/db/areas/dryads-grove.json
@@ -1,5 +1,104 @@
 {
-  "connections": {},
+  "trainers": [
+    {
+      "name": "Water Nymph",
+      "sprite": "waternymph.png",
+      "monsters": [
+        {
+          "slug": "noctalo",
+          "level": 50
+        },
+        {
+          "slug": "nudimind",
+          "level": 50
+        },
+        {
+          "slug": "vivisource",
+          "level": 50
+        }
+      ]
+    },
+    {
+      "name": "Fire Nymph",
+      "sprite": "firenymph.png",
+      "monsters": [
+        {
+          "slug": "criniotherme",
+          "level": 50
+        },
+        {
+          "slug": "masknake",
+          "level": 50
+        },
+        {
+          "slug": "vivicinder",
+          "level": 50
+        }
+      ]
+    },
+    {
+      "name": "Earth Nymph",
+      "sprite": "earthnymph.png",
+      "monsters": [
+        {
+          "slug": "exapode",
+          "level": 50
+        },
+        {
+          "slug": "sumchon",
+          "level": 50
+        },
+        {
+          "slug": "vividactil",
+          "level": 50
+        }
+      ]
+    },
+    {
+      "name": "Metal Nymph",
+      "sprite": "metalnymph.png",
+      "monsters": [
+        {
+          "slug": "araignee",
+          "level": 50
+        },
+        {
+          "slug": "allagon",
+          "level": 50
+        },
+        {
+          "slug": "viviteel",
+          "level": 50
+        }
+      ]
+    },
+    {
+      "name": "Wood Nymph",
+      "sprite": "woodnymph.png",
+      "monsters": [
+        {
+          "slug": "narcileaf",
+          "level": 50
+        },
+        {
+          "slug": "dandylion",
+          "level": 50
+        },
+        {
+          "slug": "viviphyta",
+          "level": 50
+        }
+      ]
+    }
+  ],
 
-  "modules/tuxemon.slug": "dryadsgrove"
+  "connections": {
+    "cotton-town": {
+      "conditions": []
+    }
+  },
+
+  "modules/tuxemon.slug": "dryadsgrove",
+  "modules/tuxemon.encounter": "dryadsgrove",
+  "modules/tuxemon.environment": "forest"
 }
diff --git a/db/areas/hospital-floor-1.json b/db/areas/hospital-floor-1.json
new file mode 100644
index 0000000..f89e5a3
--- /dev/null
+++ b/db/areas/hospital-floor-1.json
@@ -0,0 +1,29 @@
+{
+  "trainers": [
+    {
+      "name": "Spyder Boss Aurora",
+      "sprite": "spyder_boss.png",
+      "monsters": [
+        {
+          "slug": "exclawvate",
+          "level": 40
+        }
+      ]
+    }
+  ],
+
+  "connections": {
+    "hospital": {
+      "conditions": []
+    },
+
+    "hospital-floor-2": {
+      "conditions": [
+        "trainers"
+      ]
+    }
+  },
+
+  "modules/tuxemon.slug": "hospital1",
+  "modules/tuxemon.environment": "interior"
+}
diff --git a/db/areas/hospital-floor-2.json b/db/areas/hospital-floor-2.json
new file mode 100644
index 0000000..2e6fc42
--- /dev/null
+++ b/db/areas/hospital-floor-2.json
@@ -0,0 +1,47 @@
+{
+  "trainers": [
+    {
+      "name": "Spyder Boss Luzia",
+      "sprite": "spyder_boss.png",
+      "monsters": [
+        {
+          "slug": "galnec",
+          "level": 36
+        },
+        {
+          "slug": "exclawvate",
+          "level": 36
+        }
+      ]
+    },
+    {
+      "name": "Profressor Rhizome",
+      "sprite": "professor.png",
+      "monsters": [
+        {
+          "slug": "flacono",
+          "level": 33
+        },
+        {
+          "slug": "fancair",
+          "level": 33
+        }
+      ]
+    }
+  ],
+
+  "connections": {
+    "hospital-floor-1": {
+      "conditions": []
+    },
+
+    "hospital-floor-3": {
+      "conditions": [
+        "trainers"
+      ]
+    }
+  },
+
+  "modules/tuxemon.slug": "hospital2",
+  "modules/tuxemon.environment": "interior"
+}
diff --git a/db/areas/hospital-floor-3.json b/db/areas/hospital-floor-3.json
new file mode 100644
index 0000000..de16bc2
--- /dev/null
+++ b/db/areas/hospital-floor-3.json
@@ -0,0 +1,35 @@
+{
+  "trainers": [
+    {
+      "name": "Rival Billie",
+      "sprite": "fashionista.png",
+      "monsters": [
+        {
+          "slug": "cardinale",
+          "level": 40
+        },
+        {
+          "slug": "eyesore",
+          "level": 40
+        },
+        {
+          "slug": "viviphyta",
+          "level": 40
+        },
+        {
+          "slug": "STARTER",
+          "level": 40
+        }
+      ]
+    }
+  ],
+
+  "connections": {
+    "hospital-floor-2": {
+      "conditions": []
+    }
+  },
+
+  "modules/tuxemon.slug": "hospital3",
+  "modules/tuxemon.environment": "interior"
+}
diff --git a/db/areas/hospital.json b/db/areas/hospital.json
new file mode 100644
index 0000000..0617d78
--- /dev/null
+++ b/db/areas/hospital.json
@@ -0,0 +1,20 @@
+{
+  "locations": {
+    "hospital": {
+      "type": "healingCenter",
+      "price": 30
+    }
+  },
+
+  "connections": {
+    "candy-town": {
+      "conditions": []
+    },
+
+    "hospital-floor-1": {
+      "conditions": []
+    }
+  },
+
+  "modules/tuxemon.slug": "hospital"
+}
diff --git a/db/areas/lion-mountain.json b/db/areas/lion-mountain.json
index e1b5081..c187d2f 100644
--- a/db/areas/lion-mountain.json
+++ b/db/areas/lion-mountain.json
@@ -15,6 +15,34 @@
           "level": 60
         }
       ]
+    },
+    {
+      "name": "Bruder Mikki",
+      "sprite": "adventurer.png",
+      "monsters": [
+        {
+          "slug": "miaownolith",
+          "level": 75
+        },
+        {
+          "slug": "pyraminx",
+          "level": 76
+        },
+        {
+          "slug": "mauai",
+          "level": 77
+        },
+        {
+          "slug": "jelillow",
+          "level": 80
+        }
+      ],
+      "inventory": [
+        {
+          "slug": "super_potion",
+          "quantity": 4
+        }
+      ]
     }
   ],
 
diff --git a/db/areas/mansion-basement.json b/db/areas/mansion-basement.json
new file mode 100644
index 0000000..1a90497
--- /dev/null
+++ b/db/areas/mansion-basement.json
@@ -0,0 +1,41 @@
+{
+  "requiredEncounters": 10,
+
+  "encounters": [
+    {
+      "monster": "ignibus",
+      "encounter_percent": 5,
+      "level_range": [
+        2,
+        5
+      ]
+    }
+  ],
+
+  "trainers": [
+    {
+      "name": "Dancer Coralli",
+      "sprite": "dancer.png",
+      "monsters": [
+        {
+          "slug": "tumbleworm",
+          "level": 22
+        },
+        {
+          "slug": "elofly",
+          "level": 22
+        }
+      ]
+    }
+  ],
+
+  "connections": {
+    "mansion": {
+      "conditions": []
+    }
+  },
+
+  "modules/tuxemon.slug": "mansion_basement",
+  "modules/tuxemon.encounter": "mansion",
+  "modules/tuxemon.environment": "cave"
+}
diff --git a/db/areas/mansion-top-floor.json b/db/areas/mansion-top-floor.json
new file mode 100644
index 0000000..02bf87e
--- /dev/null
+++ b/db/areas/mansion-top-floor.json
@@ -0,0 +1,73 @@
+{
+  "requiredEncounters": 10,
+
+  "encounters": [
+    {
+      "monster": "memnomnom",
+      "encounter_percent": 5,
+      "level_range": [
+        2,
+        5
+      ]
+    }
+  ],
+
+  "trainers": [
+    {
+      "name": "Mage Russell",
+      "sprite": "mage.png",
+      "monsters": [
+        {
+          "slug": "av8r",
+          "level": 22
+        },
+        {
+          "slug": "mrmoswitch",
+          "level": 22
+        },
+        {
+          "slug": "k9",
+          "level": 22
+        }
+      ]
+    },
+    {
+      "name": "Bruder Mikki",
+      "sprite": "adventurer.png",
+      "monsters": [
+        {
+          "slug": "memnomnom",
+          "level": 25
+        },
+        {
+          "slug": "memnomnom",
+          "level": 26
+        },
+        {
+          "slug": "memnomnom",
+          "level": 27
+        },
+        {
+          "slug": "jelillow",
+          "level": 30
+        }
+      ],
+      "inventory": [
+        {
+          "slug": "super_potion",
+          "quantity": 2
+        }
+      ]
+    }
+  ],
+
+  "connections": {
+    "mansion": {
+      "conditions": []
+    }
+  },
+
+  "modules/tuxemon.slug": "mansion_top_floor",
+  "modules/tuxemon.encounter": "mansion",
+  "modules/tuxemon.environment": "cave"
+}
diff --git a/db/areas/mansion.json b/db/areas/mansion.json
new file mode 100644
index 0000000..82de65a
--- /dev/null
+++ b/db/areas/mansion.json
@@ -0,0 +1,42 @@
+{
+  "requiredEncounters": 10,
+
+  "trainers": [
+    {
+      "name": "Magician Gillette",
+      "sprite": "magician.png",
+      "monsters": [
+        {
+          "slug": "djinnbo",
+          "level": 22
+        },
+        {
+          "slug": "ghosteeth",
+          "level": 22
+        }
+      ]
+    }
+  ],
+
+  "connections": {
+    "side-route-a": {
+      "conditions": []
+    },
+
+    "mansion-top-floor": {
+      "conditions": [
+        "area.mansion-basement.completed"
+      ]
+    },
+
+    "mansion-basement": {
+      "conditions": [
+        "area.mansion-basement"
+      ]
+    }
+  },
+
+  "modules/tuxemon.slug": "mansion",
+  "modules/tuxemon.encounter": "mansion",
+  "modules/tuxemon.environment": "cave"
+}
diff --git a/db/areas/paper-town.json b/db/areas/paper-town.json
index cc897b9..9b487e3 100644
--- a/db/areas/paper-town.json
+++ b/db/areas/paper-town.json
@@ -22,7 +22,7 @@
 
     "sea-route-c": {
       "conditions": [
-        "area.sea-route-c"
+        "area.sea-route-c.completed"
       ]
     }
   },
diff --git a/db/areas/sea-route-c.json b/db/areas/sea-route-c.json
index e6082db..bba5858 100644
--- a/db/areas/sea-route-c.json
+++ b/db/areas/sea-route-c.json
@@ -1,6 +1,17 @@
 {
   "requiredEncounters": 10,
 
+  "encounters": [
+    {
+      "monster": "dollfin",
+      "encounter_percent": 5,
+      "level_range": [
+        2,
+        5
+      ]
+    }
+  ],
+
   "trainers": [
     {
       "name": "Dragonrider Nigel",
diff --git a/db/areas/side-route-a.json b/db/areas/side-route-a.json
index 78514b8..7d2d621 100644
--- a/db/areas/side-route-a.json
+++ b/db/areas/side-route-a.json
@@ -1,6 +1,41 @@
 {
   "requiredEncounters": 10,
 
+  "encounters": [
+    {
+      "monster": "shybulb",
+      "encounter_percent": 25,
+      "level_range": [
+        12,
+        14
+      ]
+    },
+    {
+      "monster": "katapill",
+      "encounter_percent": 25,
+      "level_range": [
+        12,
+        14
+      ]
+    },
+    {
+      "monster": "vamporm",
+      "encounter_percent": 25,
+      "level_range": [
+        12,
+        14
+      ]
+    },
+    {
+      "monster": "anoleaf",
+      "encounter_percent": 25,
+      "level_range": [
+        12,
+        14
+      ]
+    }
+  ],
+
   "trainers": [
     {
       "name": "Rival Billie",
@@ -26,13 +61,17 @@
     }
   ],
 
-  "environment_slug": "forest",
-
   "connections": {
     "flower-city": {
       "conditions": []
     },
 
+    "mansion": {
+      "conditions": [
+        "encounters"
+      ]
+    },
+
     "route7": {
       "conditions": [
         "encounters",
@@ -42,6 +81,6 @@
   },
 
   "modules/tuxemon.slug": "routea",
-  "modules/tuxemon.encounter": "default_encounter",
+  "modules/tuxemon.encounter": "",
   "modules/tuxemon.environment": "forest"
 }
diff --git a/db/areas/tunnel-b-underground.json b/db/areas/tunnel-b-underground.json
new file mode 100644
index 0000000..907cb09
--- /dev/null
+++ b/db/areas/tunnel-b-underground.json
@@ -0,0 +1,151 @@
+{
+  "requiredEncounters": 10,
+
+  "encounters": [
+    {
+      "monster": "grintot",
+      "encounter_percent": 5,
+      "level_range": [
+        2,
+        5
+      ]
+    },
+    {
+      "monster": "ignibus",
+      "encounter_percent": 2,
+      "level_range": [
+        2,
+        5
+      ]
+    },
+
+
+    {
+      "monster": "toufigel",
+      "encounter_percent": 20,
+      "level_range": [
+        15,
+        18
+      ]
+    },
+    {
+      "monster": "pipis",
+      "encounter_percent": 30,
+      "level_range": [
+        15,
+        16
+      ]
+    },
+    {
+      "monster": "strella",
+      "encounter_percent": 10,
+      "level_range": [
+        18,
+        20
+      ]
+    },
+    {
+      "monster": "noctula",
+      "encounter_percent": 30,
+      "level_range": [
+        15,
+        16
+      ]
+    },
+    {
+      "monster": "noctalo",
+      "encounter_percent": 10,
+      "level_range": [
+        18,
+        20
+      ]
+    },
+    {
+      "monster": "cairfrey",
+      "encounter_percent": 20,
+      "level_range": [
+        15,
+        18
+      ]
+    },
+    {
+      "monster": "possessun",
+      "encounter_percent": 10,
+      "level_range": [
+        18,
+        20
+      ]
+    },
+    {
+      "monster": "rockitten",
+      "encounter_percent": 20,
+      "level_range": [
+        15,
+        18
+      ]
+    }
+  ],
+
+  "trainers": [
+    {
+      "name": "Scientist Beryll",
+      "sprite": "scientist.png",
+      "monsters": [
+        {
+          "slug": "rockat",
+          "level": 20
+        },
+        {
+          "slug": "ignibus",
+          "level": 20
+        },
+        {
+          "slug": "grintot",
+          "level": 20
+        }
+      ]
+    },
+    {
+      "name": "Scientist Lute",
+      "sprite": "scientist.png",
+      "monsters": [
+        {
+          "slug": "noctula",
+          "level": 16
+        },
+        {
+          "slug": "noctalo",
+          "level": 18
+        },
+        {
+          "slug": "pipis",
+          "level": 16
+        },
+        {
+          "slug": "strella",
+          "level": 20
+        }
+      ]
+    },
+    {
+      "name": "Scientist Meitner",
+      "sprite": "scientist.png",
+      "monsters": [
+        {
+          "slug": "masknake",
+          "level": 22
+        }
+      ]
+    }
+  ],
+
+  "connections": {
+    "tunnel-b": {
+      "conditions": []
+    }
+  },
+
+  "modules/tuxemon.slug": "tunnel-underground",
+  "modules/tuxemon.encounter": "",
+  "modules/tuxemon.environment": "cavern"
+}
diff --git a/db/areas/tunnel-b.json b/db/areas/tunnel-b.json
index be85c96..e125c05 100644
--- a/db/areas/tunnel-b.json
+++ b/db/areas/tunnel-b.json
@@ -1,6 +1,49 @@
 {
   "requiredEncounters": 10,
 
+  "encounters": [
+    {
+      "monster": "tourbidi",
+      "encounter_percent": 50,
+      "level_range": [
+        12,
+        18
+      ]
+    },
+    {
+      "monster": "capiti",
+      "encounter_percent": 15,
+      "level_range": [
+        15,
+        16
+      ]
+    },
+    {
+      "monster": "dandicub",
+      "encounter_percent": 15,
+      "level_range": [
+        15,
+        16
+      ]
+    },
+    {
+      "monster": "toufigel",
+      "encounter_percent": 10,
+      "level_range": [
+        15,
+        18
+      ]
+    },
+    {
+      "monster": "rockitten",
+      "encounter_percent": 10,
+      "level_range": [
+        15,
+        18
+      ]
+    }
+  ],
+
   "trainers": [
     {
       "name": "Florist Iris",
@@ -19,16 +62,58 @@
           "level": 18
         }
       ]
+    },
+    {
+      "name": "Picnicker Greta",
+      "sprite": "picnicker.png",
+      "monsters": [
+        {
+          "slug": "foofle",
+          "level": 16
+        },
+        {
+          "slug": "foofle",
+          "level": 16
+        },
+        {
+          "slug": "foofle",
+          "level": 16
+        },
+        {
+          "slug": "foofle",
+          "level": 16
+        },
+        {
+          "slug": "foofle",
+          "level": 16
+        },
+        {
+          "slug": "foofle",
+          "level": 16
+        }
+      ]
+    },
+    {
+      "name": "Yellow Belt Tommy",
+      "sprite": "yellowbelt.png",
+      "monsters": [
+        {
+          "slug": "zunna",
+          "level": 22
+        }
+      ]
     }
   ],
 
-  "environment_slug": "forest",
-
   "connections": {
     "timber-town": {
       "conditions": []
     },
 
+    "tunnel-b-underground": {
+      "conditions": []
+    },
+
     "route6": {
       "conditions": [
         "encounters",
@@ -38,6 +123,6 @@
   },
 
   "modules/tuxemon.slug": "tunnel",
-  "modules/tuxemon.encounter": "default_encounter",
-  "modules/tuxemon.environment": "forest"
+  "modules/tuxemon.encounter": "",
+  "modules/tuxemon.environment": "grass"
 }