Add missing Salt Water mixings, misc. improvements/fixes

interface/objectcrafting/fu_pethouse/fu_pethouse.config

@@ -4,7 +4,7 @@
 			"type" : "title",
 			"title" : "Pet Configuration",
 			"subtitle" : "Configure your ship pet",
-			"icon" :
+			"icon" :
 			{
 				"type" : "image",
 				"file" : "/interface/windowconfig/prototyper.png",
@@ -225,14 +225,14 @@
 	"buttonTimer" : 1,
 	"popupMessages" :	{
 		"noPod" : "This requires an empty capture pod in your inventory.",
-		"captureFail" : "Incompatible mod detected. Any mods that modifiy groundPet.lua can cause issues with catching ship pets.",
+		"captureFail" : "Incompatible mod detected. Any mods that modify groundPet.lua can cause issues with catching ship pets.",
 		"petMissing" : "Can't find ship pet.",
 		"invalidTechstation" : "This SAIL is missing the necessary script changes. This either means that it uses a custom script, another mod is overwriting the techstation script or you have Purchasable Pets installed."
 	},
 	"interactionTypes" : [
 		{"type" : "always", "name" : "Always"},
-		{"type" : "timer", "name" : "Timer"},
+		{"type" : "timer", "name" : "Timer"},
 		{"type" : "never", "name" : "Never"}
 	],
 	"resetAddedPetsConfirmation" : "/interface/objectcrafting/fu_pethouse/fu_pethouse_confirmation.config"
-}
+}

items/active/weapons/ranged/pistol/swtjc_ewg_commonbeampistol.activeitem

@@ -8,7 +8,7 @@
   "tooltipKind" : "gun",
   "category" : "swtjc_ewg_beamPistol",
   "twoHanded" : false,
-  "itemTags" : ["weapon","ranged","pistol","upgradeableWeapon"],
+  "itemTags" : ["weapon","ranged","pistol","energy","upgradeableWeapon"],
   "level" : 1,
 
   "animation" : "/items/active/weapons/ranged/gun.animation",

items/active/weapons/ranged/pistol/swtjc_ewg_rarebeampistol.activeitem

@@ -8,7 +8,7 @@
   "tooltipKind" : "gun",
   "category" : "swtjc_ewg_beamPistol",
   "twoHanded" : false,
-  "itemTags" : ["weapon","ranged","pistol","upgradeableWeapon"],
+  "itemTags" : ["weapon","ranged","pistol","energy","upgradeableWeapon"],
   "level" : 1,
 
   "animation" : "/items/active/weapons/ranged/gun.animation",

items/active/weapons/ranged/pistol/swtjc_ewg_uncommonbeampistol.activeitem

@@ -8,7 +8,7 @@
   "tooltipKind" : "gun",
   "category" : "swtjc_ewg_beamPistol",
   "twoHanded" : false,
-  "itemTags" : ["weapon","ranged","pistol","upgradeableWeapon"],
+  "itemTags" : ["weapon","ranged","pistol","energy","upgradeableWeapon"],
   "level" : 1,
 
   "animation" : "/items/active/weapons/ranged/gun.animation",

liquids/orangegravrain.liquid

@@ -54,9 +54,14 @@
     //irradium
       "liquid" : 47,
       "materialResult" : "retexaetherdust"
+    },
+    {
+    //salt water
+      "liquid" : 73,
+      "liquidResult" : 51
     }
   ],
   "texture" : "/liquids/honeytex.png",
   "bottomLightMix" : [0, 0, 0],
   "textureMovementFactor" : 1.6
-}
+}

liquids/organicsoup.liquid

@@ -45,6 +45,11 @@
       //mercury
       "liquid" : 48,
       "liquidResult" : 46
+    },
+    {
+      //salt water
+      "liquid" : 73,
+      "liquidResult" : 3
     }
   ],
   "texture" : "/liquids/watertex.png",

liquids/pus.liquid

@@ -38,6 +38,11 @@
     //acid
      "liquid" : 46,
      "liquidResult" : 46
+    },
+    {
+    //salt water
+     "liquid" : 73,
+     "liquidResult" : 58
     }
   ],
   "texture" : "/liquids/pustex.png",

liquids/slimeliquid.liquid.patch

@@ -3,6 +3,7 @@
     "op" : "add",
     "path" : "/interactions/-",
     "value" : {
+      // liquid iron
       "liquid" : 52,
       "liquidResult" : 2
     }
@@ -11,6 +12,7 @@
     "op" : "add",
     "path" : "/interactions/-",
     "value" : {
+      // water
       "liquid" : 1,
       "liquidResult" : 3
     }
