Added support for various unique stats
This commit is contained in:
@@ -22,7 +22,7 @@
|
||||
* Added the following 3.6 uniques: (thanks PJacek)
|
||||
* Circle of Regret
|
||||
* The Eternity Shroud
|
||||
* Garb of the Ephemeral
|
||||
* Garb of the Ephemeral (Divinity can be enabled in the Configuration tab)
|
||||
* Maloney's Mechanism
|
||||
* Offering of the Serpent
|
||||
* Vixen's Entrapment
|
||||
|
||||
@@ -234,7 +234,7 @@ function ModStoreClass:EvalMod(mod, cfg)
|
||||
mult = target:GetMultiplier(tag.var, cfg)
|
||||
end
|
||||
local threshold = tag.threshold or target:GetMultiplier(tag.thresholdVar, cfg)
|
||||
if (tag.upper and mult > tag.threshold) or (not tag.upper and mult < tag.threshold) then
|
||||
if (tag.upper and mult > threshold) or (not tag.upper and mult < threshold) then
|
||||
return
|
||||
end
|
||||
elseif tag.type == "PerStat" then
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -999,7 +999,7 @@ function calcs.offence(env, actor, activeSkill)
|
||||
taken = taken + enemyDB:Sum("INC", nil, "TrapMineDamageTaken")
|
||||
end
|
||||
local effMult = (1 + taken / 100)
|
||||
if not isElemental[damageType] or not (skillModList:Flag(cfg, "IgnoreElementalResistances", "Ignore"..damageType.."Resistance") or enemyDB:Flag(nil, "SelfIgnore"..damageType.."Resistance")) then
|
||||
if not skillModList:Flag(cfg, "Ignore"..damageType.."Resistance", isElemental[damageType] and "IgnoreElementalResistances" or nil) and not enemyDB:Flag(nil, "SelfIgnore"..damageType.."Resistance") then
|
||||
effMult = effMult * (1 - (resist - pen) / 100)
|
||||
end
|
||||
min = min * effMult
|
||||
|
||||
@@ -347,6 +347,9 @@ return {
|
||||
{ var = "buffAdrenaline", type = "check", label = "Do you have Adrenaline?", tooltip = "This will enable the Adrenaline buff:\n100% increased Damage\n25% increased Attack, Cast and Movement Speed\n10% additional Physical Damage Reduction", apply = function(val, modList, enemyModList)
|
||||
modList:NewMod("Condition:Adrenaline", "FLAG", true, "Config", { type = "Condition", var = "Combat" })
|
||||
end },
|
||||
{ var = "buffDivinity", type = "check", label = "Do you have Divinity?", tooltip = "This will enable the Divinity buff:\n100% more Elemental Damage\n20% less Elemental Damage Taken", apply = function(val, modList, enemyModList)
|
||||
modList:NewMod("Condition:Divinity", "FLAG", true, "Config", { type = "Condition", var = "Combat" })
|
||||
end },
|
||||
{ var = "multiplierRage", type = "count", label = "Rage:", ifCond = "CanGainRage", apply = function(val, modList, enemyModList)
|
||||
modList:NewMod("Multiplier:Rage", "BASE", val, "Config", { type = "IgnoreCond" }, { type = "Condition", var = "Combat" }, { type = "Condition", var = "CanGainRage" })
|
||||
end },
|
||||
|
||||
@@ -270,13 +270,14 @@ local modNameList = {
|
||||
["life leeched per second"] = "LifeLeechRate",
|
||||
["mana leeched per second"] = "ManaLeechRate",
|
||||
["total recovery per second from life leech"] = "LifeLeechRate",
|
||||
["total recovery per second from mana leech"] = "ManaLeechRate",
|
||||
["total recovery per second from energy shield leech"] = "EnergyShieldLeechRate",
|
||||
["maximum life per second to maximum life leech rate"] = "MaxLifeLeechRate",
|
||||
["maximum mana per second to maximum mana leech rate"] = "MaxManaLeechRate",
|
||||
["total recovery per second from mana leech"] = "ManaLeechRate",
|
||||
["maximum recovery per life leech"] = "MaxLifeLeechInstance",
|
||||
["maximum recovery per energy shield leech"] = "MaxEnergyShieldLeechInstance",
|
||||
["maximum recovery per mana leech"] = "MaxManaLeechInstance",
|
||||
["maximum total recovery per second from life leech"] = "MaxLifeLeechRate",
|
||||
["maximum total recovery per second from mana leech"] = "MaxManaLeechRate",
|
||||
["maximum total recovery per second from energy shield leech"] = "MaxEnergyShieldLeechRate",
|
||||
["maximum total recovery per second from mana leech"] = "MaxManaLeechRate",
|
||||
-- Projectile modifiers
|
||||
["projectile"] = "ProjectileCount",
|
||||
["projectiles"] = "ProjectileCount",
|
||||
@@ -421,6 +422,7 @@ local modNameList = {
|
||||
["strength requirement"] = "StrRequirement",
|
||||
["dexterity requirement"] = "DexRequirement",
|
||||
["intelligence requirement"] = "IntRequirement",
|
||||
["strength and intelligence requirement"] = { "StrRequirement", "IntRequirement" },
|
||||
["attribute requirements"] = { "StrRequirement", "DexRequirement", "IntRequirement" },
|
||||
["effect of socketed jewels"] = "SocketedJewelEffect",
|
||||
-- Flask modifiers
|
||||
@@ -1292,6 +1294,10 @@ local specialModList = {
|
||||
["nearby allies have (%d+)%% increased defences per (%d+) strength you have"] = function(num, _, div) return { mod("ExtraAura", "LIST", { onlyAllies = true, mod = mod("Defences", "INC", num) }, { type = "PerStat", stat = "Str", div = tonumber(div) }) } end,
|
||||
["nearby allies have %+(%d+)%% to critical strike multiplier per (%d+) dexterity you have"] = function(num, _, div) return { mod("ExtraAura", "LIST", { onlyAllies = true, mod = mod("CritMultiplier", "BASE", num) }, { type = "PerStat", stat = "Dex", div = tonumber(div) }) } end,
|
||||
["nearby allies have (%d+)%% increased cast speed per (%d+) intelligence you have"] = function(num, _, div) return { mod("ExtraAura", "LIST", { onlyAllies = true, mod = mod("Speed", "INC", num, nil, ModFlag.Cast ) }, { type = "PerStat", stat = "Int", div = tonumber(div) }) } end,
|
||||
["you gain divinity for %d+ seconds on reaching maximum divine charges"] = {
|
||||
mod("ElementalDamage", "MORE", 50, { type = "Condition", var = "Divinity" }),
|
||||
mod("ElementalDamageTaken", "MORE", -20, { type = "Condition", var = "Divinity" }),
|
||||
},
|
||||
-- Traps, Mines and Totems
|
||||
["traps and mines deal (%d+)%-(%d+) additional physical damage"] = function(_, min, max) return { mod("PhysicalMin", "BASE", tonumber(min), nil, 0, bor(KeywordFlag.Trap, KeywordFlag.Mine)), mod("PhysicalMax", "BASE", tonumber(max), nil, 0, bor(KeywordFlag.Trap, KeywordFlag.Mine)) } end,
|
||||
["traps and mines deal (%d+) to (%d+) additional physical damage"] = function(_, min, max) return { mod("PhysicalMin", "BASE", tonumber(min), nil, 0, bor(KeywordFlag.Trap, KeywordFlag.Mine)), mod("PhysicalMax", "BASE", tonumber(max), nil, 0, bor(KeywordFlag.Trap, KeywordFlag.Mine)) } end,
|
||||
@@ -1507,6 +1513,7 @@ local specialModList = {
|
||||
["strength provides no bonus to maximum life"] = { flag("NoStrBonusToLife") },
|
||||
["intelligence provides no bonus to maximum mana"] = { flag("NoIntBonusToMana") },
|
||||
["with a ghastly eye jewel socketed, minions have %+(%d+) to accuracy rating"] = function(num) return { mod("MinionModifier", "LIST", { mod = mod("Accuracy", "BASE", num) }, { type = "Condition", var = "HaveGhastlyEyeJewelIn{SlotName}" }) } end,
|
||||
["hits ignore enemy monster chaos resistance if all equipped items are shaper items"] = { flag("IgnoreChaosResistance", { type = "MultiplierThreshold", var = "NonShaperItem", upper = true, threshold = 0 }) },
|
||||
-- Skill-specific enchantment modifiers
|
||||
["(%d+)%% increased decoy totem life"] = function(num) return { mod("TotemLife", "INC", num, { type = "SkillName", skillName = "Decoy Totem" }) } end,
|
||||
["(%d+)%% increased ice spear critical strike chance in second form"] = function(num) return { mod("CritChance", "INC", num, { type = "SkillName", skillName = "Ice Spear" }, { type = "SkillPart", skillPart = 2 }) } end,
|
||||
|
||||
@@ -22,7 +22,7 @@ VERSION[1.4.132][2019/03/10]
|
||||
* Added the following 3.6 uniques: (thanks PJacek)
|
||||
* Circle of Regret
|
||||
* The Eternity Shroud
|
||||
* Garb of the Ephemeral
|
||||
* Garb of the Ephemeral (Divinity can be enabled in the Configuration tab)
|
||||
* Maloney's Mechanism
|
||||
* Offering of the Serpent
|
||||
* Vixen's Entrapment
|
||||
|
||||
18
manifest.xml
18
manifest.xml
@@ -7,7 +7,7 @@
|
||||
<File sha1="74cd89091c4db01f0673217a5bd0927f232391e2" name="Launch.lua" part="program"/>
|
||||
<File sha1="72b9bea1871e94a643e4471fd84bbedbc7810336" name="UpdateCheck.lua" part="program"/>
|
||||
<File sha1="4f17937f2b37784e169a3792b235f2a0a3961e61" name="UpdateApply.lua" part="program"/>
|
||||
<File sha1="230d588be36b130e2b3a12dc9079aaaf0705bc1e" name="changelog.txt" part="program"/>
|
||||
<File sha1="10e57ec858b4faae9e98e113082f5ad9052d1116" name="changelog.txt" part="program"/>
|
||||
<File sha1="b093a2709f30c1f83ce5ba9df88c80f22c1beb4a" name="Classes/BuildListControl.lua" part="program"/>
|
||||
<File sha1="16fc5eaa04cc14b2022f6705a12717935454dab0" name="Classes/ButtonControl.lua" part="program"/>
|
||||
<File sha1="c160d9d42579f3e3b89e420e7931a9aecb6377bc" name="Classes/CalcBreakdownControl.lua" part="program"/>
|
||||
@@ -33,7 +33,7 @@
|
||||
<File sha1="f7281f889c87c8de45d5af4243c49d9998d4a272" name="Classes/MinionListControl.lua" part="program"/>
|
||||
<File sha1="b67204a03fc51b91cb3e73c398e57ebc50dd9df1" name="Classes/ModDB.lua" part="program"/>
|
||||
<File sha1="2fa5f20b12a4b366dc4b28a2a873699b834766d6" name="Classes/ModList.lua" part="program"/>
|
||||
<File sha1="20a45c031f8b2f061dc8221d8eea9589c84e4818" name="Classes/ModStore.lua" part="program"/>
|
||||
<File sha1="8d4c38462574fbcf2df6a71fdb927e158d941564" name="Classes/ModStore.lua" part="program"/>
|
||||
<File sha1="cc7c5eff58c2868cdc7d4c1bf9a967aa8c448c9e" name="Classes/NotesTab.lua" part="program"/>
|
||||
<File sha1="733b4a91d80b4054a30cfe953e08c3194d7c108a" name="Classes/PassiveSpec.lua" part="program"/>
|
||||
<File sha1="c88b3c38b9549c0d763c926eb98dc380594d755e" name="Classes/PassiveSpecListControl.lua" part="program"/>
|
||||
@@ -58,22 +58,22 @@
|
||||
<File sha1="ac516b6ce139e32884761eeaf1f37310bb4c9274" name="Modules/CalcActiveSkill.lua" part="program"/>
|
||||
<File sha1="48f73482c0b79c6ccfb4c053b03181da047da362" name="Modules/CalcBreakdown.lua" part="program"/>
|
||||
<File sha1="f08ee16af3c136348fe98bc97b5b7f2d2c1f79e4" name="Modules/CalcDefence-2_6.lua" part="program"/>
|
||||
<File sha1="6e9e8e34f0cbe3bdeaa73f8bd309d9409b2441b6" name="Modules/CalcDefence-3_0.lua" part="program"/>
|
||||
<File sha1="fe3dd1b4f40041ef421c89317674465b0eafeea7" name="Modules/CalcDefence-3_0.lua" part="program"/>
|
||||
<File sha1="5094a7c53f3991dbc33cea86e1e5fc0658e7a08d" name="Modules/CalcOffence-2_6.lua" part="program"/>
|
||||
<File sha1="126f93f6f7f7d8bd4eec4ec5963845ce2cfc8f01" name="Modules/CalcOffence-3_0.lua" part="program"/>
|
||||
<File sha1="4af6465183d2d075ed36a5eddfd6ed3466351b67" name="Modules/CalcOffence-3_0.lua" part="program"/>
|
||||
<File sha1="7bbc49f0f6c48391898bbf8546fffb1d3b0cc011" name="Modules/CalcPerform.lua" part="program"/>
|
||||
<File sha1="75ff525e98cb3814ece908e02900e10b76542ba5" name="Modules/Calcs.lua" part="program"/>
|
||||
<File sha1="32da2a949a5fe0ab10d54078a96caff0dccb5f3f" name="Modules/CalcSections-2_6.lua" part="program"/>
|
||||
<File sha1="05be59eeb04948590efcb134a75e69134fd8ec6c" name="Modules/CalcSections-3_0.lua" part="program"/>
|
||||
<File sha1="57704ab234fc80fd327cfa896fa69005c54df5d2" name="Modules/CalcSetup.lua" part="program"/>
|
||||
<File sha1="e03ae7af922bc316b263f65f058ba3b503721f86" name="Modules/CalcSections-3_0.lua" part="program"/>
|
||||
<File sha1="42dc7eeaa1058190754354ab919cdcd11730acd3" name="Modules/CalcSetup.lua" part="program"/>
|
||||
<File sha1="a5d1bb3b12674fb2cc89323e6deea3c99c787c2d" name="Modules/CalcTools.lua" part="program"/>
|
||||
<File sha1="e1aa789d58027c81e4877884e0ee0697d8fe58ab" name="Modules/Common.lua" part="program"/>
|
||||
<File sha1="f254def9e89b5a579a21df88ab571958ce6fcbb1" name="Modules/ConfigOptions.lua" part="program"/>
|
||||
<File sha1="3a0dad9458a1620e96ee86db8e036b9e1c8bf501" name="Modules/ConfigOptions.lua" part="program"/>
|
||||
<File sha1="45959b8e64bd8b75c2b4019555589b745d0ac68a" name="Modules/Data.lua" part="program"/>
|
||||
<File sha1="ee6926d9acb29152f44f223dd117c0b72f1e73af" name="Modules/ItemTools.lua" part="program"/>
|
||||
<File sha1="8ec34cb6ab6e8d08ddc06c524179be1e656c3a8d" name="Modules/Main.lua" part="program"/>
|
||||
<File sha1="fc2d3bdf7a4e57894b3d04beb83485cc6dcc5e26" name="Modules/ModParser-2_6.lua" part="program"/>
|
||||
<File sha1="457dc62eec80507643542aac13a758e0a2c65ade" name="Modules/ModParser-3_0.lua" part="program"/>
|
||||
<File sha1="0bbea5a4a7be837221cfe18f2abe17ec4a2ab00f" name="Modules/ModParser-3_0.lua" part="program"/>
|
||||
<File sha1="2ce4f3b83db992a286bd92f3849d037d6dcc8db2" name="Modules/ModTools.lua" part="program"/>
|
||||
<File sha1="6b0b5ac8fdb764b47fd7a1657bd470bd275f9069" name="Modules/StatDescriber.lua" part="program"/>
|
||||
<File sha1="c345cdcf374d271411aa424ab150c0edbb5a362d" name="Assets/game_ui_small.png" part="program"/>
|
||||
@@ -153,7 +153,7 @@
|
||||
<File sha1="6c445a68a337ce437efbfc597b0957172d4d50e7" name="Data/3_0/Gems.lua" part="program"/>
|
||||
<File sha1="2a7ab8265167c3bd8f3614704242393c85aa2afd" name="Data/3_0/Minions.lua" part="program"/>
|
||||
<File sha1="bebfb38022ec1d65d0683818761d7b2ca697cdf9" name="Data/3_0/Misc.lua" part="program"/>
|
||||
<File sha1="f21817bf55bbe96d1b99857333ca07b09d369f2e" name="Data/3_0/ModCache.lua" part="program"/>
|
||||
<File sha1="a15a4bec0d2e950bfe49c50ab300fdda37494c25" name="Data/3_0/ModCache.lua" part="program"/>
|
||||
<File sha1="c8bb5abd973833c80a234a097d1fecbfbf3b72ac" name="Data/3_0/ModFlask.lua" part="program"/>
|
||||
<File sha1="fca67b01a4670a3238cbe4db43991fc89a30580a" name="Data/3_0/ModItem.lua" part="program"/>
|
||||
<File sha1="3902784e41a509c67221e81812260bc38148194e" name="Data/3_0/ModJewel.lua" part="program"/>
|
||||
|
||||
Reference in New Issue
Block a user