Skip to content

Commit

Permalink
Add parsing support for arcane surge and implement non gem arcane sur…
Browse files Browse the repository at this point in the history 
…ge (#4541)

* Fix all sources of arcane surge passing also improve passing of other buffs.

* Address most requested changes.

* clean up some white spaces.

* fix non-damaging ailment effect and add types to data.

* fix merge mistakes

* Switch channelling to time

* Squashed commit of the following:

commit a449985
Author: Nostrademous <nostrademous@hotmail.com>
Date:   Sat Aug 13 23:32:53 2022 -0400

    Add support for negative levels to gems (#4756)

commit fa4aa64
Author: Nostrademous <nostrademous@hotmail.com>
Date:   Sat Aug 13 23:25:51 2022 -0400

    Fix Thrusting swords were not a base subType (#4720)

    * Fix: Thrusting should be a base subType

    * Same changes but with less diff

    Co-authored-by: Wires77 <Wires77@users.noreply.github.com>

commit 9eddc38
Author: Tomas Slusny <slusnucky@gmail.com>
Date:   Sun Aug 14 05:11:25 2022 +0200

    Fix crash when deleting the current skill set (#4772)

    When removing it from table this causes crash when rebuilding skill set
    dropdown.

    Closes #4771

    Signed-off-by: Tomas Slusny <ts6234@intl.att.com>

    Signed-off-by: Tomas Slusny <ts6234@intl.att.com>
    Co-authored-by: Tomas Slusny <ts6234@intl.att.com>

commit f8298d7
Author: Lexy <learn2draw@live.nl>
Date:   Sun Aug 14 04:41:45 2022 +0200

    [Kalandra] Update Bitterdream (#4702)

    * update bitterdream

    * Remove legacy bitterdream variants

commit bc0da55
Author: Paliak <91493239+Paliak@users.noreply.github.com>
Date:   Sun Aug 14 04:38:17 2022 +0200

    FEAT: Add parsing for triple damage mods (#4727)

commit 37e8867
Author: Nostrademous <nostrademous@hotmail.com>
Date:   Sat Aug 13 22:37:51 2022 -0400

    [Kalandra] Add support for counting Mastery Type allocations (#4746)

    * Feat: Add support for counting Mastery Type allocations

    * added support for on kill portion of ascendancy node

    * Fix spacing

commit f61b17a
Author: Nightblade <Nightblade@users.noreply.github.com>
Date:   Sun Aug 14 12:36:57 2022 +1000

    [Kalandra] Update Ngamahu's Sign (#4755)

    * Update ring.lua

    Ngamahu's Sign - Perfect
    (My first one someone check it please!)

    * remove {variant:1,2,3} not needed

commit 14151f8
Author: QuickStick <31533893+QuickStick123@users.noreply.github.com>
Date:   Sun Aug 14 12:34:18 2022 +1000

    [Kalandra] Add new uniques (#4774)

    * add new uniques

    * Add new Grand Spectrum Jewels

    Co-authored-by: LocalIdentity <localidentity2@gmail.com>

commit 2dd0cde
Author: QuickStick <31533893+QuickStick123@users.noreply.github.com>
Date:   Sun Aug 14 11:15:06 2022 +1000

    Update replica bitterdream(#4775)

commit 9b9c49f
Author: QuickStick <31533893+QuickStick123@users.noreply.github.com>
Date:   Sun Aug 14 11:12:56 2022 +1000

    Add support for Arrow Dancing (#4779)

commit f468faa
Author: QuickStick <31533893+QuickStick123@users.noreply.github.com>
Date:   Sun Aug 14 11:06:59 2022 +1000

    [Kalandra] Update batch 4 of uniques. (#4757)

    * update uniques

    * added movement on throwing a trap.

    Co-authored-by: LocalIdentity <localidentity2@gmail.com>

commit 54d1740
Author: QuickStick <31533893+QuickStick123@users.noreply.github.com>
Date:   Sun Aug 14 10:57:50 2022 +1000

    Update sources of longer obtainable uniques (#4748)

    * No longer obtainable

    * Cameria's Avarice now obtainable from vendor recipe.

commit 0961142
Author: QuickStick <31533893+QuickStick123@users.noreply.github.com>
Date:   Sun Aug 14 10:54:36 2022 +1000

    update uniques (#4754)

commit 3052165
Author: QuickStick <31533893+QuickStick123@users.noreply.github.com>
Date:   Sun Aug 14 10:49:46 2022 +1000

    [Kalandra] Update batch 2 of uniques. (#4751)

    * set2 update uniques.

    * Fix bug with wording.

    * Change to use PercentStat

    Co-authored-by: LocalIdentity <localidentity2@gmail.com>

commit fe51e95
Author: QuickStick <31533893+QuickStick123@users.noreply.github.com>
Date:   Sun Aug 14 10:43:59 2022 +1000

    Update Manastorm and Kongming's Stratagem to new bases (#4783)

commit 456c70d
Author: LocalIdentity <localidentity2@gmail.com>
Date:   Sun Aug 14 10:25:33 2022 +1000

    Fix Suppression mastery

commit 49dd720
Author: QuickStick <31533893+QuickStick123@users.noreply.github.com>
Date:   Sun Aug 14 10:20:12 2022 +1000

    [Kalandra] Update batch 1 of uniques. (#4747)

    * update

    * Update ModParser.lua

    * Update boots.lua

    * Update ModParser.lua

    * support

    * Remove Covered in Ash mod parsing

    Co-authored-by: LocalIdentity <localidentity2@gmail.com>

commit 54c24b5
Author: QuickStick <31533893+QuickStick123@users.noreply.github.com>
Date:   Sun Aug 14 09:53:41 2022 +1000

    Add support for minions have Unholy Might (#4780)

commit c65c194
Author: Lexy <learn2draw@live.nl>
Date:   Sun Aug 14 01:23:47 2022 +0200

    Update brittle values (#4696)

commit 6cc2124
Author: Lexy <learn2draw@live.nl>
Date:   Sat Aug 13 23:14:54 2022 +0200

    Update ward recharge speed (#4697)

commit dd240b9
Author: Nightblade <Nightblade@users.noreply.github.com>
Date:   Sat Aug 13 11:58:36 2022 +1000

    Update ring.lua (#4773)

    spelling

commit 1fa9ab4
Author: LocalIdentity <localidentity2@gmail.com>
Date:   Sat Aug 13 11:18:25 2022 +1000

    Compact parsing of weapon types for multistrike

commit c1903af
Author: Sinured <100538010+Sinured@users.noreply.github.com>
Date:   Sat Aug 13 02:53:33 2022 +0200

    Fix: Multistrike damage calculation with skills which have bow and melee Tag (#4740)

    * wording of blood of karui fixed

    * undo messy work

    * damage and atk increase only applies to melee weapons and unarmed

    * added less attack damage modifier to also apply to bows

    * adding ModFlag.Attack Condition with bit.bor

    * Add lines to export files

    Co-authored-by: Sinured <githubmm@use.startmail.com>
    Co-authored-by: LocalIdentity <localidentity2@gmail.com>

commit 5d94436
Author: Sinured <100538010+Sinured@users.noreply.github.com>
Date:   Sat Aug 13 01:51:28 2022 +0200

    Fix: Blood of the Karui Life recovered and wording  (#4729)

    * wording of blood of karui fixed

    * Fix: increased life recovered of current version

    * changed wording for Blood of the karui and Lavianga's Spirit

    * fixed order and wording

    * Capitalised Flask Effect

    Co-authored-by: Sinured <githubmm@use.startmail.com>

commit e5ddd8e
Author: Sinured <100538010+Sinured@users.noreply.github.com>
Date:   Sat Aug 13 01:47:56 2022 +0200

    [Kalandra] Batch of uniques update. All missing starting with S (#4753)

    * all missing uniques starting with S

    * minions deal no non damage & minions convert phys to xyz

    * testcommit to check busted

    * Fix mod parsing format

    Co-authored-by: Sinured <githubmm@use.startmail.com>
    Co-authored-by: LocalIdentity <localidentity2@gmail.com>

commit 701e719
Author: Sinured <100538010+Sinured@users.noreply.github.com>
Date:   Sat Aug 13 01:22:08 2022 +0200

    Batch of uniques update. All missingfrom D to L (#4769)

    Co-authored-by: Sinured <githubmm@use.startmail.com>

commit f17690d
Author: Sinured <100538010+Sinured@users.noreply.github.com>
Date:   Sat Aug 13 00:52:07 2022 +0200

    [Kalandra] Lifetap & Blessing interaction (#4752)

    * wording of blood of karui fixed

    * undo messy work

    * lifetap cant support skills with blessing tag

    * testcommit to check busted

    Co-authored-by: Sinured <githubmm@use.startmail.com>

commit d7d91f9
Author: Sinured <100538010+Sinured@users.noreply.github.com>
Date:   Sat Aug 13 00:49:26 2022 +0200

    [Kalandra]Batch of uniques update. All missing starting with R (#4760)

    * item variants for R added

    * implements Ralakesh's Impatience unique affix

    * Add parsing for always Freeze, Shock and Ignite

    Co-authored-by: Sinured <githubmm@use.startmail.com>
    Co-authored-by: LocalIdentity <localidentity2@gmail.com>

commit 0bfc259
Author: Sinured <100538010+Sinured@users.noreply.github.com>
Date:   Sat Aug 13 00:28:25 2022 +0200

    uniques variants added (#4763)

    Co-authored-by: Sinured <githubmm@use.startmail.com>

commit 4c8127c
Author: Sinured <100538010+Sinured@users.noreply.github.com>
Date:   Sat Aug 13 00:14:26 2022 +0200

    [Kalandra] Batch of unique update. All remaining from M to O (#4767)

    * adds remaining unique batch from M to O

    * Fix Ondar's Clasp variant

    Co-authored-by: Sinured <githubmm@use.startmail.com>
    Co-authored-by: LocalIdentity <localidentity2@gmail.com>

commit c855506
Author: Regisle <49933620+Regisle@users.noreply.github.com>
Date:   Sat Aug 13 07:31:06 2022 +0930

    Add 3.19 Tree (#4744)

    * add Initial support for adding non-Tree nodes to Tree (Nine lives)

    * update positions and add other dummy nodes

    * separate stats and reminder text and add new nodes

    * rest of nodes

    * Fix comma

    * fix spelling of sapped

    * update spec.lua for passiveSkills

    * remove unrelated spec

    * update file to hardcode group and node IDs, and correct ascendency

    * update to new tree

    * add initial 3_19 tree

    * spelling fix

    Co-authored-by: LocalIdentity <localidentity2@gmail.com>

commit 78d1390
Author: Nostrademous <nostrademous@hotmail.com>
Date:   Fri Aug 12 13:47:50 2022 -0400

    Fix: when upconverting between trees, if a Mastery lost a mod from its pool that was allocated it would error (#4765)

commit c819a68
Author: Regisle <49933620+Regisle@users.noreply.github.com>
Date:   Sat Aug 13 01:24:04 2022 +0930

    Update fix_ascendancy_positions.py to support new extra tree nodes (#4357)

    * add Initial support for adding non-Tree nodes to Tree (Nine lives)

    * update positions and add other dummy nodes

    * separate stats and reminder text and add new nodes

    * rest of nodes

    * Fix comma

    * fix spelling of sapped

    * update spec.lua for passiveSkills

    * remove unrelated spec

    * update file to hardcode group and node IDs, and correct ascendency

    * update to new tree

    * spelling fix

    Co-authored-by: LocalIdentity <localidentity2@gmail.com>

commit 872d4e2
Author: Regisle <49933620+Regisle@users.noreply.github.com>
Date:   Fri Aug 12 18:42:10 2022 +0930

    Jugg armour applies to ele damage (#4673)

    * Add support for % of armour applies to elemental damage

    * add mod parser change

    * cap percent of armour

    * fix merge conflict

    * add breakdown and fix phys not apply

    * add to main breakdown

* Revert "Squashed commit of the following:"

This reverts commit 1d7c641.

* Revert "Revert "Squashed commit of the following:""

This reverts commit b0ebcd7.

* fix merge issues.

* fix typo

* Fix redundant stuff on hits with spells

* Fix missing bracket

* Update arcane surge
  • Loading branch information
@QuickStick123
QuickStick123 committed Apr 1, 2023
1 parent f57b292 commit 30662db
Show file tree
Hide file tree
Showing 6 changed files with 88 additions and 10 deletions.
4 changes: 2 additions & 2 deletions src/Data/Skills/sup_int.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -245,10 +245,10 @@ skills["SupportArcaneSurge"] = {
statDescriptionScope = "gem_stat_descriptions",
statMap = {
["support_arcane_surge_mana_regeneration_rate_+%"] = {
mod("ManaRegen", "INC", nil, 0, 0, { type = "GlobalEffect", effectType = "Buff", effectName = "Arcane Surge" }),
mod("ArcaneSurgeManaRegen", "MAX", nil, 0, 0, { type = "GlobalEffect", effectType = "Buff", effectName = "Arcane Surge", unscalable = true }),
},
["support_arcane_surge_spell_damage_+%_final"] = {
mod("Damage", "MORE", nil, ModFlag.Spell, 0, { type = "GlobalEffect", effectType = "Buff", effectName = "Arcane Surge" }),
mod("ArcaneSurgeCastSpeed", "MAX", nil, 0, 0, { type = "GlobalEffect", effectType = "Buff", effectName = "Arcane Surge", unscalable = true }),
},
["support_arcane_surge_spell_damage_+%_final_while_you_have_arcane_surge"] = {
mod("Damage", "MORE", nil, ModFlag.Spell, 0, { type = "Condition", var = "AffectedByArcaneSurge" }),
Expand Down
4 changes: 2 additions & 2 deletions src/Export/Skills/sup_int.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ local skills, mod, flag, skill = ...
#skill SupportArcaneSurge
statMap = {
["support_arcane_surge_mana_regeneration_rate_+%"] = {
mod("ManaRegen", "INC", nil, 0, 0, { type = "GlobalEffect", effectType = "Buff", effectName = "Arcane Surge" }),
mod("ArcaneSurgeManaRegen", "MAX", nil, 0, 0, { type = "GlobalEffect", effectType = "Buff", effectName = "Arcane Surge", unscalable = true }),
},
["support_arcane_surge_spell_damage_+%_final"] = {
mod("Damage", "MORE", nil, ModFlag.Spell, 0, { type = "GlobalEffect", effectType = "Buff", effectName = "Arcane Surge" }),
mod("ArcaneSurgeCastSpeed", "MAX", nil, 0, 0, { type = "GlobalEffect", effectType = "Buff", effectName = "Arcane Surge", unscalable = true }),
},
["support_arcane_surge_spell_damage_+%_final_while_you_have_arcane_surge"] = {
mod("Damage", "MORE", nil, ModFlag.Spell, 0, { type = "Condition", var = "AffectedByArcaneSurge" }),
Expand Down
20 changes: 20 additions & 0 deletions src/Modules/CalcPerform.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -495,14 +495,26 @@ local function doActorAttribsPoolsConditions(env, actor)
end
if actor.mainSkill.skillFlags.hit and not actor.mainSkill.skillFlags.trap and not actor.mainSkill.skillFlags.mine and not actor.mainSkill.skillFlags.totem then
condList["HitRecently"] = true
if actor.mainSkill.skillFlags.spell then
condList["HitSpellRecently"] = true
end
end
if actor.mainSkill.skillFlags.totem then
condList["HaveTotem"] = true
condList["SummonedTotemRecently"] = true
if actor.mainSkill.skillFlags.hit then
condList["TotemsHitRecently"] = true
if actor.mainSkill.skillFlags.spell then
condList["TotemsSpellHitRecently"] = true
end
end
end
if actor.mainSkill.skillFlags.mine then
condList["DetonatedMinesRecently"] = true
end
if actor.mainSkill.skillFlags.trap then
condList["TriggeredTrapsRecently"] = true
end
if modDB:Sum("BASE", nil, "EnemyScorchChance") > 0 or modDB:Flag(nil, "CritAlwaysAltAilments") and not modDB:Flag(env.player.mainSkill.skillCfg, "NeverCrit") then
condList["CanInflictScorch"] = true
end
Expand Down Expand Up @@ -969,6 +981,14 @@ local function doActorMisc(env, actor)
modDB:NewMod("Speed", "INC", effect, "Onslaught", ModFlag.Cast)
modDB:NewMod("MovementSpeed", "INC", effect, "Onslaught")
end
if modDB.conditions["AffectedByArcaneSurge"] or modDB:Flag(nil, "Condition:ArcaneSurge") then
modDB.conditions["AffectedByArcaneSurge"] = true
local effect = 1 + modDB:Sum("INC", nil, "ArcaneSurgeEffect", "BuffEffectOnSelf") / 100
modDB:NewMod("ManaRegen", "INC", (modDB:Max(nil, "ArcaneSurgeManaRegen") or 30) * effect, "Arcane Surge")
modDB:NewMod("Speed", "INC", (modDB:Max(nil, "ArcaneSurgeCastSpeed") or 10) * effect, "Arcane Surge", ModFlag.Spell)
local arcaneSurgeDamage = modDB:Max(nil, "ArcaneSurgeDamage") or 0
if arcaneSurgeDamage ~= 0 then modDB:NewMod("Damage", "MORE", arcaneSurgeDamage * effect, "Arcane Surge", ModFlag.Spell) end
end
if modDB:Flag(nil, "Fanaticism") and actor.mainSkill and actor.mainSkill.skillFlags.selfCast then
local effect = m_floor(75 * (1 + modDB:Sum("INC", nil, "BuffEffectOnSelf") / 100))
modDB:NewMod("Speed", "MORE", effect, "Fanaticism", ModFlag.Cast)
Expand Down
37 changes: 32 additions & 5 deletions src/Modules/ConfigOptions.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -715,6 +715,9 @@ Huge sets the radius to 11.
{ var = "buffOnslaught", type = "check", label = "Do you have Onslaught?", tooltip = "In addition to allowing any 'while you have Onslaught' modifiers to apply,\nthis will enable the Onslaught buff itself. (Grants 20% increased Attack, Cast, and Movement Speed)", apply = function(val, modList, enemyModList)
modList:NewMod("Condition:Onslaught", "FLAG", true, "Config", { type = "Condition", var = "Combat" })
end },
{ var = "buffArcaneSurge", type = "check", label = "Do you have Arcane Surge?", tooltip = "In addition to allowing any 'while you have Arcane Surge' modifiers to apply,\nthis will enable the Arcane Surge buff itself. (Grants 10% increased cast speed and 30% increased Mana Regeneration rate)", apply = function(val, modList, enemyModList)
modList:NewMod("Condition:ArcaneSurge", "FLAG", true, "Config", { type = "Condition", var = "Combat" })
end },
{ var = "minionBuffOnslaught", type = "check", label = "Do your minions have Onslaught?", ifFlag = "haveMinion", tooltip = "In addition to allowing any 'while your minions have Onslaught' modifiers to apply,\nthis will enable the Onslaught buff itself. (Grants 20% increased Attack, Cast, and Movement Speed)", apply = function(val, modList, enemyModList)
modList:NewMod("MinionModifier", "LIST", { mod = modLib.createMod("Condition:Onslaught", "FLAG", true, "Config", { type = "Condition", var = "Combat" }) })
end },
Expand Down Expand Up @@ -876,6 +879,10 @@ Huge sets the radius to 11.
{ var = "conditionHitRecently", type = "check", label = "Have you Hit Recently?", ifCond = "HitRecently", tooltip = "You will automatically be considered to have Hit Recently if your main skill Hits and is self-cast,\nbut you can use this option to force it if necessary.", apply = function(val, modList, enemyModList)
modList:NewMod("Condition:HitRecently", "FLAG", true, "Config", { type = "Condition", var = "Combat" })
end },
{ var = "conditionHitSpellRecently", type = "check", label = "Have you Hit with a Spell Recently?", ifCond = "HitSpellRecently", implyCond = "HitRecently", tooltip = "This also implies that you have Hit Recently.", apply = function(val, modList, enemyModList)
modList:NewMod("Condition:HitSpellRecently", "FLAG", true, "Config", { type = "Condition", var = "Combat" })
modList:NewMod("Condition:HitRecently", "FLAG", true, "Config", { type = "Condition", var = "Combat" })
end },
{ var = "conditionCritRecently", type = "check", label = "Have you Crit Recently?", ifCond = "CritRecently", implyCond = "SkillCritRecently", tooltip = "This also implies that your Skills have Crit Recently.", apply = function(val, modList, enemyModList)
modList:NewMod("Condition:CritRecently", "FLAG", true, "Config", { type = "Condition", var = "Combat" })
modList:NewMod("Condition:SkillCritRecently", "FLAG", true, "Config", { type = "Condition", var = "Combat" })
Expand All @@ -895,6 +902,10 @@ Huge sets the radius to 11.
{ var = "conditionChannelling", type = "check", label = "Are you Channelling?", ifCond = "Channelling", tooltip = "You will automatically be considered to be Channeling if your main skill is a channelled skill,\nbut you can use this option to force it if necessary.", apply = function(val, modList, enemyModList)
modList:NewMod("Condition:Channelling", "FLAG", true, "Config", { type = "Condition", var = "Combat" })
end },
{ var = "multiplierChannelling", type = "count", label = "Channeling for # seconds:", ifMult = "ChannellingTime", implyCond = "Channelling", tooltip = "This also implies that you are channelling", apply = function(val, modList, enemyModList)
modList:NewMod("Multiplier:ChannellingTime", "BASE", val, "Config", { type = "Condition", var = "Combat" })
modList:NewMod("Condition:Channelling", "FLAG", true, "Config", { type = "Condition", var = "Combat" })
end },
{ var = "conditionHitRecentlyWithWeapon", type = "check", label = "Have you Hit Recently with Your Weapon?", ifCond = "HitRecentlyWithWeapon", tooltip = "This also implies that you have Hit Recently.", apply = function(val, modList, enemyModList)
modList:NewMod("Condition:HitRecentlyWithWeapon", "FLAG", true, "Config", { type = "Condition", var = "Combat" })
end },
Expand All @@ -911,12 +922,22 @@ Huge sets the radius to 11.
{ var = "conditionKilledPoisonedLast2Seconds", type = "check", label = "Killed a poisoned enemy in the last 2 Seconds?", ifCond = "KilledPoisonedLast2Seconds", implyCond = "KilledRecently", tooltip = "This also implies that you have Killed Recently.", apply = function(val, modList, enemyModList)
modList:NewMod("Condition:KilledPoisonedLast2Seconds", "FLAG", true, "Config", { type = "Condition", var = "Combat" })
end },
{ var = "conditionKilledTauntedEnemyRecently", type = "check", label = "Killed a taunted enemy recently?", ifCond = "KilledTauntedEnemyRecently", implyCondList = {"KilledRecently", "TauntedEnemyRecently" }, tooltip = "This also implies that you have killed and taunted recently.", apply = function(val, modList, enemyModList)
modList:NewMod("Condition:KilledTauntedEnemyRecently", "FLAG", true, "Config", { type = "Condition", var = "Combat" })
end },
{ var = "conditionTotemsNotSummonedInPastTwoSeconds", type = "check", label = "No summoned Totems in the past 2 seconds?", ifCond = "NoSummonedTotemsInPastTwoSeconds", apply = function(val, modList, enemyModList)
modList:NewMod("Condition:NoSummonedTotemsInPastTwoSeconds", "FLAG", true, "Config", { type = "Condition", var = "Combat" })
end },
{ var = "conditionTotemsKilledRecently", type = "check", label = "Have your Totems Killed Recently?", ifCond = "TotemsKilledRecently", apply = function(val, modList, enemyModList)
modList:NewMod("Condition:TotemsKilledRecently", "FLAG", true, "Config", { type = "Condition", var = "Combat" })
end },
{ var = "conditionTotemsHitRecently", type = "check", label = "Have your Totems Hit Recently?", ifCond = "HitRecently", apply = function(val, modList, enemyModList)
modList:NewMod("Condition:TotemsHitRecently", "FLAG", true, "Config", { type = "Condition", var = "Combat" })
end },
{ var = "conditionTotemsHitSpellRecently", type = "check", label = "Have your Totems Hit with a Spell Recently?", ifCond = "TotemsHitSpellRecently", implyCond = "TotemsHitRecently", tooltip = "This also implies that you Totems have Hit Recently.", apply = function(val, modList, enemyModList)
modList:NewMod("Condition:TotemsHitSpellRecently", "FLAG", true, "Config", { type = "Condition", var = "Combat" })
modList:NewMod("Condition:TotemsHitRecently", "FLAG", true, "Config", { type = "Condition", var = "Combat" })
end },
{ var = "conditionUsedBrandRecently", type = "check", label = "Have you used a Brand Skill recently?", ifCond = "UsedBrandRecently", apply = function(val, modList, enemyModList)
modList:NewMod("Condition:UsedBrandRecently", "FLAG", true, "Config", { type = "Condition", var = "Combat" })
end },
Expand Down Expand Up @@ -1144,10 +1165,16 @@ Huge sets the radius to 11.
{ var = "conditionUsedWarcryInPast8Seconds", type = "check", label = "Used a Warcry in the past 8 seconds?", ifCond = "UsedWarcryInPast8Seconds", apply = function(val, modList, enemyModList)
modList:NewMod("Condition:UsedWarcryInPast8Seconds", "FLAG", true, "Config", { type = "Condition", var = "Combat" })
end },
{ var = "multiplierMineDetonatedRecently", type = "count", label = "# of Mines Detonated Recently:", ifMult = "MineDetonatedRecently", apply = function(val, modList, enemyModList)
{ var = "DetonatedMinesRecently", type = "check", label = "Have you Detonated a Mine Recently", ifCond = "DetonatedMinesRecently", apply = function(val, modList, enemyModList)
modList:NewMod("Condition:DetonatedMinesRecently", "FLAG", true, "Config", { type = "Condition", var = "Combat" })
end },
{ var = "multiplierMineDetonatedRecently", type = "count", label = "# of Mines Detonated Recently:", ifMult = "MineDetonatedRecently", implyCond = "DetonatedMinesRecently", apply = function(val, modList, enemyModList)
modList:NewMod("Multiplier:MineDetonatedRecently", "BASE", val, "Config", { type = "Condition", var = "Combat" })
end },
{ var = "multiplierTrapTriggeredRecently", type = "count", label = "# of Traps Triggered Recently:", ifMult = "TrapTriggeredRecently", apply = function(val, modList, enemyModList)
{ var = "TriggeredTrapsRecently", type = "check", label = "Have you Triggered a Trap Recently?", ifCond = "TriggeredTrapsRecently", apply = function(val, modList, enemyModList)
modList:NewMod("Condition:TriggeredTrapsRecently", "FLAG", true, "Config", { type = "Condition", var = "Combat" })
end },
{ var = "multiplierTrapTriggeredRecently", type = "count", label = "# of Traps Triggered Recently:", ifMult = "TrapTriggeredRecently", implyCond = "TriggeredTrapRecently", apply = function(val, modList, enemyModList)
modList:NewMod("Multiplier:TrapTriggeredRecently", "BASE", val, "Config", { type = "Condition", var = "Combat" })
end },
{ var = "conditionThrownTrapOrMineRecently", type = "check", label = "Have you thrown a Trap or Mine Recently?", ifCond = "TrapOrMineThrownRecently", apply = function(val, modList, enemyModList)
Expand Down Expand Up @@ -1191,6 +1218,9 @@ Huge sets the radius to 11.
{ var = "conditionBlockedHitFromUniqueEnemyInPast10Sec", type = "check", label = "Blocked a Hit from a Unique enemy in the past 10s?", ifCond = "BlockedHitFromUniqueEnemyInPast10Sec", apply = function(val, modList, enemyModList)
modList:NewMod("Condition:BlockedHitFromUniqueEnemyInPast10Sec", "FLAG", true, "Config", { type = "Condition", var = "Combat" })
end },
{ var = "conditionKilledUniqueEnemy", type = "check", label = "Killed a Rare or Unique enemy Recently?", ifCond = "KilledUniqueEnemy", apply = function(val, modList, enemyModList)
modList:NewMod("Condition:KilledUniqueEnemy", "FLAG", true, "Config", { type = "Condition", var = "Combat" })
end },
{ var = "BlockedPast10Sec", type = "count", label = "Number of times you've Blocked in the past 10s", ifCond = "BlockedHitFromUniqueEnemyInPast10Sec", apply = function(val, modList, enemyModList)
modList:NewMod("Multiplier:BlockedPast10Sec", "BASE", val, "Config", { type = "Condition", var = "Combat" })
end },
Expand All @@ -1207,9 +1237,6 @@ Huge sets the radius to 11.
{ var = "multiplierFragileRegrowth", type = "count", label = "# of Fragile Regrowth Stacks:", ifMult = "FragileRegrowthCount", apply = function(val, modList, enemyModList)
modList:NewMod("Multiplier:FragileRegrowthCount", "BASE", m_min(val,10), "Config", { type = "Condition", var = "Combat" })
end },
{ var = "conditionKilledUniqueEnemy", type = "check", label = "Killed a Rare or Unique enemy Recently?", ifCond = "KilledUniqueEnemy", apply = function(val, modList, enemyModList)
modList:NewMod("Condition:KilledUniqueEnemy", "FLAG", true, "Config", { type = "Condition", var = "Combat" })
end },
{ var = "conditionHaveArborix", type = "check", label = "Do you have Iron Reflexes?", ifFlag = "Condition:HaveArborix", tooltip = "This option is specific to Arborix.",apply = function(val, modList, enemyModList)
modList:NewMod("Condition:HaveIronReflexes", "FLAG", true, "Config", { type = "Condition", var = "Combat" })
modList:NewMod("Keystone", "LIST", "Iron Reflexes", "Config")
Expand Down
1 change: 1 addition & 0 deletions src/Modules/Data.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -319,6 +319,7 @@ data.keystones = {

data.ailmentTypeList = { "Bleed", "Poison", "Ignite", "Chill", "Freeze", "Shock", "Scorch", "Brittle", "Sap" }
data.elementalAilmentTypeList = { "Ignite", "Chill", "Freeze", "Shock", "Scorch", "Brittle", "Sap" }
data.nonDamagingAilmentTypeList = { "Chill", "Freeze", "Shock", "Scorch", "Brittle", "Sap" }
data.nonElementalAilmentTypeList = { "Bleed", "Poison" }

data.nonDamagingAilment = {
Expand Down

0 comments on commit 30662db

Please sign in to comment.