Skip to content

Commit 3ac4691

Browse files
LocalIdentityLocalIdentity
andauthored
Fix Consecrated Ground effect not scaling Accuracy from Shining Justice (#9593)
* Fix Consecrated Ground effect not scaling Accuracy from Shining Justice Consecrated ground effect is meant to scale the accuracy gained from the new Shining Justice node * Fix enemy conc ground effect mod --------- Co-authored-by: LocalIdentity <localidentity2@gmail.com>
1 parent 00e7ca2 commit 3ac4691

3 files changed

Lines changed: 10 additions & 12 deletions

File tree

src/Data/ModCache.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8161,7 +8161,7 @@ c["Consecrated Ground you create applies 10% increased Damage taken to Enemies"]
81618161
c["Consecrated Ground you create applies 15% increased Damage taken to Enemies"]={{[1]={flags=0,keywordFlags=0,name="EnemyModifier",type="LIST",value={mod={[1]={type="Condition",var="OnConsecratedGround"},flags=0,keywordFlags=0,name="DamageTakenConsecratedGround",type="INC",value=15}}}},nil}
81628162
c["Consecrated Ground you create causes Life Regeneration to"]={nil,"Consecrated Ground you create causes Life Regeneration to "}
81638163
c["Consecrated Ground you create causes Life Regeneration to also Recover Energy Shield for you and Allies"]={{[1]={flags=0,keywordFlags=0,name="ExtraAura",type="LIST",value={mod={[1]={type="Condition",var="OnConsecratedGround"},flags=0,keywordFlags=0,name="LifeRegenerationRecoversEnergyShield",type="FLAG",value=true}}}},nil}
8164-
c["Consecrated Ground you create grants 30% increased Accuracy Rating to you and Allies"]={{[1]={[1]={type="Condition",var="OnConsecratedGround"},flags=0,keywordFlags=0,name="ExtraAura",type="LIST",value={mod={flags=0,keywordFlags=0,name="Accuracy",type="INC",value=30}}}},nil}
8164+
c["Consecrated Ground you create grants 30% increased Accuracy Rating to you and Allies"]={{[1]={flags=0,keywordFlags=0,name="ExtraAura",type="LIST",value={mod={[1]={type="Condition",var="OnConsecratedGround"},flags=0,keywordFlags=0,name="ConsecratedGroundAlsoAccuracy",type="INC",value=30}}}},nil}
81658165
c["Consecrated Ground you create grants 30% increased Mana Regeneration"]={{[1]={[1]={type="Condition",var="OnConsecratedGround"},flags=0,keywordFlags=0,name="ManaRegen",type="INC",value=30}},nil}
81668166
c["Consecrated Ground you create while affected by Zealotry causes enemies to take 10% increased Damage"]={{[1]={[1]={actor="enemy",type="ActorCondition",var="OnConsecratedGround"},[2]={type="Condition",var="AffectedByZealotry"},flags=0,keywordFlags=0,name="EnemyModifier",type="LIST",value={mod={flags=0,keywordFlags=0,name="DamageTakenConsecratedGround",type="INC",value=10}}}},nil}
81678167
c["Consumes Frenzy Charges on use"]={nil,"Consumes Frenzy Charges on use "}

src/Modules/CalcPerform.lua

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -740,6 +740,12 @@ local function doActorMisc(env, actor)
740740
modDB:NewMod("Speed", "INC", 20, "Her Embrace", ModFlag.Cast)
741741
modDB:NewMod("MovementSpeed", "INC", 20, "Her Embrace")
742742
end
743+
if modDB:Flag(nil, "Condition:OnConsecratedGround") then
744+
local effect = 1 + modDB:Sum("INC", nil, "ConsecratedGroundEffect") / 100
745+
modDB:NewMod("LifeRegenPercent", "BASE", 5 * effect, "Consecrated Ground")
746+
modDB:NewMod("CurseEffectOnSelf", "INC", -50 * effect, "Consecrated Ground")
747+
modDB:NewMod("Accuracy", "INC", m_floor(modDB:Sum("INC", nil, "ConsecratedGroundAlsoAccuracy") * effect), "Consecrated Ground")
748+
end
743749
if modDB:Flag(nil, "Condition:PhantasmalMight") then
744750
modDB.multipliers["BuffOnSelf"] = (modDB.multipliers["BuffOnSelf"] or 0) + (output.ActivePhantasmLimit or 1) - 1 -- slight hack to not double count the initial buff
745751
end
@@ -1960,13 +1966,6 @@ function calcs.perform(env, skipEHP)
19601966
end
19611967
end
19621968

1963-
-- Deal with Consecrated Ground
1964-
if modDB:Flag(nil, "Condition:OnConsecratedGround") then
1965-
local effect = 1 + modDB:Sum("INC", nil, "ConsecratedGroundEffect") / 100
1966-
modDB:NewMod("LifeRegenPercent", "BASE", 5 * effect, "Consecrated Ground")
1967-
modDB:NewMod("CurseEffectOnSelf", "INC", -50 * effect, "Consecrated Ground")
1968-
end
1969-
19701969
if modDB:Flag(nil, "ManaAppliesToShockEffect") then
19711970
-- Maximum Mana conversion from Lightning Mastery
19721971
local multiplier = (modDB:Max(nil, "ImprovedManaAppliesToShockEffect") or 100) / 100
@@ -3400,7 +3399,7 @@ function calcs.perform(env, skipEHP)
34003399
-- Handle consecrated ground effects on enemies
34013400
if enemyDB:Flag(nil, "Condition:OnConsecratedGround") then
34023401
local effect = 1 + modDB:Sum("INC", nil, "ConsecratedGroundEffect") / 100
3403-
enemyDB:NewMod("DamageTaken", "INC", enemyDB:Sum("INC", nil, "DamageTakenConsecratedGround") * effect, "Consecrated Ground")
3402+
enemyDB:NewMod("DamageTaken", "INC", m_floor(enemyDB:Sum("INC", nil, "DamageTakenConsecratedGround") * effect), "Consecrated Ground")
34043403
end
34053404

34063405
-- Defence/offence calculations

src/Modules/ModParser.lua

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3931,6 +3931,8 @@ local specialModList = {
39313931
["your maximum endurance charges is equal to your maximum frenzy charges"] = { flag("MaximumEnduranceChargesIsMaximumFrenzyCharges") },
39323932
["your maximum frenzy charges is equal to your maximum power charges"] = { flag("MaximumFrenzyChargesIsMaximumPowerCharges") },
39333933
["your curse limit is equal to your maximum power charges"] = { flag("CurseLimitIsMaximumPowerCharges") },
3934+
["consecrated ground you create grants (%d+)%% increased accuracy rating to you and allies"] = function(num) return { mod("ExtraAura", "LIST", { mod = mod("ConsecratedGroundAlsoAccuracy", "INC", num, { type = "Condition", var = "OnConsecratedGround" }) }) } end,
3935+
["consecrated ground created during effect applies (%d+)%% increased damage taken to enemies"] = function(num) return { mod("EnemyModifier", "LIST", { mod = mod("DamageTakenConsecratedGround", "INC", num, { type = "Condition", var = "OnConsecratedGround" }) }, { type = "Condition", var = "UsingFlask" }) } end,
39343936
["consecrated ground you create while affected by zealotry causes enemies to take (%d+)%% increased damage"] = function(num) return { mod("EnemyModifier", "LIST", { mod = mod("DamageTakenConsecratedGround", "INC", num) }, { type = "ActorCondition", actor = "enemy", var = "OnConsecratedGround" }, { type = "Condition", var = "AffectedByZealotry" }) } end,
39353937
["if you've warcried recently, you and nearby allies have (%d+)%% increased attack, cast and movement speed"] = function(num) return {
39363938
mod("ExtraAura", "LIST", { mod = mod("Speed", "INC", num) }, { type = "Condition", var = "UsedWarcryRecently" }),
@@ -4879,9 +4881,6 @@ local specialModList = {
48794881
["when hit during effect, (%d+)%% of life loss from damage taken occurs over 4 seconds instead"] = function(num) return { mod("LifeLossPrevented", "BASE", num, { type = "Condition", var = "UsingFlask" }) } end,
48804882
["y?o?u?r? ?skills [ch][oa][sv][te] no mana c?o?s?t? ?during f?l?a?s?k? ?effect"] = { mod("ManaCost", "MORE", -100, { type = "Condition", var = "UsingFlask" }) },
48814883
["life recovery from flasks also applies to energy shield during f?l?a?s?k? ?effect"] = { flag("LifeFlaskAppliesToEnergyShield", { type = "Condition", var = "UsingFlask" }) },
4882-
["consecrated ground created during effect applies (%d+)%% increased damage taken to enemies"] = function(num) return {
4883-
mod("EnemyModifier", "LIST", { mod = mod("DamageTakenConsecratedGround", "INC", num, { type = "Condition", var = "OnConsecratedGround" }) }, { type = "Condition", var = "UsingFlask" })
4884-
} end,
48854884
["profane ground you create inflicts malediction on enemies"] = { mod("EnemyModifier", "LIST", { mod = flag("HasMalediction", { type = "Condition", var = "OnProfaneGround" }) }) },
48864885
["profane ground you create also affects you and your allies, granting chaotic might"] = { mod("ExtraAura", "LIST", { mod = flag("Condition:ChaoticMight", { type = "Condition", var = "OnProfaneGround" }) }) },
48874886
["raised beast spectres have farrul's farric presence"] = {

0 commit comments

Comments
 (0)