Merge pull request #3558 from Kherae/master

small stuff

codex/documents/ffguide6.codex

@@ -8,7 +8,7 @@
 	"longContentPages":[
 		"FrackinUniverse adds a large amount of armors (and foods) and enhances some older ones, allowing for a greater variety of playstyles. These can be very useful through gameplay and provide exceptionally useful benefits!\n
 ^orange;Stats^reset; : Vanilla players may notice there are more than they are used to, and even the ones they are used to have different ranges. FU presents a wider variety of armor classes to spice up your play, and does the same with food.\n
-If you are more interested in damage, pick up Power armor or hyper power armor to trade defensive stats for offensive ones. Alternatively, pick up Tank or Power Tank sets to outlast your enemy. They come in melee OR ranged! Fighting not quite your thing? Pick up an Exploration oriented set, and be at home in your environment! You're guaranteed to locate a set that suits your playstyle somewhere out there!\n
+If you are more interested in damage, pick up Power Armor or Hyper Power Armor to trade defensive stats for offensive ones. Alternatively, pick up Tank or Hyper Tank sets to outlast your enemy. They come in melee OR ranged! Fighting not quite your thing? Pick up an Exploration oriented set, and be at home in your environment! You're guaranteed to locate a set that suits your playstyle somewhere out there!\n
 ^orange;Resistances^reset; : Many armors in FU come with inherent resistances. Many biome weather effects will simply stop affecting you once you hit an appropriate amount, and various enemy attacks will do less damage. Nifty, right? It gets better; upgrade your armor, and those resistances will increase!\n
 ^orange;Bonuses^reset; : Most are increases to your stats, plenty are conditional.
 Any that say ^green;+value^reset; are typically additive increases. It can be a little confusing, however. As example: if it gives +^green;3^reset;% Crit Chance it increases your crit chance by a flat 3%, but if it says +^green;3^reset;% Energy Regen, that's 3% of your base. The easiest way to remember is to ask yourself...does it have a base of 0? If so, it likely is like Crit Chance! If a bonus says x^green;1.3^reset;, or ^green;More^reset;, that's a multiplier on the value you currently have. Have 1000% Damage somehow? 100% More (or 2x) would make it 2000%! Small note: Regen is usually per second.\n
@@ -27,10 +27,12 @@ As a small side-note, some terms or symbols are used loosely. If you see a bonus
 ^cyan;Undying Resolve^reset;: increases Protection as your life gets lower, up to the stated amount, while ^cyan;Immortal Resolve^reset; grants HP Regen instead. If a set grants either, it will grant ^cyan;Immortal Resolve^reset; to your pet.\n
 ^cyan;Dark Commander^reset;/^cyan;Beast Master^reset;: Increases Damage, Protection, HP and Speed of your pets (both) and crew (Dark Commander) by the listed percent, increases their jump ability by half of that, and regenerates HP at a sixth of that amount per second.\n
 ^cyan;Capturenaut^reset;: Increases pet count by 1, plus an additional 1 per 2 tiers (up to +2) of the lowest equipped set piece. Grants an additional +1 if using alongside the back item. This means a fully upgraded set will allow up to 5 additional pets!\n
-^red;Wretchel Toxicity^reset;: Ingesting Wretchel reduces core stats and healing received, and drains health over time. These effects increase in severity the more you consume in a short time frame, as well as while your health is critically low. It will ^red;KILL^reset; you, if you are careless.
+^red;Wretchel Toxicity^reset;: Ingesting Wretchel reduces core stats and healing received, and drains health over time. These effects increase in severity the more you consume in a short time frame, as well as while your health is critically low. It will ^red;KILL^reset; you, if you are careless.\n
 ^cyan;Charisma^reset;: Your ability to bargain with Traders at space stations. The higher your charisma, the better the deal (and fatter your bank balance!)\n
-They will inherit more stats from you, both beneficial and detrimental, and have special scaling on Protection and HP. Be mindful when taking powerful buffs like ^cyan;Glass Cannon^reset;, as it will reduce their health noticeably.
-^cyan;Pet Stat Inheritance^reset; is as follows: HP, directly from your character, rather than just equipped armor, and increased further by your Protection stat. Protection: Inherited from armor as in vanilla. Damage: directly from character sheet. Health Regen: Inherits as a flat amount, except in special cases (^cyan;Immortal Resolve^reset;, effects not covered by FU, etc.). If you have 100 health and 10% HP Regen, it will grant your pet 10 HP per second. If a stat isn't here, a pet most likely does not inherit it."
+\n\n^cyan;Pet/Crew Stat Inheritance^reset;:
+Overall scaling is as follows: HP, directly from your character, rather than just equipped armor. Protection: applied as a multiplier to HP via a specific formula. Damage: directly from character sheet. Health Regen: Inherits as a flat amount, except in special cases (^cyan;Immortal Resolve^reset;, effects not covered by FU, etc.). If you have 100 health and 10% HP Regen, it will grant your pet 10 HP per second. If a stat isn't here, a pet most likely does not inherit it.
+^yellow;Special notes^reset;: Be mindful when taking powerful buffs like ^cyan;Glass Cannon^reset;, as it will reduce their health noticeably.
+"
 
 	],
 

