Merge pull request #1 from sayterdarkwynd/master

I guess this is PR in my direction instead of yours. Who knows. git is kafka's wet dream
sayterdarkwynd · Feb 13, 2017 · 418ba0f · 418ba0f
2 parents eee4f5f + f127e91
commit 418ba0f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/monsters/ghosts/eyejelly/eyejelly.animation b/monsters/ghosts/eyejelly/eyejelly.animation
@@ -22,7 +22,7 @@
         }
       },
       "head" : {
-        "priority" : 0,
+        "priority" : 1,
         "default" : "idle",
         "states" : {
           "idle" : {
@@ -68,7 +68,7 @@
     "parts" : {
       "body" : {
         "properties" : {
-          "zlevel" : 1,
+          "zLevel" : 1,
           "transformationGroups" : [ "facing", "body" ],
           "offset" : [0.0, 0.125]
         },
@@ -101,7 +101,7 @@
       },
       "head" : {
         "properties" : {
-          "zlevel" : 2,
+          "zLevel" : 2,
           "offset" : [0,0],
           "transformationGroups" : [ "aim", "facing", "body" ]
         },

diff --git a/monsters/walkers/fufirecrab/fufirecrab.monstertype b/monsters/walkers/fufirecrab/fufirecrab.monstertype
@@ -285,7 +285,6 @@
     "feetOffset" : [0, -8],
     "capturable" : true,
     "captureHealthFraction" : 0.5,
-    "nametagColor" : [64, 200, 255],
-    "captureCollectables" : { "monsters" : "oogler" }
+    "nametagColor" : [64, 200, 255]
   }
 }