Minor fixes for Farrul's items

This commit is contained in:
Openarl
2018-03-21 21:20:10 +10:00
parent ca022c8a53
commit 5d38bae3e5
4 changed files with 10 additions and 7 deletions

File diff suppressed because one or more lines are too long

View File

@@ -889,6 +889,9 @@ function calcs.perform(env)
end
end
-- Merge keystones again to catch any that were added by buffs
mergeKeystones(env)
-- Special handling for Dancing Dervish
if modDB:Sum("FLAG", nil, "DisableWeapons") then
env.player.weaponData1 = copyTable(env.data.unarmedWeaponData[env.classId])

View File

@@ -167,10 +167,10 @@ function calcs.buildOutput(build, mode)
end
end
local function addMult(out, var, mod)
if not env.multipliersUsed[var] then
env.multipliersUsed[var] = { }
if not out[var] then
out[var] = { }
end
t_insert(env.multipliersUsed[var], mod)
t_insert(out[var], mod)
end
local function addMultTag(out, tag, mod)
if tag.varList then

View File

@@ -1089,8 +1089,8 @@ local specialModList = {
["melee critical strikes cause bleeding"] = { mod("BleedChance", "BASE", 100, nil, ModFlag.Melee, { type = "Condition", var = "CriticalStrike" }) },
["causes bleeding on melee critical strike"] = { mod("BleedChance", "BASE", 100, nil, ModFlag.Melee, { type = "Condition", var = "CriticalStrike" }) },
["melee critical strikes have (%d+)%% chance to cause bleeding"] = function(num) return { mod("BleedChance", "BASE", num, nil, ModFlag.Melee, { type = "Condition", var = "CriticalStrike" }) } end,
["attacks always inflict bleeding while you have cat's stealth"] = { mod("BleedChance", "BASE", 100, nil, ModFlag.Attack, { type = "Condition", var = "CatsStealth" }) },
["you have crimson dance while you have cat's stealth"] = { mod("Keystone", "LIST", "Crimson Dance", { type = "Condition", var = "CatsStealth" }) },
["attacks always inflict bleeding while you have cat's stealth"] = { mod("BleedChance", "BASE", 100, nil, ModFlag.Attack, { type = "Condition", var = "AffectedByCat'sStealth" }) },
["you have crimson dance while you have cat's stealth"] = { mod("Keystone", "LIST", "Crimson Dance", { type = "Condition", var = "AffectedByCat'sStealth" }) },
["you have crimson dance if you have dealt a critical strike recently"] = { mod("Keystone", "LIST", "Crimson Dance", { type = "Condition", var = "CritRecently" }) },
-- Poison
["y?o?u?r? ?fire damage can poison"] = { flag("FireCanPoison") },
@@ -1109,7 +1109,7 @@ local specialModList = {
["onslaught"] = { flag("Condition:Onslaught") },
["you have phasing if you've killed recently"] = { flag("Condition:Phasing", { type = "Condition", var = "KilledRecently" }) },
["you have phasing while affected by haste"] = { flag("Condition:Phasing", { type = "Condition", var = "AffectedByHaste" }) },
["you have phasing while you have cat's stealth"] = { flag("Condition:Phasing", { type = "Condition", var = "CatsStealth" }) },
["you have phasing while you have cat's stealth"] = { flag("Condition:Phasing", { type = "Condition", var = "AffectedByCat'sStealth" }) },
["you have onslaught while on low life"] = { flag("Condition:Onslaught", { type = "Condition", var = "LowLife" }) },
["your aura buffs do not affect allies"] = { flag("SelfAurasCannotAffectAllies") },
["allies' aura buffs do not affect you"] = { flag("AlliesAurasCannotAffectSelf") },