Merge pull request #3597 from Kherae/master

Small stuff
sayterdarkwynd · Oct 21, 2024 · b552c0c · b552c0c
2 parents 19781fb + 8239228
commit b552c0c
Show file tree

Hide file tree

Showing 21 changed files with 119 additions and 46 deletions.
diff --git a/species/floran.raceeffect b/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",

diff --git a/species/fragmentedruin.raceeffect b/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": []
-}
+}
diff --git a/species/glitch.raceeffect b/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": [],

diff --git a/species/hylotl.raceeffect b/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": [

diff --git a/species/novakid.raceeffect b/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": {},

diff --git a/species/novali.raceeffect b/species/novali.raceeffect
@@ -59,6 +59,10 @@
 		{
 			"stat": "radiationburnImmunity",
 			"amount": 1
+		},
+		{
+			"stat": "fuRadiationHeal",
+			"amount": 1
 		}
 	],
 	"diet" : "entity",

diff --git a/species/radien.raceeffect b/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" ]
-}
+}
diff --git a/species/shade.raceeffect b/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" ]
-}
+}
diff --git a/species/shadow.raceeffect b/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" ]
-}
+}
diff --git a/species/slimeperson.raceeffect b/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 @@
 			]
 		}
 	]
-}
+}
diff --git a/species/trink.raceeffect b/species/trink.raceeffect
@@ -55,6 +55,10 @@
 		{
 			"stat": "slushslowImmunity",
 			"amount": 1
+		},
+		{
+			"stat": "fuElectrifiedPenaltyEnergy",
+			"amount": 1
 		}
 	],
 	"diet" : "robot",

diff --git a/stats/__STAT_LIST.TXT b/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.
diff --git a/stats/effects/electrified/electrified.lua b/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 }
 		})

diff --git a/stats/effects/fu_effects/radiendirt/radiendirt.lua b/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())

diff --git a/stats/effects/heal/healradioactive.lua b/stats/effects/heal/healradioactive.lua
@@ -10,9 +10,10 @@ function init()
 end
 
 function update(dt)
-	local species = status.statusProperty("fr_race") or world.entitySpecies(entity.id())
+	-- local species = status.statusProperty("fr_race") or world.entitySpecies(entity.id())
 
-	if (species == "radien") or (species == "novakid") or (species == "shadow") then
+	-- if (species == "radien") or (species == "novakid") or (species == "shadow") then
+	if (status.statPositive("fuRadiationHeal")) then
 		effect.setStatModifierGroup(bonusHandler,{{stat="healthRegen",amount=((self.healingRate*math.max(0, 1 + status.stat("healingBonus") )) - self.penaltyRate)}})
 		--status.modifyResource("health", (self.healingRate - self.penaltyRate) * dt)
 	else

diff --git a/stats/effects/regeneration/regen_healingwater.lua b/stats/effects/regeneration/regen_healingwater.lua
@@ -9,11 +9,11 @@ function init()
 
 	self.healingRate = 1.0 / config.getParameter("healTime", 60)
 	bonusHandler=bonusHandler or effect.addStatModifierGroup({})
-	if self.eType=="player" or self.eType=="npc" then
-		self.frEnabled=status.statusProperty("fr_enabled")
-		self.species = status.statusProperty("fr_race") or world.entitySpecies(entity.id())
-	end
-	if self.frEnabled and (self.species == "fragmentedruin") then
+	-- if self.eType=="player" or self.eType=="npc" then
+		-- self.frEnabled=status.statusProperty("fr_enabled")
+		-- self.species = status.statusProperty("fr_race") or world.entitySpecies(entity.id())
+	-- end
+	if status.statPositive("fuHealingWaterPoisons") then
 		animator.setParticleEmitterOffsetRegion("drips", mcontroller.boundBox())
 		animator.setParticleEmitterActive("drips", true)
 	else
@@ -26,7 +26,7 @@ end
 
 function update(dt)
 	if (not self.didInit) or (not self.healingRate) then init() end
-	if self.frEnabled and (self.species == "fragmentedruin") then
+	if status.statPositive("fuHealingWaterPoisons") then
 		self.tickTimer = self.tickTimer - dt
 		if self.tickTimer <= 0 then
 			self.tickTimer = self.tickTime

diff --git a/stats/effects/slimeslow/slimeslow.lua b/stats/effects/slimeslow/slimeslow.lua
@@ -6,15 +6,15 @@ function init()
 	animator.setParticleEmitterActive("drips", true)
 	effect.setParentDirectives("fade=347857=0.8")
 	bonusHandler=effect.addStatModifierGroup({})
