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

Formatting #2 (#59)

Browse source
This commit is contained in:
Kamron Batman 2019-10-05 00:37:03 -07:00 • committed by GitHub
parent 096d39609e
commit 8e9221bb5a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
400 changed files with 3688 additions and 5969 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Projects/Scripts/Spells/Base/SpecialMove.cs
View file

@ -252,8 +252,6 @@ namespace Server.Spells
public static void ClearCurrentMove(Mobile m)
{
;
if (Table.TryGetValue(m, out SpecialMove move))
{
move.OnClearMove(m);

7
Projects/Scripts/Spells/Base/Spell.cs
View file

@ -403,11 +403,11 @@ namespace Server.Spells
if (!Caster.CheckAlive()) return false;
if (Scroll is BaseWand && Caster.Spell != null && Caster.Spell.IsCasting)
if (Scroll is BaseWand && Caster.Spell?.IsCasting == true)
{
Caster.SendLocalizedMessage(502643); // You can not cast a spell while frozen.
}
else if (Caster.Spell != null && Caster.Spell.IsCasting)
else if (Caster.Spell?.IsCasting == true)
{
Caster.SendLocalizedMessage(502642); // You are already casting a spell.
}
@ -432,8 +432,7 @@ namespace Server.Spells
#region Dueling
else if ((Caster as PlayerMobile)?.DuelContext != null &&
!((PlayerMobile)Caster).DuelContext.AllowSpellCast(Caster, this))
else if ((Caster as PlayerMobile)?.DuelContext?.AllowSpellCast(Caster, this) == false)
{
}

17
Projects/Scripts/Spells/Base/SpellHelper.cs
View file

@ -106,37 +106,37 @@ namespace Server.Spells
private static bool[,] m_Rules =
{
/*T2A(Fel), Khaldun, Ilshenar, Wind(Tram), Wind(Fel), Dungeons(Fel), Solen(Tram), Solen(Fel), CrystalCave(Malas), Gauntlet(Malas), Gauntlet(Ferry), SafeZone, Stronghold, ChampionSpawn, Dungeons(Tokuno[Malas]), LampRoom(Doom), GuardianRoom(Doom), Heartwood, MLDungeons */
/* Recall From */
/* Recall From */
{
false, false, true, true, false, false, true, false, false, false, false, true, true, false, true, false,
false, false, false
},
/* Recall To */
/* Recall To */
{
false, false, false, false, false, false, false, false, false, false, false, false, false, false, false,
false, false, false, false
},
/* Gate From */
/* Gate From */
{
false, false, false, false, false, false, false, false, false, false, false, false, false, false, false,
false, false, false, false
},
/* Gate To */
/* Gate To */
{
false, false, false, false, false, false, false, false, false, false, false, false, false, false, false,
false, false, false, false
},
/* Mark In */
/* Mark In */
{
false, false, false, false, false, false, false, false, false, false, false, false, false, false, false,
false, false, false, false
},
/* Tele From */
/* Tele From */
{
true, true, true, true, true, true, true, true, false, true, true, true, false, true, true, true, true,
false, true
},
/* Tele To */
/* Tele To */
{
true, true, true, true, true, true, true, true, false, true, false, false, false, true, true, true, true,
false, false
@ -686,9 +686,8 @@ namespace Server.Spells
if (Region.Find(loc, map).IsPartOf<SafeZone>() &&
(m_TravelType == TravelCheckType.TeleportTo || m_TravelType == TravelCheckType.TeleportFrom)
&& (m_TravelCaster as PlayerMobile)?.DuelPlayer?.Eliminated == false)
{
return true;
}
#endregion
return false;