diff --git a/CHANGELOG.md b/CHANGELOG.md index b3cbf4ee..694d6385 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +### 1.4.130 - 2019/03/07 + * Passive tree updated to 3.6 + * Added base radius values for Dark Pact (24), Vaal Blight (20), and Wither (18) + * Fixed issue preventing local life on hit modifiers from working correctly + * The stat comparisons in tooltips for non-equipped two handed weapons now show the changes from replacing both + weapons if you are dual wielding, rather than your main hand weapon only + * Storm Call now shows DPS as well as average damage + * Decay DPS is now only shown if the skill can deal Chaos Damage + ### 1.4.129 - 2019/01/13 * "while Focussed" modifiers are now correctly recognised * "+X to minimum Endurance Charges" now works correctly diff --git a/Classes/ConfigTab.lua b/Classes/ConfigTab.lua index 400b300a..2f7eed0a 100644 --- a/Classes/ConfigTab.lua +++ b/Classes/ConfigTab.lua @@ -10,7 +10,7 @@ local m_floor = math.floor local gameVersionDropList = { { label = "2.6 (Atlas of Worlds)", version = "2_6", versionPretty = "2.6" }, - { label = "3.4 (War for the Atlas)", version = "3_0", versionPretty = "3.4" }, + { label = "3.5 (War for the Atlas)", version = "3_0", versionPretty = "3.5" }, } local varList = LoadModule("Modules/ConfigOptions") diff --git a/Data/3_0/Skills/act_int.lua b/Data/3_0/Skills/act_int.lua index 312eafef..d5077e33 100644 --- a/Data/3_0/Skills/act_int.lua +++ b/Data/3_0/Skills/act_int.lua @@ -577,6 +577,7 @@ skills["VaalBlight"] = { area = true, }, baseMods = { + skill("radius", 20), }, qualityStats = { { "base_skill_area_of_effect_+%", 0.5 }, @@ -1516,6 +1517,7 @@ skills["DarkPact"] = { area = true, }, baseMods = { + skill("radius", 24), }, qualityStats = { { "base_skill_area_of_effect_+%", 0.5 }, @@ -5876,6 +5878,8 @@ skills["StormCall"] = { skillTypes = { [2] = true, [10] = true, [11] = true, [12] = true, [17] = true, [18] = true, [19] = true, [36] = true, [26] = true, [45] = true, [35] = true, [67] = true, }, statDescriptionScope = "skill_stat_descriptions", castTime = 0.5, + ["base_skill_show_average_damage_instead_of_dps"] = { + }, baseFlags = { spell = true, area = true, @@ -6783,6 +6787,7 @@ skills["Wither"] = { }, baseMods = { skill("debuff", true), + skill("radius", 18), skill("stackCount", 1, { type = "SkillPart", skillPart = 1 }), skill("stackCount", 5, { type = "SkillPart", skillPart = 2 }), skill("stackCount", 10, { type = "SkillPart", skillPart = 3 }), diff --git a/Export/Skills/act_int.txt b/Export/Skills/act_int.txt index dc8bbd38..b0600f71 100644 --- a/Export/Skills/act_int.txt +++ b/Export/Skills/act_int.txt @@ -85,6 +85,7 @@ local skills, mod, flag, skill = ... mod("ChaosDamageTaken", "INC", nil, 0, 0, { type = "GlobalEffect", effectType = "Debuff", effectName = "Hinder" }), }, }, +#baseMod skill("radius", 20) #mods #skill CorpseWarp @@ -251,6 +252,7 @@ local skills, mod, flag, skill = ... mod("Damage", "MORE", nil, 0, bit.bor(KeywordFlag.Hit, KeywordFlag.Ailment), { type = "SkillPart", skillPart = 1 }), }, }, +#baseMod skill("radius", 24) #mods #skill Despair @@ -901,6 +903,8 @@ local skills, mod, flag, skill = ... #skill StormCall #flags spell area duration + ["base_skill_show_average_damage_instead_of_dps"] = { + }, #baseMod skill("radius", 20) #mods @@ -1053,6 +1057,7 @@ local skills, mod, flag, skill = ... }, }, #baseMod skill("debuff", true) +#baseMod skill("radius", 18) #baseMod skill("stackCount", 1, { type = "SkillPart", skillPart = 1 }) #baseMod skill("stackCount", 5, { type = "SkillPart", skillPart = 2 }) #baseMod skill("stackCount", 10, { type = "SkillPart", skillPart = 3 }) diff --git a/Export/skills.lua b/Export/skills.lua index 68b5ccc3..47535015 100644 --- a/Export/skills.lua +++ b/Export/skills.lua @@ -69,8 +69,6 @@ directiveTable.skill = function(state, args, out) local skillGem = SkillGems[skillGemKey] local baseItemType = BaseItemTypes[skillGem.BaseItemTypesKey] out:write('\tname = "', baseItemType.Name:gsub(" Support",""), '",\n') - --local gemId, gemName = dammitChris(grantedId) - --out:write('\tname = "', gemName, '",\n') if #skillGem.Description > 0 then out:write('\tdescription = "', skillGem.Description, '",\n') end diff --git a/Modules/CalcOffence-3_0.lua b/Modules/CalcOffence-3_0.lua index 9f07df26..7b31883a 100644 --- a/Modules/CalcOffence-3_0.lua +++ b/Modules/CalcOffence-3_0.lua @@ -1102,9 +1102,9 @@ function calcs.offence(env, actor, activeSkill) output.EnergyShieldOnHit = 0 output.ManaOnHit = 0 else - output.LifeOnHit = (skillModList:Sum("BASE", skillCfg, "LifeOnHit") + enemyDB:Sum("BASE", skillCfg, "SelfLifeOnHit")) * globalOutput.LifeRecoveryMod - output.EnergyShieldOnHit = (skillModList:Sum("BASE", skillCfg, "EnergyShieldOnHit") + enemyDB:Sum("BASE", skillCfg, "SelfEnergyShieldOnHit")) * globalOutput.EnergyShieldRecoveryMod - output.ManaOnHit = (skillModList:Sum("BASE", skillCfg, "ManaOnHit") + enemyDB:Sum("BASE", skillCfg, "SelfManaOnHit")) * globalOutput.ManaRecoveryMod + output.LifeOnHit = (skillModList:Sum("BASE", cfg, "LifeOnHit") + enemyDB:Sum("BASE", cfg, "SelfLifeOnHit")) * globalOutput.LifeRecoveryMod + output.EnergyShieldOnHit = (skillModList:Sum("BASE", cfg, "EnergyShieldOnHit") + enemyDB:Sum("BASE", cfg, "SelfEnergyShieldOnHit")) * globalOutput.EnergyShieldRecoveryMod + output.ManaOnHit = (skillModList:Sum("BASE", cfg, "ManaOnHit") + enemyDB:Sum("BASE", cfg, "SelfManaOnHit")) * globalOutput.ManaRecoveryMod end output.LifeOnHitRate = output.LifeOnHit * hitRate output.EnergyShieldOnHitRate = output.EnergyShieldOnHit * hitRate @@ -1973,7 +1973,7 @@ function calcs.offence(env, actor, activeSkill) combineStat("FreezeDurationMod", "AVERAGE") end - if skillFlags.hit and skillData.decay then + if skillFlags.hit and skillData.decay and canDeal.Chaos then -- Calculate DPS for Essence of Delirium's Decay effect skillFlags.decay = true activeSkill.decayCfg = { diff --git a/Modules/CalcSetup.lua b/Modules/CalcSetup.lua index 789b09ae..5849344d 100644 --- a/Modules/CalcSetup.lua +++ b/Modules/CalcSetup.lua @@ -334,6 +334,8 @@ function calcs.initEnv(build, mode, override) local item if slotName == override.repSlotName then item = override.repItem + elseif override.repItem and override.repSlotName:match("^Weapon 1") and slotName:match("^Weapon 2") then + item = nil elseif slot.nodeId and override.spec then item = build.itemsTab.items[env.spec.jewels[slot.nodeId]] else @@ -348,7 +350,7 @@ function calcs.initEnv(build, mode, override) t_insert(env.itemGrantedSkills, grantedSkill) end end - if slot.weaponSet and slot.weaponSet ~= (build.itemsTab.activeItemSet.useSecondWeaponSet and 2 or 1) then + if slot.weaponSet and slot.weaponSet ~= (build.itemsTab.activeItemSet.useSecondWeaponSet and 2 or 1) then item = nil end if slot.weaponSet == 2 and build.itemsTab.activeItemSet.useSecondWeaponSet then diff --git a/Modules/ModParser-3_0.lua b/Modules/ModParser-3_0.lua index 9b24bd34..52e92c23 100644 --- a/Modules/ModParser-3_0.lua +++ b/Modules/ModParser-3_0.lua @@ -878,7 +878,9 @@ local function flag(name, ...) return mod(name, "FLAG", true, ...) end -local gemIdLookup = { } +local gemIdLookup = { + ["power charge on critical strike"] = "SupportPowerChargeOnCrit" +} for name, grantedEffect in pairs(data["3_0"].skills) do if not grantedEffect.hidden or grantedEffect.fromItem then gemIdLookup[grantedEffect.name:lower()] = grantedEffect.id diff --git a/Modules/StatDescriber.lua b/Modules/StatDescriber.lua index abb05716..cc739879 100644 --- a/Modules/StatDescriber.lua +++ b/Modules/StatDescriber.lua @@ -120,8 +120,9 @@ local function applySpecial(val, spec) val[spec.v].min = 100 + val[spec.v].min val[spec.v].max = 100 + val[spec.v].max elseif spec.k == "multiplicative_permyriad_damage_modifier" then - val[spec.v].min = 100 + val[spec.v].min / 100 - val[spec.v].max = 100 + val[spec.v].max / 100 + val[spec.v].min = 100 + round(val[spec.v].min / 100, 1) + val[spec.v].max = 100 + round(val[spec.v].max / 100, 1) + val[spec.v].fmt = "g" elseif spec.k == "reminderstring" or spec.k == "canonical_line" then else --ConPrintf("Unknown description function: %s", spec.k) diff --git a/changelog.txt b/changelog.txt index dd3fa031..a837e66d 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,11 @@ +VERSION[1.4.130][2019/03/07] + * Passive tree updated to 3.6 + * Added base radius values for Dark Pact (24), Vaal Blight (20), and Wither (18) + * Fixed issue preventing local life on hit modifiers from working correctly + * The stat comparisons in tooltips for non-equipped two handed weapons now show the changes from replacing both + weapons if you are dual wielding, rather than your main hand weapon only + * Storm Call now shows DPS as well as average damage + * Decay DPS is now only shown if the skill can deal Chaos Damage VERSION[1.4.129][2019/01/13] * "while Focussed" modifiers are now correctly recognised * "+X to minimum Endurance Charges" now works correctly diff --git a/manifest.xml b/manifest.xml index e650c4e9..2dbc6527 100644 --- a/manifest.xml +++ b/manifest.xml @@ -1,20 +1,20 @@ - + - + - + @@ -60,12 +60,12 @@ - + - + @@ -73,9 +73,9 @@ - + - + @@ -182,7 +182,7 @@ - + @@ -251,8 +251,8 @@ - - - - + + + + diff --git a/tree.zip b/tree.zip index 0b60b83e..ac62f66a 100644 Binary files a/tree.zip and b/tree.zip differ