@@ -19,8 +21,18 @@
     "op" : "add",
     "path" : "/interactions/-",
     "value" : {
+      // poison
       "liquid" : 3,
       "liquidResult" : 41
     }
+  },
+  {
+    "op" : "add",
+    "path" : "/interactions/-",
+    "value" : {
+      // salt water
+      "liquid" : 73,
+      "liquidResult" : 3
+    }
   }
 ]

objects/power/fu_liquidcondenser/fu_liquidcondenser.object

@@ -2,7 +2,7 @@
 	"objectName": "fu_liquidcondenser",
 	"rarity": "rare",
 	"colonyTags": ["science", "wired", "lab"],
-	"description": "Condenses liquid from biome atmosphere. ^cyan;Requires ^orange;15J^cyan; per action^reset;. ^red;Slower production when stacked^reset;. Scan for Info.",
+	"description": "Condenses liquid from biome atmosphere. ^cyan;Requires ^orange;15W^cyan; of power^reset;. ^red;Slower production when stacked^reset;. Scan for Info.",
 	"shortdescription": "^cyan;Liquid Collector^reset;",
 	"race": "generic",
 	"category": "wire",

objects/power/fu_liquidmixer/fu_liquidmixer_recipes.config

@@ -10,6 +10,10 @@
 	{"inputs":{"fusaltwater":1,"fu_liquidhoney":1},"outputs":{"honeycombmaterial":1}},
 	{"inputs":{"fusaltwater":10,"corruptionore":1},"outputs":{"liquiddarkwater":5}},
 	{"inputs":{"fusaltwater":1,"liquidwater":1},"outputs":{"fusaltwater":2}},
+	{"inputs":{"fusaltwater":1,"liquidorangegravrain":1},"outputs":{"liquidgravrain":2}},
+	{"inputs":{"fusaltwater":1,"liquidorganicsoup":1},"outputs":{"liquidpoison":2}},
+	{"inputs":{"fusaltwater":1,"liquidpus":1},"outputs":{"liquidwastewater":2}},
+	{"inputs":{"fusaltwater":1,"liquidslime":1},"outputs":{"liquidpoison":2}},
 
 	{"inputs":{"liquidwater":1,"liquidpoison":1},"outputs":{"liquidpoison":2}},
 	{"inputs":{"liquidwater":1,"swampwater":1},"outputs":{"swampwater":2}},
@@ -18,69 +22,69 @@
 	{"inputs":{"liquidwater":1,"liquidwastewater":1},"outputs":{"liquidwastewater":2}},
 	{"inputs":{"liquidwater":1,"fu_liquidhoney":1},"outputs":{"honeycombmaterial":1}},
 	{"inputs":{"liquidwater":20,"corruptionore":1},"outputs":{"liquiddarkwater":5}},
-
+
 	{"inputs":{"liquidlava":1,"liquidwater":1},"outputs":{"magmarock":1}},
 	{"inputs":{"liquidlava":1,"liquidoil":1},"outputs":{"asphalt":1}},
 	{"inputs":{"liquidlava":1,"liquidblood":1},"outputs":{"bloodstonewall2":1}},
 	{"inputs":{"liquidlava":1,"liquidblacktar":1},"outputs":{"andesite":1}},
 	{"inputs":{"liquidlava":1,"liquidorganicsoup":1},"outputs":{"purplecrystalmaterial":1}},
 	{"inputs":{"liquidlava":1,"liquidelderfluid":1},"outputs":{"sulphurstonematerial":1}},
 	{"inputs":{"liquidlava":1,"liquidsulphuricacid":1},"outputs":{"sulphurstonematerial":1}},
-
+
 	{"inputs":{"liquidslime":1,"liquidlava":1},"outputs":{"liquidlava":2}},
 	{"inputs":{"liquidslime":1,"liquidironfu":1},"outputs":{"liquidlava":1}},
 	{"inputs":{"liquidslime":1,"liquidwater":1},"outputs":{"liquidpoison":1}},
 	{"inputs":{"liquidslime":1,"liquidpoison":1},"outputs":{"liquidbioooze":1}},
-
+
 	{"inputs":{"liquidblood":1,"liquidwater":1},"outputs":{"liquidblood":2}},
 	{"inputs":{"liquidblood":1,"liquidpoison":1},"outputs":{"liquidpoison":2}},
 	{"inputs":{"liquidblood":1,"liquidirradium":1},"outputs":{"bloodstonewall":1}},
 	{"inputs":{"liquidblood":1,"ff_mercury":1},"outputs":{"bloodstonewall2":1}},
-
+
 	{"inputs":{"fu_oxygen":1,"liquidwastewater":1},"outputs":{"liquidwater":1}},
