Merge branch 'develop'

timongorpg · Dec 8, 2016 · afb3f41 · afb3f41
2 parents fd44c5b + 8a73cd6
commit afb3f41
Show file tree

Hide file tree

Showing 22 changed files with 22 additions and 22 deletions.
diff --git a/data/angry-sheep.json b/data/angry-sheep.json
@@ -2,7 +2,7 @@
     "name": "Angry Sheep",
     "image": "sheep.gif",
     "level": 5,
-    "health": 30,
+    "health": 60,
     "attack": 10,
     "armor": 5,
     "magic_resistance": 2,

diff --git a/data/barbarian.json b/data/barbarian.json
@@ -2,7 +2,7 @@
     "name": "Barbarian",
     "image": "barbarianbw.gif",
     "level": 18,
-    "health": 95,
+    "health": 190,
     "attack": 36,
     "armor": 18,
     "magic_resistance": 11,

diff --git a/data/bear.json b/data/bear.json
@@ -2,7 +2,7 @@
     "name": "Bear",
     "image": "bear.gif",
     "level": 7,
-    "health": 40,
+    "health": 80,
     "attack": 14,
     "armor": 7,
     "magic_resistance": 3,

diff --git a/data/behemoth.json b/data/behemoth.json
@@ -2,7 +2,7 @@
     "name": "Behemoth",
     "image": "behemoth.gif",
     "level": 23,
-    "health": 120,
+    "health": 360,
     "attack": 46,
     "armor": 23,
     "magic_resistance": 17,

diff --git a/data/cyclops.json b/data/cyclops.json
@@ -2,7 +2,7 @@
     "name": "Cyclops",
     "image": "cyclops.gif",
     "level": 20,
-    "health": 105,
+    "health": 210,
     "attack": 40,
     "armor": 20,
     "magic_resistance": 15,

diff --git a/data/demonskeleton.json b/data/demonskeleton.json
@@ -2,7 +2,7 @@
     "name": "Demon Skeleton",
     "image": "demonskeleton.gif",
     "level": 19,
-    "health": 100,
+    "health": 250,
     "attack": 38,
     "armor": 19,
     "magic_resistance": 15,

diff --git a/data/goblin.json b/data/goblin.json
@@ -2,7 +2,7 @@
     "name": "Goblin",
     "image": "goblin.gif",
     "level": 9,
-    "health": 50,
+    "health": 80,
     "attack": 18,
     "armor": 9,
     "magic_resistance": 5,

diff --git a/data/lordminotaur.json b/data/lordminotaur.json
@@ -2,7 +2,7 @@
     "name": "Lord Minotaur",
     "image": "lordminotaur.gif",
     "level": 21,
-    "health": 110,
+    "health": 220,
     "attack": 42,
     "armor": 21,
     "magic_resistance": 16,

diff --git a/data/noblelion.json b/data/noblelion.json
@@ -2,7 +2,7 @@
     "name": "Lion",
     "image": "noblelion.gif",
     "level": 11,
-    "health": 60,
+    "health": 120,
     "attack": 22,
     "armor": 11,
     "magic_resistance": 6,

diff --git a/data/ogre.json b/data/ogre.json
@@ -2,7 +2,7 @@
     "name": "Ogre",
     "image": "ogre.gif",
     "level": 14,
-    "health": 75,
+    "health": 130,
     "attack": 28,
     "armor": 14,
     "magic_resistance": 8,

diff --git a/data/ogresavage.json b/data/ogresavage.json
@@ -2,7 +2,7 @@
     "name": "Ogre Savage",
     "image": "ogresavage.gif",
     "level": 15,
-    "health": 80,
+    "health": 160,
     "attack": 30,
     "armor": 15,
     "magic_resistance": 8,

diff --git a/data/ogreshaman.json b/data/ogreshaman.json
@@ -2,7 +2,7 @@
     "name": "Ogre Shaman",
     "image": "ogreshaman.gif",
     "level": 16,
-    "health": 85,
+    "health": 170,
     "attack": 32,
     "armor": 16,
     "magic_resistance": 9,

diff --git a/data/orc.json b/data/orc.json
@@ -2,7 +2,7 @@
     "name": "Orc",
     "image": "orc.gif",
     "level": 10,
-    "health": 55,
+    "health": 90,
     "attack": 20,
     "armor": 10,
     "magic_resistance": 5,

diff --git a/data/orcberserker.json b/data/orcberserker.json
@@ -2,7 +2,7 @@
     "name": "Orc Berserker",
     "image": "orcberserker.gif",
     "level": 13,
-    "health": 70,
+    "health": 120,
     "attack": 26,
     "armor": 13,
     "magic_resistance": 7,

diff --git a/data/skeleton.json b/data/skeleton.json
@@ -2,7 +2,7 @@
     "name": "Skeleton",
     "image": "skeleton.gif",
     "level": 12,
-    "health": 65,
+    "health": 100,
     "attack": 24,
     "armor": 12,
     "magic_resistance": 6,

diff --git a/data/snake.json b/data/snake.json
@@ -2,7 +2,7 @@
     "name": "Snake",
     "image": "snake.gif",
     "level": 3,
-    "health": 20,
+    "health": 25,
     "attack": 6,
     "armor": 3,
     "magic_resistance": 1,

diff --git a/data/tarantula.json b/data/tarantula.json
@@ -2,7 +2,7 @@
     "name": "Tarantula",
     "image": "tarantula.gif",
     "level": 17,
-    "health": 90,
+    "health": 110,
     "attack": 34,
     "armor": 17,
     "magic_resistance": 10,

diff --git a/data/tiger.json b/data/tiger.json
@@ -2,7 +2,7 @@
     "name": "Tiger",
     "image": "kitty.gif",
     "level": 6,
-    "health": 35,
+    "health": 70,
     "attack": 12,
     "armor": 6,
     "magic_resistance": 2,

diff --git a/data/toad.json b/data/toad.json
@@ -2,7 +2,7 @@
     "name": "Toad",
     "image": "toad.gif",
     "level": 2,
-    "health": 15,
+    "health": 20,
     "attack": 4,
     "armor": 2,
     "magic_resistance": 0,

diff --git a/data/wereboar.json b/data/wereboar.json
@@ -2,7 +2,7 @@
     "name": "Wereboar",
     "image": "wereboar.gif",
     "level": 22,
-    "health": 115,
+    "health": 200,
     "attack": 44,
     "armor": 22,
     "magic_resistance": 17,

diff --git a/data/wilddog.json b/data/wilddog.json
@@ -2,7 +2,7 @@
     "name": "Wild Dog",
     "image": "dog.gif",
     "level": 4,
-    "health": 25,
+    "health": 50,
     "attack": 8,
     "armor": 4,
     "magic_resistance": 1,

diff --git a/data/wildorcdwarf.json b/data/wildorcdwarf.json
@@ -2,7 +2,7 @@
     "name": "Wild Orc Dwarf",
     "image": "dworc.gif",
     "level": 8,
-    "health": 45,
+    "health": 90,
     "attack": 16,
     "armor": 8,
     "magic_resistance": 8,