feat: Adds ability groups, DOT abilities, and combat abilities (#1264)

- [X] Adds `MonsterAbilitySingleTarget`
- [X] Adds `MonsterAbilitySingleTargetDoT`
- [X] Adds monster ability groups with weighted abilities
- [X] Adds rune corruption ability
- [X] Adds poison gas counter ability
- [X] Adds stun attack ability
- [X] Adds throw hatchet counter ability
- [X] Adds fanning fire ability
- [X] Fixes destroy equipment to skip spell channel items
This commit is contained in:
Kamron Batman 2022-11-23 12:33:27 -08:00 • committed by GitHub
parent df9a58dd49
commit 520f15e46c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
62 changed files with 644 additions and 546 deletions

View file

@ -4,7 +4,7 @@ using Server.Network;
namespace Server.Mobiles;
public class DestroyEquipment : MonsterAbilityAttack
public class DestroyEquipment : MonsterAbilitySingleTarget
{
public override MonsterAbilityType AbilityType => MonsterAbilityType.DestroyEquipment;
public override MonsterAbilityTrigger AbilityTrigger => MonsterAbilityTrigger.GiveMeleeDamage;
@ -12,9 +12,9 @@ public class DestroyEquipment : MonsterAbilityAttack
public virtual int AttackRange => 1;
protected override void OnAttack(MonsterAbilityTrigger trigger, BaseCreature source, Mobile defender)
protected override void OnTarget(MonsterAbilityTrigger trigger, BaseCreature source, Mobile defender)
{
base.OnAttack(trigger, source, defender);
base.OnTarget(trigger, source, defender);
using var queue = PooledRefQueue<Item>.Create();
for (var i = 0; i < defender.Items.Count; i++)
@ -25,7 +25,18 @@ public class DestroyEquipment : MonsterAbilityAttack
continue;
}
if (!(Mobile.InsuranceEnabled && item.Insured) && item is IDurability { MaxHitPoints: > 0 })
if (Mobile.InsuranceEnabled && item.Insured)
{
continue;
}
// Late publish AOS, do not destroy equipment that mages use
if (item is IAosItem { Attributes.SpellChanneling: > 0 })
{
continue;
}
if (item is IDurability { MaxHitPoints: > 0 })
{
queue.Enqueue(item);
}

View file

@ -2,15 +2,15 @@
namespace Server.Mobiles;
public class EnergyBoltCounter : MonsterAbilityAttack
public class EnergyBoltCounter : MonsterAbilitySingleTarget
{
public override MonsterAbilityType AbilityType => MonsterAbilityType.EnergyBoltCounter;
public override MonsterAbilityTrigger AbilityTrigger => MonsterAbilityTrigger.TakeDamage; // Ranged attackers
public override double ChanceToTrigger => 0.4;
protected override void OnAttack(MonsterAbilityTrigger trigger, BaseCreature source, Mobile defender)
protected override void OnTarget(MonsterAbilityTrigger trigger, BaseCreature source, Mobile defender)
{
base.OnAttack(trigger, source, defender);
base.OnTarget(trigger, source, defender);
source.MovingParticles(defender, 0x379F, 7, 0, false, true, 0xBE3, 0xFCB, 0x211);
defender.PlaySound(0x229);

View file

@ -0,0 +1,43 @@
namespace Server.Mobiles;
public class FanThrowCounter : MonsterAbilitySingleTarget
{
public override MonsterAbilityType AbilityType => MonsterAbilityType.EnergyBoltCounter;
public override MonsterAbilityTrigger AbilityTrigger => MonsterAbilityTrigger.TakeDamage;
public override double ChanceToTrigger => 0.2;
protected override void OnTarget(MonsterAbilityTrigger trigger, BaseCreature source, Mobile defender)
{
base.OnTarget(trigger, source, defender);
/* Fan Throw
* Effect:
* - To: "0x57D4F5B"
* - ItemId: "0x27A3"
* - ItemIdName: "Tessen"
* - FromLocation: "(992 299, 24)"
* - ToLocation: "(992 308, 22)"
* - Speed: "10"
* - Duration: "0"
* - FixedDirection: "False"
* - Explode: "False"
* - Hue: "0x0"
* - Render: "0x0"
* Damage: 50-65
*/
Effects.SendMovingEffect(
defender.Location,
defender.Map,
0x27A3,
source.Location,
defender.Location,
10,
0
);
AOS.Damage(defender, source, Utility.RandomMinMax(50, 65), 100, 0, 0, 0, 0);
}
protected override bool CanEffectTarget(MonsterAbilityTrigger trigger, BaseCreature source, Mobile defender) =>
base.CanEffectTarget(trigger, source, defender) && !defender.InRange(source, 1);
}

View file

@ -0,0 +1,68 @@
namespace Server.Mobiles;
public class FanningFire : MonsterAbilitySingleTargetDoT
{
public override MonsterAbilityType AbilityType => MonsterAbilityType.FanningFire;
public override MonsterAbilityTrigger AbilityTrigger => MonsterAbilityTrigger.GiveDamage;
public override double ChanceToTrigger => 0.05;
public const string Name = "FanningFire";
protected override void StartEffect(BaseCreature source, Mobile defender)
{
/**
* Fanning Fire
* Start cliloc: 1070833
* Effect: Fire res -10% for 10 seconds. Does not stack.
* Damage: 35-45, 100% fire
* End cliloc: 1070834
* Sound: 0x208
* Graphic:
* - Type: "3"
* - From: "0x57D4F5B"
* - To: "0x0"
* - ItemId: "0x3709"
* - ItemIdName: "fire column"
* - FromLocation: "(994 325, 16)"
* - ToLocation: "(994 325, 16)"
* - Speed: "10"
* - Duration: "30"
* - FixedDirection: "True"
* - Explode: "False"
* - Hue: "0x0"
* - RenderMode: "0x0"
* - Effect: "0x34"
* - ExplodeEffect: "0x1"
* - ExplodeSound: "0x0"
* - Layer: "5"
* - Unknown: "0x0"
*/
RemoveEffect(source, defender);
// The creature fans you with fire, reducing your resistance to fire attacks.
defender.SendLocalizedMessage(1070833);
var effect = -(defender.FireResistance / 10);
var mod = new ResistanceMod(ResistanceType.Fire, Name, effect);
defender.AddResistanceMod(mod);
defender.FixedParticles(0x37B9, 10, 30, 0x34, EffectLayer.RightFoot);
defender.PlaySound(0x208);
// TODO: Trigger replaces a normal attack.
AOS.Damage(defender, source, Utility.RandomMinMax(35, 45), 0, 100, 0, 0, 0);
}
protected override void EndEffect(BaseCreature source, Mobile defender)
{
defender.RemoveResistanceMod(Name);
}
protected override void OnEffectExpired(BaseCreature source, Mobile defender)
{
// Your resistance to fire attacks has returned.
defender.SendLocalizedMessage(1070834);
}
}

View file

@ -5,7 +5,7 @@ namespace Server.Mobiles;
public class FireBreath : MonsterAbility
{
public override MonsterAbilityTrigger AbilityTrigger => MonsterAbilityTrigger.Think;
public override MonsterAbilityTrigger AbilityTrigger => MonsterAbilityTrigger.CombatAction;
public override MonsterAbilityType AbilityType => MonsterAbilityType.FireBreath;
public override double ChanceToTrigger => 0.5;

View file

@ -1,27 +1,23 @@
using System;
using System.Collections.Generic;
namespace Server.Mobiles;
namespace Server.Mobiles;
public class GraspingClaw : MonsterAbility
public class GraspingClaw : MonsterAbilitySingleTargetDoT
{
private Dictionary<Mobile, ExpireTimer> _table;
public override MonsterAbilityType AbilityType => MonsterAbilityType.GraspingClaw;
public override MonsterAbilityTrigger AbilityTrigger => MonsterAbilityTrigger.GiveMeleeDamage;
public override double ChanceToTrigger => 0.10;
public override void Trigger(MonsterAbilityTrigger trigger, BaseCreature source, Mobile target)
private const string Name = "GraspingClaw";
protected override void StartEffect(BaseCreature source, Mobile defender)
{
if (_table.Remove(target, out var timer))
if (RemoveEffect(source, defender))
{
timer.DoExpire();
target.SendLocalizedMessage(1070837); // The creature lands another blow in your weakened state.
defender.SendLocalizedMessage(1070837); // The creature lands another blow in your weakened state.
}
else
{
// The blow from the creature's claws has made you more susceptible to physical attacks.
target.SendLocalizedMessage(1070836);
defender.SendLocalizedMessage(1070836);
}
/**
@ -30,7 +26,7 @@ public class GraspingClaw : MonsterAbility
* Effect: Physical resistance -15% for 5 seconds
* Refresh Cliloc: 1070837
* End cliloc: 1070838
* Effect:
* Graphic:
* - Type: "3"
* - From: Player
* - To: 0x0
@ -42,46 +38,20 @@ public class GraspingClaw : MonsterAbility
* - FixedDirection: "True"
* - Explode: "False"
*/
var effect = -(target.PhysicalResistance * 15 / 100);
var mod = new ResistanceMod(ResistanceType.Physical, "GraspingClaw", effect);
var mod = new ResistanceMod(ResistanceType.Physical, Name, -(defender.PhysicalResistance * 15 / 100));
defender.AddResistanceMod(mod);
target.FixedEffect(0x37B9, 10, 5);
target.AddResistanceMod(mod);
timer = new ExpireTimer(this, target, mod, TimeSpan.FromSeconds(5.0));
timer.Start();
_table ??= new Dictionary<Mobile, ExpireTimer>();
_table[target] = timer;
base.Trigger(trigger, source, target);
defender.FixedEffect(0x37B9, 10, 5);
}
private class ExpireTimer : Timer
protected override void EndEffect(BaseCreature source, Mobile defender)
{
private GraspingClaw _graspingClaw;
private Mobile _mobile;
private ResistanceMod _mod;
defender.RemoveResistanceMod(Name);
}
public ExpireTimer(GraspingClaw claw, Mobile m, ResistanceMod mod, TimeSpan delay) : base(delay)
{
_mobile = m;
_mod = mod;
_graspingClaw = claw;
}
public void DoExpire()
{
_mobile.RemoveResistanceMod(_mod);
Stop();
_graspingClaw._table?.Remove(_mobile);
}
protected override void OnTick()
{
_mobile.SendLocalizedMessage(1070838); // Your resistance to physical attacks has returned.
DoExpire();
}
protected override void OnEffectExpired(BaseCreature source, Mobile defender)
{
defender.SendLocalizedMessage(1070838); // Your resistance to physical attacks has returned.
}
}

View file

@ -1,17 +1,20 @@
namespace Server.Mobiles;
public abstract partial class MonsterAbility
public static class MonsterAbilities
{
// Fire Breath
public static FireBreath FireBreath => new();
public static ChaosBreath ChaosBreath => new();
public static ColdBreath ColdBreath => new();
// Resistance Debuffs
public static GraspingClaw GraspingClaw => new();
public static RuneCorruption RuneCorruption => new();
public static FanningFire FanningFire => new();
// Summon Undead
public static SummonSkeletons SummonSkeletons => new();
public static SummonLesserUndead SummonLesserUndead => new();
public static SummonSkeletonsCounter SummonSkeletonsCounter => new();
public static SummonLesserUndeadCounter SummonLesserUndeadCounter => new();
// Stun
public static ColossalBlow ColossalBlow => new();
@ -26,10 +29,13 @@ public abstract partial class MonsterAbility
// Direct attack counters
public static ThrowHatchetCounter ThrowHatchetCounter => new();
public static EnergyBoltCounter EnergyBoltCounter => new();
public static FanThrowCounter FanThrowCounter => new();
public static DestroyEquipment DestroyEquipment => new();
public static DrainLifeAreaAttack DrainLifeAreaAttack => new();
public static MagicalBarrier MagicalBarrier => new();
public static ReflectPhysicalDamage ReflectPhysicalDamage => new();
}

View file

@ -1,18 +1,18 @@
namespace Server.Mobiles;
public abstract class MonsterAbilityAttack : MonsterAbility
public abstract class MonsterAbilitySingleTarget : MonsterAbility
{
public override void Trigger(MonsterAbilityTrigger trigger, BaseCreature source, Mobile target)
{
if (CanEffectTarget(trigger, source, target))
{
OnAttack(trigger, source, target);
OnTarget(trigger, source, target);
}
base.Trigger(trigger, source, target);
}
protected virtual void OnAttack(MonsterAbilityTrigger trigger, BaseCreature source, Mobile defender)
protected virtual void OnTarget(MonsterAbilityTrigger trigger, BaseCreature source, Mobile defender)
{
source.DoHarmful(defender);
}

View file

@ -0,0 +1,79 @@
using System;
using System.Collections.Generic;
namespace Server.Mobiles;
public abstract class MonsterAbilitySingleTargetDoT : MonsterAbilitySingleTarget
{
private Dictionary<Mobile, ExpireTimer> _table;
public virtual TimeSpan MinDelay => TimeSpan.FromSeconds(10.0);
public virtual TimeSpan MaxDelay => TimeSpan.FromSeconds(10.0);
protected override void OnTarget(MonsterAbilityTrigger trigger, BaseCreature source, Mobile defender)
{
_table ??= new Dictionary<Mobile, ExpireTimer>();
var duration = Utility.RandomMinMax(MinDelay, MaxDelay);
var count = GetCount(source, defender);
var timer = _table[defender] = new ExpireTimer(this, source, defender, duration, count);
timer.Start();
StartEffect(source, defender);
}
protected virtual int GetCount(BaseCreature source, Mobile defender) => 1;
protected abstract void StartEffect(BaseCreature source, Mobile defender);
protected virtual void EffectTick(BaseCreature source, Mobile defender, out TimeSpan nextDelay)
{
nextDelay = Utility.RandomMinMax(MinDelay, MaxDelay);
}
protected abstract void EndEffect(BaseCreature source, Mobile defender);
protected abstract void OnEffectExpired(BaseCreature source, Mobile defender);
public bool IsUnderEffect(Mobile defender) => _table?.ContainsKey(defender) == true;
protected bool RemoveEffect(BaseCreature source, Mobile defender)
{
if (_table?.Remove(defender, out var timer) == true)
{
timer.Stop();
EndEffect(source, defender);
return true;
}
return false;
}
private class ExpireTimer : Timer
{
private BaseCreature _source;
private Mobile _defender;
private MonsterAbilitySingleTargetDoT _ability;
public ExpireTimer(
MonsterAbilitySingleTargetDoT ability,
BaseCreature source,
Mobile defender,
TimeSpan delay,
int count
) : base(delay, delay, count)
{
_ability = ability;
_source = source;
_defender = defender;
}
protected override void OnTick()
{
_ability.EffectTick(_source, _defender, out var delay);
Delay = delay;
_ability.RemoveEffect(_source, _defender);
_ability.OnEffectExpired(_source, _defender);
}
}
}

View file

@ -15,5 +15,8 @@ public enum MonsterAbilityType
MassDrainLife,
MagicalBarrier,
EnergyBoltCounter,
ReflectPhysicalDamage
ReflectPhysicalDamage,
FanningFire, // Fire debuff
RuneCorruption,
FanThrow
}

View file

@ -1,6 +1,6 @@
namespace Server.Mobiles;
public class PoisonGasCounter : MonsterAbilityAttack
public class PoisonGasCounter : MonsterAbilitySingleTarget
{
public override MonsterAbilityType AbilityType => MonsterAbilityType.Poison;
public override MonsterAbilityTrigger AbilityTrigger => MonsterAbilityTrigger.TakeDamage;
@ -11,7 +11,7 @@ public class PoisonGasCounter : MonsterAbilityAttack
protected override bool CanEffectTarget(MonsterAbilityTrigger trigger, BaseCreature source, Mobile defender) =>
source.InRange(defender, AttackRange) && defender is not BaseCreature { BardProvoked: true };
protected override void OnAttack(MonsterAbilityTrigger trigger, BaseCreature source, Mobile defender)
protected override void OnTarget(MonsterAbilityTrigger trigger, BaseCreature source, Mobile defender)
{
source.Animate(10, 4, 1, true, false, 0);
AOS.Damage(defender, source, 50, 100, 0, 0, 0, 0, 0);

View file

@ -0,0 +1,162 @@
namespace Server.Mobiles;
public class RuneCorruption : MonsterAbilitySingleTargetDoT
{
public override MonsterAbilityType AbilityType => MonsterAbilityType.RuneCorruption;
public override MonsterAbilityTrigger AbilityTrigger => MonsterAbilityTrigger.GiveMeleeDamage;
public override double ChanceToTrigger => 0.05;
private const string Name = "RuneCorruption";
protected override void OnTarget(MonsterAbilityTrigger trigger, BaseCreature source, Mobile defender)
{
if (RemoveEffect(source, defender))
{
defender.SendLocalizedMessage(1070845); // The creature continues to corrupt your armor!
}
else
{
defender.SendLocalizedMessage(1070846); // The creature magically corrupts your armor!
}
base.OnTarget(trigger, source, defender);
}
protected override void StartEffect(BaseCreature source, Mobile defender)
{
/**
* Rune Corruption
* Start cliloc: 1070846 "The creature magically corrupts your armor!"
* Effect: All resistances -70 (lowest 0) for 5 seconds
* End ASCII: "The corruption of your armor has worn off"
*/
if (Core.ML)
{
if (defender.PhysicalResistance > 0)
{
defender.AddResistanceMod(
new ResistanceMod(
ResistanceType.Physical,
Name,
-(defender.PhysicalResistance / 2)
)
);
}
if (defender.FireResistance > 0)
{
defender.AddResistanceMod(
new ResistanceMod(
ResistanceType.Fire,
Name,
-(defender.FireResistance / 2)
)
);
}
if (defender.ColdResistance > 0)
{
defender.AddResistanceMod(
new ResistanceMod(
ResistanceType.Cold,
Name,
-(defender.ColdResistance / 2)
)
);
}
if (defender.PoisonResistance > 0)
{
defender.AddResistanceMod(
new ResistanceMod(
ResistanceType.Poison,
Name,
-(defender.PoisonResistance / 2)
)
);
}
if (defender.EnergyResistance > 0)
{
defender.AddResistanceMod(
new ResistanceMod(
ResistanceType.Energy,
Name,
-(defender.EnergyResistance / 2)
)
);
}
}
else
{
if (defender.PhysicalResistance > 0)
{
defender.AddResistanceMod(
new ResistanceMod(
ResistanceType.Physical,
Name,
defender.PhysicalResistance > 70 ? -70 : -defender.PhysicalResistance
)
);
}
if (defender.FireResistance > 0)
{
defender.AddResistanceMod(
new ResistanceMod(
ResistanceType.Fire,
Name,
defender.FireResistance > 70 ? -70 : -defender.FireResistance
)
);
}
if (defender.ColdResistance > 0)
{
defender.AddResistanceMod(
new ResistanceMod(
ResistanceType.Cold,
Name,
defender.ColdResistance > 70 ? -70 : -defender.ColdResistance
)
);
}
if (defender.PoisonResistance > 0)
{
defender.AddResistanceMod(
new ResistanceMod(
ResistanceType.Poison,
Name,
defender.PoisonResistance > 70 ? -70 : -defender.PoisonResistance
)
);
}
if (defender.EnergyResistance > 0)
{
defender.AddResistanceMod(
new ResistanceMod(
ResistanceType.Energy,
Name,
defender.EnergyResistance > 70 ? -70 : -defender.EnergyResistance
)
);
}
}
defender.FixedEffect(0x37B9, 10, 5);
}
protected override void EndEffect(BaseCreature source, Mobile defender)
{
defender.RemoveResistanceMod(Name);
}
protected override void OnEffectExpired(BaseCreature source, Mobile defender)
{
defender.SendLocalizedMessage(1071967); // The corruption of your armor has worn off
}
}

View file

@ -1,6 +1,6 @@
namespace Server.Mobiles;
public class SummonLesserUndead : SummonUndead
public class SummonLesserUndeadCounter : SummonUndeadCounter
{
private int _group;

View file

@ -1,6 +1,6 @@
namespace Server.Mobiles;
public class SummonSkeletons : SummonUndead
public class SummonSkeletonsCounter : SummonUndeadCounter
{
public override BaseCreature CreateSummon(BaseCreature source) => new Skeleton();
}

View file

@ -2,7 +2,7 @@
namespace Server.Mobiles;
public abstract class SummonUndead : MonsterAbility
public abstract class SummonUndeadCounter : MonsterAbility
{
public override MonsterAbilityType AbilityType => MonsterAbilityType.SummonUndead;
public override MonsterAbilityTrigger AbilityTrigger => MonsterAbilityTrigger.TakeDamage;

View file

@ -2,13 +2,13 @@
namespace Server.Mobiles;
public class ThrowHatchetCounter : MonsterAbilityAttack
public class ThrowHatchetCounter : MonsterAbilitySingleTarget
{
public override MonsterAbilityType AbilityType => MonsterAbilityType.ThrowWeapon;
public override MonsterAbilityTrigger AbilityTrigger => MonsterAbilityTrigger.TakeDamage;
public override double ChanceToTrigger => 0.4;
protected override void OnAttack(MonsterAbilityTrigger trigger, BaseCreature source, Mobile defender)
protected override void OnTarget(MonsterAbilityTrigger trigger, BaseCreature source, Mobile defender)
{
source.MovingEffect(defender, 0xF43, 10, 0, false, false);
AOS.Damage(defender, source, 50, 100, 0, 0, 0, 0, 0);