-
+
 	{"inputs":{"liquidbioooze":1,"liquidwater":1},"outputs":{"slime":1}},
 	{"inputs":{"liquidbioooze":1,"liquidpoison":1},"outputs":{"slime":1}},
 	{"inputs":{"liquidbioooze":1,"liquidhealing":1},"outputs":{"liquidbioooze":2}},
 	{"inputs":{"liquidbioooze":1,"liquidsulphuricacid":1},"outputs":{"wastestone":1}},
 	{"inputs":{"liquidbioooze":1,"ff_mercury":1},"outputs":{"vialproto":1}},
-
+
 	{"inputs":{"liquidblacktar":1,"liquidpoison":1},"outputs":{"tarstonematerial":1}},
 	{"inputs":{"liquidblacktar":1,"liquidbioooze":1},"outputs":{"tarstonematerial":1}},
 	{"inputs":{"liquidblacktar":1,"vialproto":1},"outputs":{"vialproto":2}},
 	{"inputs":{"liquidblacktar":1,"liquidsulphuricacid":1},"outputs":{"tarstonematerial":1}},
 	{"inputs":{"liquidblacktar":1,"liquidirradium":1},"outputs":{"liquidirradium":2}},
 	{"inputs":{"liquidblacktar":1,"liquiddarkwater":1},"outputs":{"tarstonematerial":1}},
-
+
 	{"inputs":{"liquidorganicsoup":1,"liquidwater":1},"outputs":{"liquidpoison":1}},
 	{"inputs":{"liquidorganicsoup":1,"liquidpoison":1},"outputs":{"liquidorganicsoup":2}},
 	{"inputs":{"liquidorganicsoup":1,"liquidbioooze":1},"outputs":{"slimedirtmaterial":1}},
 	{"inputs":{"liquidorganicsoup":1,"liquidblacktar":1},"outputs":{"slime2material":1}},
 	{"inputs":{"liquidorganicsoup":1,"vialproto":1},"outputs":{"liquidorganicsoup":2}},
 	{"inputs":{"liquidorganicsoup":1,"ff_mercury":1},"outputs":{"liquidsulphuricacid":1}},
-
+
 	{"inputs":{"vialproto":1,"liquidwater":1},"outputs":{"slime":1}},
 	{"inputs":{"vialproto":1,"liquidpoison":1},"outputs":{"slime2material":1}},
 	{"inputs":{"vialproto":1,"liquidbioooze":1},"outputs":{"liquidirradium":1}},
 	{"inputs":{"vialproto":25,"liquidalienjuice":25},"outputs":{"liquidelderfluid":1}},
-
+
 	{"inputs":{"liquidsulphuricacid":1,"liquidpoison":1},"outputs":{"liquidsulphuricacid":2}},
 	{"inputs":{"liquidsulphuricacid":1,"liquidorganicsoup":1},"outputs":{"liquidblacktar":1}},
 	{"inputs":{"liquidsulphuricacid":1,"vialproto":1},"outputs":{"wastestone":1}},
 	{"inputs":{"liquidsulphuricacid":1,"liquidirradium":1},"outputs":{"liquidsulphuricacid":2}},
 	{"inputs":{"liquidsulphuricacid":1,"ff_mercury":1},"outputs":{"wastestone":1}},
-
+
 	{"inputs":{"liquidirradium":1,"liquidwater":1},"outputs":{"rainbowsandmaterial":1}},
 	{"inputs":{"liquidirradium":1,"liquidpoison":1},"outputs":{"rainbowsandmaterial":1}},
 	{"inputs":{"liquidirradium":1,"liquidbioooze":1},"outputs":{"rainbowsandmaterial":1}},
 	{"inputs":{"liquidirradium":1,"liquidorganicsoup":1},"outputs":{"liquidirradium":2}},
 	{"inputs":{"liquidirradium":1,"vialproto":1},"outputs":{"rainbowsandmaterial":1}},
-
+
 	{"inputs":{"ff_mercury":1,"liquidblacktar":1},"outputs":{"liquidorganicsoup":1}},
 	{"inputs":{"ff_mercury":1,"vialproto":1},"outputs":{"liquidirradium":1}},
-
+
 	{"inputs":{"shadowgasliquid":1,"liquidpoison":1},"outputs":{"darknessmaterial":2}},
-
+
 	{"inputs":{"liquidgravrain":1,"liquidwater":1},"outputs":{"liquidgravrain":2}},
 	{"inputs":{"liquidgravrain":1,"liquidpoison":1},"outputs":{"liquidpoison":2}},
 	{"inputs":{"liquidgravrain":1,"liquidbioooze":1},"outputs":{"liquidgravrain":2}},
