Merge remote-tracking branch 'origin/feature/weaponJSON' into feature/weaponCollision

2016-06-21 17:07:59 +02:00
parent d14f045708 4437acb9f2
commit 0431e9c230
1 changed files with 7 additions and 3 deletions
@@ -12,7 +12,7 @@
 	"music": "WAVE/test1.wav"
  },
  "player": {
-    "startposition": [ 20, 5, 20 ]
+    "startposition": [ 20, 0, 20 ]
  },
  "objects": [ ],
  "portal": {     
@@ -24,13 +24,17 @@
      "file": "models/squid/Blooper.obj",
      "pos": [ 20, 5, 10 ],
      "scale": 0.01,
-      "music": "WAVE/enemy.wav"
+      "music": "WAVE/enemy.wav",
+      "health": 10,
+      "damage": 2
    },
    {
      "file": "models/squid/Blooper.obj",
      "pos": [ 30, 10, 10 ],
      "scale": 0.01,
-      "music": "WAVE/enemy.wav"
+      "music": "WAVE/enemy.wav",
+      "health": 15,
+      "damage": 2
  }],
  "crystal": {
    "full texture": "models/crystal/Crystal.obj",