Skip to content

Commit 4304570

Browse files
LocalIdentityLocalIdentity
andauthored
Fix Penance Mark not counting the enemy as cursed (#9301)
* Add Penance Mark Minion + fix skill not counting the enemy as cursed Penance Mark wasn't counting the enemy as cursed as it didn't have any mods stat mapped to it with a global effect. Added a dummy mod for the phantasm spawn so it now works correctly * Remove spec change --------- Co-authored-by: LocalIdentity <[email protected]>
1 parent 7390143 commit 4304570

File tree

6 files changed

+92
-4
lines changed

6 files changed

+92
-4
lines changed

src/Data/Minions.lua

Lines changed: 33 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -652,7 +652,6 @@ minions["UniqueAnimatedWeapon"] = {
652652
mod("Damage", "MORE", 70), -- MonsterUnique5,
653653
mod("Speed", "MORE", 33, ModFlag.Attack), -- MonsterUnique8,
654654
mod("Damage", "MORE", -33, ModFlag.Attack), -- MonsterUnique8,
655-
mod("DamageTaken", "MORE", -95), -- monster_inherent_damage_taken_+%_final : UniqueAnimatedWeapon.ot,
656655
},
657656
}
658657

@@ -1722,3 +1721,36 @@ minions["LivingLightningMinion"] = {
17221721
mod("AvoidProjectilesChance", "BASE", 100, 0, 0), -- set_base_avoid_projectiles_%_chance [set_base_avoid_projectiles_%_chance = 100]
17231722
},
17241723
}
1724+
1725+
minions["PenanceMarkPhantasm"] = {
1726+
name = "Shackled Phantasm",
1727+
monsterTags = { "caster", "fire_affinity", "ghost", "ghost_armour", "ghost_blood", "is_unarmed", "medium_movement", "slashing_weapon", "undead", },
1728+
life = 1.3,
1729+
fireResist = 40,
1730+
coldResist = 40,
1731+
lightningResist = 40,
1732+
chaosResist = 20,
1733+
damage = 0.9,
1734+
damageSpread = 0.2,
1735+
attackTime = 1.755,
1736+
attackRange = 6,
1737+
accuracy = 1,
1738+
limit = "ActiveVoidSpawnLimit",
1739+
skillList = {
1740+
"MPSPhantasmBasicBlood",
1741+
},
1742+
modList = {
1743+
-- MonsterNoDropsOrExperience [monster_no_drops_or_experience = 1]
1744+
-- CannotSpawnBeyondPortals [monster_no_beyond_portal = 1]
1745+
mod("KnockbackImmune", "FLAG", 1, 0, 0), -- ImmuneToKnockback [cannot_be_knocked_back = 1]
1746+
-- CannotBeAugmented [cannot_have_azmeri_dust = 1]
1747+
-- CannotBeAugmented [cant_possess_this = 1]
1748+
-- CannotBeAugmented [cant_touch_this = 1]
1749+
-- CannotBeAugmented [cannot_be_tagged_by_sentinel = 1]
1750+
-- CannotBeAugmented [cannot_be_afflicted = 1]
1751+
-- CannotBeAugmented [cannot_have_affliction_mods = 1]
1752+
-- set_monster_no_drops_or_experience [set_monster_no_drops_or_experience = 1]
1753+
mod("CurseImmune", "FLAG", 1, 0, 0), -- set_immune_to_curses [set_immune_to_curses = 1]
1754+
-- set_monster_can_grant_vaal_souls_if_no_experience [set_monster_can_grant_vaal_souls_if_no_experience = 1]
1755+
},
1756+
}

src/Data/Skills/minion.lua

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2119,4 +2119,37 @@ skills["SummonedLivingLightningZap"] = {
21192119
levels = {
21202120
[1] = { cooldown = 0.25, levelRequirement = 0, storedUses = 1, },
21212121
},
2122+
}
2123+
skills["MPSPhantasmBasicBlood"] = {
2124+
name = "Projectile Spell",
2125+
hidden = true,
2126+
color = 4,
2127+
baseEffectiveness = 1.1059999465942,
2128+
incrementalEffectiveness = 0.035999998450279,
2129+
skillTypes = { [SkillType.Spell] = true, [SkillType.Projectile] = true, [SkillType.ProjectilesFromUser] = true, [SkillType.Triggerable] = true, },
2130+
statDescriptionScope = "skill_stat_descriptions",
2131+
castTime = 1.17,
2132+
baseFlags = {
2133+
spell = true,
2134+
projectile = true,
2135+
},
2136+
constantStats = {
2137+
{ "monster_projectile_variation", 248 },
2138+
{ "spell_maximum_action_distance_+%", -40 },
2139+
},
2140+
stats = {
2141+
"spell_minimum_base_physical_damage",
2142+
"spell_maximum_base_physical_damage",
2143+
"projectile_uses_contact_position",
2144+
"use_scaled_contact_offset",
2145+
"maintain_projectile_direction_when_using_contact_position",
2146+
"base_is_projectile",
2147+
},
2148+
notMinionStat = {
2149+
"spell_minimum_base_physical_damage",
2150+
"spell_maximum_base_physical_damage",
2151+
},
2152+
levels = {
2153+
[1] = { 0.80000001192093, 1.2000000476837, levelRequirement = 0, statInterpolation = { 3, 3, }, },
2154+
},
21222155
}

src/Data/Skills/other.lua

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2388,7 +2388,15 @@ skills["PenanceMark"] = {
23882388
skillTypes = { [SkillType.Spell] = true, [SkillType.Trappable] = true, [SkillType.Totemable] = true, [SkillType.Mineable] = true, [SkillType.Multicastable] = true, [SkillType.Triggerable] = true, [SkillType.AppliesCurse] = true, [SkillType.CanRapidFire] = true, [SkillType.InstantNoRepeatWhenHeld] = true, [SkillType.InstantShiftAttackForLeftMouse] = true, [SkillType.Mark] = true, [SkillType.Duration] = true, },
23892389
statDescriptionScope = "brand_skill_stat_descriptions",
23902390
castTime = 0.5,
2391-
fromTree = true,
2391+
fromItem = true,
2392+
minionList = {
2393+
"PenanceMarkPhantasm",
2394+
},
2395+
statMap = {
2396+
["penance_mark_summon_phantasms_when_hit"] = {
2397+
mod("SummonPhantasmWhenHit", "BASE", nil, 0, 0, { type = "GlobalEffect", effectType = "Curse" }),
2398+
},
2399+
},
23922400
baseFlags = {
23932401
spell = true,
23942402
curse = true,

src/Export/Minions/Minions.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@ local minions, mod = ...
9595
#mod mod("Damage", "MORE", 70), -- MonsterUnique5
9696
#mod mod("Speed", "MORE", 33, ModFlag.Attack), -- MonsterUnique8
9797
#mod mod("Damage", "MORE", -33, ModFlag.Attack), -- MonsterUnique8
98-
#mod mod("DamageTaken", "MORE", -95), -- monster_inherent_damage_taken_+%_final : UniqueAnimatedWeapon.ot
9998
#emit
10099

101100
#monster Metadata/Monsters/SummonedPhantasm/SummonedPhantasm SummonedPhantasm
@@ -240,4 +239,8 @@ minions["GuardianRelicAll"] = {
240239

241240
#monster Metadata/Monsters/LivingLightning/LivingLightningSummoned LivingLightningMinion
242241
#limit ActiveLivingLightningLimit
242+
#emit
243+
244+
#monster Metadata/Monsters/SummonedPhantasm/SummonedPhantasmPenanceMark PenanceMarkPhantasm
245+
#limit ActiveVoidSpawnLimit
243246
#emit

src/Export/Skills/minion.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -431,4 +431,8 @@ skills["GuardianSentinelFireAura"] = {
431431

432432
#skill SummonedLivingLightningZap
433433
#flags attack melee
434+
#mods
435+
436+
#skill MPSPhantasmBasicBlood Projectile Spell
437+
#flags spell projectile
434438
#mods

src/Export/Skills/other.txt

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -649,7 +649,15 @@ local skills, mod, flag, skill = ...
649649

650650
#skill PenanceMark
651651
#flags spell curse duration mark
652-
fromTree = true,
652+
fromItem = true,
653+
minionList = {
654+
"PenanceMarkPhantasm",
655+
},
656+
statMap = {
657+
["penance_mark_summon_phantasms_when_hit"] = {
658+
mod("SummonPhantasmWhenHit", "BASE", nil, 0, 0, { type = "GlobalEffect", effectType = "Curse" }),
659+
},
660+
},
653661
#baseMod skill("debuff", true)
654662
#mods
655663

0 commit comments

Comments
 (0)