celediel/morrowind-a-sinking-feeling
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

more small error fixes

Browse source 
I need to stop doing all my coding after a ten hour workday
This commit is contained in:
Lilian Jónsdóttir 2021-08-14 11:40:06 -07:00
parent fc646d69cf
commit 5d4753e85d
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
MWSE/mods/celediel/ASinkingFeeling/main.lua
View file

@ -57,7 +57,7 @@ formulas.allEquipmentNecroEdit = function(actor, ref)
-- Thanks Necrolesian for this formula -- Thanks Necrolesian for this formula
-- https://forums.nexusmods.com/index.php?/topic/10349253-a-sinking-feeling/page-2#entry97870268 -- https://forums.nexusmods.com/index.php?/topic/10349253-a-sinking-feeling/page-2#entry97870268
local term1 = ((config.multipliers.allEquipment / 100) * totalWeight) * 2 local term1 = ((config.multipliers.allEquipment / 100) * totalWeight) * 2
local term2 = ((config.multipliers.allEquipment / 100) * (totalWeight - 135) * 0.2 + 270) local term2 = (config.multipliers.allEquipment / 100) * ((totalWeight - 135) * 0.2 + 270)
local downPull = math.min(term1, term2) local downPull = math.min(term1, term2)
local debugStr = string.format("Pulling %s down by %s (instead of %s) using equipment weight mode (necro edit) (%s total equipment weight)", local debugStr = string.format("Pulling %s down by %s (instead of %s) using equipment weight mode (necro edit) (%s total equipment weight)",
ref.id, downPull, math.max(term1, term2), totalWeight) ref.id, downPull, math.max(term1, term2), totalWeight)
@ -80,11 +80,11 @@ formulas.worstCaseScenario = function(actor, mobile, ref)
-- todo: maybe loop over formulas to calculate each instead of this -- todo: maybe loop over formulas to calculate each instead of this
-- different formulas needing different actor/mobile might make it too unwieldy though -- different formulas needing different actor/mobile might make it too unwieldy though
results.equippedArmour = formulas.equippedArmour(actor, ref) results.equippedArmour = formulas.equippedArmour(actor, ref)
results.allEquipment = formulas.allEquipment(actor, ref) results.encumbrancePercentage = formulas.encumbrancePercentage(mobile, ref)
if config.allEquipmentWorstCaseNecroMode then if config.allEquipmentWorstCaseNecroMode then
results.allEquipmentNecroEdit = formulas.allEquipmentNecroEdit(actor, ref) results.allEquipmentNecroEdit = formulas.allEquipmentNecroEdit(actor, ref)
else else
results.encumbrancePercentage = formulas.encumbrancePercentage(mobile, ref) results.allEquipment = formulas.allEquipment(actor, ref)
end end
local largest = common.keyOfLargestValue(results) local largest = common.keyOfLargestValue(results)