Skip to content

Commit 58ea211

Browse files
OpenarlOpenarl
committed
Merge remote-tracking branch 'origin/dev'
2 parents 7c43326 + 1e60aac commit 58ea211

23 files changed

+149
-67
lines changed

‎Classes/ConfigTab.lua‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ local gameVersionDropList = {
1717

1818
local varList = {
1919
{ section = "General", col = 1 },
20+
{ var = "resistancePenalty", type = "list", label = "Resistance penalty:", ifVer = "3_0", list = {{val=0,label="None"},{val=-30,label="Act 5 (-30%)"},{val=nil,label="Act 10 (-60%)"}} },
2021
{ var = "enemyLevel", type = "number", label = "Enemy Level:", tooltip = "This overrides the default enemy level used to estimate your hit and evade chances.\nThe default level is your character level, capped at 84, which is the same value\nused in-game to calculate the stats on the character sheet." },
2122
{ var = "enemyPhysicalHit", type = "number", label = "Enemy Physical Hit Damage:", tooltip = "This overrides the default damage amount used to estimate your physical damage reduction from armour.\nThe default is 1.5 times the enemy's base damage, which is the same value\nused in-game to calculate the estimate shown on the character sheet." },
2223
{ var = "conditionStationary", type = "check", label = "Are you always stationary?", ifCond = "Stationary", apply = function(val, modList, enemyModList)
@@ -507,7 +508,7 @@ local ConfigTabClass = common.NewClass("ConfigTab", "UndoHandler", "ControlHost"
507508
end
508509
t_insert(self.sectionList, lastSection)
509510
t_insert(self.controls, lastSection)
510-
else
511+
elseif not varData.ifVer or varData.ifVer == build.targetVersion then
511512
local control
512513
if varData.type == "check" then
513514
control = common.New("CheckBoxControl", {"TOPLEFT",lastSection,"TOPLEFT"}, 234, 0, 18, nil, function(state)

‎Classes/PassiveTree.lua‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ local PassiveTreeClass = common.NewClass("PassiveTree", function(self, targetVer
158158
data.rsq = size * size
159159
end
160160

161-
local err, passives = PLoadModule("Data/"..targetVersion.."/Passives.lua")
161+
--local err, passives = PLoadModule("Data/"..targetVersion.."/Passives.lua")
162162

163163
ConPrintf("Processing tree...")
164164
self.keystoneMap = { }

‎Classes/PassiveTreeView.lua‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -461,7 +461,7 @@ function PassiveTreeViewClass:Draw(build, viewPort, inputEvents)
461461
-- Draw tooltip
462462
SetDrawLayer(nil, 100)
463463
local size = m_floor(node.size * scale)
464-
if self.tooltip:CheckForUpdate(node, launch.devModeAlt, build.outputRevision) then
464+
if self.tooltip:CheckForUpdate(node, self.showStatDifferences, launch.devModeAlt, build.outputRevision) then
465465
self:AddNodeTooltip(self.tooltip, node, build)
466466
end
467467
self.tooltip:Draw(m_floor(scrX - size), m_floor(scrY - size), size * 2, size * 2, viewPort)

‎Classes/TextListControl.lua‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ function TextListClass:Draw(viewPort)
4343
local lineY = -scrollBar.offset
4444
for _, lineInfo in ipairs(self.list) do
4545
if lineInfo[colIndex] then
46-
DrawString(colInfo.x, lineY, colInfo.align, lineInfo.height, lineInfo.font or "VAR", lineInfo[colIndex])
46+
DrawString(lineInfo.x or colInfo.x, lineY, lineInfo.align or colInfo.align, lineInfo.height, lineInfo.font or "VAR", lineInfo[colIndex])
4747
end
4848
lineY = lineY + lineInfo.height
4949
end

‎Data/2_6/ModCache.lua‎

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎Data/3_0/EnchantmentHelmet.lua‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -261,6 +261,16 @@ return {
261261
"12% increased Blade Flurry Area of Effect",
262262
},
263263
},
264+
["Charged Dash"] = {
265+
["MERCILESS"] = {
266+
"25% increased Charged Dash Damage",
267+
"4% chance to Dodge Attacks if you have finished Channelling Charged Dash Recently",
268+
},
269+
["ENDGAME"] = {
270+
"40% increased Charged Dash Damage",
271+
"6% chance to Dodge Attacks if you have finished Channelling Charged Dash Recently",
272+
},
273+
},
264274
["Clarity"] = {
265275
["MERCILESS"] = {
266276
"20% reduced Clarity Mana Reservation",
@@ -345,6 +355,18 @@ return {
345355
"40% increased Cyclone Damage",
346356
},
347357
},
358+
["Dark Pact"] = {
359+
["MERCILESS"] = {
360+
"25% increased Dark Pact Damage",
361+
"8% increased Dark Pact Cast Speed",
362+
"8% increased Dark Pact Area of Effect",
363+
},
364+
["ENDGAME"] = {
365+
"40% increased Dark Pact Damage",
366+
"12% increased Dark Pact Cast Speed",
367+
"12% increased Dark Pact Area of Effect",
368+
},
369+
},
348370
["Decoy Totem"] = {
349371
["MERCILESS"] = {
350372
"40% increased Decoy Totem Life",
@@ -1445,6 +1467,18 @@ return {
14451467
"12% increased Static Strike Area of Effect",
14461468
},
14471469
},
1470+
["Storm Burst"] = {
1471+
["MERCILESS"] = {
1472+
"25% increased Storm Burst Damage",
1473+
"8% increased Storm Burst Area of Effect",
1474+
"30% chance to Avoid interruption from Stuns while Casting Storm Burst",
1475+
},
1476+
["ENDGAME"] = {
1477+
"40% increased Storm Burst Damage",
1478+
"12% increased Storm Burst Area of Effect",
1479+
"45% chance to Avoid interruption from Stuns while Casting Storm Burst",
1480+
},
1481+
},
14481482
["Storm Call"] = {
14491483
["MERCILESS"] = {
14501484
"25% increased Storm Call Damage",

‎Data/3_0/Minions.lua‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,6 @@ minions["Clone"] = {
275275
},
276276
modList = {
277277
mod("EnergyShield", "BASE", 10),
278-
mod("SkillData", "LIST", { key = "attackRateCap", value = 1.84 }),
279278
},
280279
}
281280
minions["SpiderMinion"] = {

‎Data/3_0/ModCache.lua‎

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎Data/Uniques/belt.lua‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ Requires Level 50
163163
(67-75) Life Regenerated per second
164164
(8-10) Mana Regenerated per second
165165
{variant:1}−40% to all Elemental Resistances
166-
{variant:3}−25% to all Elemental Resistances
166+
{variant:3}−(15-25)% to all Elemental Resistances
167167
{variant:1}−10% to all maximum Resistances
168168
{variant:2}−5% to all maximum Resistances
169169
−(50-40) Physical Damage taken from Attacks

‎Data/Uniques/body.lua‎

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -348,6 +348,7 @@ Variant: Arrow Dancing
348348
Variant: Avatar of Fire
349349
Variant: Blood Magic
350350
Variant: Conduit
351+
Variant: Crimson Dance
351352
Variant: Eldritch Battery
352353
Variant: Elemental Equilibrium
353354
Variant: Elemental Overload
@@ -375,22 +376,23 @@ You can only Socket Corrupted Gems in this item
375376
{variant:4}Avatar of Fire
376377
{variant:5}Blood Magic
377378
{variant:6}Conduit
378-
{variant:7}Eldritch Battery
379-
{variant:8}Elemental Equilibrium
380-
{variant:9}Elemental Overload
381-
{variant:10}Ghost Reaver
382-
{variant:11}Iron Grip
383-
{variant:12}Iron Reflexes
384-
{variant:13}Mind Over Matter
385-
{variant:14}Minion Instability
386-
{variant:15}Pain Attunement
387-
{variant:16}Perfect Agony
388-
{variant:17}Phase Acrobatics
389-
{variant:18}Point Blank
390-
{variant:19}Resolute Technique
391-
{variant:20}Unwavering Stance
392-
{variant:21}Vaal Pact
393-
{variant:22}Zealot's Oath
379+
{variant:7}Crimson Dance
380+
{variant:8}Eldritch Battery
381+
{variant:9}Elemental Equilibrium
382+
{variant:10}Elemental Overload
383+
{variant:11}Ghost Reaver
384+
{variant:12}Iron Grip
385+
{variant:13}Iron Reflexes
386+
{variant:14}Mind Over Matter
387+
{variant:15}Minion Instability
388+
{variant:16}Pain Attunement
389+
{variant:17}Perfect Agony
390+
{variant:18}Phase Acrobatics
391+
{variant:19}Point Blank
392+
{variant:20}Resolute Technique
393+
{variant:21}Unwavering Stance
394+
{variant:22}Vaal Pact
395+
{variant:23}Zealot's Oath
394396
Corrupted
395397
]],[[
396398
Soul Mantle

0 commit comments

Comments
 (0)