interface/itemdescriptions/gun2aetherium.itemdescription

@@ -131,7 +131,7 @@
     "type" : "label",
     "position" : [16, 34],
     "hAnchor" : "left",
-    "value" : "^green;Shots per Charge^reset;:"
+    "value" : "Energy Per Shot:"
   },
   "energyPerShotLabel" : {
     "type" : "label",

items/active/weapons/npc/swtjc_ewg_npcantimaterialrifle.activeitem

@@ -4,7 +4,7 @@
   "maxStack" : 1,
   "rarity" : "Common",
   "description" : "A high-powered rifle that sacrifices rate-of-fire for enough firepower to cut through armor like a hot knife through butter.",
-  "shortdescription" : "NPC Anti-Material Rifle",
+  "shortdescription" : "NPC Anti-Materiel Rifle",
   "tooltipKind" : "gun",
   "category" : "swtjc_ewg_antiMaterialRifle",
   "twoHanded" : true,

items/active/weapons/ranged/sniperrifle/swtjc_ewg_commonantimaterialrifle.activeitem

@@ -4,7 +4,7 @@
   "maxStack" : 1,
   "rarity" : "Common",
   "description" : "Sacrifices rate-of-fire for enough firepower to cut through armor.",
-  "shortdescription" : "Common Anti-Material Rifle",
+  "shortdescription" : "Common Anti-Materiel Rifle",
   "tooltipKind" : "gun2",
   "category" : "swtjc_ewg_antiMaterialRifle",
   "twoHanded" : true,

items/active/weapons/ranged/sniperrifle/swtjc_ewg_rareantimaterialrifle.activeitem

@@ -4,7 +4,7 @@
   "maxStack" : 1,
   "rarity" : "Rare",
   "description" : "A high-powered rifle that sacrifices rate-of-fire for enough firepower to cut through armor.",
-  "shortdescription" : "Rare Anti-Material Rifle",
+  "shortdescription" : "Rare Anti-Materiel Rifle",
   "tooltipKind" : "gun2",
   "category" : "swtjc_ewg_antiMaterialRifle",
   "twoHanded" : true,

items/active/weapons/ranged/sniperrifle/swtjc_ewg_uncommonantimaterialrifle.activeitem

@@ -4,7 +4,7 @@
   "maxStack" : 1,
   "rarity" : "Uncommon",
   "description" : "A high-powered rifle that sacrifices rate-of-fire for enough firepower to cut through armor.",
-  "shortdescription" : "Uncommon Anti-Material Rifle",
+  "shortdescription" : "Uncommon Anti-Materiel Rifle",
   "tooltipKind" : "gun2",
   "category" : "swtjc_ewg_antiMaterialRifle",
   "twoHanded" : true,

items/categories.config.patch

@@ -36,7 +36,7 @@
   [{"op":"test","inverse":true,"path":"/labels/swtjc_ewg_battleRifle"},{"op": "add","path": "/labels/swtjc_ewg_battleRifle","value": "Battle Rifle"}],
   [{"op":"test","inverse":true,"path":"/labels/swtjc_ewg_squadAutomaticWeapon"},{"op": "add","path": "/labels/swtjc_ewg_squadAutomaticWeapon","value": "Squad Automatic Weapon"}],
   [{"op":"test","inverse":true,"path":"/labels/swtjc_ewg_beamRifle"},{"op": "add","path": "/labels/swtjc_ewg_beamRifle","value": "Beam Rifle"}],
-  [{"op":"test","inverse":true,"path":"/labels/swtjc_ewg_antiMaterialRifle"},{"op": "add","path": "/labels/swtjc_ewg_antiMaterialRifle","value": "Anti-Material Rifle"}],
+  [{"op":"test","inverse":true,"path":"/labels/swtjc_ewg_antiMaterialRifle"},{"op": "add","path": "/labels/swtjc_ewg_antiMaterialRifle","value": "Anti-Materiel Rifle"}],
   [{"op":"test","inverse":true,"path":"/labels/swtjc_ewg_sawedOffShotgun"},{"op": "add","path": "/labels/swtjc_ewg_sawedOffShotgun","value": "Short-Barreled Shotgun"}],
   [{"op":"test","inverse":true,"path":"/labels/swtjc_ewg_autoShotgun"},{"op": "add","path": "/labels/swtjc_ewg_autoShotgun","value": "Automatic Shotgun"}],
   [{"op":"test","inverse":true,"path":"/labels/swtjc_ewg_flakCannon"},{"op": "add","path": "/labels/swtjc_ewg_flakCannon","value": "Flak Cannon"}],

objects/power/isn_battery.lua

@@ -66,7 +66,7 @@ function isn_makeBatteryDescription(desc, charge, onDeath)
 	-- append charge state to default description; ensure that it's on a line of its own
 	local str=string_split(desc,"^truncate;")
 	if str[1] then str=str[1] else str="" end
-	str=str..((onDeath and " ^red;Scan for Info^reset;") or "\n^blue;Upper Right Input^reset;: On/Off Switch\n^red;Output 1^reset;: Partial Power, ^red;Output 2^reset;: Full Power")
+	str=str..((onDeath and " ^red;Scan for Info^reset;") or "\n^blue;Upper Right Input^reset;: On/Off Switch\n^red;Battery Logic outputs:\nLeft^reset;: Has Power, ^red;Right^reset;: Is Full")
 	str = str .. (desc ~= '' and "\n" or '') .. "Power Stored: ^yellow;"..util.round(power.getStoredEnergy(),1).."^reset;/^green;"..util.round(power.getMaxEnergy(),1).."^reset;J (^yellow;" .. charge .. '^reset;%)'
 	return str
 end
@@ -115,7 +115,7 @@ function batteryUpdate(dt)
 		self.oldPowerStored=power.getStoredEnergy()
 		batteryUpdateThrottle=batteryUpdateThrottleBase*throttleMult
 		--object.setOutputNodeLevel(0,self.oldPowerStored>0)
-		object.setOutputNodeLevel(0,self.oldPowerStored>=power.getMaxEnergy()*0.01)
+		object.setOutputNodeLevel(0,self.oldPowerStored>=power.getMaxEnergy()*0.1)
 		object.setOutputNodeLevel(1,power.getStoredEnergy() >= power.getMaxEnergy())
 	end
 end

quests/generated/pools/weapon.config.patch

@@ -5,5 +5,5 @@
 {"op" : "replace", "path" : "/0/1/3/name", "value" : "Semi-Automatic, Beam Pistol or Revolver" },
 {"op" : "replace", "path" : "/0/1/4/name", "value" : "Standard or Mini Rocket Launcher" },
 {"op" : "replace", "path" : "/0/1/5/name", "value" : "Handheld or Multi Grenade Launcher" },
-{"op" : "replace", "path" : "/0/1/6/name", "value" : "Sniper, Semi-Automatic, Anti-Material or Beam Rifle" }
-]
+{"op" : "replace", "path" : "/0/1/6/name", "value" : "Sniper, Semi-Automatic, Anti-Materiel or Beam Rifle" }
+]