@@ -90,11 +94,11 @@
 	{"inputs":{"liquidgravrain":1,"liquidelderfluid":1},"outputs":{"corruptslimematerial":1}},
 	{"inputs":{"liquidgravrain":1,"liquidsulphuricacid":1},"outputs":{"retexaetherdust":1}},
 	{"inputs":{"liquidgravrain":1,"liquidirradium":1},"outputs":{"retexaetherdust":1}},
-
+
 	{"inputs":{"liquidironfu":1,"liquidaether":1},"outputs":{"retexaetherdust":1}},
 	{"inputs":{"liquidironfu":1,"liquidlava":1},"outputs":{"liquidlava":2}},
 	{"inputs":{"liquidironfu":1,"liquidelderfluid":1},"outputs":{"liquidorangegravrain":1}},
-
+
 	{"inputs":{"liquidpus":1,"liquidwater":1},"outputs":{"liquidwastewater":1}},
 	{"inputs":{"liquidpus":1,"liquidpoison":1},"outputs":{"liquidbioooze":1}},
 	{"inputs":{"liquidpus":1,"liquidbioooze":1},"outputs":{"liquidbioooze":2}},
@@ -104,16 +108,16 @@
 	{"inputs":{"liquidpus":1,"liquidelderfluid":1},"outputs":{"liquidelderfluid":2}},
 	{"inputs":{"liquidpus":1,"liquidsulphuricacid":1},"outputs":{"liquidsulphuricacid":2}},
 	{"inputs":{"liquidpus":1,"liquidirradium":1},"outputs":{"liquidirradium":2}},
-
+
 	{"inputs":{"liquidnitrogenitem":1,"liquidwater":1},"outputs":{"ice":1}},
 	{"inputs":{"liquidnitrogenitem":1,"liquidpoison":1},"outputs":{"cloudblock":1}},
 	{"inputs":{"liquidnitrogenitem":1,"swampwater":1},"outputs":{"ice":1}},
 	{"inputs":{"liquidnitrogenitem":1,"liquidslime":1},"outputs":{"iceblock4material":1}},
-
+
 	{"inputs":{"liquidwastewater":1,"liquidpoison":1},"outputs":{"clay":1}},
 	{"inputs":{"liquidwastewater":1,"swampwater":1},"outputs":{"swampwater":2}},
 	{"inputs":{"liquidwastewater":1,"liquidhealing":1},"outputs":{"liquidhealing":2}},
-
+
 	{"inputs":{"liquidcrystal":1,"liquidwater":1},"outputs":{"crystalblock":1}},
 	{"inputs":{"liquidcrystal":1,"liquidpoison":1},"outputs":{"aegisaltcrystal":1}},
 	{"inputs":{"liquidcrystal":1,"swampwater":1},"outputs":{"purplecrystalmaterial":1}},
@@ -124,13 +128,13 @@
 	{"inputs":{"liquidcrystal":1,"liquidelderfluid":1},"outputs":{"corruptslimematerial":1}},
 	{"inputs":{"liquidcrystal":1,"liquidsulphuricacid":1},"outputs":{"retexaetherdust":1}},
 	{"inputs":{"liquidcrystal":1,"liquidirradium":1},"outputs":{"retexaetherdust":1}},
-
+
 	{"inputs":{"liquiddarkwater":1,"liquidwater":1},"outputs":{"penumbradirtmaterial":1}},
 	{"inputs":{"liquiddarkwater":1,"liquidhealing":1},"outputs":{"penumbrastonematerial":1}},
 	{"inputs":{"liquiddarkwater":1,"liquidbioooze":1},"outputs":{"corruptslimematerial":1}},
 	{"inputs":{"liquiddarkwater":1,"helium3gasliquid":1},"outputs":{"retexaetherdust":1}},
 	{"inputs":{"liquiddarkwater":1,"shadowgasliquid":1},"outputs":{"retexaetherdust":1}},
-
+
 	{"inputs":{"liquidorangegravrain":1,"liquidwater":1},"outputs":{"liquidgravrain":1}},
 	{"inputs":{"liquidorangegravrain":1,"liquidpoison":1},"outputs":{"liquidpoison":2}},
 	{"inputs":{"liquidorangegravrain":1,"liquidbioooze":1},"outputs":{"liquidgravrain":1}},
@@ -140,7 +144,7 @@
 	{"inputs":{"liquidorangegravrain":1,"liquidelderfluid":1},"outputs":{"corruptslimematerial":1}},
 	{"inputs":{"liquidorangegravrain":1,"liquidsulphuricacid":1},"outputs":{"retexaetherdust":1}},
 	{"inputs":{"liquidorangegravrain":1,"liquidirradium":1},"outputs":{"retexaetherdust":1}},
