final push

sayterdarkwynd · Nov 3, 2016 · 6833228 · 6833228
1 parent fbd9f9d
commit 6833228
Show file tree

Hide file tree

Showing 18 changed files with 85 additions and 44 deletions.
diff --git a/.metadata b/.metadata
@@ -8,5 +8,5 @@
   "priority" : 100,
   "requires" : [],
   "steamContentId" : "729480149",
-  "version" : "4.20.4"
+  "version" : "4.20.5"
 }
diff --git a/items/armors/eldercultist/cultarmor.chest b/items/armors/eldercultist/cultarmor.chest
@@ -41,7 +41,7 @@
       "amount" : 10
     }
   ],
-  "questTags" : [ "tier3armor" ],
+
   "colorOptions" : [
     /* YELLOW DEFAULT */
     { "ffca8a" : "ffffa7", "e0975c" : "e2c344", "a85636" : "a46e06", "6f2919" : "642f00" },

diff --git a/items/armors/eldercultist/cultarmor.head b/items/armors/eldercultist/cultarmor.head
@@ -33,7 +33,7 @@
       "amount" : 5
     }
   ],
-  "questTags" : [ "tier3armor" ],
+
   "colorOptions" : [
     /* YELLOW DEFAULT */
     { "ffca8a" : "ffffa7", "e0975c" : "e2c344", "a85636" : "a46e06", "6f2919" : "642f00" },

diff --git a/items/armors/eldercultist/cultarmor.legs b/items/armors/eldercultist/cultarmor.legs
@@ -33,7 +33,7 @@
     },
     "energyregenfu_armor75"
   ],
