Skip to content

Commit d6f4b0c

Browse files
committed
Concentration review
Config is now a counter
1 parent 440a76a commit d6f4b0c

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

src/Data/ModCache.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4696,7 +4696,7 @@ c["Deal 30% of Overkill damage to enemies within 2 metres of the enemy killed"]=
46964696
c["Deal 4% increased Damage with Hits to Rare or Unique Enemies for each second they've ever been in your Presence, up to a maximum of 200%"]={{[1]={[1]={actor="enemy",limit=200,limitTotal=true,type="Multiplier",var="EnemyPresenceSeconds"},[2]={actor="enemy",type="ActorCondition",var="RareOrUnique"},flags=0,keywordFlags=262144,name="Damage",type="INC",value=4}},nil}
46974697
c["Deal no Elemental Damage"]={{[1]={flags=0,keywordFlags=0,name="DealNoLightning",type="FLAG",value=true},[2]={flags=0,keywordFlags=0,name="DealNoCold",type="FLAG",value=true},[3]={flags=0,keywordFlags=0,name="DealNoFire",type="FLAG",value=true}},nil}
46984698
c["Deal no Non-Fire Damage"]={{[1]={flags=0,keywordFlags=0,name="DealNoPhysical",type="FLAG",value=true},[2]={flags=0,keywordFlags=0,name="DealNoLightning",type="FLAG",value=true},[3]={flags=0,keywordFlags=0,name="DealNoCold",type="FLAG",value=true},[4]={flags=0,keywordFlags=0,name="DealNoChaos",type="FLAG",value=true}},nil}
4699-
c["Deal up to 40% more Damage to Enemies based on their missing Concentration"]={{[1]={[1]={type="Condition",var="EnemyNoConcentration"},flags=0,keywordFlags=0,name="Damage",type="MORE",value=40},[2]={flags=0,keywordFlags=0,name="EnemyConcentration",type="FLAG",value=true}},nil}
4699+
c["Deal up to 40% more Damage to Enemies based on their missing Concentration"]={{[1]={flags=0,keywordFlags=0,name="EnemyConcentration",type="FLAG",value=true},[2]={flags=0,keywordFlags=0,name="Condition:EnemyConcentration",type="FLAG",value=true}},nil}
47004700
c["Deal your Thorns Damage to Enemies you Stun with Melee Attacks"]={nil,"your Thorns Damage to Enemies you Stun with Melee Attacks "}
47014701
c["Deal your Thorns Damage to Enemies you Stun with Melee Attacks 35 to 53 Physical Thorns damage"]={nil,"your Thorns Damage to Enemies you Stun with Melee Attacks 35 to 53 Physical Thorns damage "}
47024702
c["Deals 25% of current Mana as Chaos Damage to you when Effect ends"]={nil,"Deals 25% of current Mana as Chaos Damage to you when Effect ends "}

src/Modules/ConfigOptions.lua

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1822,8 +1822,12 @@ Huge sets the radius to 11.
18221822
{ var = "conditionEnemyCoveredInFrost", type = "check", label = "Is the enemy covered in Frost?", tooltip = "Covered in Frost applies the following to the enemy:\n\t20% increased ^x3F6DB3Cold ^7Damage taken\n\t50% less Critical Strike Chance", apply = function(val, modList, enemyModList)
18231823
modList:NewMod("CoveredInFrostEffect", "BASE", 20, "Covered in Frost")
18241824
end },
1825-
{ var = "conditionEnemyConcentration", type = "check", label = "Is the enemy Concentration 0?", ifFlag ="EnemyConcentration", apply = function(val, modList, enemyModList)
1826-
modList:NewMod("Condition:EnemyNoConcentration", "FLAG", true, "Config", { type = "Condition", var = "Effective" } )
1825+
{ var = "enemyConcentration", type = "count", label = "% Concentration missing", ifFlag ="EnemyConcentration", defaultState = 50, apply = function(val, modList, enemyModList)
1826+
if val < 100 then
1827+
modList:NewMod("Damage", "MORE", 40 * val/100, "Tree:46535", { type = "Condition", var = "EnemyConcentration"})
1828+
else
1829+
modList:NewMod("Damage", "MORE", 40, "Tree:46535", { type = "Condition", var = "EnemyConcentration"})
1830+
end
18271831
end },
18281832
{ var = "conditionEnemyHasOpenWeakness", type = "check", label = "Does enemy have Open Weakness?", ifCond = "EnemyHasOpenWeakness", apply = function(val, modList, enemyModList)
18291833
-- This one means the enemy you're targeting has open weakness

src/Modules/ModParser.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3249,8 +3249,8 @@ local specialModList = {
32493249
["gain maximum life instead of maximum energy shield from equipped armour items"] = { flag("ConvertArmourESToLife") },
32503250
-- Mercenary - Witchhunter
32513251
["deal up to (%d+)%% more damage to enemies based on their missing concentration"] = function(num) return {
3252-
mod("Damage", "MORE", num, {type = "Condition", var ="EnemyNoConcentration"}),
32533252
flag("EnemyConcentration"),
3253+
flag("Condition:EnemyConcentration")
32543254
} end,
32553255
-- Mercenary - Gemling
32563256
["attribute requirements of gems can be satisi?fied by your highest attribute"] = { flag("GemAttributeRequirementsSatisfiedByHighestAttribute") },

0 commit comments

Comments
 (0)