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

2
Scripts/Items/Construction/Ankhs.cs
View file

@ -33,7 +33,7 @@ namespace Server.Items
}
else if (m.Map != null && m.Map.CanFit(m.Location, 16, false, false))
{
m.CloseGump(typeof(ResurrectGump));
m.CloseGump<ResurrectGump>();
m.SendGump(new ResurrectGump(m, ResurrectMessage.VirtueShrine));
}
else

23
Scripts/Items/Construction/Doors/BaseDoor.cs
View file

@ -144,18 +144,16 @@ namespace Server.Items
}
else
{
from.BeginTarget(-1, false, TargetFlags.None, new TargetStateCallback(Link_OnSecondTarget), door);
from.BeginTarget(-1, false, TargetFlags.None, Link_OnSecondTarget, door);
from.SendMessage("Target the second door to link.");
}
}
private static void Link_OnSecondTarget(Mobile from, object targeted, object state)
private static void Link_OnSecondTarget(Mobile from, object targeted, BaseDoor first)
{
BaseDoor first = (BaseDoor)state;
if (!(targeted is BaseDoor second))
{
from.BeginTarget(-1, false, TargetFlags.None, new TargetStateCallback(Link_OnSecondTarget), first);
from.BeginTarget(-1, false, TargetFlags.None, Link_OnSecondTarget, first);
from.SendMessage("That is not a door. Try again.");
}
else
@ -170,22 +168,19 @@ namespace Server.Items
[Description("Chain-links two or more targeted doors together.")]
private static void ChainLink_OnCommand(CommandEventArgs e)
{
e.Mobile.BeginTarget(-1, false, TargetFlags.None, new TargetStateCallback(ChainLink_OnTarget),
new List<BaseDoor>());
e.Mobile.BeginTarget(-1, false, TargetFlags.None, ChainLink_OnTarget, new List<BaseDoor>());
e.Mobile.SendMessage("Target the first of a sequence of doors to link.");
}
private static void ChainLink_OnTarget(Mobile from, object targeted, object state)
private static void ChainLink_OnTarget(Mobile from, object targeted, List<BaseDoor> list)
{
if (!(targeted is BaseDoor door))
{
from.BeginTarget(-1, false, TargetFlags.None, new TargetStateCallback(ChainLink_OnTarget), state);
from.BeginTarget(-1, false, TargetFlags.None, ChainLink_OnTarget, list);
from.SendMessage("That is not a door. Try again.");
}
else
{
List<BaseDoor> list = (List<BaseDoor>)state;
if (list.Count > 0 && list[0] == door)
{
if (list.Count >= 2)
@ -197,13 +192,13 @@ namespace Server.Items
}
else
{
from.BeginTarget(-1, false, TargetFlags.None, new TargetStateCallback(ChainLink_OnTarget), state);
from.BeginTarget(-1, false, TargetFlags.None, ChainLink_OnTarget, list);
from.SendMessage("You have not yet targeted two unique doors. Target the second door to link.");
}
}
else if (list.Contains(door))
{
from.BeginTarget(-1, false, TargetFlags.None, new TargetStateCallback(ChainLink_OnTarget), state);
from.BeginTarget(-1, false, TargetFlags.None, ChainLink_OnTarget, list);
from.SendMessage(
"You have already targeted that door. Target another door, or retarget the first door to complete the chain.");
}
@ -211,7 +206,7 @@ namespace Server.Items
{
list.Add(door);
from.BeginTarget(-1, false, TargetFlags.None, new TargetStateCallback(ChainLink_OnTarget), state);
from.BeginTarget(-1, false, TargetFlags.None, ChainLink_OnTarget, list);
if (list.Count == 1)
from.SendMessage("Target the second door to link.");