Merge branch 'master' of https://github.com/sayterdarkwynd/FrackinUni…

…verse

items/FOODS/CANS/gic_cannedtomatosoup.consumable.patch

@@ -13,6 +13,6 @@
   {
     "op": "replace",
     "path": "/description",
-    "value": "A can of Tomato Soup. A great source of Vitamin A and C in a small, compact package. Not to be confused with tomato paste, which typically comes in a jar and is used in other recipes.\n^green;Type: Herbivore^reset;"
+    "value": "A can of Tomato Soup. A great source of vitamins A and C in a small, compact package. Not to be confused with tomato paste, which typically comes in a jar and is used in other recipes.\n^green;Type: Herbivore^reset;"
   }
 ]

monsters/segmented/distortionsnakes/aquasnake/aquasnake.monstertype

@@ -1,7 +1,7 @@
 {
   "type" : "aquasnake",
-  "shortdescription" : "The head of a aqua sphere snake",
-  "description" : "A snake-like construct composed of aqua distortion spheres",
+  "shortdescription" : "The head of an aqua sphere snake.",
+  "description" : "A snake-like construct composed of aqua distortion spheres.",
 
   "categories" : [ "aquasnake" ],
   "parts" : [ "body" ],

monsters/segmented/distortionsnakes/aquasnake/aquasnakesegment.monstertype

@@ -1,7 +1,7 @@
 {
   "type" : "aquasnakesegment",
-  "shortdescription" : "A segment of a aqua sphere snake",
-  "description" : "A snake-like construct composed of aqua distortion spheres",
+  "shortdescription" : "A segment of an aqua sphere snake.",
+  "description" : "A snake-like construct composed of aqua distortion spheres.",
 
  "categories" : [ "aquasnake" ],
   "parts" : [ "body" ],

objects/crafting/matterassembler/prototyper.object

@@ -68,7 +68,7 @@
         "placementImage" : "prototyper2.png:default.default",
         "placementImagePosition" : [-28, 0],
 
-        "description" : "Create more complicated gear",
+        "description" : "Create more complicated gear.",
         "shortdescription" : "^orange;Auto-Assembler^reset;"
       },
 

objects/crafting/matterassembler/prototyperoutpost.object

@@ -60,7 +60,7 @@
         "placementImage" : "prototyper2.png:default.default",
         "placementImagePosition" : [-28, 0],
 
-        "description" : "Create more complicated gear",
+        "description" : "Create more complicated gear.",
         "shortdescription" : "^orange;Auto-Assembler^reset;"
       },
 

objects/farmables/eggs/poptopegg/poptopegg.object

@@ -6,7 +6,7 @@
   "category" : "farmBeastEgg",
   "price" : 150,
 
-  "description" : "Hatches into a adorable floofy carnivore.",
+  "description" : "Hatches into an adorable floofy carnivore.",
   "shortdescription" : "Poptop Egg",
   "race" : "generic",
 

objects/mission/mining/minecrusher/cmineduct.object

@@ -7,11 +7,11 @@
   "shortdescription" : "C Rock duct",
   "race" : "human",
 
-  "apexDescription" : "An industrial machine, used for transporting across rocks.",
-  "avianDescription" : "A duct used for down rocks.",
+  "apexDescription" : "An industrial machine, used for transporting rocks across.",
+  "avianDescription" : "A duct used for transporting rocks.",
   "floranDescription" : "Floran wants to drop prey inssside!",
   "glitchDescription" : "Observant. The duct exists to send rocks to the crusher.",
-  "humanDescription" : "A machine used for transport across rocks.",
+  "humanDescription" : "A machine used for transporting rocks across.",
   "hylotlDescription" : "An unsightly metal construction.",
 
   "inventoryIcon" : "mineicon.png",

objects/mission/mining/minecrusher/hmineduct.object

@@ -3,15 +3,15 @@
   "rarity" : "Common",
   "category" : "decorative",
   "price" : 400,
-  "description" : "A duct for transport rocks.",
+  "description" : "A duct for transporting rocks.",
   "shortdescription" : "H Rock duct",
   "race" : "human",
 
-  "apexDescription" : "An industrial machine, used for transporting across rocks.",
-  "avianDescription" : "A machine used for down rocks.",
+  "apexDescription" : "An industrial machine, used for transporting rocks across.",
+  "avianDescription" : "A machine used for transporting rocks.",
   "floranDescription" : "Floran wants to drop prey inssside!",
   "glitchDescription" : "Observant. The duct exists to send rocks to the crusher.",
