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

Clean up: Bugs, LINQ, constructors, default values, and null checks (#18)

Browse source
This commit is contained in:
Kamron Batman 2019-03-11 14:29:59 -07:00 • committed by GitHub
parent e748af4430
commit 513e54f70e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1094 changed files with 15913 additions and 21892 deletions
Download patch file Download diff file Expand all files Collapse all files

130
Scripts/Holiday Stuff/Halloween/2006/Engines/TrickOrTreat.cs
View file

@ -44,7 +44,8 @@ namespace Server.Engines.Events
public static void RemoveHueMod(Mobile target)
{
if (target != null && !target.Deleted) target.SolidHueOverride = -1;
if (target?.Deleted == false)
target.SolidHueOverride = -1;
}
public static void SolidHueMobile(Mobile target)
@ -67,7 +68,7 @@ namespace Server.Engines.Events
if (twin.Deleted)
return;
foreach (Item item in m_From.Items)
if (item.Layer != Layer.Backpack && item.Layer != Layer.Mount && item.Layer != Layer.Bank)
m_Items.Add(item);
@ -122,78 +123,80 @@ namespace Server.Engines.Events
protected override void OnTarget(Mobile from, object targ)
{
if (targ != null && CheckMobile(from))
if (targ == null || !CheckMobile(from))
return;
if (!(targ is Mobile))
{
if (!(targ is Mobile))
from.SendLocalizedMessage(1076781); /* There is little chance of getting candy from that! */
return;
}
BaseVendor begged = targ as BaseVendor;
if (begged?.Deleted != false)
{
from.SendLocalizedMessage(1076765); /* That doesn't look friendly. */
return;
}
DateTime now = DateTime.UtcNow;
if (CheckMobile(begged))
{
if (begged.NextTrickOrTreat > now)
{
from.SendLocalizedMessage(1076781); /* There is little chance of getting candy from that! */
from.SendLocalizedMessage(1076767); /* That doesn't appear to have any more candy. */
return;
}
if (!(targ is BaseVendor) || ((BaseVendor)targ).Deleted)
{
from.SendLocalizedMessage(1076765); /* That doesn't look friendly. */
begged.NextTrickOrTreat = now + TimeSpan.FromMinutes(Utility.RandomMinMax(5, 10));
if (from.Backpack?.Deleted != false)
return;
}
DateTime now = DateTime.UtcNow;
BaseVendor m_Begged = targ as BaseVendor;
if (CheckMobile(m_Begged))
if (Utility.RandomDouble() > .10)
{
if (m_Begged.NextTrickOrTreat > now)
switch (Utility.Random(3))
{
from.SendLocalizedMessage(1076767); /* That doesn't appear to have any more candy. */
return;
case 0:
begged.Say(1076768);
break; /* Oooooh, aren't you cute! */
case 1:
begged.Say(1076779);
break; /* All right...This better not spoil your dinner! */
case 2:
begged.Say(1076778);
break; /* Here you go! Enjoy! */
}
m_Begged.NextTrickOrTreat = now + TimeSpan.FromMinutes(Utility.RandomMinMax(5, 10));
if (from.Backpack != null && !from.Backpack.Deleted)
if (Utility.RandomDouble() <= .01 && from.Skills.Begging.Value >= 100)
{
if (Utility.RandomDouble() > .10)
{
switch (Utility.Random(3))
{
case 0:
m_Begged.Say(1076768);
break; /* Oooooh, aren't you cute! */
case 1:
m_Begged.Say(1076779);
break; /* All right...This better not spoil your dinner! */
case 2:
m_Begged.Say(1076778);
break; /* Here you go! Enjoy! */
}
from.AddToBackpack(HolidaySettings.RandomGMBeggerItem);
if (Utility.RandomDouble() <= .01 && from.Skills.Begging.Value >= 100)
{
from.AddToBackpack(HolidaySettings.RandomGMBeggerItem);
from.SendLocalizedMessage(1076777); /* You receive a special treat! */
}
else
{
from.AddToBackpack(HolidaySettings.RandomTreat);
from.SendLocalizedMessage(1076769); /* You receive some candy. */
}
}
else
{
m_Begged.Say(1076770); /* TRICK! */
int action = Utility.Random(4);
if (action == 0)
Timer.DelayCall(OneSecond, OneSecond, 10, Bleeding, from);
else if (action == 1)
Timer.DelayCall(TimeSpan.FromSeconds(2), SolidHueMobile, from);
else
Timer.DelayCall(TimeSpan.FromSeconds(2), MakeTwin, from);
}
from.SendLocalizedMessage(1076777); /* You receive a special treat! */
}
else
{
from.AddToBackpack(HolidaySettings.RandomTreat);
from.SendLocalizedMessage(1076769); /* You receive some candy. */
}
}
else
{
begged.Say(1076770); /* TRICK! */
int action = Utility.Random(4);
if (action == 0)
Timer.DelayCall(OneSecond, OneSecond, 10, Bleeding, from);
else if (action == 1)
Timer.DelayCall(TimeSpan.FromSeconds(2), SolidHueMobile, from);
else
Timer.DelayCall(TimeSpan.FromSeconds(2), MakeTwin, from);
}
}
}
@ -263,7 +266,8 @@ namespace Server.Engines.Events
public override void OnThink()
{
if (m_From == null || m_From.Deleted) Delete();
if (m_From?.Deleted != false)
Delete();
}
public static Item FindCandyTypes(Mobile target)
@ -287,7 +291,7 @@ namespace Server.Engines.Events
target.SendLocalizedMessage(1113967); /* Your naughty twin steals some of your candy. */
if (item != null && !item.Deleted)
if (item?.Deleted == false)
item.Delete();
}
else
@ -321,4 +325,4 @@ namespace Server.Engines.Events
int version = reader.ReadInt();
}
}
}
}