scripts/ffstrangeseaconfig.config

@@ -0,0 +1,20 @@
+{
+	"version":1.2,
+	"modifier":1.5,
+	"effectList":{
+		"cold":["ffbiomecold0","ffbiomecold1","ffbiomecold2","ffbiomecold3","ffbiomecold4"],
+		"heat":["ffbiomeheat1","ffbiomeheat2","ffbiomeheat3"],
+		"natureStings":["desertweathernew","desertweathernewdeadly","jungleweathernew","beesting"],
+		"aether":["aetherweathernew","aetherweathernew2","aetherweathernew3"],
+		"electric":["ffbiomeelectric1","ffbiomeelectric2","ffbiomeelectric3"],
+		"radiation":["radioactiveweathernew","radioactiveweathernew2","radioactiveweathernew3"],
+		"poisons":["biomepoison1","biomepoison2","biomepoison3","booze","booze2","booze3","protoweather"],
+		"sulphuric":["sulphuricweathernew","sulphuricweathernew2","sulphuricweathernew3","sulphuricweathernew4"],
+		"gases":["fu_nooxygen","helium3","shadowgasfx"],
+		"pressure":["gasworld1","gasworld2","gasworld3"],
+		"dark":["superdarkstatlarge","superdarkstatmid","superdarkstat"],
+		"ghosts":["erchiussickness","erchiussickness2","erchiussickness3"],
+		"insanity":["insanitynew","insanitynew2","insanitynew3unknown"],
+		"time":["futimeweather","organicsoupeffect"]
+	}
+}