-  "humanDescription" : "A machine used for transport across rocks.",
+  "humanDescription" : "A machine used for transporting rocks across.",
   "hylotlDescription" : "An unsightly metal construction.",
 
   "inventoryIcon" : "mineicon.png",

objects/mission/mining/minecrusher/mineduct.object

@@ -3,15 +3,15 @@
   "rarity" : "Common",
   "category" : "decorative",
   "price" : 400,
-  "description" : "A duct for transport rocks.",
+  "description" : "A duct for transporting rocks.",
   "shortdescription" : "Rock duct",
   "race" : "human",
 
-  "apexDescription" : "An industrial machine, used for down rocks.",
-  "avianDescription" : "A machine used for down rocks.",
+  "apexDescription" : "An industrial machine, used for transporting rocks down.",
+  "avianDescription" : "A machine used for transporting rocks down.",
   "floranDescription" : "Floran wants to drop prey inssside!",
   "glitchDescription" : "Observant. The machine exists to send rocks to the crusher.",
-  "humanDescription" : "A machine used for transport down rocks.",
+  "humanDescription" : "A machine used for transporting rocks down.",
   "hylotlDescription" : "An unsightly metal construction.",
 
   "inventoryIcon" : "mineicon.png",

objects/mission/mining/minecrusher/smineduct.object

@@ -3,15 +3,15 @@
   "rarity" : "Common",
   "category" : "decorative",
   "price" : 400,
-  "description" : "A duct for transport rocks.",
+  "description" : "A duct for transporting rocks.",
   "shortdescription" : "S Rock duct",
   "race" : "human",
 
-  "apexDescription" : "An industrial machine, used for down rocks.",
-  "avianDescription" : "A machine used for down rocks.",
+  "apexDescription" : "An industrial machine, used for transporting rocks down.",
+  "avianDescription" : "A machine used for transporting rocks down.",
   "floranDescription" : "Floran wants to drop prey inssside!",
   "glitchDescription" : "Observant. The machine exists to send rocks to the crusher.",
-  "humanDescription" : "A machine used for transport down rocks.",
+  "humanDescription" : "A machine used for transporting rocks down.",
   "hylotlDescription" : "An unsightly metal construction.",
 
   "inventoryIcon" : "mineicon.png",

objects/mission/mining/minefence/minefence.object

@@ -3,11 +3,11 @@
   "rarity" : "Common",
   "category" : "decorative",
   "price" : 1500,
-  "description" : "A metal fence with red and black warning stripes.",
+  "description" : "A metal fence with black and yellow warning stripes.",
   "shortdescription" : "Mine Railing",
   "race" : "human",
 
-  "apexDescription" : "A metal railing painted with red and black stripes.",
+  "apexDescription" : "A metal railing painted with black and yellow stripes.",
   "avianDescription" : "A metal railing.",
   "floranDescription" : "Floran bored of fencesss.",
   "glitchDescription" : "Observant. The railing is implemented for safety.",

species/floran.raceeffect

@@ -9,7 +9,11 @@
 		{ "stat": "shadowResistance", "amount": -0.05 },
 
 		{ "stat": "bowMastery", "amount": 0.20 },
-		{ "stat": "spearMastery", "amount": 0.15 }
+		{ "stat": "spearMastery", "amount": 0.15 },
+		{
+			"stat": "fuWaterPlants",
+			"amount": 1
+		}
 
 	],
 	"diet" : "carnivore",

species/fragmentedruin.raceeffect

@@ -39,6 +39,14 @@
 		{
 			"stat": "darknessImmunity",
 			"amount": 1
+		},
+		{
+			"stat": "fuHealingWaterPoisons",
+			"amount": 1
+		},
+		{
+			"stat": "fuPoisonHeals",
+			"amount": 1
 		}
 	],
 	"diet" : "omnivore",
@@ -92,4 +100,4 @@
 		}
 	],
 	"scripts": []
-}
+}

species/glitch.raceeffect

@@ -13,7 +13,19 @@
 		{ "stat": "beestingImmunity", "amount": 1 },
 
 		{ "stat": "hammerMastery", "amount": 0.25 },
-		{ "stat": "bowMastery", "amount": 0.10 }
+		{ "stat": "bowMastery", "amount": 0.10 },
+		{
+			"stat": "fuElectrifiedPenaltyEnergy",
+			"amount": 1
+		},
+		{
+			"stat": "fuElectrifiedPenaltyDamage",
+			"amount": 1
+		},
+		{
+			"stat": "fuTarHeals",
+			"amount": 1
+		}
 	],
 	"diet" : [ { "ORGANIC" : false, "ROBOT_PLANT" : true }, { "MEAT_RAW" : true } ],
 	"weaponEffects": [],