-	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 == "slimeperson") then
+	if status.statPositive("fuSlimeHeals") then
 		self.healingRate = 0.025
 		effect.setStatModifierGroup(bonusHandler,{{stat="healthRegen",amount=status.stat("maxHealth")*self.healingRate*math.max(0,1+status.stat("healingBonus"))}})
 		applyFilteredModifiers({

diff --git a/stats/effects/tarslow/tarslow.lua b/stats/effects/tarslow/tarslow.lua
@@ -8,16 +8,16 @@ function init()
 	effect.setParentDirectives("fade=300030=0.8")
 	bonusHandler=effect.addStatModifierGroup({})
 	self.healingRate = 1
-	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 not self.didInit then return end
 
-	if self.frEnabled and (self.species == "glitch") then
+	if status.statPositive("fuTarHeals") then
 		self.healingRate = 0.015
 		effect.setStatModifierGroup(bonusHandler,{{stat="healthRegen",amount=status.stat("maxHealth")*self.healingRate*math.max(0,1+status.stat("healingBonus"))}})
 		applyFilteredModifiers({

diff --git a/stats/effects/weaknesses/radioactiveplant.lua b/stats/effects/weaknesses/radioactiveplant.lua
@@ -16,7 +16,7 @@ function init()
 
 	self.healthRegen = config.getParameter("healthRegen",0)
 	self.frEnabled=status.statusProperty("fr_enabled")
-	self.species = status.statusProperty("fr_race") or world.entitySpecies(entity.id())
+	-- self.species = status.statusProperty("fr_race") or world.entitySpecies(entity.id())
 	if not self.frEnabled or ((status.stat("isHerbivore")==1 or status.stat("isRobot")==1 or status.stat("isOmnivore")==1 or status.stat("isSugar")==1) and (not(status.stat("isRadien")==1))) then
 		world.sendEntityMessage(entity.id(), "queueRadioMessage", "foodtyperad")
 	end
@@ -27,13 +27,13 @@ end
 function update(dt)
 	if not self.didInit then init() end
 	if not self.didInit then return end
-	if self.frEnabled and (self.species == "radien" or self.species == "novakid" or self.species == "thelusian") then
+	if status.statPositive("fuRadPlantHeal") then
 		applyEffects()
 		animator.setParticleEmitterOffsetRegion("healing", mcontroller.boundBox())
 		animator.setParticleEmitterActive("healing", true)
 	else
 		effect.setStatModifierGroup(self.statHandler,{})
-		if (self.frEnabled or (not (self.species == "radien"))) and ((self.tickTimer or 0) <= 0) then
+		if (self.frEnabled --[[or (not (self.species == "radien"))]]) and ((self.tickTimer or 0) <= 0) then
 			applyPenalty()
 			animator.setParticleEmitterOffsetRegion("drips", mcontroller.boundBox())
 			animator.setParticleEmitterActive("drips", true)

diff --git a/stats/effects/weakpoison/weakpoison.lua b/stats/effects/weakpoison/weakpoison.lua
@@ -1,8 +1,8 @@
 function init()
 	if not world.entityType(entity.id()) then return end
-	self.frEnabled=status.statusProperty("fr_enabled")
-	self.species = status.statusProperty("fr_race") or world.entitySpecies(entity.id())
-	if self.frEnabled and (self.species == "fragmentedruin") then
+	-- self.frEnabled=status.statusProperty("fr_enabled")
+	-- self.species = status.statusProperty("fr_race") or world.entitySpecies(entity.id())
+	if status.statPositive("fuPoisonHeals") then
 		animator.setParticleEmitterOffsetRegion("healing", mcontroller.boundBox())
 		animator.setParticleEmitterActive("healing", config.getParameter("particles", true))
 	else
@@ -25,7 +25,7 @@ end
 function update(dt)
 	if not self.didInit then init() end
 	if not self.didInit then return end
-	if self.frEnabled and (self.species == "fragmentedruin") then
+	if status.statPositive("fuPoisonHeals") then
 		--sb.logInfo("weakpoison")
 		effect.setStatModifierGroup(bonusHandler,{{stat="healthRegen",amount=((self.healingRate*( 1 + status.stat("healingBonus") )) - self.penaltyRate)}})
 		--status.modifyResource("health", (self.healingRate - self.penaltyRate) * dt)
@@ -54,4 +54,4 @@ function uninit()
 	if bonusHandler then
 		effect.removeStatModifierGroup(bonusHandler)
 	end
-end
+end