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

54
Scripts/Spells/Seventh/Polymorph.cs
View file

@ -1,5 +1,6 @@
using System;
using System.Collections;
using System.Collections.Generic;
using Server.Factions;
using Server.Gumps;
using Server.Items;
@ -19,19 +20,15 @@ namespace Server.Spells.Seventh
Reagent.MandrakeRoot
);
private static Hashtable m_Timers = new Hashtable();
private static Dictionary<Mobile, InternalTimer> m_Timers = new Dictionary<Mobile, InternalTimer>();
private int m_NewBody;
public PolymorphSpell(Mobile caster, Item scroll, int body) : base(caster, scroll, m_Info)
public PolymorphSpell(Mobile caster, Item scroll, int body = 0) : base(caster, scroll, m_Info)
{
m_NewBody = body;
}
public PolymorphSpell(Mobile caster, Item scroll) : this(caster, scroll, 0)
{
}
public override SpellCircle Circle => SpellCircle.Seventh;
public override bool CheckCast()
@ -66,7 +63,7 @@ namespace Server.Spells.Seventh
return false;
}
if (!Caster.CanBeginAction(typeof(PolymorphSpell)))
if (!Caster.CanBeginAction<PolymorphSpell>())
{
if (Core.ML)
EndPolymorph(Caster);
@ -77,11 +74,7 @@ namespace Server.Spells.Seventh
if (m_NewBody == 0)
{
Gump gump;
if (Core.SE)
gump = new NewPolymorphGump(Caster, Scroll);
else
gump = new PolymorphGump(Caster, Scroll);
Gump gump = Core.SE ? (Gump)new NewPolymorphGump(Caster, Scroll) : new PolymorphGump(Caster, Scroll);
Caster.SendGump(gump);
return false;
@ -101,7 +94,7 @@ namespace Server.Spells.Seventh
{
Caster.SendLocalizedMessage(1010521); // You cannot polymorph while you have a Town Sigil
}
else if (!Caster.CanBeginAction(typeof(PolymorphSpell)))
else if (!Caster.CanBeginAction<PolymorphSpell>())
{
if (Core.ML)
EndPolymorph(Caster);
@ -120,13 +113,13 @@ namespace Server.Spells.Seventh
{
Caster.SendLocalizedMessage(1042512); // You cannot polymorph while wearing body paint
}
else if (!Caster.CanBeginAction(typeof(IncognitoSpell)) || Caster.IsBodyMod)
else if (!Caster.CanBeginAction<IncognitoSpell>() || Caster.IsBodyMod)
{
DoFizzle();
}
else if (CheckSequence())
{
if (Caster.BeginAction(typeof(PolymorphSpell)))
if (Caster.BeginAction<PolymorphSpell>())
{
if (m_NewBody != 0)
{
@ -141,7 +134,7 @@ namespace Server.Spells.Seventh
Caster.BodyMod = m_NewBody;
if (m_NewBody == 400 || m_NewBody == 401)
Caster.HueMod = Utility.RandomSkinHue();
Caster.HueMod = Caster.Race.RandomSkinHue();
else
Caster.HueMod = 0;
@ -152,11 +145,11 @@ namespace Server.Spells.Seventh
{
StopTimer(Caster);
Timer t = new InternalTimer(Caster);
InternalTimer timer = new InternalTimer(Caster);
m_Timers[Caster] = t;
m_Timers[Caster] = timer;
t.Start();
timer.Start();
}
}
}
@ -169,26 +162,23 @@ namespace Server.Spells.Seventh
FinishSequence();
}
public static bool StopTimer(Mobile m)
public static void StopTimer(Mobile m)
{
Timer t = (Timer)m_Timers[m];
InternalTimer timer = m_Timers[m];
if (timer == null)
return;
if (t != null)
{
t.Stop();
m_Timers.Remove(m);
}
return t != null;
timer.Stop();
m_Timers.Remove(m);
}
private static void EndPolymorph(Mobile m)
{
if (!m.CanBeginAction(typeof(PolymorphSpell)))
if (!m.CanBeginAction<PolymorphSpell>())
{
m.BodyMod = 0;
m.HueMod = -1;
m.EndAction(typeof(PolymorphSpell));
m.EndAction<PolymorphSpell>();
BaseArmor.ValidateMobile(m);
BaseClothing.ValidateMobile(m);
@ -203,7 +193,7 @@ namespace Server.Spells.Seventh
{
m_Owner = owner;
int val = (int)owner.Skills[SkillName.Magery].Value;
int val = (int)owner.Skills.Magery.Value;
if (val > 120)
val = 120;
@ -218,4 +208,4 @@ namespace Server.Spells.Seventh
}
}
}
}
}