overspend1/PathOfBuilding
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Release 1.3.2

Browse Source 
- Added support for increased buff effect
- Added basic support for DD
- Fixed unarmed detection
This commit is contained in:
Openarl
2017-02-18 22:36:19 +10:00
parent 90b1f58af2
commit af35d1818b
13 changed files with 172 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Modules/Calcs.lua
View File

@@ -257,10 +257,13 @@ local function buildActiveSkillModList(env, activeSkill)
if skillFlags.hit then
skillModFlags = bor(skillModFlags, ModFlag.Hit)
end
if skillFlags.spell then
skillModFlags = bor(skillModFlags, ModFlag.Spell)
elseif skillFlags.attack then
if skillFlags.attack then
skillModFlags = bor(skillModFlags, ModFlag.Attack)
else
skillModFlags = bor(skillModFlags, ModFlag.Cast)
if skillFlags.spell then
skillModFlags = bor(skillModFlags, ModFlag.Spell)
end
end
if skillFlags.melee then
skillModFlags = bor(skillModFlags, ModFlag.Melee)
@@ -1064,7 +1067,7 @@ local function performCalcs(env)
if env.weaponData1.type and env.weaponData2.type then
condList["DualWielding"] = true
end
if not env.weaponData1.type then
if env.weaponData1.type == "None" then
condList["Unarmed"] = true
end
if (modDB.multipliers["NormalItem"] or 0) > 0 then
@@ -1157,14 +1160,14 @@ local function performCalcs(env)
-- Merge auxillary modifiers
if env.mode_buffs then
if activeSkill.buffModList and (not activeSkill.skillFlags.totem or activeSkill.skillData.allowTotemBuff) then
local inc = modDB:Sum("INC", skillCfg, "BuffEffect")
if activeSkill.activeGem.data.golem and modDB:Sum("FLAG", skillCfg, "LiegeOfThePrimordial") and (activeSkill.activeGem.data.fire or activeSkill.activeGem.data.cold or activeSkill.activeGem.data.lightning) then
modDB:ScaleAddList(activeSkill.buffModList, 2)
else
modDB:AddList(activeSkill.buffModList)
inc = inc + 100
end
modDB:ScaleAddList(activeSkill.buffModList, 1 + inc / 100)
end
if activeSkill.auraModList then
local inc = modDB:Sum("INC", skillCfg, "AuraEffect") + skillModList:Sum("INC", skillCfg, "AuraEffect")
local inc = modDB:Sum("INC", skillCfg, "AuraEffect") + skillModList:Sum("INC", skillCfg, "AuraEffect") + modDB:Sum("INC", skillCfg, "BuffEffect")
local more = modDB:Sum("MORE", skillCfg, "AuraEffect") * skillModList:Sum("MORE", skillCfg, "AuraEffect")
modDB:ScaleAddList(activeSkill.auraModList, (1 + inc / 100) * more)
modDB:ScaleAddList(extraAuraModList, (1 + inc / 100) * more)
@@ -1269,12 +1272,13 @@ local function performCalcs(env)
-- Add misc buffs
if env.mode_combat then
if condList["Onslaught"] then
local effect = m_floor(20 * (1 + modDB:Sum("INC", nil, "OnslaughtEffect") / 100))
local effect = m_floor(20 * (1 + modDB:Sum("INC", nil, "OnslaughtEffect", "BuffEffect") / 100))
modDB:NewMod("Speed", "INC", effect, "Onslaught")
modDB:NewMod("MovementSpeed", "INC", effect, "Onslaught")
end
if condList["UnholyMight"] then
modDB:NewMod("PhysicalDamageGainAsChaos", "BASE", 30, "Unholy Might")
local effect = m_floor(30 * (1 + modDB:Sum("INC", nil, "BuffEffect") / 100))
modDB:NewMod("PhysicalDamageGainAsChaos", "BASE", effect, "Unholy Might")
end
end

9
Modules/Data.lua
View File

@@ -13,11 +13,12 @@ ModFlag.Attack = 0x00000001
ModFlag.Spell = 0x00000002
ModFlag.Hit = 0x00000004
ModFlag.Dot = 0x00000008
ModFlag.Cast = 0x00000010
-- Damage sources
ModFlag.Melee = 0x00000010
ModFlag.Area = 0x00000020
ModFlag.Projectile = 0x00000040
ModFlag.SourceMask = 0x00000060
ModFlag.Melee = 0x00000100
ModFlag.Area = 0x00000200
ModFlag.Projectile = 0x00000400
ModFlag.SourceMask = 0x00000600
-- Weapon types
ModFlag.Axe = 0x00001000
ModFlag.Bow = 0x00002000

3
Modules/ModParser.lua
View File

@@ -125,6 +125,7 @@ local modNameList = {
["curse duration"] = { "Duration", keywordFlags = KeywordFlag.Curse },
["radius of auras"] = { "AreaRadius", keywordFlags = KeywordFlag.Aura },
["radius of curses"] = { "AreaRadius", keywordFlags = KeywordFlag.Curse },
["effect of buffs on you"] = "BuffEffect",
-- Charges
["maximum power charge"] = "PowerChargesMax",
["maximum power charges"] = "PowerChargesMax",
@@ -207,7 +208,7 @@ local modNameList = {
["critical strike multiplier"] = "CritMultiplier",
["accuracy rating"] = "Accuracy",
["attack speed"] = { "Speed", flags = ModFlag.Attack },
["cast speed"] = { "Speed", flags = ModFlag.Spell },
["cast speed"] = { "Speed", flags = ModFlag.Cast },
["attack and cast speed"] = "Speed",
-- Elemental status ailments
["to shock"] = "EnemyShockChance",