-  "questTags" : [ "tier3armor" ],
+
   "colorOptions" : [
     /* YELLOW DEFAULT */
     { "ffca8a" : "ffffa7", "e0975c" : "e2c344", "a85636" : "a46e06", "6f2919" : "642f00" },

diff --git a/items/armors/fudesertwalker/fudesertwalker.chest b/items/armors/fudesertwalker/fudesertwalker.chest
@@ -8,7 +8,7 @@
   "shortdescription" : "Nomad Robes",
   "category" : "chestarmour",
   "tooltipKind" : "armornew2",
-"level" : 4,
+  "level" : 3,
   "maleFrames" : {
     "body" : "chest.png",
     "backSleeve" : "bsleeve.png",
@@ -24,12 +24,12 @@
   "statusEffects" : [
     {
       "stat" : "powerMultiplier",
-      "baseMultiplier" : 1.82
+      "baseMultiplier" : 1.80
     },
 
     {
       "stat" : "protection",
-      "amount" : 30
+      "amount" : 27
     },
 
     {

diff --git a/items/armors/fudesertwalker/fudesertwalker.head b/items/armors/fudesertwalker/fudesertwalker.head
@@ -8,20 +8,20 @@
   "shortdescription" : "Nomad Hood",
   "category" : "headarmour",
   "tooltipKind" : "armornew2",
-"level" : 4,
+  "level" : 3,
   "maleFrames" : "head.png",
   "femaleFrames" : "head.png",
   "mask" : "mask.png",
 
   "statusEffects" : [
     {
       "stat" : "powerMultiplier",
-      "baseMultiplier" : 1.55
+      "baseMultiplier" : 1.45
     },
 
     {
       "stat" : "protection",
-      "amount" : 16
+      "amount" : 15
     },
 
     {

diff --git a/items/armors/fudesertwalker/fudesertwalker.legs b/items/armors/fudesertwalker/fudesertwalker.legs
@@ -4,18 +4,18 @@
   "dropCollision" : [-4.0, -3.0, 4.0, 3.0],
   "maxStack" : 1,
   "rarity" : "Common",
-  "description" : "Thick black tar can't slow these down.",
+  "description" : "Thick black tar and quicksand can't slow you down.",
   "shortdescription" : "Nomad Robes",
   "category" : "legarmour",
   "tooltipKind" : "armornew2",
-"level" : 4,
+  "level" : 3,
   "maleFrames" : "pants.png",
   "femaleFrames" : "pants.png",
 
   "statusEffects" : [
     {
       "stat" : "powerMultiplier",
-      "baseMultiplier" : 1.41
+      "baseMultiplier" : 1.32
     },
 
     {
@@ -25,13 +25,17 @@
 
     {
       "stat" : "maxEnergy",
-      "amount" : 12
+      "amount" : 11
     },
 
     {
       "stat" : "maxHealth",
-      "amount" : 5
-    },    
+      "amount" : 8
+    },  
+    {
+      "stat" : "quicksandImmunity",
+      "amount" : 1
+    },       
     "blacktarimmunity"
   ],
 

diff --git a/items/generic/crafting/fissionfurnace/carbonplate.item b/items/generic/crafting/fissionfurnace/carbonplate.item
@@ -6,6 +6,16 @@
   "inventoryIcon" : "carbonplate.png",
   "description" : "Carbon plating can be used for armor or other goods.",
   "shortdescription" : "^#77acc3;Carbon Plate^white;",
-  "learnBlueprintsOnPickup" : [ "fu_watcher", "fucarbonhammer", "fucarbondagger", "carbonaxe", "carbonpickaxe", "carbonspear", "carbonbow", "carbonblade", "napalmcannon" ],
+  "learnBlueprintsOnPickup" : [ 
+  "fu_watcher", 
+  "fucarbonhammer", 
+  "fucarbondagger", 
+  "carbonaxe", 
+  "carbonpickaxe", 
+  "carbonspear", 
+  "carbonbow", 
+  "carbonblade", 
+  "napalmcannon" 
+  ],
   "itemTags" : [ "reagent" ]
 }
diff --git a/items/generic/crafting/fissionfurnace/moonstonebar.item b/items/generic/crafting/fissionfurnace/moonstonebar.item
@@ -13,7 +13,8 @@
   "fuinvaderchest", 
   "fuinvaderhead", 
   "fuinvaderpants",
-  "physicsfield_tech"
+  "physicsfield_tech",
+  "humangenerator"
   ],
   "itemTags" : [ "reagent" ]
 }
diff --git a/items/generic/crafting/fissionfurnace/solaricrystal.item b/items/generic/crafting/fissionfurnace/solaricrystal.item
@@ -6,6 +6,14 @@
   "inventoryIcon" : "solaricrystal.png",
   "description" : "Condensed and hardened Lunari crystal.",
   "shortdescription" : "Lunari Crystal",
-  "learnBlueprintsOnPickup" : [ "lunariwardshield", "lunaririfle", "lunaripistol", "lunarichest", "lunarihead", "lunarilegs", "lunarishield" ],
+  "learnBlueprintsOnPickup" : [ 
+  "lunariwardshield", 
+  "lunaririfle", 
+  "lunaripistol", 
+  "lunarichest", 
+  "lunarihead", 
+  "lunarilegs", 
+  "lunarishield" 
+  ],
   "itemTags" : [ "reagent" ]
 }
diff --git a/npcs/crew/crewmembergeologist.npctype b/npcs/crew/crewmembergeologist.npctype
@@ -36,16 +36,21 @@
     "buyFactor" : 4.75,
     "sellFactor" : 0.21,
     "items" : [
-      { "item" : "ironore" },
-      { "item" : "tungstenore" },
-      { "item" : "durasteelore" },
+          { "item" : "copperore" },
+          { "item" : "silverore" },
+          { "item" : "goldore" },
+          { "item" : "ironore" },
+          { "item" : "tungstenore" },
+          { "item" : "titaniumore" },
+          { "item" : "durasteelore" },
 	  { "item" : "zerchesiumore" },
 	  { "item" : "prisiliteore" },
 	  { "item" : "protociteore" },
 	  { "item" : "penumbriteore" },
-	  { "item" : "thoriumore" },
-	  { "item" : "neptuniumore" },
-      { "item" : "titaniumore" }
+	  { "item" : "uraniumore" },
+	  { "item" : "ceptuniumore" },
+	  { "item" : "plutoniumore" },
+	  { "item" : "thoriumore" }
     ]
   }      
 

diff --git a/npcs/crew/crewmemberstealth.npctype b/npcs/crew/crewmemberstealth.npctype
@@ -38,7 +38,7 @@
       "role" : {
         "type" : "chemist",
         "name" : "Assassin",
-        "field" : "Poisons",
+        "field" : "Murderology",
         "uniformColorIndex" : 6
       }
     },

diff --git a/npcs/crew/crewmemberwarrior.npctype b/npcs/crew/crewmemberwarrior.npctype
@@ -38,7 +38,7 @@
       "role" : {
         "type" : "soldier",
         "name" : "Warrior",
-        "field" : "Stabbing",
+        "field" : "Stabology",
         "uniformColorIndex" : 5
       },
 

