Skip to content

Commit 3099e5e

Browse files
authored
Merge pull request #151 from deathbeam/enemy-chaos-res
Set default boss chaos resist to 0 and reg boss ele res to 30
2 parents 746c116 + 53b80e6 commit 3099e5e

File tree

2 files changed

+6
-9
lines changed

2 files changed

+6
-9
lines changed

src/Modules/ConfigOptions.lua

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1701,11 +1701,11 @@ Huge sets the radius to 11.
17011701
modList:NewMod("WarcryPower", "BASE", 20, "Boss")
17021702
modList:NewMod("Multiplier:EnemyPower", "BASE", 20, "Boss")
17031703

1704-
local defaultEleResist = 40
1704+
local defaultEleResist = 30
17051705
build.configTab.varControls['enemyLightningResist']:SetPlaceholder(defaultEleResist, true)
17061706
build.configTab.varControls['enemyColdResist']:SetPlaceholder(defaultEleResist, true)
17071707
build.configTab.varControls['enemyFireResist']:SetPlaceholder(defaultEleResist, true)
1708-
build.configTab.varControls['enemyChaosResist']:SetPlaceholder(25, true)
1708+
build.configTab.varControls['enemyChaosResist']:SetPlaceholder(0, true)
17091709

17101710
local defaultLevel = 83
17111711
build.configTab.varControls['enemyLevel']:SetPlaceholder("", true)
@@ -1740,7 +1740,7 @@ Huge sets the radius to 11.
17401740
build.configTab.varControls['enemyLightningResist']:SetPlaceholder(defaultEleResist, true)
17411741
build.configTab.varControls['enemyColdResist']:SetPlaceholder(defaultEleResist, true)
17421742
build.configTab.varControls['enemyFireResist']:SetPlaceholder(defaultEleResist, true)
1743-
build.configTab.varControls['enemyChaosResist']:SetPlaceholder(30, true)
1743+
build.configTab.varControls['enemyChaosResist']:SetPlaceholder(0, true)
17441744

17451745
local defaultLevel = 84
17461746
build.configTab.varControls['enemyLevel']:SetPlaceholder(defaultLevel, true)
@@ -1774,7 +1774,7 @@ Huge sets the radius to 11.
17741774
build.configTab.varControls['enemyLightningResist']:SetPlaceholder(defaultEleResist, true)
17751775
build.configTab.varControls['enemyColdResist']:SetPlaceholder(defaultEleResist, true)
17761776
build.configTab.varControls['enemyFireResist']:SetPlaceholder(defaultEleResist, true)
1777-
build.configTab.varControls['enemyChaosResist']:SetPlaceholder(30, true)
1777+
build.configTab.varControls['enemyChaosResist']:SetPlaceholder(0, true)
17781778

17791779
local defaultLevel = 85
17801780
build.configTab.varControls['enemyLevel']:SetPlaceholder(defaultLevel, true)

src/Modules/Data.lua

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -738,14 +738,12 @@ This is divided by 4.40 to represent 4 damage types + some (40% as much) ^xD0209
738738
Bosses' armour and evasion multiplier are calculated using the average of the boss type
739739
740740
Standard Boss adds the following modifiers:
741-
+40% to enemy Elemental Resistances
742-
+25% to enemy ^xD02090Chaos Resistance
741+
+30% to enemy Elemental Resistances
743742
^7]]..tostring(m_floor(data.misc.stdBossDPSMult * 100))..[[% of monster Damage of each type
744743
]]..tostring(m_floor(data.misc.stdBossDPSMult * 4.4 * 100))..[[% of monster Damage total
745744
746745
Guardian / Pinnacle Boss adds the following modifiers:
747746
+50% to enemy Elemental Resistances
748-
+30% to enemy ^xD02090Chaos Resistance
749747
^7]]..tostring(m_floor(data.bossStats.PinnacleArmourMean))..[[% of monster Armour
750748
]]..tostring(m_floor(data.bossStats.PinnacleEvasionMean))..[[% of monster ^x33FF77Evasion
751749
^7]]..tostring(m_floor(data.misc.pinnacleBossDPSMult * 100))..[[% of monster Damage of each type
@@ -754,7 +752,6 @@ Guardian / Pinnacle Boss adds the following modifiers:
754752
755753
Uber Pinnacle Boss adds the following modifiers:
756754
+50% to enemy Elemental Resistances
757-
+30% to enemy ^xD02090Chaos Resistance
758755
^7]]..tostring(m_floor(data.bossStats.UberArmourMean))..[[% of monster Armour
759756
]]..tostring(m_floor(data.bossStats.UberEvasionMean))..[[% of monster ^x33FF77Evasion
760757
^770% less to enemy Damage taken
@@ -952,4 +949,4 @@ data.uniques['race'] = LoadModule("Data/Uniques/Special/race")
952949
LoadModule("Data/Uniques/Special/Generated")
953950
LoadModule("Data/Uniques/Special/New")
954951

955-
data.questRewards = LoadModule("Data/QuestRewards")
952+
data.questRewards = LoadModule("Data/QuestRewards")

0 commit comments

Comments
 (0)