fix: Fixes buffs don't start/stop properly. Streamlines constructor and Add/Remove buffs. (#2082)

This commit is contained in:
mark1145 2025-01-25 13:20:23 +11:00 • committed by GitHub
parent c8f13b2933
commit d5160bd6db
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
50 changed files with 651 additions and 616 deletions

View file

@ -1,5 +1,7 @@
using System;
using System.Collections.Generic;
using Server.Engines.BuffIcons;
using Server.Mobiles;
namespace Server.Spells.Spellweaving
{
@ -62,9 +64,8 @@ namespace Server.Spells.Spellweaving
Caster.BeginAction<AttuneWeaponSpell>();
BuffInfo.AddBuff(
Caster,
new BuffInfo(BuffIcon.AttuneWeapon, 1075798, duration, Caster, damageAbsorb.ToString())
(Caster as PlayerMobile)?.AddBuff(
new BuffInfo(BuffIcon.AttuneWeapon, 1075798, duration, damageAbsorb.ToString())
);
}
@ -130,7 +131,7 @@ namespace Server.Spells.Spellweaving
_table.Remove(m_Mobile);
StartTimer(TimeSpan.FromSeconds(120), m_Mobile.EndAction<AttuneWeaponSpell>);
BuffInfo.RemoveBuff(m_Mobile, BuffIcon.AttuneWeapon);
(m_Mobile as PlayerMobile)?.RemoveBuff(BuffIcon.AttuneWeapon);
}
}
}

View file

@ -1,6 +1,8 @@
using System;
using System.Collections.Generic;
using Server.Collections;
using Server.Engines.BuffIcons;
using Server.Mobiles;
namespace Server.Spells.Spellweaving
{
@ -63,9 +65,8 @@ namespace Server.Spells.Spellweaving
_table[m] = t;
BuffInfo.AddBuff(
m,
new BuffInfo(BuffIcon.EssenceOfWind, 1075802, duration, m, $"{fcMalus}\t{ssiMalus}")
(m as PlayerMobile)?.AddBuff(
new BuffInfo(BuffIcon.EssenceOfWind, 1075802, duration, $"{fcMalus}\t{ssiMalus}")
);
}
}
@ -110,7 +111,7 @@ namespace Server.Spells.Spellweaving
Stop();
_table.Remove(_defender);
BuffInfo.RemoveBuff(_defender, BuffIcon.EssenceOfWind);
(_defender as PlayerMobile)?.RemoveBuff(BuffIcon.EssenceOfWind);
}
}
}

View file

@ -1,4 +1,6 @@
using System;
using Server.Engines.BuffIcons;
using Server.Mobiles;
namespace Server.Spells.Spellweaving
{
@ -71,7 +73,7 @@ namespace Server.Spells.Spellweaving
// Cannot cast this spell for another 5 minutes(300sec) after effect removed.
Caster.BeginAction<EtherealVoyageSpell>();
BuffInfo.AddBuff(Caster, new BuffInfo(BuffIcon.EtherealVoyage, 1031613, 1075805, duration, Caster));
(Caster as PlayerMobile)?.AddBuff(new BuffInfo(BuffIcon.EtherealVoyage, 1031613, 1075805, duration));
}
public override void RemoveEffect(Mobile m)
@ -82,7 +84,7 @@ namespace Server.Spells.Spellweaving
Timer.StartTimer(TimeSpan.FromMinutes(5), m.EndAction<EtherealVoyageSpell>);
BuffInfo.RemoveBuff(m, BuffIcon.EtherealVoyage);
(m as PlayerMobile)?.RemoveBuff(BuffIcon.EtherealVoyage);
}
}
}

View file

@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using ModernUO.CodeGeneratedEvents;
using Server.Engines.BuffIcons;
using Server.Gumps;
using Server.Mobiles;
using Server.Targeting;
@ -67,7 +68,9 @@ namespace Server.Spells.Spellweaving
_table[m] = t;
BuffInfo.AddBuff(m, new BuffInfo(BuffIcon.GiftOfLife, 1031615, 1075807, duration, m, null, true));
(m as PlayerMobile)?.AddBuff(
new BuffInfo(BuffIcon.GiftOfLife, 1031615, 1075807, duration, retainThroughDeath: true)
);
}
}
@ -152,7 +155,7 @@ namespace Server.Spells.Spellweaving
_mobile.SendLocalizedMessage(1074776); // You are no longer protected with Gift of Life.
_table.Remove(_mobile);
BuffInfo.RemoveBuff(_mobile, BuffIcon.GiftOfLife);
(_mobile as PlayerMobile)?.RemoveBuff(BuffIcon.GiftOfLife);
}
}
}

View file

@ -1,5 +1,7 @@
using System;
using System.Collections.Generic;
using Server.Engines.BuffIcons;
using Server.Mobiles;
using Server.Targeting;
namespace Server.Spells.Spellweaving
@ -59,9 +61,14 @@ namespace Server.Spells.Spellweaving
Caster.BeginAction<GiftOfRenewalSpell>();
BuffInfo.AddBuff(
m,
new BuffInfo(BuffIcon.GiftOfRenewal, 1031602, 1075797, TimeSpan.FromSeconds(duration), m, hitsPerRound.ToString())
(m as PlayerMobile)?.AddBuff(
new BuffInfo(
BuffIcon.GiftOfRenewal,
1031602,
1075797,
TimeSpan.FromSeconds(duration),
hitsPerRound.ToString()
)
);
}
}
@ -74,7 +81,7 @@ namespace Server.Spells.Spellweaving
public static bool StopEffect(Mobile m)
{
BuffInfo.RemoveBuff(m, BuffIcon.GiftOfRenewal);
(m as PlayerMobile)?.RemoveBuff(BuffIcon.GiftOfRenewal);
if (_table.Remove(m, out var timer))
{

View file

@ -1,6 +1,8 @@
using System;
using System.Collections.Generic;
using Server.Collections;
using Server.Engines.BuffIcons;
using Server.Mobiles;
namespace Server.Spells.Spellweaving
{
@ -72,9 +74,8 @@ namespace Server.Spells.Spellweaving
Timer.StartTimer(duration, () => DoExpire(m), out var timerToken);
_table[m] = timerToken;
BuffInfo.AddBuff(
m,
new BuffInfo(BuffIcon.Thunderstorm, 1075800, duration, m, GetCastRecoveryMalus(m))
(m as PlayerMobile)?.AddBuff(
new BuffInfo(BuffIcon.Thunderstorm, 1075800, duration, GetCastRecoveryMalus(m))
);
}
}
@ -95,7 +96,7 @@ namespace Server.Spells.Spellweaving
public static void DoExpire(Mobile m)
{
StopTimer(m);
BuffInfo.RemoveBuff(m, BuffIcon.Thunderstorm);
(m as PlayerMobile)?.RemoveBuff(BuffIcon.Thunderstorm);
}
}
}