scripts/ffunknownconfig.config

@@ -15,6 +15,6 @@
 		"dark":["superdarkstatlarge","superdarkstatmid","superdarkstat"],
 		"ghosts":["erchiussickness","erchiussickness2","erchiussickness3"],
 		"insanity":["insanitynew","insanitynew2","insanitynew3unknown"],
-		"time":["futimeweather"]
+		"time":["futimeweather","organicsoupeffect"]
 	}
 }

scripts/fr_scripts/healthRegen.lua

@@ -14,10 +14,8 @@ function FRHelper:call(args, main, dt, ...)
 	if not dt then dt = script.updateDt() end
 	local label=(args.label or "default").."_healthRegen"
 	if not (world.isNpc(entity.id()) and status.resource("health") < 1) then
-		--status.modifyResourcePercentage("health", args.healingRate * dt * math.max(0,1+status.stat("healingBonus")))
 		if not self[label.."_timer"] or self[label.."_timer"]>=0.5 then
 			world.sendEntityMessage(entity.id(),"recordFUPersistentEffect",label)
-			--sb.logInfo("args %s, maxHp %s, healingBonus %s, actualRegen %s",args,status.stat("maxHealth"),status.stat("healingBonus"),status.stat("maxHealth")*(args.healingRate or 0)*math.max(0,1+status.stat("healingBonus")))
 			status.setPersistentEffects(label,{{stat="healthRegen",amount=status.stat("maxHealth")*(args.healingRate or 0)*math.max(0,1+status.stat("healingBonus"))}})
 			self[label.."_timer"]=0.0
 		else

scripts/fu_player_init.lua

@@ -8,7 +8,7 @@ local unknownWorlds={
 	ffunknown="/scripts/ffunknownconfig.config",
 	shadow="/scripts/ffshadowconfig.config",
 	superdense="/scripts/ffsuperdenseconfig.config",
-	strangesea="/scripts/ffunknownconfig.config"
+	strangesea="/scripts/ffstrangeseaconfig.config"
 }
 local ffunknownConfig
 

stats/bonuses/argonianRegen.lua

@@ -1,24 +1,12 @@
---didit = false
-
 function init()
-    --[[self.species = world.entitySpecies(entity.id())
-    if not self.species then return else didit = true end
-
-    self.raceJson = root.assetJson("/species/argonian.raceeffect")
-    self.specialConfig = self.raceJson.specialConfig
-]]
     script.setUpdateDelta(10)
 	bonusHandler=effect.addStatModifierGroup({})
 end
 
 function update(dt)
-    --if not didit then init() end
-
-		effect.setStatModifierGroup(bonusHandler,{{stat="healthRegen",amount=status.stat("maxHealth")*0.0023810714*math.max(0,1+status.stat("healingBonus"))}})
-    --self.healingRate = 1.00005 / 420 -- health per time - 0.005% health per 420ms, I think --420 seconds to reach 100.005%, or 419.97900104 seconds to restore 100% -khe
-    --status.modifyResourcePercentage("health", self.healingRate * dt)
+	effect.setStatModifierGroup(bonusHandler,{{stat="healthRegen",amount=status.stat("maxHealth")*0.0023810714*math.max(0,1+status.stat("healingBonus"))}})
 end
 
 function uninit()
 	effect.removeStatModifierGroup(bonusHandler)
-end
+end

stats/effects/fu_effects/guardianwings/blueguardian.statuseffect

