Skip to content

Commit 6080815

Browse files
committed
Fix comparison in library
1 parent 22b473e commit 6080815

2 files changed

Lines changed: 5 additions & 5 deletions

File tree

src/Classes/MinionSearchListControl.lua

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,11 +76,11 @@ function MinionSearchListClass:sortSourceList()
7676
valueA = minionA.life
7777
valueB = minionB.life
7878
elseif sortOption.field == "totalHitPoints" then
79-
valueA = minionA.life + ((minionA.energyShield or 0) * minionA.life)
80-
valueB = minionB.life + ((minionB.energyShield or 0) * minionB.life)
79+
valueA = minionA.life + (((minionA.energyShield or 0) * (data.gameConstants["EnergyShieldRatioOfLife"]) / 100) * minionA.life)
80+
valueB = minionB.life + (((minionB.energyShield or 0) * (data.gameConstants["EnergyShieldRatioOfLife"]) / 100) * minionB.life)
8181
elseif sortOption.field == "energyShield" then
82-
valueA = (minionA.energyShield or 0) * minionA.life
83-
valueB = (minionB.energyShield or 0) * minionB.life
82+
valueA = ((minionA.energyShield or 0) * (data.gameConstants["EnergyShieldRatioOfLife"]) / 100) * minionA.life
83+
valueB = ((minionB.energyShield or 0) * (data.gameConstants["EnergyShieldRatioOfLife"]) / 100) * minionB.life
8484
elseif sortOption.field == "totalResist" then
8585
valueA = (minionA.fireResist or 0) + (minionA.coldResist or 0) + (minionA.lightningResist or 0) + (minionA.chaosResist or 0)
8686
valueB = (minionB.fireResist or 0) + (minionB.coldResist or 0) + (minionB.lightningResist or 0) + (minionB.chaosResist or 0)

src/Export/Scripts/minions.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ directiveTable.emit = function(state, args, out)
340340
end
341341
out:write('\tbaseMovementSpeed = ', monsterVariety.MovementSpeed, ',\n')
342342
if monsterCategory then
343-
out:write('\tmonsterCategory = "', (monsterCategory), '",\n')
343+
out:write('\tmonsterCategory = "', monsterCategory, '",\n')
344344
end
345345
out:write('\tspawnLocation = {\n')
346346
table.sort(worldAreaNames)

0 commit comments

Comments
 (0)