diff --git a/recipes/ff_stations/clothingfabricator/fudesertwalkerchest.recipe b/recipes/ff_stations/clothingfabricator/fudesertwalkerchest.recipe
@@ -1,8 +1,8 @@
 {
   "input" : [
-    { "item" : "leather", "count" : 5 },
-    { "item" : "bugshell", "count" : 4 },
-    { "item" : "bone", "count" : 5 }
+    { "item" : "leather", "count" : 3 },
+    { "item" : "bugshell", "count" : 5 },
+    { "item" : "canvas", "count" : 5 }
   ],
   "output" : {
     "item" : "fudesertwalkerchest",

diff --git a/recipes/ff_stations/clothingfabricator/fudesertwalkerhead.recipe b/recipes/ff_stations/clothingfabricator/fudesertwalkerhead.recipe
@@ -1,8 +1,8 @@
 {
   "input" : [
-    { "item" : "leather", "count" : 3 },
-    { "item" : "bugshell", "count" : 2 },
-    { "item" : "bone", "count" : 4 }
+    { "item" : "leather", "count" : 2 },
+    { "item" : "bugshell", "count" : 4 },
+    { "item" : "canvas", "count" : 3 }
   ],
   "output" : {
     "item" : "fudesertwalkerhead",

diff --git a/recipes/ff_stations/clothingfabricator/fudesertwalkerlegs.recipe b/recipes/ff_stations/clothingfabricator/fudesertwalkerlegs.recipe
@@ -1,8 +1,8 @@
 {
   "input" : [
-    { "item" : "leather", "count" : 4 },
-    { "item" : "bugshell", "count" : 3 },
-    { "item" : "bone", "count" : 4 }
+    { "item" : "leather", "count" : 3 },
+    { "item" : "bugshell", "count" : 5 },
+    { "item" : "canvas", "count" : 4 }
   ],
   "output" : {
     "item" : "fudesertwalkerpants",

diff --git a/recipes/ff_stations/prototyper/labs/humangenerator.recipe b/recipes/ff_stations/prototyper/labs/humangenerator.recipe
@@ -0,0 +1,13 @@
+{
+  "input" : [
+    { "item" : "electromagnet", "count" : 5 },
+    { "item" : "battery", "count" : 2 },
+    { "item" : "moonstonebar", "count" : 20 },
+    { "item" : "staticcell", "count" : 10 }
+  ],
+  "output" : {
+    "item" : "humangenerator",
+    "count" : 1
+  },
+  "groups" : [ "prototyper", "genetics", "all", "tools" ]
+}
diff --git a/stats/effects/fu_armoreffects/brainslug.animation b/stats/effects/fu_armoreffects/brainslug.animation
@@ -2,22 +2,22 @@
   "particleEmitters" : {
     "slug" : {
       "enabled" : true,
-      "emissionRate" : 5.0,
+      "emissionRate" : 8.0,
       "particles" : [
         {
           "particle" : {
             "type" : "ember",
-            "size" : 1.5,
+            "size" : 2.212,
             "color" : [200, 40, 40, 230],
-            "fade" : 0.9,
+            "fade" : 0.76,
             "destructionAction" : "shrink",
             "destructionTime" : 0.8,
             "position" : [0.0, 0.0],
             "offsetRegion" : [0, 0, 0, 0],
             "initialVelocity" : [0, 1],
             "finalVelocity" : [0, 1],
             "approach" : [0, 10],
-            "timeToLive" : 0.3,
+            "timeToLive" : 0.33,
             "variance" : {
             }
           }
@@ -31,9 +31,9 @@
         {
           "particle" : {
             "type" : "text",
-            "text" : "Enhanced!",
-            "size" : 0.75,
-            "color" : [150, 220, 220, 230],
+            "text" : "+ Symbiote -",
+            "size" : 1,
+            "color" : [150, 220, 99, 255],
             "fade" : 1,
             "destructionAction" : "shrink",
             "destructionTime" : 0.8,
@@ -42,7 +42,7 @@
             "initialVelocity" : [0, 4],
             "finalVelocity" : [0, 1],
             "approach" : [0, 10],
-            "timeToLive" : 1,
+            "timeToLive" : 1.25,
             "variance" : {
             }
           }