species/hylotl.raceeffect

@@ -9,7 +9,11 @@
 		{ "stat": "radioactiveResistance", "amount": 0.12 },
 		{ "stat": "shadowResistance", "amount": -0.10 },
 
-		{ "stat": "katanaMastery", "amount": 0.25 }
+		{ "stat": "katanaMastery", "amount": 0.25 },
+		{
+			"stat": "fuFishFood",
+			"amount": 1
+		}
 	],
 	"diet" : [ { "ORGANIC" : false, "FISH" : true }, { "MEAT_RAW" : true } ],
 	"envEffects": [

species/novakid.raceeffect

@@ -15,7 +15,11 @@
 
 		{ "stat": "pistolMastery", "amount": 0.15 },
 		{ "stat": "sniperrifleMastery", "amount": 0.15 },
-		{ "stat": "shotgunMastery", "amount": 0.15 }
+		{ "stat": "shotgunMastery", "amount": 0.15 },
+		{
+			"stat": "fuRadiationHeal",
+			"amount": 1
+		}
 	],
 	"diet" : "entity",
 	"controlModifiers": {},

species/novali.raceeffect

@@ -59,6 +59,10 @@
 		{
 			"stat": "radiationburnImmunity",
 			"amount": 1
+		},
+		{
+			"stat": "fuRadiationHeal",
+			"amount": 1
 		}
 	],
 	"diet" : "entity",

species/radien.raceeffect

@@ -15,7 +15,15 @@
 
 		{ "stat": "radiationburnImmunity", "amount": 1 },
 		{ "stat": "healingStatusImmunity", "amount": 1 },
-		{ "stat": "isXi", "amount": 1 }
+		{ "stat": "isXi", "amount": 1 },
+		{
+			"stat": "fuRadiationHeal",
+			"amount": 1
+		},
+		{
+			"stat": "fuDirtBeer",
+			"amount": 1
+		}
 	],
 	"diet" : "entity",
 	"special" : [ "radienFoodBoost" ],
@@ -47,4 +55,4 @@
 		}
 	],
 	"tech" : [ "xi_bulb" ]
-}
+}

species/shade.raceeffect

@@ -16,7 +16,11 @@
 		{"stat": "darknessImmunity","amount": 1 },
 		{"stat": "breathProtection","amount": 1 },
 
-		{"stat": "scytheMastery", "amount": 0.25 }
+		{"stat": "scytheMastery", "amount": 0.25 },
+		{
+			"stat": "fuRadiationHeal",
+			"amount": 1
+		}
 	],
 	"diet" : "entity",
 	"envEffects": [
@@ -64,4 +68,4 @@
 
 	"special": [ "shadowglow1","darkhunternightar" ],
 	"tech" : [ "tenebrhaeburst" ]
-}
+}

species/shadow.raceeffect

@@ -16,7 +16,11 @@
 		{ "stat": "darknessImmunity", "amount": 1 },
 		{ "stat": "breathProtection", "amount": 1 },
 
-		{ "stat": "scytheMastery", "amount": 0.25 }
+		{ "stat": "scytheMastery", "amount": 0.25 },
+		{
+			"stat": "fuRadiationHeal",
+			"amount": 1
+		}
 	],
 	"diet" : "entity",
 	"envEffects": [
@@ -64,4 +68,4 @@
 
 	"special": [ "shadowglow1","darkhunternightar" ],
 	"tech" : [ "tenebrhaeburst" ]
-}
+}

species/slimeperson.raceeffect

@@ -16,7 +16,11 @@
 		{ "stat": "slimestickImmunity", "amount": 1},
 		{ "stat": "webstickImmunity", "amount": 1},
 
-		{ "stat": "whipMastery", "amount": 0.15}
+		{ "stat": "whipMastery", "amount": 0.15},
+		{
+			"stat": "fuSlimeHeals",
+			"amount": 1
+		}
 	],
 	"diet" : "raw_omnivore",
 	"envEffects": [{
@@ -69,4 +73,4 @@
 			]
 		}
 	]
-}
+}

species/trink.raceeffect

@@ -55,6 +55,10 @@
 		{
 			"stat": "slushslowImmunity",
 			"amount": 1
+		},
+		{
+			"stat": "fuElectrifiedPenaltyEnergy",
+			"amount": 1
 		}
 	],
 	"diet" : "robot",