@@ -1,10 +1,10 @@
 {
   "name" : "blueguardian",
-  "effectConfig" : {},
+  "effectConfig" : {"regenRate":0.005},
   "defaultDuration" : 5,
 
   "scripts" : [
-    "blueguardian.lua"
+    "guardianwings.lua"
   ],
 
   "animationConfig" : "blueguardian.animation"

stats/effects/fu_effects/guardianwings/greenguardian.statuseffect

@@ -1,10 +1,10 @@
 {
   "name" : "greenguardian",
-  "effectConfig" : {},
+  "effectConfig" : {"regenRate":0.005},
   "defaultDuration" : 5,
 
   "scripts" : [
-    "greenguardian.lua"
+    "guardianwings.lua"
   ],
 
   "animationConfig" : "greenguardian.animation"

stats/effects/fu_effects/guardianwings/guardianwings.lua

@@ -0,0 +1,17 @@
+function init()
+	script.setUpdateDelta(5)
+	self.healingRate=config.getParameter("regenRate",1/200)
+	bonusHandler=effect.addStatModifierGroup({})
+end
+
+function update(dt)
+	if (world.entityType(entity.id())=="player") or status.resource("health")>=1 then
+		effect.setStatModifierGroup(bonusHandler,{{stat="healthRegen",amount=status.resourceMax("health")*self.healingRate*math.max(0,1+status.stat("healingBonus"))}})
+	else
+		effect.setStatModifierGroup(bonusHandler,{})
+	end
+end
+
+function uninit()
+	effect.removeStatModifierGroup(bonusHandler)
+end

stats/effects/fu_effects/guardianwings/isogenguardian.statuseffect

@@ -1,10 +1,10 @@
 {
   "name" : "isogenguardian",
-  "effectConfig" : {},
+  "effectConfig" : {"regenRate":0.005},
   "defaultDuration" : 5,
 
   "scripts" : [
-    "isogenguardian.lua"
+    "guardianwings.lua"
   ],
 
   "animationConfig" : "isogenguardian.animation"

stats/effects/fu_effects/guardianwings/orangeguardian.statuseffect

@@ -1,10 +1,10 @@
 {
   "name" : "orangeguardian",
-  "effectConfig" : {},
+  "effectConfig" : {"regenRate":0.005},
   "defaultDuration" : 5,
 
   "scripts" : [
-    "orangeguardian.lua"
+    "guardianwings.lua"
   ],
 
   "animationConfig" : "orangeguardian.animation"

stats/effects/fu_effects/guardianwings/pinkguardian.statuseffect

@@ -1,10 +1,10 @@
 {
   "name" : "pinkguardian",
-  "effectConfig" : {},
+  "effectConfig" : {"regenRate":0.005},
   "defaultDuration" : 5,
 
   "scripts" : [
-    "pinkguardian.lua"
+    "guardianwings.lua"
   ],
 
   "animationConfig" : "pinkguardian.animation"

stats/effects/fu_effects/guardianwings/xithriciteguardian.statuseffect

@@ -1,10 +1,10 @@
 {
   "name" : "xithriciteguardian",
-  "effectConfig" : {},
+  "effectConfig" : {"regenRate":0.005},
   "defaultDuration" : 5,
 
   "scripts" : [
-    "xithriciteguardian.lua"
+    "guardianwings.lua"
   ],
 
   "animationConfig" : "xithriciteguardian.animation"

stats/effects/fu_effects/guardianwings/yellowguardian.statuseffect

@@ -1,10 +1,10 @@
 {
   "name" : "yellowguardian",
-  "effectConfig" : {},
+  "effectConfig" : {"regenRate":0.005},
   "defaultDuration" : 5,
 
   "scripts" : [
-    "yellowguardian.lua"
+    "guardianwings.lua"
   ],
 
   "animationConfig" : "yellowguardian.animation"

stats/effects/gfex_eeveesetbonus/espeon/espeonsetbonus.lua

@@ -1,13 +1,7 @@
 function init()
-  effect.addStatModifierGroup({
-    {stat = "physicalResistance", amount = 0.15},
-    {stat = "fallDamageMultiplier", effectiveMultiplier = 0.7}
-  })
-  script.setUpdateDelta(0)
-end
-
-function update(dt)
+	bonusHandler=effect.addStatModifierGroup({{stat = "physicalResistance", amount = 0.15},{stat = "fallDamageMultiplier", effectiveMultiplier = 0.7}})
 end
 
 function uninit()
+	effect.removeStatModifierGroup(bonusHandler)
 end