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

Modernization Fixes & Updates to Default Values (#3)

Browse source
This commit is contained in:
Kamron Batman 2018-10-28 00:33:16 -07:00 • committed by GitHub
parent 445eddff68
commit dcf64091b1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
768 changed files with 10507 additions and 14196 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Scripts/Items/Skill Items/Tailor Items/Dyetubs/CustomHuePicker.cs
View file

@ -103,16 +103,16 @@ namespace Server.Items
public string TitleString{ get; }
}
public delegate void CustomHuePickerCallback(Mobile from, object state, int hue);
public delegate void CustomHuePickerCallback<in T>(Mobile from, T state, int hue);
public class CustomHuePickerGump : Gump
public class CustomHuePickerGump<T> : Gump
{
private CustomHuePickerCallback m_Callback;
private CustomHuePickerCallback<T> m_Callback;
private CustomHuePicker m_Definition;
private Mobile m_From;
private object m_State;
private T m_State;
public CustomHuePickerGump(Mobile from, CustomHuePicker definition, CustomHuePickerCallback callback, object state) :
public CustomHuePickerGump(Mobile from, CustomHuePicker definition, CustomHuePickerCallback<T> callback, T state) :
base(50, 50)
{
m_From = from;

12
Scripts/Items/Skill Items/Tailor Items/Dyetubs/MetallicHuePicker.cs
View file

@ -2,17 +2,15 @@ using Server.Gumps;
using Server.Network;
namespace Server.Items
{
public class MetallicHuePicker : Gump
{
public class MetallicHuePicker<T> : Gump
{
public delegate void MetallicHuePickerCallback(Mobile from, object state, int hue);
private MetallicHuePickerCallback m_Callback;
private CustomHuePickerCallback<T> m_Callback;
private Mobile m_From;
private object m_State;
private T m_State;
public MetallicHuePicker(Mobile from, MetallicHuePickerCallback callback, object state)
public MetallicHuePicker(Mobile from, CustomHuePickerCallback<T> callback, T state)
: base(450, 450)
{
m_From = from;

8
Scripts/Items/Skill Items/Tailor Items/Misc/Dyes.cs
View file

@ -59,9 +59,9 @@ namespace Server.Items
{
}
public virtual void SetTubHue(Mobile from, object state, int hue)
public virtual void SetTubHue(Mobile from, DyeTub tub, int hue)
{
if (state is DyeTub tub) tub.DyedHue = hue;
tub.DyedHue = hue;
}
protected override void OnTarget(Mobile from, object targeted)
@ -71,9 +71,9 @@ namespace Server.Items
if (tub.Redyable)
{
if (tub.MetallicHues) /* OSI has three metallic tubs now */
from.SendGump(new MetallicHuePicker(from, SetTubHue, tub));
from.SendGump(new MetallicHuePicker<DyeTub>(from, SetTubHue, tub));
else if (tub.CustomHuePicker != null)
from.SendGump(new CustomHuePickerGump(from, tub.CustomHuePicker, SetTubHue, tub));
from.SendGump(new CustomHuePickerGump<DyeTub>(from, tub.CustomHuePicker, SetTubHue, tub));
else
from.SendHuePicker(new InternalPicker(tub));
}