Skip to content

Commit f409d3c

Browse files
PeecheyPeechey
authored
Add support for Breachlord Bloodline's Otherworldly Appendages (#9282)
* add support for breachlord's otherwordly appendages * nil check
1 parent 1a4bf51 commit f409d3c

File tree

3 files changed

+11
-14
lines changed

3 files changed

+11
-14
lines changed

‎src/Data/ModCache.lua‎

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11745,20 +11745,10 @@ c["Sword Attacks deal 30% increased Damage with Hits and Ailments"]={{[1]={flags
1174511745
c["Sword Attacks deal 35% increased Damage with Ailments"]={{[1]={flags=4196352,keywordFlags=0,name="Damage",type="INC",value=35}},nil}
1174611746
c["Take 100 Fire Damage when you Ignite an Enemy"]={{[1]={flags=0,keywordFlags=0,name="EyeOfInnocenceSelfDamage",type="LIST",value={baseDamage=100,damageType="fire"}}},nil}
1174711747
c["Take 10000 Fire Damage per Second while Flame-Touched"]={{[1]={[1]={type="Condition",var="AffectedByApproachingFlames"},flags=0,keywordFlags=0,name="FireDegen",type="BASE",value=10000}},nil}
11748-
c["Take 15% less Cold Damage with at least one Tulgraft grafted to you"]={{[1]={flags=0,keywordFlags=0,name="ColdDamageTaken",type="MORE",value=-15}}," with at least one Tulgraft grafted to you "}
11749-
c["Take 15% less Cold Damage with at least one Tulgraft grafted to you Take 15% less Physical Damage with at least one Uulgraft grafted to you"]={{[1]={flags=0,keywordFlags=0,name="ColdDamageTaken",type="MORE",value=-15}}," with at least one Tulgraft grafted to you Take 15% less Physical Damage with at least one Uulgraft grafted to you "}
11750-
c["Take 15% less Cold Damage with at least one Tulgraft grafted to you Take 15% less Physical Damage with at least one Uulgraft grafted to you Take 15% less Fire Damage with at least one Xophgraft grafted to you"]={{[1]={flags=0,keywordFlags=0,name="ColdDamageTaken",type="MORE",value=-15}}," with at least one Tulgraft grafted to you Take 15% less Physical Damage with at least one Uulgraft grafted to you Take 15% less Fire Damage with at least one Xophgraft grafted to you "}
11751-
c["Take 15% less Cold Damage with at least one Tulgraft grafted to you Take 15% less Physical Damage with at least one Uulgraft grafted to you Take 15% less Fire Damage with at least one Xophgraft grafted to you Nearby Enemies take 100% increased Damage from Graft Skills"]={{[1]={flags=0,keywordFlags=0,name="ColdDamageTaken",type="MORE",value=-15}}," with at least one Tulgraft grafted to you Take 15% less Physical Damage with at least one Uulgraft grafted to you Take 15% less Fire Damage with at least one Xophgraft grafted to you Nearby Enemies take 100% increased Damage from Graft Skills "}
11752-
c["Take 15% less Fire Damage with at least one Xophgraft grafted to you"]={{[1]={flags=0,keywordFlags=0,name="FireDamageTaken",type="MORE",value=-15}}," with at least one Xophgraft grafted to you "}
11753-
c["Take 15% less Fire Damage with at least one Xophgraft grafted to you Nearby Enemies take 100% increased Damage from Graft Skills"]={{[1]={flags=0,keywordFlags=0,name="FireDamageTaken",type="MORE",value=-15}}," with at least one Xophgraft grafted to you Nearby Enemies take 100% increased Damage from Graft Skills "}
11754-
c["Take 15% less Lightning Damage with at least one Eshgraft grafted to you"]={{[1]={flags=0,keywordFlags=0,name="LightningDamageTaken",type="MORE",value=-15}}," with at least one Eshgraft grafted to you "}
11755-
c["Take 15% less Lightning Damage with at least one Eshgraft grafted to you Take 15% less Cold Damage with at least one Tulgraft grafted to you"]={{[1]={flags=0,keywordFlags=0,name="LightningDamageTaken",type="MORE",value=-15}}," with at least one Eshgraft grafted to you Take 15% less Cold Damage with at least one Tulgraft grafted to you "}
11756-
c["Take 15% less Lightning Damage with at least one Eshgraft grafted to you Take 15% less Cold Damage with at least one Tulgraft grafted to you Take 15% less Physical Damage with at least one Uulgraft grafted to you"]={{[1]={flags=0,keywordFlags=0,name="LightningDamageTaken",type="MORE",value=-15}}," with at least one Eshgraft grafted to you Take 15% less Cold Damage with at least one Tulgraft grafted to you Take 15% less Physical Damage with at least one Uulgraft grafted to you "}
11757-
c["Take 15% less Lightning Damage with at least one Eshgraft grafted to you Take 15% less Cold Damage with at least one Tulgraft grafted to you Take 15% less Physical Damage with at least one Uulgraft grafted to you Take 15% less Fire Damage with at least one Xophgraft grafted to you"]={{[1]={flags=0,keywordFlags=0,name="LightningDamageTaken",type="MORE",value=-15}}," with at least one Eshgraft grafted to you Take 15% less Cold Damage with at least one Tulgraft grafted to you Take 15% less Physical Damage with at least one Uulgraft grafted to you Take 15% less Fire Damage with at least one Xophgraft grafted to you "}
11758-
c["Take 15% less Lightning Damage with at least one Eshgraft grafted to you Take 15% less Cold Damage with at least one Tulgraft grafted to you Take 15% less Physical Damage with at least one Uulgraft grafted to you Take 15% less Fire Damage with at least one Xophgraft grafted to you Nearby Enemies take 100% increased Damage from Graft Skills"]={{[1]={flags=0,keywordFlags=0,name="LightningDamageTaken",type="MORE",value=-15}}," with at least one Eshgraft grafted to you Take 15% less Cold Damage with at least one Tulgraft grafted to you Take 15% less Physical Damage with at least one Uulgraft grafted to you Take 15% less Fire Damage with at least one Xophgraft grafted to you Nearby Enemies take 100% increased Damage from Graft Skills "}
11759-
c["Take 15% less Physical Damage with at least one Uulgraft grafted to you"]={{[1]={flags=0,keywordFlags=0,name="PhysicalDamageTaken",type="MORE",value=-15}}," with at least one Uulgraft grafted to you "}
11760-
c["Take 15% less Physical Damage with at least one Uulgraft grafted to you Take 15% less Fire Damage with at least one Xophgraft grafted to you"]={{[1]={flags=0,keywordFlags=0,name="PhysicalDamageTaken",type="MORE",value=-15}}," with at least one Uulgraft grafted to you Take 15% less Fire Damage with at least one Xophgraft grafted to you "}
11761-
c["Take 15% less Physical Damage with at least one Uulgraft grafted to you Take 15% less Fire Damage with at least one Xophgraft grafted to you Nearby Enemies take 100% increased Damage from Graft Skills"]={{[1]={flags=0,keywordFlags=0,name="PhysicalDamageTaken",type="MORE",value=-15}}," with at least one Uulgraft grafted to you Take 15% less Fire Damage with at least one Xophgraft grafted to you Nearby Enemies take 100% increased Damage from Graft Skills "}
11748+
c["Take 15% less Cold Damage with at least one Tulgraft grafted to you"]={{[1]={[1]={type="Condition",var="UsingTulgraft"},flags=0,keywordFlags=0,name="ColdDamageTaken",type="MORE",value=-15}},nil}
11749+
c["Take 15% less Fire Damage with at least one Xophgraft grafted to you"]={{[1]={[1]={type="Condition",var="UsingXophgraft"},flags=0,keywordFlags=0,name="FireDamageTaken",type="MORE",value=-15}},nil}
11750+
c["Take 15% less Lightning Damage with at least one Eshgraft grafted to you"]={{[1]={[1]={type="Condition",var="UsingEshgraft"},flags=0,keywordFlags=0,name="LightningDamageTaken",type="MORE",value=-15}},nil}
11751+
c["Take 15% less Physical Damage with at least one Uulgraft grafted to you"]={{[1]={[1]={type="Condition",var="UsingUulgraft"},flags=0,keywordFlags=0,name="PhysicalDamageTaken",type="MORE",value=-15}},nil}
1176211752
c["Take 150 Physical Damage per Second per Siphoning Charge if you've used a Skill Recently"]={{[1]={[1]={type="Multiplier",var="SiphoningCharge"},[2]={type="Condition",var="UsedSkillRecently"},flags=0,keywordFlags=0,name="PhysicalDegen",type="BASE",value=150}},nil}
1176311753
c["Take 150 Physical Damage when you use a Movement Skill"]={{[1]={[1]={type="Condition",var="UsedMovementSkillRecently"},flags=0,keywordFlags=0,name="PhysicalDamageTaken",type="BASE",value=150}},nil}
1176411754
c["Take 200 Physical Damage when you use a Movement Skill"]={{[1]={[1]={type="Condition",var="UsedMovementSkillRecently"},flags=0,keywordFlags=0,name="PhysicalDamageTaken",type="BASE",value=200}},nil}

‎src/Modules/CalcPerform.lua‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,12 @@ local function doActorAttribsConditions(env, actor)
180180
condList["Using"..slotName] = true
181181
end
182182
end
183+
if actor.itemList["Graft 1"] and actor.itemList["Graft 1"].baseName then
184+
condList["Using"..actor.itemList["Graft 1"].baseName:match("%s(%S+)")] = true
185+
end
186+
if actor.itemList["Graft 2"] and actor.itemList["Graft 2"].baseName then
187+
condList["Using"..actor.itemList["Graft 2"].baseName:match("%s(%S+)")] = true
188+
end
183189
if actor.weaponData2.type then
184190
local info = env.data.weaponTypeInfo[actor.weaponData2.type]
185191
condList["Using"..info.flag] = true

‎src/Modules/ModParser.lua‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1624,6 +1624,7 @@ local modTagList = {
16241624
["during effect of any life or mana flask"] = { tag = { type = "Condition", varList = { "UsingManaFlask", "UsingLifeFlask" } } },
16251625
["while you have an active tincture"] = { tag = { type = "Condition", var = "UsingTincture" } },
16261626
["while you have a tincture active"] = { tag = { type = "Condition", var = "UsingTincture" } },
1627+
["with at least one (%w+) grafted to you"] = function(_, graft) return { tag = { type = "Condition", var = "Using"..firstToUpper(graft) } } end,
16271628
["while on consecrated ground"] = { tag = { type = "Condition", var = "OnConsecratedGround" } },
16281629
["while on caustic ground"] = { tag = { type = "Condition", var = "OnCausticGround" } },
16291630
["when you create consecrated ground"] = { },

0 commit comments

Comments
 (0)