-
+
 	{"inputs":{"liquidaether":1,"liquidlava":1},"outputs":{"retexaetherdust":1}},
 
 	{"inputs":{"fu_liquidhoneyred":1,"fusaltwater":1},"outputs":{"redhoneycombmaterial":1}},

recipes/chemlab/liquids/fusaltwater.recipe

@@ -1,12 +1,12 @@
 {
   "input" : [
-    { "item" : "fusaltwater", "count" : 10 },
-    { "item" : "corefragmentore", "count" : 1 }
+    { "item" : "liquidwater", "count" : 1 },
+    { "item" : "fu_salt", "count" : 1 }
   ],
   "output" : {
-    "item" : "liquidwater",
-    "count" : 10
+    "item" : "fusaltwater",
+    "count" : 2
   },
-  "groups" : [ "chemlab1", "liquids", "all","nouncrafting","norecycling" ],
-  "duration" : 0.2
-}
+  "groups" : [ "chemlab","chemlab1", "liquids", "all","nouncrafting","norecycling" ],
+  "duration" : 0.25
+}

recipes/chemlab/liquids/liquidwater.recipe

@@ -1,12 +1,12 @@
 {
   "input" : [
-    { "item" : "liquidwater", "count" : 1 },
-    { "item" : "fu_salt", "count" : 1 }
+    { "item" : "fusaltwater", "count" : 10 },
+    { "item" : "corefragmentore", "count" : 1 }
   ],
   "output" : {
-    "item" : "fusaltwater",
-    "count" : 2
+    "item" : "liquidwater",
+    "count" : 10
   },
-  "groups" : [ "chemlab","chemlab1", "liquids", "all","nouncrafting","norecycling" ],
-  "duration" : 0.25
-}
+  "groups" : [ "chemlab1", "liquids", "all","nouncrafting","norecycling", "excludeFromQuests" ],
+  "duration" : 0.2
+}

recipes/chemlab/liquids/purewater.recipe

@@ -8,6 +8,6 @@
     "item" : "liquidwater",
     "count" : 5
   },
-  "groups" : [ "chemlab1", "liquids", "all","nouncrafting","norecycling" ],
+  "groups" : [ "chemlab1", "liquids", "all","nouncrafting","norecycling", "excludeFromQuests" ],
   "duration" : 0.25
-}
+}

species/novakid.species.patch

@@ -8,6 +8,7 @@
   ^orange;Diet^reset;: Any
 
 ^orange;Perks^reset;:
+  Glow in the dark
   Energy x^green;1.1^reset;
   ^green;Resist^reset;: +^cyan;35^reset;% Radiation, +^cyan;20^reset;% Fire
   ^cyan;Immune^reset;: Burning, Radiation Burn

stats/effects/regeneration/lightregen.lua

@@ -4,35 +4,22 @@ require "/scripts/interp.lua"
 require "/stats/effects/fu_statusUtil.lua"
 
 function init()
-	self.healingRate = 1.01 / config.getParameter("healTime", 320)
 	script.setUpdateDelta(5)
 	self.healTime=config.getParameter("healTime", 140)
 	bonusHandler=effect.addStatModifierGroup({})
 end
 
 function update(dt)
-	local daytime = daytimeCheck()
-	local underground = undergroundCheck()
 	local lightLevel = getLight()
+	local healingRate = 0.0
 
-	if daytime then
-		if underground and lightLevel < 40 then
-			self.healingRate = 1.0009 / self.healTime
-		elseif underground and lightLevel > 40 then
-			self.healingRate = 1.001 / self.healTime
-		else
-		    if lightLevel > 25 then
-				self.healingRate=((((lightLevel-25.0)/37.5)+1.0)/self.healTime)
-			else
-				self.healingRate=0.0
-			end
-		end
-	else
-		self.healingRate=0.0
+	if lightLevel > 25 then
+		healingRate = ((((lightLevel-25.0)/37.5)+1.0)/self.healTime)
 	end
-	effect.setStatModifierGroup(bonusHandler,{{stat="healthRegen",amount=status.resourceMax("health")*self.healingRate*math.max(0,1+status.stat("healingBonus"))}})
+
+	effect.setStatModifierGroup(bonusHandler,{{stat="healthRegen",amount=status.resourceMax("health")*healingRate*math.max(0,1+status.stat("healingBonus"))}})
 end
 
 function uninit()
 	effect.removeStatModifierGroup(bonusHandler)
-end
+end