fix: Updates disguises and codegens tinkering items (#1353)
This commit is contained in:
Kamron Batman
GitHub
parent
f2fdc0321c
commit
d14e864c85
56 changed files with 1012 additions and 1454 deletions
|
|
@ -1,27 +1,11 @@
|
|||
namespace Server.Items
|
||||
using ModernUO.Serialization;
|
||||
|
||||
namespace Server.Items;
|
||||
|
||||
[Flippable(0xec6, 0xec7)]
|
||||
[SerializationGenerator(0, false)]
|
||||
public partial class Dressform : Item
|
||||
{
|
||||
[Flippable(0xec6, 0xec7)]
|
||||
public class Dressform : Item
|
||||
{
|
||||
[Constructible]
|
||||
public Dressform() : base(0xec6) => Weight = 10;
|
||||
|
||||
public Dressform(Serial serial) : base(serial)
|
||||
{
|
||||
}
|
||||
|
||||
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();
|
||||
}
|
||||
}
|
||||
[Constructible]
|
||||
public Dressform() : base(0xec6) => Weight = 10;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,110 +1,77 @@
|
|||
using ModernUO.Serialization;
|
||||
using Server.HuePickers;
|
||||
using Server.Targeting;
|
||||
|
||||
namespace Server.Items
|
||||
namespace Server.Items;
|
||||
|
||||
[SerializationGenerator(0, false)]
|
||||
public partial class Dyes : Item
|
||||
{
|
||||
public class Dyes : Item /* , IUsesRemaining */ /* TODO complete usesremaing */
|
||||
// TODO: Add uses remaining
|
||||
|
||||
[Constructible]
|
||||
public Dyes() : base(0xFA9) => Weight = 3.0;
|
||||
|
||||
public override void OnDoubleClick(Mobile from)
|
||||
{
|
||||
/*
|
||||
public bool ShowUsesRemaining { get { return false; } set { } }
|
||||
from.SendLocalizedMessage(500856); // Select the dye tub to use the dyes on.
|
||||
from.Target = new InternalTarget();
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public virtual int UsesRemaining { get { return m_UsesRemaining; } set { m_UsesRemaining = value; } }
|
||||
|
||||
private int m_UsesRemaining;
|
||||
*/
|
||||
|
||||
[Constructible]
|
||||
public Dyes() : base(0xFA9) => Weight = 3.0;
|
||||
|
||||
public Dyes(Serial serial) : base(serial)
|
||||
private class InternalTarget : Target
|
||||
{
|
||||
public InternalTarget() : base(1, false, TargetFlags.None)
|
||||
{
|
||||
}
|
||||
|
||||
public override void Serialize(IGenericWriter writer)
|
||||
public virtual void SetTubHue(Mobile from, DyeTub tub, int hue)
|
||||
{
|
||||
base.Serialize(writer);
|
||||
|
||||
writer.Write(1); // version
|
||||
|
||||
/* writer.Write( ( int )m_UsesRemaining ); */
|
||||
tub.DyedHue = hue;
|
||||
}
|
||||
|
||||
public override void Deserialize(IGenericReader reader)
|
||||
protected override void OnTarget(Mobile from, object targeted)
|
||||
{
|
||||
base.Deserialize(reader);
|
||||
|
||||
var version = reader.ReadInt();
|
||||
|
||||
if (Weight == 0.0)
|
||||
if (targeted is DyeTub tub)
|
||||
{
|
||||
Weight = 3.0;
|
||||
}
|
||||
|
||||
/* m_UsesRemaining = ( version == 0 ) ? 25 : reader.ReadInt(); */
|
||||
}
|
||||
|
||||
public override void OnDoubleClick(Mobile from)
|
||||
{
|
||||
from.SendLocalizedMessage(500856); // Select the dye tub to use the dyes on.
|
||||
from.Target = new InternalTarget();
|
||||
}
|
||||
|
||||
private class InternalTarget : Target
|
||||
{
|
||||
public InternalTarget() : base(1, false, TargetFlags.None)
|
||||
{
|
||||
}
|
||||
|
||||
public virtual void SetTubHue(Mobile from, DyeTub tub, int hue)
|
||||
{
|
||||
tub.DyedHue = hue;
|
||||
}
|
||||
|
||||
protected override void OnTarget(Mobile from, object targeted)
|
||||
{
|
||||
if (targeted is DyeTub tub)
|
||||
if (tub.Redyable)
|
||||
{
|
||||
if (tub.Redyable)
|
||||
if (tub.MetallicHues) /* OSI has three metallic tubs now */
|
||||
{
|
||||
if (tub.MetallicHues) /* OSI has three metallic tubs now */
|
||||
{
|
||||
from.SendGump(new MetallicHuePicker<DyeTub>(from, SetTubHue, tub));
|
||||
}
|
||||
else if (tub.CustomHuePicker != null)
|
||||
{
|
||||
from.SendGump(new CustomHuePickerGump<DyeTub>(from, tub.CustomHuePicker, SetTubHue, tub));
|
||||
}
|
||||
else
|
||||
{
|
||||
from.SendHuePicker(new InternalPicker(tub));
|
||||
}
|
||||
from.SendGump(new MetallicHuePicker<DyeTub>(from, SetTubHue, tub));
|
||||
}
|
||||
else if (tub is BlackDyeTub)
|
||||
else if (tub.CustomHuePicker != null)
|
||||
{
|
||||
from.SendLocalizedMessage(1010092); // You can not use this on a black dye tub.
|
||||
from.SendGump(new CustomHuePickerGump<DyeTub>(from, tub.CustomHuePicker, SetTubHue, tub));
|
||||
}
|
||||
else
|
||||
{
|
||||
from.SendMessage("That dye tub may not be redyed.");
|
||||
from.SendHuePicker(new InternalPicker(tub));
|
||||
}
|
||||
}
|
||||
else if (tub is BlackDyeTub)
|
||||
{
|
||||
from.SendLocalizedMessage(1010092); // You can not use this on a black dye tub.
|
||||
}
|
||||
else
|
||||
{
|
||||
from.SendLocalizedMessage(500857); // Use this on a dye tub.
|
||||
from.SendMessage("That dye tub may not be redyed.");
|
||||
}
|
||||
}
|
||||
|
||||
private class InternalPicker : HuePicker
|
||||
else
|
||||
{
|
||||
private readonly DyeTub m_Tub;
|
||||
from.SendLocalizedMessage(500857); // Use this on a dye tub.
|
||||
}
|
||||
}
|
||||
|
||||
public InternalPicker(DyeTub tub) : base(tub.ItemID) => m_Tub = tub;
|
||||
private class InternalPicker : HuePicker
|
||||
{
|
||||
private readonly DyeTub m_Tub;
|
||||
|
||||
public override void OnResponse(int hue)
|
||||
{
|
||||
m_Tub.DyedHue = hue;
|
||||
}
|
||||
public InternalPicker(DyeTub tub) : base(tub.ItemID) => m_Tub = tub;
|
||||
|
||||
public override void OnResponse(int hue)
|
||||
{
|
||||
m_Tub.DyedHue = hue;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,123 +1,98 @@
|
|||
using ModernUO.Serialization;
|
||||
using Server.Targeting;
|
||||
|
||||
namespace Server.Items
|
||||
namespace Server.Items;
|
||||
|
||||
public interface IScissorable
|
||||
{
|
||||
public interface IScissorable
|
||||
bool Scissor(Mobile from, Scissors scissors);
|
||||
}
|
||||
|
||||
[Flippable(0xf9f, 0xf9e)]
|
||||
[SerializationGenerator(0, false)]
|
||||
public partial class Scissors : Item
|
||||
{
|
||||
[Constructible]
|
||||
public Scissors() : base(0xF9F) => Weight = 1.0;
|
||||
|
||||
public override void OnDoubleClick(Mobile from)
|
||||
{
|
||||
bool Scissor(Mobile from, Scissors scissors);
|
||||
from.SendLocalizedMessage(502434); // What should I use these scissors on?
|
||||
|
||||
from.Target = new InternalTarget(this);
|
||||
}
|
||||
|
||||
[Flippable(0xf9f, 0xf9e)]
|
||||
public class Scissors : Item
|
||||
public static bool CanScissor(Mobile from, IScissorable obj)
|
||||
{
|
||||
[Constructible]
|
||||
public Scissors() : base(0xF9F) => Weight = 1.0;
|
||||
|
||||
public Scissors(Serial serial) : base(serial)
|
||||
if (obj is Item item && item.Nontransferable)
|
||||
{
|
||||
from.SendLocalizedMessage(502440); // Scissors can not be used on that to produce anything.
|
||||
return false;
|
||||
}
|
||||
|
||||
public override void Serialize(IGenericWriter writer)
|
||||
// TODO: Move other general checks from the different implementations here
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
private class InternalTarget : Target
|
||||
{
|
||||
private readonly Scissors m_Item;
|
||||
|
||||
public InternalTarget(Scissors item) : base(2, false, TargetFlags.None) => m_Item = item;
|
||||
|
||||
protected override void OnTarget(Mobile from, object targeted)
|
||||
{
|
||||
base.Serialize(writer);
|
||||
if (m_Item.Deleted)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
writer.Write(0); // version
|
||||
}
|
||||
|
||||
public override void Deserialize(IGenericReader reader)
|
||||
{
|
||||
base.Deserialize(reader);
|
||||
|
||||
var version = reader.ReadInt();
|
||||
}
|
||||
|
||||
public override void OnDoubleClick(Mobile from)
|
||||
{
|
||||
from.SendLocalizedMessage(502434); // What should I use these scissors on?
|
||||
|
||||
from.Target = new InternalTarget(this);
|
||||
}
|
||||
|
||||
public static bool CanScissor(Mobile from, IScissorable obj)
|
||||
{
|
||||
if (obj is Item item && item.Nontransferable)
|
||||
if (Core.AOS && targeted == from)
|
||||
{
|
||||
// "That doesn't seem like the smartest thing to do." / "That was an encounter you don't wish to repeat." / "Ha! You missed!"
|
||||
from.SendLocalizedMessage(1062845 + Utility.Random(3));
|
||||
}
|
||||
else if (Core.SE && Utility.RandomDouble() < 0.80 && (from.Direction & Direction.Running) != 0 &&
|
||||
Core.TickCount - from.LastMoveTime < from.ComputeMovementSpeed(from.Direction))
|
||||
{
|
||||
// Didn't your parents ever tell you not to run with scissors in your hand?!
|
||||
from.SendLocalizedMessage(1063305);
|
||||
}
|
||||
else if (targeted is Item item && !item.Movable)
|
||||
{
|
||||
if (item is IScissorable obj && obj is PlagueBeastInnard or PlagueBeastMutationCore)
|
||||
{
|
||||
if (CanScissor(from, obj) && obj.Scissor(from, m_Item))
|
||||
{
|
||||
from.PlaySound(0x248);
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (targeted is IScissorable obj)
|
||||
{
|
||||
if (CanScissor(from, obj) && obj.Scissor(from, m_Item))
|
||||
{
|
||||
from.PlaySound(0x248);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
from.SendLocalizedMessage(502440); // Scissors can not be used on that to produce anything.
|
||||
return false;
|
||||
}
|
||||
|
||||
// TODO: Move other general checks from the different implementations here
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
private class InternalTarget : Target
|
||||
protected override void OnNonlocalTarget(Mobile from, object targeted)
|
||||
{
|
||||
private readonly Scissors m_Item;
|
||||
|
||||
public InternalTarget(Scissors item) : base(2, false, TargetFlags.None) => m_Item = item;
|
||||
|
||||
protected override void OnTarget(Mobile from, object targeted)
|
||||
if (targeted is not (IScissorable obj and (PlagueBeastInnard or PlagueBeastMutationCore)))
|
||||
{
|
||||
if (m_Item.Deleted)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
/*if (targeted is Item && !((Item)targeted).IsStandardLoot())
|
||||
{
|
||||
from.SendLocalizedMessage( 502440 ); // Scissors can not be used on that to produce anything.
|
||||
}
|
||||
else */
|
||||
if (Core.AOS && targeted == from)
|
||||
{
|
||||
from.SendLocalizedMessage(
|
||||
1062845 + Utility
|
||||
.Random(3)
|
||||
); // "That doesn't seem like the smartest thing to do." / "That was an encounter you don't wish to repeat." / "Ha! You missed!"
|
||||
}
|
||||
else if (Core.SE && Utility.RandomDouble() < 0.80 && (from.Direction & Direction.Running) != 0 &&
|
||||
Core.TickCount - from.LastMoveTime < from.ComputeMovementSpeed(from.Direction))
|
||||
{
|
||||
// Didn't your parents ever tell you not to run with scissors in your hand?!
|
||||
from.SendLocalizedMessage(1063305);
|
||||
}
|
||||
else if (targeted is Item item && !item.Movable)
|
||||
{
|
||||
if (item is IScissorable obj && obj is PlagueBeastInnard or PlagueBeastMutationCore)
|
||||
{
|
||||
if (CanScissor(from, obj) && obj.Scissor(from, m_Item))
|
||||
{
|
||||
from.PlaySound(0x248);
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (targeted is IScissorable obj)
|
||||
{
|
||||
if (CanScissor(from, obj) && obj.Scissor(from, m_Item))
|
||||
{
|
||||
from.PlaySound(0x248);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
from.SendLocalizedMessage(502440); // Scissors can not be used on that to produce anything.
|
||||
}
|
||||
base.OnNonlocalTarget(from, targeted);
|
||||
return;
|
||||
}
|
||||
|
||||
protected override void OnNonlocalTarget(Mobile from, object targeted)
|
||||
if (CanScissor(from, obj) && obj.Scissor(from, m_Item))
|
||||
{
|
||||
if (targeted is IScissorable obj && obj is PlagueBeastInnard or PlagueBeastMutationCore)
|
||||
{
|
||||
if (CanScissor(from, obj) && obj.Scissor(from, m_Item))
|
||||
{
|
||||
from.PlaySound(0x248);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
base.OnNonlocalTarget(from, targeted);
|
||||
}
|
||||
from.PlaySound(0x248);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue