feat: T2A defensive spells (#2378)
## Summary Implements T2A-accurate mechanics for the three defensive spells based on UO98 demo scripts. Pre-UOR (`!Core.UOR`) triggers the new behavior; UOR and AOS paths are unchanged. - **Reactive Armor**: percentage-based melee damage reflection (10-35% based on target Magery), targeted, timed (25-75s). Guards exempt, ranged attacks beyond 1 tile unaffected. Reflected damage is sourceless. - **Protection**: temporary AC bonus (casterMagery/10, 1-10 AR) via VirtualArmorMod, targeted, timed (12-120s). Shared table with Arch Protection — only one protection buff per mobile. - **Magic Reflect**: single-use spell reflection using MagicDamageAbsorb as a flag. No timer, no DefensiveSpell lock. Consumed on first reflected spell. - **Arch Protection**: T2A path applies Protection via shared table with area sound (0x1F7 vs 0x1ED). - No DefensiveSpell mutual exclusion for T2A — all three spells operate independently. ## Test plan - [x] Set expansion to T2A - [x] Cast Reactive Armor on self → verify particles (0x376A) and sound (0x1F2) - [x] Get hit in melee → verify attacker takes reflected damage with spark effect and sound - [x] Get hit by ranged weapon from > 1 tile → verify no reflection - [x] Wait for RA to expire → verify effect ends silently - [x] Cast RA on target that already has it → verify "This spell is already in effect" - [x] Cast Protection on another player → verify particles (0x375A) and sound (0x1ED) - [x] Check target's AR → verify it increased by casterMagery/10 - [x] Wait for Protection to expire → verify AR returns to normal - [x] Cast Protection on self, then cast Protection on another player → verify both succeed - [x] Cast Arch Protection on ground near allies → verify each gets AR bonus with sound 0x1F7 - [x] Cast Arch Protection near a target already protected → verify that target is skipped - [x] Cast Magic Reflect on self → verify particles (0x375A) and sound (0x1E9) - [x] Have an enemy cast a harmful spell at you → verify spell reflects back, effect consumed - [x] Cast Magic Reflect again → verify it can be recast after consumption - [x] Cast Magic Reflect when already active → verify "This spell is already in effect" - [x] Verify all three spells can be active simultaneously on the same mobile - [x] Switch expansion to UOR → verify existing UOR behavior unchanged - [x] Switch expansion to AOS → verify existing AOS behavior unchanged
This commit is contained in:
Jack
GitHub
parent
6cdec42146
commit
7be8b5f7f6
7 changed files with 258 additions and 60 deletions
|
|
@ -12,6 +12,7 @@ using Server.Regions;
|
|||
using Server.Spells;
|
||||
using Server.Spells.Bushido;
|
||||
using Server.Spells.Chivalry;
|
||||
using Server.Spells.First;
|
||||
using Server.Spells.Fourth;
|
||||
using Server.Spells.Necromancy;
|
||||
using Server.Spells.Ninjitsu;
|
||||
|
|
@ -1834,6 +1835,12 @@ public partial class DuelContext
|
|||
|
||||
if (!Core.AOS)
|
||||
{
|
||||
if (!Core.UOR)
|
||||
{
|
||||
ReactiveArmorSpell.RemoveEffect(mob);
|
||||
ProtectionSpell.RemoveT2AProtection(mob);
|
||||
}
|
||||
|
||||
mob.MagicDamageAbsorb = 0;
|
||||
mob.MeleeDamageAbsorb = 0;
|
||||
ProtectionSpell.Registry.Remove(mob);
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
using Server.Spells.First;
|
||||
using Server.Spells.Spellweaving;
|
||||
|
||||
namespace Server.Items
|
||||
|
|
@ -23,34 +24,7 @@ namespace Server.Items
|
|||
return damage;
|
||||
}
|
||||
|
||||
var absorb = defender.MeleeDamageAbsorb;
|
||||
|
||||
if (absorb > 0)
|
||||
{
|
||||
if (absorb > damage)
|
||||
{
|
||||
var react = damage / 5;
|
||||
|
||||
if (react <= 0)
|
||||
{
|
||||
react = 1;
|
||||
}
|
||||
|
||||
defender.MeleeDamageAbsorb -= damage;
|
||||
damage = 0;
|
||||
|
||||
attacker.Damage(react, defender);
|
||||
|
||||
attacker.PlaySound(0x1F1);
|
||||
attacker.FixedEffect(0x374A, 10, 16);
|
||||
}
|
||||
else
|
||||
{
|
||||
defender.MeleeDamageAbsorb = 0;
|
||||
defender.SendLocalizedMessage(1005556); // Your reactive armor spell has been nullified.
|
||||
DefensiveSpell.Nullify(defender);
|
||||
}
|
||||
}
|
||||
ReactiveArmorSpell.HandleMeleeHit(attacker, defender, ref damage);
|
||||
|
||||
return damage;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -893,16 +893,25 @@ namespace Server.Spells
|
|||
|
||||
if (target.MagicDamageAbsorb > 0)
|
||||
{
|
||||
++circle;
|
||||
|
||||
target.MagicDamageAbsorb -= circle;
|
||||
|
||||
// This order isn't very intuitive, but you have to nullify reflect before target gets switched
|
||||
reflect = target.MagicDamageAbsorb >= 0;
|
||||
if (target.MagicDamageAbsorb <= 0)
|
||||
if (!Core.UOR)
|
||||
{
|
||||
// T2A: single-use reflection, consumed immediately
|
||||
target.MagicDamageAbsorb = 0;
|
||||
DefensiveSpell.Nullify(target);
|
||||
reflect = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
++circle;
|
||||
|
||||
target.MagicDamageAbsorb -= circle;
|
||||
|
||||
// This order isn't very intuitive, but you have to nullify reflect before target gets switched
|
||||
reflect = target.MagicDamageAbsorb >= 0;
|
||||
if (target.MagicDamageAbsorb <= 0)
|
||||
{
|
||||
target.MagicDamageAbsorb = 0;
|
||||
DefensiveSpell.Nullify(target);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -38,6 +38,11 @@ namespace Server.Spells.Fifth
|
|||
return false;
|
||||
}
|
||||
|
||||
if (!Core.UOR)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
if (!Caster.CanBeginAction<DefensiveSpell>())
|
||||
{
|
||||
Caster.SendLocalizedMessage(1005385); // The spell will not adhere to you at this time.
|
||||
|
|
@ -105,6 +110,20 @@ namespace Server.Spells.Fifth
|
|||
}
|
||||
}
|
||||
}
|
||||
else if (!Core.UOR)
|
||||
{
|
||||
if (Caster.MagicDamageAbsorb > 0)
|
||||
{
|
||||
Caster.SendLocalizedMessage(1005559); // This spell is already in effect.
|
||||
}
|
||||
else if (CheckSequence())
|
||||
{
|
||||
Caster.MagicDamageAbsorb = 1;
|
||||
|
||||
Caster.FixedParticles(0x375A, 10, 15, 5037, EffectLayer.Waist);
|
||||
Caster.PlaySound(0x1E9);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if (Caster.MagicDamageAbsorb > 0)
|
||||
|
|
|
|||
|
|
@ -3,10 +3,11 @@ using System.Collections.Generic;
|
|||
using ModernUO.CodeGeneratedEvents;
|
||||
using Server.Engines.BuffIcons;
|
||||
using Server.Mobiles;
|
||||
using Server.Targeting;
|
||||
|
||||
namespace Server.Spells.First
|
||||
{
|
||||
public class ReactiveArmorSpell : MagerySpell
|
||||
public class ReactiveArmorSpell : MagerySpell, ITargetingSpell<Mobile>
|
||||
{
|
||||
private static readonly SpellInfo _info = new(
|
||||
"Reactive Armor",
|
||||
|
|
@ -18,7 +19,8 @@ namespace Server.Spells.First
|
|||
Reagent.SulfurousAsh
|
||||
);
|
||||
|
||||
private static readonly Dictionary<Mobile, ResistanceMod[]> _table = new();
|
||||
private static Dictionary<Mobile, ResistanceMod[]> _table;
|
||||
private static Dictionary<Mobile, TimerExecutionToken> _t2aTable;
|
||||
|
||||
public ReactiveArmorSpell(Mobile caster, Item scroll = null) : base(caster, scroll, _info)
|
||||
{
|
||||
|
|
@ -26,9 +28,81 @@ namespace Server.Spells.First
|
|||
|
||||
public override SpellCircle Circle => SpellCircle.First;
|
||||
|
||||
public static bool HasEffect(Mobile m) => _t2aTable?.ContainsKey(m) == true;
|
||||
|
||||
public static void RemoveEffect(Mobile m)
|
||||
{
|
||||
if (_t2aTable?.Remove(m, out var token) == true)
|
||||
{
|
||||
token.Cancel();
|
||||
}
|
||||
}
|
||||
|
||||
public static void HandleMeleeHit(Mobile attacker, Mobile defender, ref int damage)
|
||||
{
|
||||
if (!Core.UOR)
|
||||
{
|
||||
// T2A: percentage-based melee reflection
|
||||
if (!HasEffect(defender))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
// Only reflect adjacent melee hits; guards are exempt
|
||||
if (!defender.InRange(attacker, 1) || attacker is BaseGuard)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
var magery = defender.Skills.Magery.Value;
|
||||
var reflectPct = (int)(10 + magery / 4); // 10–35%
|
||||
var reflected = damage * reflectPct / 100;
|
||||
|
||||
if (reflected > 0)
|
||||
{
|
||||
damage -= reflected;
|
||||
|
||||
// Sourceless damage — does not trigger attacker's own combat events
|
||||
attacker.Damage(reflected);
|
||||
}
|
||||
|
||||
attacker.PlaySound(0x1F1);
|
||||
attacker.FixedEffect(0x374A, 10, 16);
|
||||
}
|
||||
else
|
||||
{
|
||||
// UOR: damage absorption pool
|
||||
var absorb = defender.MeleeDamageAbsorb;
|
||||
|
||||
if (absorb <= 0)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
if (absorb > damage)
|
||||
{
|
||||
var react = Math.Max(damage / 5, 1);
|
||||
|
||||
defender.MeleeDamageAbsorb -= damage;
|
||||
damage = 0;
|
||||
|
||||
attacker.Damage(react, defender);
|
||||
|
||||
attacker.PlaySound(0x1F1);
|
||||
attacker.FixedEffect(0x374A, 10, 16);
|
||||
}
|
||||
else
|
||||
{
|
||||
defender.MeleeDamageAbsorb = 0;
|
||||
defender.SendLocalizedMessage(1005556); // Your reactive armor spell has been nullified.
|
||||
DefensiveSpell.Nullify(defender);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public override bool CheckCast()
|
||||
{
|
||||
if (Core.AOS)
|
||||
if (Core.AOS || !Core.UOR)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
|
@ -48,6 +122,38 @@ namespace Server.Spells.First
|
|||
return true;
|
||||
}
|
||||
|
||||
public void Target(Mobile m)
|
||||
{
|
||||
if (!Caster.CanBeBeneficial(m))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
if (HasEffect(m))
|
||||
{
|
||||
// This target already has Reactive Armor
|
||||
Caster.SendLocalizedMessage(1005559); // This spell is already in effect.
|
||||
return;
|
||||
}
|
||||
|
||||
if (CheckBSequence(m))
|
||||
{
|
||||
Caster.DoBeneficial(m);
|
||||
SpellHelper.Turn(Caster, m);
|
||||
|
||||
m.FixedParticles(0x376A, 9, 32, 5008, EffectLayer.Waist);
|
||||
m.PlaySound(0x1F2);
|
||||
|
||||
var duration = TimeSpan.FromSeconds(25 + Caster.Skills.Magery.Value / 2); // 25–75s
|
||||
|
||||
Timer.StartTimer(duration, () => ExpireT2AEffect(m), out var token);
|
||||
_t2aTable ??= [];
|
||||
_t2aTable[m] = token;
|
||||
}
|
||||
}
|
||||
|
||||
private static void ExpireT2AEffect(Mobile m) => _t2aTable?.Remove(m);
|
||||
|
||||
public override void OnCast()
|
||||
{
|
||||
if (Core.AOS)
|
||||
|
|
@ -63,7 +169,7 @@ namespace Server.Spells.First
|
|||
|
||||
if (CheckSequence())
|
||||
{
|
||||
if (_table.Remove(Caster, out var mods))
|
||||
if (_table?.Remove(Caster, out var mods) == true)
|
||||
{
|
||||
Caster.PlaySound(0x1ED);
|
||||
Caster.FixedParticles(0x376A, 9, 32, 5008, EffectLayer.Waist);
|
||||
|
|
@ -93,6 +199,7 @@ namespace Server.Spells.First
|
|||
new ResistanceMod(ResistanceType.Energy, "EnergyResistReactiveArmorSpell", -5)
|
||||
];
|
||||
|
||||
_table ??= [];
|
||||
_table[Caster] = mods;
|
||||
|
||||
for (var i = 0; i < mods.Length; ++i)
|
||||
|
|
@ -100,8 +207,7 @@ namespace Server.Spells.First
|
|||
Caster.AddResistanceMod(mods[i]);
|
||||
}
|
||||
|
||||
var physresist = 15 + (int)(Caster.Skills.Inscribe.Value / 20);
|
||||
var args = $"{physresist}\t{5}\t{5}\t{5}\t{5}";
|
||||
var args = $"{15 + (int)(Caster.Skills.Inscribe.Value / 20)}\t{5}\t{5}\t{5}\t{5}";
|
||||
|
||||
(Caster as PlayerMobile)?.AddBuff(new BuffInfo(BuffIcon.ReactiveArmor, 1075812, 1075813, args: args));
|
||||
}
|
||||
|
|
@ -109,6 +215,10 @@ namespace Server.Spells.First
|
|||
|
||||
FinishSequence();
|
||||
}
|
||||
else if (!Core.UOR)
|
||||
{
|
||||
Caster.Target = new SpellTarget<Mobile>(this, TargetFlags.Beneficial);
|
||||
}
|
||||
else
|
||||
{
|
||||
if (Caster.MeleeDamageAbsorb > 0)
|
||||
|
|
@ -148,7 +258,9 @@ namespace Server.Spells.First
|
|||
[OnEvent(nameof(PlayerMobile.PlayerDeletedEvent))]
|
||||
public static void EndArmor(Mobile m)
|
||||
{
|
||||
if (!_table.Remove(m, out var mods))
|
||||
RemoveEffect(m);
|
||||
|
||||
if (_table?.Remove(m, out var mods) != true)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -69,6 +69,19 @@ namespace Server.Spells.Fourth
|
|||
}
|
||||
}
|
||||
}
|
||||
else if (!Core.UOR)
|
||||
{
|
||||
while (targets.Count > 0)
|
||||
{
|
||||
var m = targets.Dequeue();
|
||||
if (!ProtectionSpell.HasT2AProtection(m))
|
||||
{
|
||||
Caster.DoBeneficial(m);
|
||||
ProtectionSpell.ApplyT2AProtection(Caster, m);
|
||||
m.PlaySound(0x1F7);
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
var val = (int)(Caster.Skills.Magery.Value / 10.0 + 1);
|
||||
|
|
|
|||
|
|
@ -3,10 +3,11 @@ using System.Collections.Generic;
|
|||
using ModernUO.CodeGeneratedEvents;
|
||||
using Server.Engines.BuffIcons;
|
||||
using Server.Mobiles;
|
||||
using Server.Targeting;
|
||||
|
||||
namespace Server.Spells.Second
|
||||
{
|
||||
public class ProtectionSpell : MagerySpell
|
||||
public class ProtectionSpell : MagerySpell, ITargetingSpell<Mobile>
|
||||
{
|
||||
private static readonly SpellInfo _info = new(
|
||||
"Protection",
|
||||
|
|
@ -18,8 +19,10 @@ namespace Server.Spells.Second
|
|||
Reagent.SulfurousAsh
|
||||
);
|
||||
|
||||
// TODO: Cleanup periodically if players have logged out for a while
|
||||
private static readonly Dictionary<Mobile, Tuple<ResistanceMod, DefaultSkillMod>> _table = new();
|
||||
private static Dictionary<Mobile, Tuple<ResistanceMod, DefaultSkillMod>> _table;
|
||||
|
||||
// T2A: stores the AR bonus per mobile (shared with ArchProtection)
|
||||
private static Dictionary<Mobile, int> _t2aTable;
|
||||
|
||||
public ProtectionSpell(Mobile caster, Item scroll = null) : base(caster, scroll, _info)
|
||||
{
|
||||
|
|
@ -29,9 +32,39 @@ namespace Server.Spells.Second
|
|||
|
||||
public override SpellCircle Circle => SpellCircle.Second;
|
||||
|
||||
public static bool HasT2AProtection(Mobile m) => _t2aTable?.ContainsKey(m) ?? false;
|
||||
|
||||
public static void RemoveT2AProtection(Mobile m)
|
||||
{
|
||||
if (_t2aTable?.Remove(m, out var bonus) == true)
|
||||
{
|
||||
m.VirtualArmorMod -= Math.Min(bonus, m.VirtualArmorMod);
|
||||
}
|
||||
}
|
||||
|
||||
public static void ApplyT2AProtection(Mobile caster, Mobile target)
|
||||
{
|
||||
if (HasT2AProtection(target))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
var magery = caster.Skills.Magery.Value;
|
||||
var bonus = (int)(magery / 10);
|
||||
var duration = TimeSpan.FromSeconds(6 * magery / 5);
|
||||
|
||||
_t2aTable ??= [];
|
||||
_t2aTable[target] = bonus;
|
||||
target.VirtualArmorMod += bonus;
|
||||
|
||||
target.FixedParticles(0x375A, 9, 20, 5016, EffectLayer.Waist);
|
||||
|
||||
new InternalTimer(target, duration).Start();
|
||||
}
|
||||
|
||||
public override bool CheckCast()
|
||||
{
|
||||
if (Core.AOS)
|
||||
if (Core.AOS || !Core.UOR)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
|
@ -51,6 +84,28 @@ namespace Server.Spells.Second
|
|||
return false;
|
||||
}
|
||||
|
||||
public void Target(Mobile m)
|
||||
{
|
||||
if (!Caster.CanBeBeneficial(m))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
if (HasT2AProtection(m))
|
||||
{
|
||||
Caster.SendLocalizedMessage(1005559); // This spell is already in effect.
|
||||
return;
|
||||
}
|
||||
|
||||
if (CheckBSequence(m))
|
||||
{
|
||||
Caster.DoBeneficial(m);
|
||||
SpellHelper.Turn(Caster, m);
|
||||
ApplyT2AProtection(Caster, m);
|
||||
m.PlaySound(0x1ED);
|
||||
}
|
||||
}
|
||||
|
||||
// AOS+ only
|
||||
public static void Toggle(Mobile caster, Mobile target)
|
||||
{
|
||||
|
|
@ -63,7 +118,7 @@ namespace Server.Spells.Second
|
|||
* even after dying, until you turn them off by casting them again.
|
||||
*/
|
||||
|
||||
if (_table.Remove(target, out var mods))
|
||||
if (_table?.Remove(target, out var mods) == true)
|
||||
{
|
||||
target.PlaySound(0x1ED);
|
||||
target.FixedParticles(0x375A, 9, 20, 5016, EffectLayer.Waist);
|
||||
|
|
@ -85,6 +140,7 @@ namespace Server.Spells.Second
|
|||
var physMod = new ResistanceMod(ResistanceType.Physical, "PhysicalResistProtectionSpell", physLoss);
|
||||
var resistMod = new DefaultSkillMod(SkillName.MagicResist, "MagicResistProtectionSpell", true, resistLoss);
|
||||
|
||||
_table ??= [];
|
||||
_table[target] = Tuple.Create(physMod, resistMod);
|
||||
Registry[target] = 1000; // 100.0% protection from disruption
|
||||
|
||||
|
|
@ -99,7 +155,9 @@ namespace Server.Spells.Second
|
|||
[OnEvent(nameof(PlayerMobile.PlayerDeletedEvent))]
|
||||
public static void EndProtection(Mobile m)
|
||||
{
|
||||
if (!_table.Remove(m, out var mods))
|
||||
RemoveT2AProtection(m);
|
||||
|
||||
if (_table?.Remove(m, out var mods) != true)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
|
@ -123,6 +181,10 @@ namespace Server.Spells.Second
|
|||
|
||||
FinishSequence();
|
||||
}
|
||||
else if (!Core.UOR)
|
||||
{
|
||||
Caster.Target = new SpellTarget<Mobile>(this, TargetFlags.Beneficial);
|
||||
}
|
||||
else
|
||||
{
|
||||
if (Registry.ContainsKey(Caster))
|
||||
|
|
@ -142,7 +204,8 @@ namespace Server.Spells.Second
|
|||
Caster.Skills.Inscribe.Value) * 10 / 4;
|
||||
|
||||
Registry.Add(Caster, Math.Clamp((int)value, 0, 750)); // 75.0% protection from disruption
|
||||
new InternalTimer(Caster).Start();
|
||||
var duration = TimeSpan.FromSeconds(Math.Clamp(Caster.Skills.Magery.Value * 2.0, 15, 240));
|
||||
new InternalTimer(Caster, duration).Start();
|
||||
|
||||
Caster.FixedParticles(0x375A, 9, 20, 5016, EffectLayer.Waist);
|
||||
Caster.PlaySound(0x1ED);
|
||||
|
|
@ -159,20 +222,21 @@ namespace Server.Spells.Second
|
|||
|
||||
private class InternalTimer : Timer
|
||||
{
|
||||
private readonly Mobile m_Caster;
|
||||
private readonly Mobile _mobile;
|
||||
|
||||
public InternalTimer(Mobile caster) : base(TimeSpan.FromSeconds(0))
|
||||
{
|
||||
var val = Math.Clamp(caster.Skills.Magery.Value * 2.0, 15, 240);
|
||||
|
||||
m_Caster = caster;
|
||||
Delay = TimeSpan.FromSeconds(val);
|
||||
}
|
||||
public InternalTimer(Mobile mobile, TimeSpan duration) : base(duration) => _mobile = mobile;
|
||||
|
||||
protected override void OnTick()
|
||||
{
|
||||
Registry.Remove(m_Caster);
|
||||
DefensiveSpell.Nullify(m_Caster);
|
||||
if (!Core.UOR)
|
||||
{
|
||||
RemoveT2AProtection(_mobile);
|
||||
}
|
||||
else
|
||||
{
|
||||
Registry.Remove(_mobile);
|
||||
DefensiveSpell.Nullify(_mobile);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue