translations and story

9 files changed, 162 insertions, 84 deletions

diff --git a/db/areas/cotton-town.json b/db/areas/cotton-town.json
index f1bc9e6..2301cdd 100644
--- a/db/areas/cotton-town.json
+++ b/db/areas/cotton-town.json
@@ -24,6 +24,12 @@
       "conditions": [
         "area.hospital-floor-3.complete"
       ]
+    },
+
+    "cotton-tunnel": {
+      "conditions": [
+        "area.cotton-tunnel.complete"
+      ]
     }
   },
 
diff --git a/db/areas/cotton-tunnel.json b/db/areas/cotton-tunnel.json
new file mode 100644
index 0000000..58ee1af
--- /dev/null
+++ b/db/areas/cotton-tunnel.json
@@ -0,0 +1,60 @@
+{
+  "requiredEncounters": 10,
+
+  "trainers": [
+    {
+      "name": "Dragonrider Carlos",
+      "sprite": "dragonrider.png",
+      "monsters": [
+        {
+          "slug": "agnidon",
+          "level": 35
+        },
+        {
+          "slug": "legko",
+          "level": 35
+        }
+      ]
+    }
+  ],
+
+  "items": [
+    {
+      "slug": "candy_tuxeball",
+      "chance": 10
+    },
+    {
+      "slug": "imperial_potion",
+      "chance": 10
+    },
+    {
+      "slug": "imperial_tea",
+      "chance": 10
+    },
+    {
+      "slug": "cureall",
+      "chance": 10
+    },
+    {
+      "slug": "raise_melee",
+      "chance": 10
+    }
+  ],
+
+  "connections": {
+    "dragons-cave": {
+      "conditions": []
+    },
+
+    "cotton-town": {
+      "conditions": [
+        "encounters",
+        "trainers"
+      ]
+    }
+  },
+
+  "modules/tuxemon.slug": "cotton_tunnel",
+  "modules/tuxemon.encounter": "cotton_tunnel",
+  "modules/tuxemon.environment": "cavern"
+}
diff --git a/db/areas/dragons-cave.json b/db/areas/dragons-cave.json
new file mode 100644
index 0000000..fade04c
--- /dev/null
+++ b/db/areas/dragons-cave.json
@@ -0,0 +1,48 @@
+{
+  "requiredEncounters": 10,
+
+  "trainers": [
+    {
+      "name": "Dragonrider Tomas",
+      "sprite": "dragonrider.png",
+      "monsters": [
+        {
+          "slug": "allagon",
+          "level": 35
+        }
+      ]
+    }
+  ],
+
+  "items": [
+    {
+      "slug": "boost_armour",
+      "chance": 10
+    },
+    {
+      "slug": "boost_melee",
+      "chance": 10
+    },
+    {
+      "slug": "super_potion",
+      "chance": 10
+    }
+  ],
+
+  "connections": {
+    "sea-route-c": {
+      "conditions": []
+    },
+
+    "cotton-tunnel": {
+      "conditions": [
+        "encounters",
+        "trainers"
+      ]
+    }
+  },
+
+  "modules/tuxemon.slug": "dragonscave",
+  "modules/tuxemon.encounter": "dragonscave",
+  "modules/tuxemon.environment": "cavern"
+}
diff --git a/db/areas/hospital-floor-1.json b/db/areas/hospital-floor-1.json
index f89e5a3..089ba7a 100644
--- a/db/areas/hospital-floor-1.json
+++ b/db/areas/hospital-floor-1.json
@@ -1,16 +1,12 @@
 {
-  "trainers": [
-    {
-      "name": "Spyder Boss Aurora",
-      "sprite": "spyder_boss.png",
-      "monsters": [
-        {
-          "slug": "exclawvate",
-          "level": 40
-        }
-      ]
-    }
-  ],
+  "events": {
+    "onEnter": [
+      {
+        "type": "story",
+        "story": "hospital-floor-1"
+      }
+    ]
+  },
 
   "connections": {
     "hospital": {
@@ -19,7 +15,7 @@
 
     "hospital-floor-2": {
       "conditions": [
-        "trainers"
+        "story.hospital-floor-1"
       ]
     }
   },
diff --git a/db/areas/hospital-floor-2.json b/db/areas/hospital-floor-2.json
index 2e6fc42..adbfbed 100644
--- a/db/areas/hospital-floor-2.json
+++ b/db/areas/hospital-floor-2.json
@@ -1,34 +1,12 @@
 {
-  "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
-        }
-      ]
-    }
-  ],
+  "events": {
+    "onEnter": [
+      {
+        "type": "story",
+        "story": "hospital-floor-2"
+      }
+    ]
+  },
 
   "connections": {
     "hospital-floor-1": {
@@ -37,7 +15,7 @@
 
     "hospital-floor-3": {
       "conditions": [
-        "trainers"
+        "story.hospital-floor-2"
       ]
     }
   },
diff --git a/db/areas/hospital-floor-3.json b/db/areas/hospital-floor-3.json
index de16bc2..3bcf6b6 100644
--- a/db/areas/hospital-floor-3.json
+++ b/db/areas/hospital-floor-3.json
@@ -1,28 +1,12 @@
 {
-  "trainers": [
-    {
-      "name": "Rival Billie",
-      "sprite": "fashionista.png",
-      "monsters": [
-        {
-          "slug": "cardinale",
-          "level": 40
-        },
-        {
-          "slug": "eyesore",
-          "level": 40
-        },
-        {
-          "slug": "viviphyta",
-          "level": 40
-        },
-        {
-          "slug": "STARTER",
-          "level": 40
-        }
-      ]
-    }
-  ],
+  "events": {
+    "onEnter": [
+      {
+        "type": "story",
+        "story": "hospital-floor-3"
+      }
+    ]
+  },
 
   "connections": {
     "hospital-floor-2": {
diff --git a/db/areas/paper-town.json b/db/areas/paper-town.json
index 5213a5f..1120538 100644
--- a/db/areas/paper-town.json
+++ b/db/areas/paper-town.json
@@ -21,7 +21,7 @@
 
     "route1": {
       "conditions": [
-        "story.selectStarterMonster"
+        "story.select-starter-monster"
       ]
     }
   },
diff --git a/db/areas/route2.json b/db/areas/route2.json
index f753a70..12ec927 100644
--- a/db/areas/route2.json
+++ b/db/areas/route2.json
@@ -3,25 +3,26 @@
 
   "trainers": [
     {
-      "name": "Rival Billie",
-      "sprite": "fashionista.png",
+      "name": "Tennis Player Roddick",
+      "sprite": "tennisplayer.png",
       "monsters": [
         {
-          "slug": "cardiling",
-          "level": 3
-        },
-        {
-          "slug": "eyenemy",
-          "level": 6
-        },
-        {
-          "slug": "STARTER",
-          "level": 6
+          "slug": "spighter",
+          "level": 8
         }
       ]
     }
   ],
 
+  "events": {
+    "onEnter": [
+      {
+        "type": "story",
+        "story": "battle-rival-two"
+      }
+    ]
+  },
+
   "connections": {
     "cotton-town": {
       "conditions": []
diff --git a/db/areas/sea-route-c.json b/db/areas/sea-route-c.json
index bba5858..da22e7c 100644
--- a/db/areas/sea-route-c.json
+++ b/db/areas/sea-route-c.json
@@ -25,13 +25,18 @@
     }
   ],
 
-  "environment_slug": "sea",
-
   "connections": {
     "candy-town": {
       "conditions": []
     },
 
+    "dragons-cave": {
+      "conditions": [
+        "encounters",
+        "trainers"
+      ]
+    },
+
     "paper-town": {
       "conditions": [
         "encounters",
@@ -41,6 +46,6 @@
   },
 
   "modules/tuxemon.slug": "routec",
-  "modules/tuxemon.encounter": "default_encounter",
+  "modules/tuxemon.encounter": "routec",
   "modules/tuxemon.environment": "sea"
 }