gravgen adjustments

sayterdarkwynd · Dec 31, 2016 · d8a6e71 · d8a6e71
1 parent cc347a0
commit d8a6e71
Show file tree

Hide file tree

Showing 7 changed files with 43 additions and 16 deletions.
diff --git a/.metadata b/.metadata
@@ -7,5 +7,5 @@
   "name" : "FrackinUniverse",
   "requires" : [],
   "steamContentId" : "729480149",
-  "version" : "4.30.7"
+  "version" : "4.30.71"
 }
diff --git a/objects/generic/antigravgenerator/antigravgen.lua b/objects/generic/antigravgenerator/antigravgen.lua
@@ -3,5 +3,7 @@ function init(virtual)
 end
 
 function update(dt)
-	isn_projectileAllInRange("antigravgenprojectile",75)
+	--isn_projectileAllInRange("antigravgenprojectile",75)
+        local active = 1
+	physics.setForceEnabled("jumpForce", active)		
 end
diff --git a/objects/generic/antigravgenerator/antigravgen.object b/objects/generic/antigravgenerator/antigravgen.object
@@ -4,8 +4,8 @@
   "printable" : false,
   "price" : 1600,
   "rarity" : "rare",
-
-  "description" : "Produces anti-gravity in a 75 tile radius. Use with caution.",
+  "objectType" : "physics",
+  "description" : "Produces anti-gravity in a 30 tile radius. Use with caution.",
   "shortdescription" : "^orange;Anti-Grav Generator^white;",
   "race" : "generic",
   "category" : "crafting",
@@ -22,7 +22,8 @@
       "animationCycle" : 1,
 
       "spaceScan" : 0.1,
-      "anchors" : [ "bottom" ]
+      "anchors" : [ "bottom" ],
+      "metaBoundBox" : [-30, -30, 30, 30]
     },
     {
       "imageLayers" : [ { "image" : "antigravgen.png:<color>.<frame>", "fullbright" : true }, { "image" : "antigravgenlit.png:<color>.<frame>" } ],
@@ -33,7 +34,8 @@
       "animationCycle" : 1,
 
       "spaceScan" : 0.1,
-      "anchors" : [ "bottom" ]
+      "anchors" : [ "bottom" ],
+      "metaBoundBox" : [-30, -30, 30, 30]
     }
   ],
 
@@ -59,5 +61,14 @@
     "preciseStandPositionLeft" : [-1.0, 0.0],
     "preciseStandPositionRight" : [1.0, 0.0],
     "maxNpcs" : 1
+  },
+
+  "physicsForces" : {
+    "jumpForce" : {
+      "type" : "DirectionalForceRegion",
+      "rectRegion" : [-50, -50, 50, 50],
+      "yTargetVelocity" : 3,
+      "controlForce" : 700
+    }
   }
 }
diff --git a/objects/generic/gravgenerator/gravgen.lua b/objects/generic/gravgenerator/gravgen.lua
@@ -3,5 +3,8 @@ function init(virtual)
 end
 
 function update(dt)
-	isn_projectileAllInRange("gravgenprojectile",100)
+	--isn_projectileAllInRange("gravgenprojectile",100)
+        local active = 1
+	physics.setForceEnabled("jumpForce", active)	
+
 end
diff --git a/objects/generic/gravgenerator/gravgen.object b/objects/generic/gravgenerator/gravgen.object
@@ -4,8 +4,8 @@
   "printable" : false,
   "price" : 1600,
   "rarity" : "rare",
-
-  "description" : "Produces gravity in a small radius. Perfect for moon and asteroid bases.",
+  "objectType" : "physics",
+  "description" : "Produces gravity in a 30 tile radius. Perfect for moon and asteroid bases, or mining.",
   "shortdescription" : "^orange;Gravity Generator^white;",
   "race" : "generic",
   "category" : "crafting",
@@ -22,7 +22,8 @@
       "animationCycle" : 1,
 
       "spaceScan" : 0.1,
-      "anchors" : [ "bottom" ]
+      "anchors" : [ "bottom" ],
+      "metaBoundBox" : [-30, -30, 30, 30]
     },
     {
       "imageLayers" : [ { "image" : "gravgen.png:<color>.<frame>", "fullbright" : true }, { "image" : "gravgenlit.png:<color>.<frame>" } ],
@@ -33,7 +34,8 @@
       "animationCycle" : 1,
 
       "spaceScan" : 0.1,
-      "anchors" : [ "bottom" ]
+      "anchors" : [ "bottom" ],
+      "metaBoundBox" : [-30, -30, 30, 30]
     }  
   ],
 
@@ -59,5 +61,14 @@
     "preciseStandPositionLeft" : [-1.0, 0.0],
     "preciseStandPositionRight" : [1.0, 0.0],
     "maxNpcs" : 1
+  },
+
+  "physicsForces" : {
+    "jumpForce" : {
+      "type" : "DirectionalForceRegion",
+      "rectRegion" : [-50, -50, 50, 50],
+      "yTargetVelocity" : -5,
+      "controlForce" : 700
+    }
   }
 }
diff --git a/stats/effects/fu_armoreffects/bonesetbonus2.lua b/stats/effects/fu_armoreffects/bonesetbonus2.lua
@@ -9,7 +9,7 @@ function init()
               {stat = "sulphuricImmunity", amount = 1}
 	    }) 
        else
-	    setBonusInit("fu_boneset", {
+	    setBonusInit("fu_boneset2", {
 	      {stat = "maxHealth", baseMultiplier = 1.0},
 	      {stat = "powerMultiplier", baseMultiplier = 1.0},
 	      {stat = "physicalResistance", baseMultiplier = 1.0},

diff --git a/stats/effects/fu_armoreffects/reptilesetbonus.lua b/stats/effects/fu_armoreffects/reptilesetbonus.lua
@@ -5,17 +5,17 @@ function init()
       setBonusInit("fu_reptileset", {
         {stat = "maxHealth", baseMultiplier = 1.1},
         {stat = "powerMultiplier", baseMultiplier = 1.1},
-        {stat = "physicalResistance", baseMultiplier = 1.1}
+        {stat = "physicalResistance", baseMultiplier = 1.1},
         {stat = "sulphuricImmunity", amount = 1},
-        {stat = "protoImmunity", amount = 1},
+        {stat = "protoImmunity", amount = 1}
       })
     else
       setBonusInit("fu_reptileset", {
         {stat = "maxHealth", baseMultiplier = 1.0},
         {stat = "powerMultiplier", baseMultiplier = 1.0},
-        {stat = "physicalResistance", baseMultiplier = 1.0}
+        {stat = "physicalResistance", baseMultiplier = 1.0},
         {stat = "sulphuricImmunity", amount = 1},
-        {stat = "protoImmunity", amount = 1},
+        {stat = "protoImmunity", amount = 1}
       })
     end
 end