war angel fix, prototyper fullbright and animation

sayterdarkwynd · Sep 14, 2016 · 3fa0d4d · 3fa0d4d
1 parent 5f13a2a
commit 3fa0d4d
Show file tree

Hide file tree

Showing 9 changed files with 77 additions and 24 deletions.
diff --git a/objects/generic/prototyper/prototyper.animation b/objects/generic/prototyper/prototyper.animation
@@ -0,0 +1,43 @@
+{
+  "animatedParts" : {
+    "stateTypes" : {
+      "prototyperanim" : {
+        "default" : "idle",
+        "states" : {
+          "idle" : {
+            "frames" : 1
+          },
+          "working" : {
+            "frames" : 6,
+            "cycle" : 0.5,
+            "mode" : "loop"
+          }
+        }
+      }
+    },
+
+    "parts" : {
+      "prototyperanim" : {
+        "properties" : {
+          "centered" : false
+        },
+
+        "partStates" : {
+          "prototyperanim" : {
+            "idle" : {
+              "properties" : {
+                "image" : "<partImage>:default.default"
+              }
+            },
+
+            "working" : {
+              "properties" : {
+                "image" : "<partImage>:default.<frame>"
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/objects/generic/prototyper/prototyper.object b/objects/generic/prototyper/prototyper.object
@@ -17,20 +17,30 @@
   "learnBlueprintsOnPickup" : [ "clothingfabricator", "apexpod2", "magneticshielding", "electronmicroscope", "extractionlab", "extractionlab_roof", "nanofabricator", "circuitboard", "basicminer" ],
   "radioMessagesOnPickup" : [ "pickupmatterassembler" ],
   "inventoryIcon" : "prototypericon.png",
+
   "orientations" : [
+     {
+      "imageLayers" : [ { "image" : "prototyper.png:<color>.<frame>", "fullbright" : true }, { "image" : "prototyperlit.png:<color>.<frame>" } ],
+      "direction" : "left",
+      "flipImages" : true,
 
-    {
-      "imageLayers" : [ { "image" : "prototyper.png:<color>.<key>" }, { "image" : "prototyper_lit.png:<color>.<key>", "fullbright" : true } ],
       "imagePosition" : [0, 0],
       "frames" : 7,
-      "animationCycle" : 3.0,
+      "animationCycle" : 1.35,
+      "spaceScan" : 0.1,
+      "anchors" : [ "bottom" ]
+    },
+    {
+      "imageLayers" : [ { "image" : "prototyper.png:<color>.<frame>", "fullbright" : true }, { "image" : "prototyperlit.png:<color>.<frame>" } ],
+      "direction" : "right",
 
+      "imagePosition" : [0, 0],
+      "frames" : 7,
+      "animationCycle" : 1.35,
       "spaceScan" : 0.1,
-      "fgAnchors" : [ [0, -1] ],
-      "collision" : "platform",
-      "direction" : "left",
-      "flipImages" : true
-    }
+      "anchors" : [ "bottom" ]
+    }     
+
   ],
   "scripts" : [ "/scripts/npcToyObject.lua" ],
   "npcToy" : {

diff --git a/objects/generic/prototyper/prototyper.png b/objects/generic/prototyper/prototyper.png
diff --git a/objects/generic/prototyper/prototyper_lit.png b/objects/generic/prototyper/prototyper_lit.png
diff --git a/.../generic/prototyper/prototyper_lit.frames → ...s/generic/prototyper/prototyperlit.frames b/.../generic/prototyper/prototyper_lit.frames → ...s/generic/prototyper/prototyperlit.frames
diff --git a/objects/generic/prototyper/prototyperlit.png b/objects/generic/prototyper/prototyperlit.png
diff --git a/stats/effects/fu_armoreffects/warangelsetbonus.lua b/stats/effects/fu_armoreffects/warangelsetbonus.lua
@@ -1,5 +1,4 @@
-require "/stats/effects/regeneration/lightregen.lua"
-callbacks = { { init = init, update = update, uninit = uninit } }
+
 
 require "/stats/effects/fu_armoreffects/setbonuses_common.lua"
 
@@ -22,6 +21,5 @@ function init()
     {stat = "powerMultiplier", baseMultiplier = self.powerModifier},
     {stat = "grit", amount = 0.75},
     {stat = "wetImmunity", amount = 1}
-	}, 
-	callbacks )
+	})
 end
diff --git a/stats/effects/fu_armoreffects/warangelsetbonus.statuseffect b/stats/effects/fu_armoreffects/warangelsetbonus.statuseffect
@@ -10,8 +10,6 @@
     "warangelsetbonus.lua"
   ],
 
-  "animationConfig" : "/stats/effects/regeneration/lightregen.animation",
-
   "label" : "Superior",
   "icon" : "/interface/statuses/impervious.png"
 }
diff --git a/terrestrial_worlds.config.patch b/terrestrial_worlds.config.patch
@@ -5624,7 +5624,7 @@
   {
       "caveLiquid" : [ "healingliquid" ],
       "caveLiquidChanceRange" : [55, 95],
-
+      "fgCaveSelector" : [ "normalCaves", "denseCaves", "moonCaves" ],
       "biome" : [
         [0, [ "zen" ]]
       ]
@@ -5637,7 +5637,7 @@
   {
       "caveLiquid" : [ "darkwater", "water" ],
       "caveLiquidChanceRange" : [25, 45],
-
+      "fgCaveSelector" : [ "normalCaves", "denseCaves", "moonCaves" ],
       "biome" : [
         [0, [ "abandonedmines" ] ]
       ]
@@ -5650,7 +5650,7 @@
   {
       "caveLiquid" : [ "darkwater", "blacktar" ],
       "caveLiquidChanceRange" : [25, 45],
-
+      "fgCaveSelector" : [ "normalCaves", "denseCaves", "moonCaves" ],
       "biome" : [
         [0, [ "hiveold"] ]
       ]
@@ -5663,7 +5663,7 @@
   {
       "caveLiquid" : [ "blacktar", "water" ],
       "caveLiquidChanceRange" : [25, 55],
-
+      "fgCaveSelector" : [ "normalCaves", "denseCaves", "moonCaves" ],
       "biome" : [
         [0, [ "shroomcave"]]
       ]
@@ -5676,7 +5676,7 @@
   {
       "caveLiquid" : [ "water" ],
       "caveLiquidChanceRange" : [45,65],
-
+      "fgCaveSelector" : [ "normalCaves", "denseCaves", "moonCaves" ],
       "biome" : [
         [0, [ "colorfulcave"]]
       ]
@@ -5689,7 +5689,7 @@
   {
       "caveLiquid" : [ "organicsoup", "water" ],
       "caveLiquidChanceRange" : [25, 95],
-
+      "fgCaveSelector" : [ "normalCaves", "denseCaves", "moonCaves" ],
       "biome" : [
         [0, [ "crystalcave"]]
       ]
@@ -5702,7 +5702,7 @@
   {
       "caveLiquid" : [ "pus", "bio_ooze", "swampwater", "slimeliquid" ],
       "caveLiquidChanceRange" : [55, 100],
-
+      "fgCaveSelector" : [ "normalCaves", "denseCaves", "moonCaves" ],
       "biome" : [
         [0, [ "ffpoopit"]]
       ]
@@ -5715,7 +5715,7 @@
   {
       "caveLiquid" : [ "organicsoup", "darkwater", "gravrain", "healingliquid", "lava", "poison", "bio_ooze" ],
       "caveLiquidChanceRange" : [25, 95],
-
+      "fgCaveSelector" : [ "normalCaves", "denseCaves", "moonCaves" ],
       "biome" : [
         [0, [ "ffcrystalrealm"]]
       ]
@@ -5728,9 +5728,13 @@
   {
       "caveLiquid" : [ "blacktar", "darkwater", "gravrain", "lava", "poison", "bio_ooze" ],
       "caveLiquidChanceRange" : [25, 95],
-
+
+      "blockSelector" : [ "remixedSurface", "remixedMildSurface","remixedMountainsSurface", "remixedMegaMountainsSurface", "remixedFlatsSurface" ],
+      "subBlockSelector" : [ "largeClumps" ],
+      "fgCaveSelector" : [ "normalCaves", "denseCaves", "moonCaves" ],
+
       "biome" : [
-        [0, [ "wastelandmini"]]
+        [0, [ "wastelandmini"] ]
       ]
     }
   },