fix: Codegens potions and fixes a few minor bugs (#1347)

This commit is contained in:
Kamron Batman 2023-02-24 18:06:59 -08:00 • committed by GitHub
parent 42bcf3c95a
commit 8c4aaeeda6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
76 changed files with 1644 additions and 2095 deletions

View file

@ -1,95 +1,79 @@
using System;
using System.Collections.Generic;
using ModernUO.Serialization;
namespace Server.Items
namespace Server.Items;
[SerializationGenerator(0, false)]
public partial class InvisibilityPotion : BasePotion
{
public class InvisibilityPotion : BasePotion
private static readonly Dictionary<Mobile, TimerExecutionToken> m_Table = new();
[Constructible]
public InvisibilityPotion() : base(0xF0A, PotionEffect.Invisibility) => Hue = 0x48D;
public override int LabelNumber => 1072941; // Potion of Invisibility
public override void Drink(Mobile from)
{
private static readonly Dictionary<Mobile, TimerExecutionToken> m_Table = new();
[Constructible]
public InvisibilityPotion() : base(0xF0A, PotionEffect.Invisibility) => Hue = 0x48D;
public InvisibilityPotion(Serial serial) : base(serial)
if (from.Hidden)
{
from.SendLocalizedMessage(1073185); // You are already unseen.
return;
}
public override int LabelNumber => 1072941; // Potion of Invisibility
public override void Drink(Mobile from)
if (HasTimer(from))
{
if (from.Hidden)
from.SendLocalizedMessage(1073186); // An invisibility potion is already taking effect on your person.
return;
}
Consume();
Timer.StartTimer(TimeSpan.FromSeconds(2), () => Hide(from), out var timerToken);
m_Table[from] = timerToken;
PlayDrinkEffect(from);
}
public static void Hide(Mobile m)
{
Effects.SendLocationParticles(
EffectItem.Create(new Point3D(m.X, m.Y, m.Z + 16), m.Map, EffectItem.DefaultDuration),
0x376A,
10,
15,
5045
);
m.PlaySound(0x3C4);
m.Hidden = true;
BuffInfo.RemoveBuff(m, BuffIcon.HidingAndOrStealth);
BuffInfo.AddBuff(m, new BuffInfo(BuffIcon.Invisibility, 1075825)); // Invisibility/Invisible
RemoveTimer(m);
Timer.StartTimer(TimeSpan.FromSeconds(30), () => EndHide(m));
}
public static void EndHide(Mobile m)
{
m.RevealingAction();
RemoveTimer(m);
}
public static bool HasTimer(Mobile m) => m_Table.ContainsKey(m);
public static void RemoveTimer(Mobile m, bool interrupted = false)
{
if (m_Table.Remove(m, out var timer))
{
if (interrupted)
{
from.SendLocalizedMessage(1073185); // You are already unseen.
return;
m.SendLocalizedMessage(1073187); // The invisibility effect is interrupted.
}
if (HasTimer(from))
{
from.SendLocalizedMessage(1073186); // An invisibility potion is already taking effect on your person.
return;
}
Consume();
Timer.StartTimer(TimeSpan.FromSeconds(2), () => Hide(from), out var timerToken);
m_Table[from] = timerToken;
PlayDrinkEffect(from);
}
public static void Hide(Mobile m)
{
Effects.SendLocationParticles(
EffectItem.Create(new Point3D(m.X, m.Y, m.Z + 16), m.Map, EffectItem.DefaultDuration),
0x376A,
10,
15,
5045
);
m.PlaySound(0x3C4);
m.Hidden = true;
BuffInfo.RemoveBuff(m, BuffIcon.HidingAndOrStealth);
BuffInfo.AddBuff(m, new BuffInfo(BuffIcon.Invisibility, 1075825)); // Invisibility/Invisible
RemoveTimer(m);
Timer.StartTimer(TimeSpan.FromSeconds(30), () => EndHide(m));
}
public static void EndHide(Mobile m)
{
m.RevealingAction();
RemoveTimer(m);
}
public static bool HasTimer(Mobile m) => m_Table.ContainsKey(m);
public static void RemoveTimer(Mobile m, bool interrupted = false)
{
if (m_Table.Remove(m, out var timer))
{
if (interrupted)
{
m.SendLocalizedMessage(1073187); // The invisibility effect is interrupted.
}
timer.Cancel();
}
}
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.Write(0); // version
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
timer.Cancel();
}
}
}