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

fix: Updates disguises and codegens tinkering items (#1353)

Browse source
This commit is contained in:
Kamron Batman 2023-02-25 12:01:06 -08:00 • committed by GitHub
parent f2fdc0321c
commit d14e864c85
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
56 changed files with 1012 additions and 1454 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Projects/UOContent/Engines/ConPVP/DuelContext.cs
View file

@ -1854,11 +1854,7 @@ namespace Server.Engines.ConPVP
TransformationSpellHelper.RemoveContext(mob, true);
AnimalForm.RemoveContext(mob, true);
if (DisguiseTimers.IsDisguised(mob))
{
DisguiseTimers.StopTimer(mob);
}
DisguisePersistence.StopTimer(mob);
if (!mob.CanBeginAction<PolymorphSpell>())
{

32
Projects/UOContent/Engines/ML Quests/Gumps/RaceChangeGump.cs
View file

@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using ModernUO.Serialization;
using Server.Gumps;
using Server.Items;
using Server.Mobiles;
@ -167,9 +168,10 @@ namespace Server.Engines.MLQuests.Gumps
{
from.SendLocalizedMessage(1073647); // You may not continue while mounted...
}
else if (!from.CanBeginAction<PolymorphSpell>() || DisguiseTimers.IsDisguised(from) ||
// TODO: Does this cover everything?
else if (!from.CanBeginAction<PolymorphSpell>() || DisguisePersistence.IsDisguised(from) ||
AnimalForm.UnderTransformation(from) || !from.CanBeginAction<IncognitoSpell>() ||
from.IsBodyMod) // TODO: Does this cover everything?
from.IsBodyMod)
{
from.SendLocalizedMessage(1073648); // You may only proceed while in your original state...
}
@ -284,17 +286,11 @@ namespace Server.Engines.MLQuests.Gumps
}
}
public class RaceChangeDeed : Item, IRaceChanger
[SerializationGenerator(0, false)]
public partial class RaceChangeDeed : Item, IRaceChanger
{
[Constructible]
public RaceChangeDeed()
: base(0x14F0) =>
LootType = LootType.Blessed;
public RaceChangeDeed(Serial serial)
: base(serial)
{
}
public RaceChangeDeed() : base(0x14F0) => LootType = LootType.Blessed;
public override string DefaultName => "a race change deed";
@ -335,19 +331,5 @@ namespace Server.Engines.MLQuests.Gumps
pm.SendGump(new RaceChangeConfirmGump(this, pm, pm.Race == Race.Human ? Race.Elf : Race.Human));
}
}
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();
}
}
}