Skip to content

Commit e429c1f

Browse files
committed
Support wording changes in modparser
1 parent 4d0b0b0 commit e429c1f

2 files changed

Lines changed: 13 additions & 11 deletions

File tree

src/Data/ModCache.lua

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5664,13 +5664,11 @@ c["Hits have 15% chance to treat Enemy Monster Elemental Resistance values as in
56645664
c["Hits have 25% reduced Critical Hit Chance against you"]={{[1]={flags=0,keywordFlags=0,name="EnemyCritChance",type="INC",value=-25}},nil}
56655665
c["Hits ignore non-negative Elemental Resistances of Frozen Enemies"]={{[1]={[1]={actor="enemy",type="ActorCondition",var="Frozen"},flags=0,keywordFlags=0,name="IgnoreNonNegativeEleRes",type="FLAG",value=true}},nil}
56665666
c["Hits that Heavy Stun Enemies have Culling Strike"]={{[1]={[1]={type="Condition",var="AlwaysHeavyStunning"},flags=0,keywordFlags=0,name="CanCull",type="FLAG",value=1}},nil}
5667-
c["Hits with this Weapon have no Critical Damage Bonus"]={nil,"no Critical Damage Bonus "}
5668-
c["Hits with this Weapon have no Critical Damage Bonus This Weapon's Critical Hit Chance is 100%"]={{[1]={[1]={type="Condition",var="{Hand}Attack"},[2]={skillType=1,type="SkillType"},flags=8196,keywordFlags=0,name="CritMultiplier",type="OVERRIDE",value=100}},"no This 's Critical Hit Chance "}
5667+
c["Hits with this Weapon have no Critical Damage Bonus"]={{[1]={[1]={type="Condition",var="{Hand}Attack"},flags=0,keywordFlags=0,name="NoCritMultiplier",type="FLAG",value=true}},nil}
56695668
c["Hollow Palm Technique"]={{[1]={flags=0,keywordFlags=0,name="Keystone",type="LIST",value="Hollow Palm Technique"}},nil}
56705669
c["If you would gain a Charge, Allies in your Presence gain that Charge instead"]={nil,"If you would gain a Charge, that Charge instead "}
56715670
c["Ignite inflicted with Fire Spells deals Chaos Damage instead of Fire Damage"]={{[1]={[1]={skillType=2,type="SkillType"},[2]={skillType=28,type="SkillType"},flags=0,keywordFlags=0,name="IgniteToChaos",type="FLAG",value=true},[2]={[1]={skillType=2,type="SkillType"},[2]={skillType=28,type="SkillType"},flags=0,keywordFlags=0,name="SkillData",type="LIST",value={key="IgniteToChaos",value=true}}},nil}
5672-
c["Ignite you inflict deals Chaos Damage instead of Fire Damage"]={nil,"Ignite you inflict deals Chaos Damage instead of Fire Damage "}
5673-
c["Ignite you inflict deals Chaos Damage instead of Fire Damage 50% increased Ignite Magnitude"]={nil,"Ignite you inflict deals Chaos Damage instead of Fire Damage 50% increased Ignite Magnitude "}
5671+
c["Ignite you inflict deals Chaos Damage instead of Fire Damage"]={{[1]={flags=0,keywordFlags=0,name="IgniteToChaos",type="FLAG",value=true}},nil}
56745672
c["Ignites you cause are reflected back to you"]={nil,"Ignites you cause are reflected back to you "}
56755673
c["Ignites you cause are reflected back to you 40% reduced Magnitude of Ignite on you"]={nil,"Ignites you cause are reflected back to you 40% reduced Magnitude of Ignite on you "}
56765674
c["Ignites you inflict deal Damage 10% faster"]={{[1]={flags=0,keywordFlags=0,name="IgniteFaster",type="INC",value=10}},nil}
@@ -6318,11 +6316,9 @@ c["Skeletal Minions you would create instead grant you Umbral Souls for each Min
63186316
c["Skill Gems have no Attribute Requirements"]={{[1]={flags=0,keywordFlags=0,name="GlobalGemAttributeRequirements",type="MORE",value=-100}},nil}
63196317
c["Skill Mana Costs Converted to Life Costs"]={{[1]={flags=0,keywordFlags=0,name="HybridManaAndLifeCost_Life",type="BASE",value=100}},nil}
63206318
c["Skills Cost +3 Rage"]={{[1]={flags=0,keywordFlags=0,name="RageCostBase",type="BASE",value=3}},nil}
6321-
c["Skills Gain 10% of Mana Cost as Extra Life Cost"]={{[1]={flags=0,keywordFlags=0,name="ManaCost",type="BASE",value=10}}," as Extra Life Cost "}
6322-
c["Skills Gain 10% of Mana Cost as Extra Life Cost Deal your Thorns Damage to Enemies you Stun with Melee Attacks"]={{[1]={flags=256,keywordFlags=0,name="ManaCost",type="BASE",value=10}}," as Extra Life Cost Deal your Thorns Damage to Enemies you Stun "}
6323-
c["Skills Gain 100% of Mana Cost as Extra Life Cost"]={{[1]={flags=0,keywordFlags=0,name="ManaCost",type="BASE",value=100}}," as Extra Life Cost "}
6324-
c["Skills Gain 50% of Mana Cost as Extra Life Cost"]={{[1]={flags=0,keywordFlags=0,name="ManaCost",type="BASE",value=50}}," as Extra Life Cost "}
6325-
c["Skills Gain 50% of Mana Cost as Extra Life Cost Skills Gain 100% of Mana Cost as Extra Life Cost"]={{[1]={flags=0,keywordFlags=0,name="ManaCost",type="BASE",value=50}}," as Extra Life Cost Skills Gain 100% of Mana Cost as Extra Life Cost "}
6319+
c["Skills Gain 10% of Mana Cost as Extra Life Cost"]={{[1]={flags=0,keywordFlags=0,name="BaseManaCostAsLifeCost",type="BASE",value=10}},nil}
6320+
c["Skills Gain 100% of Mana Cost as Extra Life Cost"]={{[1]={flags=0,keywordFlags=0,name="BaseManaCostAsLifeCost",type="BASE",value=100}},nil}
6321+
c["Skills Gain 50% of Mana Cost as Extra Life Cost"]={{[1]={flags=0,keywordFlags=0,name="BaseManaCostAsLifeCost",type="BASE",value=50}},nil}
63266322
c["Skills can build and retain Combo regardless of Weapon Set"]={nil,"Skills can build and retain Combo regardless of Weapon Set "}
63276323
c["Skills can build and retain Combo regardless of Weapon Set Gain Combo from all Attack Hits"]={nil,"Skills can build and retain Combo regardless of Weapon Set Gain Combo from all Attack Hits "}
63286324
c["Skills deal 20% increased Damage per Connected Red Support Gem"]={{[1]={flags=0,keywordFlags=0,name="SkillDamageIncreasedPerRedSupport",type="FLAG",value=20}},nil}
@@ -6612,7 +6608,7 @@ c["You have Consecrated Ground around you while stationary"]={{[1]={[1]={type="C
66126608
c["You have Unholy Might"]={{[1]={flags=0,keywordFlags=0,name="Condition:UnholyMight",type="FLAG",value=true}},nil}
66136609
c["You have a Smoke Cloud around you while stationary"]={nil,"a Smoke Cloud around you "}
66146610
c["You have no Accuracy Penalty at Distance"]={{[1]={flags=0,keywordFlags=0,name="NoAccuracyDistancePenalty",type="FLAG",value=true}},nil}
6615-
c["You have no Critical Damage Bonus"]={nil,"no Critical Damage Bonus "}
6611+
c["You have no Critical Damage Bonus"]={{[1]={flags=0,keywordFlags=0,name="NoCritMultiplier",type="FLAG",value=true}},nil}
66166612
c["You have no Elemental Resistances"]={{[1]={flags=0,keywordFlags=0,name="FireResist",type="OVERRIDE",value=0},[2]={flags=0,keywordFlags=0,name="ColdResist",type="OVERRIDE",value=0},[3]={flags=0,keywordFlags=0,name="LightningResist",type="OVERRIDE",value=0}},nil}
66176613
c["You have no Life Regeneration"]={{[1]={flags=0,keywordFlags=0,name="NoLifeRegen",type="FLAG",value=true}},nil}
66186614
c["You have no Mana"]={{[1]={flags=0,keywordFlags=0,name="Mana",type="OVERRIDE",value=0}},nil}

src/Modules/ModParser.lua

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3363,7 +3363,7 @@ local specialModList = {
33633363
["all flames of chayula that you manifest are red"] = { flag("BreachFlameOnlyRed") },
33643364
["all flames of chayula that you manifest are blue"] = { flag("BreachFlameOnlyBlue") },
33653365
["all flames of chayula that you manifest are purple"] = { flag("BreachFlameOnlyPurple") },
3366-
["mana leech recovers based on other damage types damage as well as physical damage"] = { -- legacy wording
3366+
["mana leech recovers based on other damage types damage as well as physical damage"] = { -- legacy wording
33673367
flag("ManaLeechBasedOnElementalDamage"),
33683368
flag("ManaLeechBasedOnChaosDamage"),
33693369
},
@@ -3734,6 +3734,8 @@ local specialModList = {
37343734
["your critical hit chance is lucky while focus?sed"] = { flag("CritChanceLucky", { type = "Condition", var = "Focused" }) },
37353735
["your critical hits do not deal extra damage"] = { flag("NoCritMultiplier") },
37363736
["critical hits do not deal extra damage"] = { flag("NoCritMultiplier") },
3737+
["you have no critical damage bonus"] = { flag("NoCritMultiplier") },
3738+
["hits with this weapon have no critical damage bonus"] = { flag("NoCritMultiplier", { type = "Condition", var = "{Hand}Attack" }) },
37373739
["minion critical hits do not deal extra damage"] = { mod("MinionModifier", "LIST", { mod = flag("NoCritMultiplier") }) },
37383740
["lightning damage with non%-critical hits is lucky"] = { flag("LightningNoCritLucky") },
37393741
["your damage with critical hits is lucky"] = { flag("CritLucky") },
@@ -3918,6 +3920,7 @@ local specialModList = {
39183920
} end,
39193921
["enemies ignited by you during f?l?a?s?k? ?effect take (%d+)%% increased damage"] = function(num) return { mod("EnemyModifier", "LIST", { mod = mod("DamageTaken", "INC", num) }, { type = "ActorCondition", actor = "enemy", var = "Ignited" }) } end,
39203922
["enemies ignited by you take chaos damage instead of fire damage from ignite"] = { flag("IgniteToChaos") },
3923+
["ignite you inflict deals chaos damage instead of fire damage"] = { flag("IgniteToChaos") },
39213924
["enemies chilled by your hits are shocked"] = {
39223925
mod("ShockBase", "BASE", data.nonDamagingAilment["Shock"].default, { type = "ActorCondition", actor = "enemy", var = "ChilledByYourHits" }),
39233926
mod("EnemyModifier", "LIST", { mod = flag("Condition:Shocked", { type = "Condition", var = "ChilledByYourHits" }) })
@@ -5954,6 +5957,9 @@ local specialModList = {
59545957
["skills gain a base life cost equal to (%d+)%% of base mana cost"] = function(num) return {
59555958
mod("BaseManaCostAsLifeCost", "BASE", num),
59565959
} end,
5960+
["skills gain (%d+)%% of mana cost as extra life cost"] = function(num) return {
5961+
mod("BaseManaCostAsLifeCost", "BASE", num),
5962+
} end,
59575963
["skills gain a base energy shield cost equal to (%d+)%% of base mana cost"] = function(num) return {
59585964
mod("ManaCostAsEnergyShieldCost", "BASE", num),
59595965
} end,

0 commit comments

Comments
 (0)