stats/__STAT_LIST.TXT

@@ -109,6 +109,16 @@ IMMUNITIES
 		freudBonus                  [amount] [0-Relative] - see /quests/madness/madnessdata.lua. tl;dr: higher number, madness decays faster. lower number, madness decays slower.
         aetherImmunity              [amount] [Boolean]
 
+		fuFishFood                  [amount] [Boolean] - water restors belly
+		fuWaterPlants               [amount] [Boolean] - water restores health
+		fuPoisonHeals               [amount] [Boolean] - this is self exclamatory
+		fuRadPlantHeal              [amount] [Boolean] - this is self exclamatory
+		fuRadiationHeal             [amount] [Boolean] - this is self exclamatory
+		fuTarHeals                  [amount] [Boolean] - this is self exclamatory
+		fuHealingWaterPoisons       [amount] [Boolean] - this is self exclamatory
+		fuDirtBeer                  [amount] [Boolean] - beer makes you drunk
+		fuElectrifiedPenaltyEnergy  [amount] [Boolean] - whether you have -50% energy when electrified
+		fuElectrifiedPenaltyDamage  [amount] [Boolean] - whether you have -50% damage when electrified
 
     MISC:
         specialStatusImmunity       [amount] [Boolean] - Used almost exclusively on bosses. when 'hard targets' are referred to, it means targets with this.
@@ -190,3 +200,5 @@ OTHER:
 	maxFuel                         [amount]              [0-relative. Default: 0] added to base value of max ship fuel
 	fuelEfficiency                  [amount]              [0-relative. Default: 0.0] percentage fuel cost reduction. not actual 'efficiency'. capped at 99%.
 	shipSpeed                       [amount]              [0-relative. Default: 0] flat value increase to ship speed, which is capped around 398
+
+	isXi                            [amount] [Boolean]    Xi get special modifiers in madness script, gaining bonus genes.

stats/effects/electrified/electrified.lua

@@ -6,16 +6,16 @@ function init()
 	animator.setParticleEmitterOffsetRegion("sparks", mcontroller.boundBox())
 	animator.setParticleEmitterActive("sparks", true)
 	effect.setParentDirectives("fade=7733AA=0.25")
-	self.species = status.statusProperty("fr_enabled") and (status.statusProperty("fr_race") or world.entitySpecies(entity.id()))
+	-- self.species = status.statusProperty("fr_enabled") and (status.statusProperty("fr_race") or world.entitySpecies(entity.id()))
 
 	-- *** FU additions
-	if self.species == "glitch" then -- when electrified, glitch lose 50% power and Energy
+	if status.statPositive("fuElectrifiedPenaltyEnergy") then -- when electrified, glitch lose 50% power and Energy
 		self.statHandler=effect.addStatModifierGroup({
-			{stat = "powerMultiplier", baseMultiplier = 0.5 },
+			-- {stat = "powerMultiplier", baseMultiplier = 0.5 },
 			{stat = "maxEnergy", baseMultiplier = 0.5 }
 		})
 	end
-	if self.species == "trink" then -- when electrified, trinks lose 50% power
+	if status.statPositive("fuElectrifiedPenaltyDamage") then -- when electrified, trinks lose 50% power
 		self.statHandler=effect.addStatModifierGroup({
 			{stat = "powerMultiplier", baseMultiplier = 0.5 }
 		})

stats/effects/fu_effects/radiendirt/radiendirt.lua

@@ -5,14 +5,14 @@ function init()
 	animator.setParticleEmitterEmissionRate("healing", config.getParameter("emissionRate", 3))
 	animator.setParticleEmitterActive("healing", true)
 
-	self.frEnabled=status.statusProperty("fr_enabled")
-	self.species = status.statusProperty("fr_race") or world.entitySpecies(entity.id())
+	-- self.frEnabled=status.statusProperty("fr_enabled")
+	-- self.species = status.statusProperty("fr_race") or world.entitySpecies(entity.id())
 	self.didInit=true
 end
 
 function update(dt)
 	if not self.didInit then init() end
-	if self.frEnabled and (self.species == "radien") then
+	if status.statPositive("fuDirtBeer") then
 		status.addEphemeralEffect("booze3", 240, entity.id())
 		status.addEphemeralEffect("slow", 240, entity.id())
 		status.addEphemeralEffect("maxhealthboostneg20", 240, entity.id())