warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: Fixes Dot abilities. Adds blood bath attack (#1277)

Browse source
This commit is contained in:
Kamron Batman 2022-11-23 19:40:48 -08:00 • committed by GitHub
parent f884193b70
commit 9c74276240
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 213 additions and 276 deletions
Download patch file Download diff file Expand all files Collapse all files

49
Projects/UOContent/Mobiles/Abilities/BloodBathAttack.cs Normal file
View file

@ -0,0 +1,49 @@
using System;
namespace Server.Mobiles;
public class BloodBathAttack : MonsterAbilitySingleTargetDoT
{
public override MonsterAbilityType AbilityType => MonsterAbilityType.BloodBath;
public override MonsterAbilityTrigger AbilityTrigger => MonsterAbilityTrigger.GiveMeleeDamage;
public override TimeSpan MinDelay => TimeSpan.FromSeconds(1.0);
public override TimeSpan MaxDelay => TimeSpan.FromSeconds(1.0);
protected override int GetCount(BaseCreature source, Mobile defender) => 5;
protected override void EffectTick(BaseCreature source, Mobile defender, ref TimeSpan nextDelay)
{
if (defender.Alive)
{
defender.Damage(2, source);
}
else
{
RemoveEffect(source, defender);
}
}
public override double ChanceToTrigger => 0.1;
protected override void OnBeforeTarget(MonsterAbilityTrigger trigger, BaseCreature source, Mobile defender)
{
if (RemoveEffect(source, defender))
{
defender.SendLocalizedMessage(1070825); // The creature continues to rage!
}
else
{
defender.SendLocalizedMessage(1070826); // The creature goes into a rage, inflicting heavy damage!
}
}
protected override void EndEffect(BaseCreature source, Mobile defender)
{
}
protected override void OnEffectExpired(BaseCreature source, Mobile defender)
{
defender.SendLocalizedMessage(1070824); // The creature's rage subsides.
}
}

37
Projects/UOContent/Mobiles/Abilities/DrainLifeAttack.cs
View file

@ -14,8 +14,25 @@ public class DrainLifeAttack : MonsterAbilitySingleTargetDoT
public override double ChanceToTrigger => 0.5; public override double ChanceToTrigger => 0.5;
private void DrainLife(BaseCreature source, Mobile defender)
{
source.DoHarmful(defender);
defender.Mana -= 15;
if (defender.Alive)
{
var damageGiven = AOS.Damage(defender, source, 5, 0, 0, 0, 0, 100);
source.Hits += damageGiven;
}
else
{
RemoveEffect(source, defender);
defender.SendLocalizedMessage(1070849); // The drain on your life force is gone.
}
}
protected override bool CanEffectTarget(MonsterAbilityTrigger trigger, BaseCreature source, Mobile defender) => protected override bool CanEffectTarget(MonsterAbilityTrigger trigger, BaseCreature source, Mobile defender) =>
base.CanEffectTarget(trigger, source, defender) && defender.Mana > 14 && !IsUnderEffect(defender); base.CanEffectTarget(trigger, source, defender) && defender.Mana > 14;
protected override void OnBeforeTarget(MonsterAbilityTrigger trigger, BaseCreature source, Mobile defender) protected override void OnBeforeTarget(MonsterAbilityTrigger trigger, BaseCreature source, Mobile defender)
{ {
@ -32,20 +49,12 @@ public class DrainLifeAttack : MonsterAbilitySingleTargetDoT
protected override void OnTarget(MonsterAbilityTrigger trigger, BaseCreature source, Mobile defender) protected override void OnTarget(MonsterAbilityTrigger trigger, BaseCreature source, Mobile defender)
{ {
base.OnTarget(trigger, source, defender); base.OnTarget(trigger, source, defender);
DrainLife(source, defender);
}
source.DoHarmful(defender); protected override void EffectTick(BaseCreature source, Mobile defender, ref TimeSpan nextDelay)
defender.Mana -= 15; {
DrainLife(source, defender);
if (defender.Alive)
{
var damageGiven = AOS.Damage(defender, source, 5, 0, 0, 0, 0, 100);
source.Hits += damageGiven;
}
else
{
RemoveEffect(source, defender);
defender.SendLocalizedMessage(1070849); // The drain on your life force is gone.
}
} }
protected override void EndEffect(BaseCreature source, Mobile defender) protected override void EndEffect(BaseCreature source, Mobile defender)

8
Projects/UOContent/Mobiles/Abilities/FanningFire.cs
View file

@ -1,4 +1,6 @@
namespace Server.Mobiles; using System;
namespace Server.Mobiles;
public class FanningFire : MonsterAbilitySingleTargetDoT public class FanningFire : MonsterAbilitySingleTargetDoT
{ {
@ -62,6 +64,10 @@ public class FanningFire : MonsterAbilitySingleTargetDoT
AOS.Damage(defender, source, Utility.RandomMinMax(35, 45), 0, 100, 0, 0, 0); AOS.Damage(defender, source, Utility.RandomMinMax(35, 45), 0, 100, 0, 0, 0);
} }
protected override void EffectTick(BaseCreature source, Mobile defender, ref TimeSpan nextDelay)
{
}
protected override void EndEffect(BaseCreature source, Mobile defender) protected override void EndEffect(BaseCreature source, Mobile defender)
{ {
defender.RemoveResistanceMod(Name); defender.RemoveResistanceMod(Name);

8
Projects/UOContent/Mobiles/Abilities/GraspingClaw.cs
View file

@ -1,4 +1,6 @@
namespace Server.Mobiles; using System;
namespace Server.Mobiles;
public class GraspingClaw : MonsterAbilitySingleTargetDoT public class GraspingClaw : MonsterAbilitySingleTargetDoT
{ {
@ -51,6 +53,10 @@ public class GraspingClaw : MonsterAbilitySingleTargetDoT
defender.FixedEffect(0x37B9, 10, 5); defender.FixedEffect(0x37B9, 10, 5);
} }
protected override void EffectTick(BaseCreature source, Mobile defender, ref TimeSpan nextDelay)
{
}
protected override void EndEffect(BaseCreature source, Mobile defender) protected override void EndEffect(BaseCreature source, Mobile defender)
{ {
defender.RemoveResistanceMod(Name); defender.RemoveResistanceMod(Name);

2
Projects/UOContent/Mobiles/Abilities/MonsterAbilities.cs
View file

@ -47,4 +47,6 @@ public static class MonsterAbilities
public static MagicalBarrier MagicalBarrier => new(); public static MagicalBarrier MagicalBarrier => new();
public static ReflectPhysicalDamage ReflectPhysicalDamage => new(); public static ReflectPhysicalDamage ReflectPhysicalDamage => new();
public static BloodBathAttack BloodBathAttack => new();
} }

13
Projects/UOContent/Mobiles/Abilities/MonsterAbilitySingleTargetDoT.cs
View file

@ -22,10 +22,7 @@ public abstract class MonsterAbilitySingleTargetDoT : MonsterAbilitySingleTarget
protected virtual int GetCount(BaseCreature source, Mobile defender) => 1; protected virtual int GetCount(BaseCreature source, Mobile defender) => 1;
protected virtual void EffectTick(BaseCreature source, Mobile defender, out TimeSpan nextDelay) protected abstract void EffectTick(BaseCreature source, Mobile defender, ref TimeSpan nextDelay);
{
nextDelay = Utility.RandomMinMax(MinDelay, MaxDelay);
}
protected abstract void EndEffect(BaseCreature source, Mobile defender); protected abstract void EndEffect(BaseCreature source, Mobile defender);
protected abstract void OnEffectExpired(BaseCreature source, Mobile defender); protected abstract void OnEffectExpired(BaseCreature source, Mobile defender);
@ -65,8 +62,12 @@ public abstract class MonsterAbilitySingleTargetDoT : MonsterAbilitySingleTarget
protected override void OnTick() protected override void OnTick()
{ {
_ability.EffectTick(_source, _defender, out var delay); var delay = RemainingCount == 0
Delay = delay; ? TimeSpan.MinValue
: Utility.RandomMinMax(_ability.MinDelay, _ability.MaxDelay);
_ability.EffectTick(_source, _defender, ref delay);
Interval = delay;
if (RemainingCount == 0) if (RemainingCount == 0)
{ {

3
Projects/UOContent/Mobiles/Abilities/MonsterAbilityType.cs
View file

@ -19,5 +19,6 @@ public enum MonsterAbilityType
ReflectPhysicalDamage, ReflectPhysicalDamage,
FanningFire, // Fire debuff FanningFire, // Fire debuff
RuneCorruption, RuneCorruption,
FanThrow FanThrow,
BloodBath
} }

8
Projects/UOContent/Mobiles/Abilities/RuneCorruption.cs
View file

@ -1,4 +1,6 @@
namespace Server.Mobiles; using System;
namespace Server.Mobiles;
public class RuneCorruption : MonsterAbilitySingleTargetDoT public class RuneCorruption : MonsterAbilitySingleTargetDoT
{ {
@ -151,6 +153,10 @@ public class RuneCorruption : MonsterAbilitySingleTargetDoT
defender.FixedEffect(0x37B9, 10, 5); defender.FixedEffect(0x37B9, 10, 5);
} }
protected override void EffectTick(BaseCreature source, Mobile defender, ref TimeSpan nextDelay)
{
}
protected override void EndEffect(BaseCreature source, Mobile defender) protected override void EndEffect(BaseCreature source, Mobile defender)
{ {
defender.RemoveResistanceMod(Name); defender.RemoveResistanceMod(Name);

104
Projects/UOContent/Mobiles/Monsters/SE/BakeKitsune.cs
View file

@ -1,5 +1,4 @@
using System; using System;
using System.Collections.Generic;
using Server.Engines.Plants; using Server.Engines.Plants;
using Server.Items; using Server.Items;
@ -7,8 +6,6 @@ namespace Server.Mobiles
{ {
public class BakeKitsune : BaseCreature public class BakeKitsune : BaseCreature
{ {
private static readonly Dictionary<Mobile, ExpireTimer> m_Table = new();
private TimerExecutionToken _disguiseTimerToken; private TimerExecutionToken _disguiseTimerToken;
[Constructible] [Constructible]
@ -67,6 +64,9 @@ namespace Server.Mobiles
public override bool ClickTitle => false; public override bool ClickTitle => false;
public override bool PropertyTitle => false; public override bool PropertyTitle => false;
private static MonsterAbility[] _abilities = { MonsterAbilities.BloodBathAttack };
public override MonsterAbility[] GetMonsterAbilities() => _abilities;
public override void GenerateLoot() public override void GenerateLoot()
{ {
AddLoot(LootPack.FilthyRich); AddLoot(LootPack.FilthyRich);
@ -89,38 +89,6 @@ namespace Server.Mobiles
return base.OnBeforeDeath(); return base.OnBeforeDeath();
} }
public override void OnGaveMeleeAttack(Mobile defender, int damage)
{
base.OnGaveMeleeAttack(defender, damage);
if (Utility.RandomDouble() < 0.9)
{
return;
}
/* Blood Bath
* Start cliloc 1070826
* Sound: 0x52B
* 2-3 blood spots
* Damage: 2 hps per second for 5 seconds
* End cliloc: 1070824
*/
if (m_Table.TryGetValue(defender, out var timer))
{
timer.DoExpire();
defender.SendLocalizedMessage(1070825); // The creature continues to rage!
}
else
{
defender.SendLocalizedMessage(1070826); // The creature goes into a rage, inflicting heavy damage!
}
timer = new ExpireTimer(defender, this);
timer.Start();
m_Table[defender] = timer;
}
public override int GetAngerSound() => 0x4DE; public override int GetAngerSound() => 0x4DE;
public override int GetIdleSound() => 0x4DD; public override int GetIdleSound() => 0x4DD;
@ -187,17 +155,25 @@ namespace Server.Mobiles
switch (Utility.Random(4)) switch (Utility.Random(4))
{ {
case 0: case 0:
AddItem(new Shoes(Utility.RandomNeutralHue())); {
break; AddItem(new Shoes(Utility.RandomNeutralHue()));
break;
}
case 1: case 1:
AddItem(new Boots(Utility.RandomNeutralHue())); {
break; AddItem(new Boots(Utility.RandomNeutralHue()));
break;
}
case 2: case 2:
AddItem(new Sandals(Utility.RandomNeutralHue())); {
break; AddItem(new Sandals(Utility.RandomNeutralHue()));
break;
}
case 3: case 3:
AddItem(new ThighBoots(Utility.RandomNeutralHue())); {
break; AddItem(new ThighBoots(Utility.RandomNeutralHue()));
break;
}
} }
AddItem(new Robe(Utility.RandomNondyedHue())); AddItem(new Robe(Utility.RandomNondyedHue()));
@ -232,47 +208,5 @@ namespace Server.Mobiles
{ {
FindItemOnLayer(layer)?.Delete(); FindItemOnLayer(layer)?.Delete();
} }
private class ExpireTimer : Timer
{
private readonly Mobile m_From;
private readonly Mobile m_Mobile;
private int m_Count;
public ExpireTimer(Mobile m, Mobile from) : base(TimeSpan.FromSeconds(1.0), TimeSpan.FromSeconds(1.0))
{
m_Mobile = m;
m_From = from;
}
public void DoExpire()
{
Stop();
m_Table.Remove(m_Mobile);
}
public void DrainLife()
{
if (m_Mobile.Alive)
{
m_Mobile.Damage(2, m_From);
}
else
{
DoExpire();
}
}
protected override void OnTick()
{
DrainLife();
if (++m_Count >= 5)
{
DoExpire();
m_Mobile.SendLocalizedMessage(1070824); // The creature's rage subsides.
}
}
}
} }
} }

257
Projects/UOContent/Mobiles/Monsters/SE/TsukiWolf.cs
View file

@ -1,180 +1,103 @@
using System;
using System.Collections.Generic;
using Server.Engines.Plants; using Server.Engines.Plants;
using Server.Items; using Server.Items;
namespace Server.Mobiles namespace Server.Mobiles;
public class TsukiWolf : BaseCreature
{ {
public class TsukiWolf : BaseCreature [Constructible]
public TsukiWolf() : base(AIType.AI_Melee)
{ {
private static readonly Dictionary<Mobile, ExpireTimer> m_Table = new(); Body = 250;
Hue = Utility.Random(3) == 0 ? Utility.RandomNeutralHue() : 0;
[Constructible] SetStr(401, 450);
public TsukiWolf() : base(AIType.AI_Melee) SetDex(151, 200);
SetInt(66, 76);
SetHits(376, 450);
SetMana(40);
SetDamage(14, 18);
SetDamageType(ResistanceType.Physical, 90);
SetDamageType(ResistanceType.Cold, 5);
SetDamageType(ResistanceType.Energy, 5);
SetResistance(ResistanceType.Physical, 40, 60);
SetResistance(ResistanceType.Fire, 50, 70);
SetResistance(ResistanceType.Cold, 50, 70);
SetResistance(ResistanceType.Poison, 50, 70);
SetResistance(ResistanceType.Energy, 50, 70);
SetSkill(SkillName.Anatomy, 65.1, 72.0);
SetSkill(SkillName.MagicResist, 65.1, 70.0);
SetSkill(SkillName.Tactics, 95.1, 110.0);
SetSkill(SkillName.Wrestling, 97.6, 107.5);
Fame = 8500;
Karma = -8500;
if (Core.ML && Utility.RandomDouble() < .33)
{ {
Body = 250; PackItem(Seed.RandomPeculiarSeed(1));
Hue = Utility.Random(3) == 0 ? Utility.RandomNeutralHue() : 0;
SetStr(401, 450);
SetDex(151, 200);
SetInt(66, 76);
SetHits(376, 450);
SetMana(40);
SetDamage(14, 18);
SetDamageType(ResistanceType.Physical, 90);
SetDamageType(ResistanceType.Cold, 5);
SetDamageType(ResistanceType.Energy, 5);
SetResistance(ResistanceType.Physical, 40, 60);
SetResistance(ResistanceType.Fire, 50, 70);
SetResistance(ResistanceType.Cold, 50, 70);
SetResistance(ResistanceType.Poison, 50, 70);
SetResistance(ResistanceType.Energy, 50, 70);
SetSkill(SkillName.Anatomy, 65.1, 72.0);
SetSkill(SkillName.MagicResist, 65.1, 70.0);
SetSkill(SkillName.Tactics, 95.1, 110.0);
SetSkill(SkillName.Wrestling, 97.6, 107.5);
Fame = 8500;
Karma = -8500;
if (Core.ML && Utility.RandomDouble() < .33)
{
PackItem(Seed.RandomPeculiarSeed(1));
}
PackItem(
Utility.Random(10) switch
{
0 => new LeftArm(),
1 => new RightArm(),
2 => new Torso(),
3 => new Bone(),
4 => new RibCage(),
5 => new RibCage(),
_ => new BonePile() // 6-9
}
);
} }
public TsukiWolf(Serial serial) PackItem(
: base(serial) Utility.Random(10) switch
{
}
public override string CorpseName => "a tsuki wolf corpse";
public override string DefaultName => "a tsuki wolf";
public override int Meat => 4;
public override int Hides => 25;
public override FoodType FavoriteFood => FoodType.Meat;
public override void GenerateLoot()
{
AddLoot(LootPack.Average);
AddLoot(LootPack.Rich);
}
public override void OnGaveMeleeAttack(Mobile defender, int damage)
{
base.OnGaveMeleeAttack(defender, damage);
if (Utility.RandomDouble() < 0.9)
{ {
return; 0 => new LeftArm(),
1 => new RightArm(),
2 => new Torso(),
3 => new Bone(),
4 => new RibCage(),
5 => new RibCage(),
_ => new BonePile() // 6-9
} }
);
/* Blood Bath
* Start cliloc 1070826
* Sound: 0x52B
* 2-3 blood spots
* Damage: 2 hps per second for 5 seconds
* End cliloc: 1070824
*/
if (m_Table.TryGetValue(defender, out var timer))
{
timer.DoExpire();
defender.SendLocalizedMessage(1070825); // The creature continues to rage!
}
else
{
defender.SendLocalizedMessage(1070826); // The creature goes into a rage, inflicting heavy damage!
}
timer = new ExpireTimer(defender, this);
timer.Start();
m_Table[defender] = timer;
}
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.Write(0);
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
}
public override int GetAngerSound() => 0x52D;
public override int GetIdleSound() => 0x52C;
public override int GetAttackSound() => 0x52B;
public override int GetHurtSound() => 0x52E;
public override int GetDeathSound() => 0x52A;
private class ExpireTimer : Timer
{
private readonly Mobile m_From;
private readonly Mobile m_Mobile;
private int m_Count;
public ExpireTimer(Mobile m, Mobile from)
: base(TimeSpan.FromSeconds(1.0), TimeSpan.FromSeconds(1.0))
{
m_Mobile = m;
m_From = from;
}
public void DoExpire()
{
Stop();
m_Table.Remove(m_Mobile);
}
public void DrainLife()
{
if (m_Mobile.Alive)
{
m_Mobile.Damage(2, m_From);
}
else
{
DoExpire();
}
}
protected override void OnTick()
{
DrainLife();
if (++m_Count >= 5)
{
DoExpire();
m_Mobile.SendLocalizedMessage(1070824); // The creature's rage subsides.
}
}
}
} }
public TsukiWolf(Serial serial)
: base(serial)
{
}
public override string CorpseName => "a tsuki wolf corpse";
public override string DefaultName => "a tsuki wolf";
public override int Meat => 4;
public override int Hides => 25;
public override FoodType FavoriteFood => FoodType.Meat;
private static MonsterAbility[] _abilities = { MonsterAbilities.BloodBathAttack };
public override MonsterAbility[] GetMonsterAbilities() => _abilities;
public override void GenerateLoot()
{
AddLoot(LootPack.Average);
AddLoot(LootPack.Rich);
}
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.Write(0);
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
}
public override int GetAngerSound() => 0x52D;
public override int GetIdleSound() => 0x52C;
public override int GetAttackSound() => 0x52B;
public override int GetHurtSound() => 0x52E;
public override int GetDeathSound() => 0x52A;
} }