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/Engines/Quests/The Summoning/Conversations.cs
View file

@ -34,7 +34,7 @@ namespace Server.Engines.Quests.Doom
System.From.SendMessage("Internal error: unable to find summoning altar. Quest unable to continue.");
System.Cancel();
}
else if (altar.Daemon == null || !altar.Daemon.Alive)
else if (altar.Daemon?.Alive != true)
{
BoneDemon daemon = new BoneDemon();

2
Projects/Scripts/Engines/Quests/The Summoning/Items/BellOfTheDead.cs
View file

@ -83,7 +83,7 @@ namespace Server.Engines.Quests.Doom
2023, 0);
Effects.PlaySound(loc, Map, 0x1FE);
Chyloth = new Chyloth { Direction = (Direction)(7 & (4 + (int)from.GetDirectionTo(loc))) };
Chyloth = new Chyloth { Direction = (Direction)(7 & 4 + (int)from.GetDirectionTo(loc)) };
Chyloth.MoveToWorld(loc, Map);

2
Projects/Scripts/Engines/Quests/The Summoning/Items/SummoningAltar.cs
View file

@ -28,7 +28,7 @@ namespace Server.Engines.Quests.Doom
public void CheckDaemon()
{
if (m_Daemon == null || !m_Daemon.Alive)
if (m_Daemon?.Alive != true)
{
m_Daemon = null;
Hue = 0;

4
Projects/Scripts/Engines/Quests/The Summoning/Objectives.cs
View file

@ -28,7 +28,7 @@ namespace Server.Engines.Quests.Doom
System.From.SendMessage("Internal error: unable to find summoning altar. Quest unable to continue.");
System.Cancel();
}
else if (altar.Daemon == null || !altar.Daemon.Alive)
else if (altar.Daemon?.Alive != true)
{
System.AddConversation(new VanquishDaemonConversation());
}
@ -85,7 +85,7 @@ namespace Server.Engines.Quests.Doom
public override void CheckProgress()
{
if (m_Daemon == null || !m_Daemon.Alive)
if (m_Daemon?.Alive != true)
Complete();
}

4
Projects/Scripts/Engines/Quests/The Summoning/TheSummoningQuest.cs
View file

@ -42,7 +42,7 @@ namespace Server.Engines.Quests.Doom
{
SummoningAltar altar = Victoria.Altar;
if (altar != null && (altar.Daemon == null || !altar.Daemon.Alive))
if (altar != null && altar.Daemon?.Alive != true)
if (From.Map == Victoria.Map && From.InRange(Victoria, 8))
{
WaitForSummon = false;
@ -56,7 +56,7 @@ namespace Server.Engines.Quests.Doom
public static int GetDaemonBonesFor(BaseCreature creature)
{
if (creature == null || creature.Controlled || creature.Summoned)
if (creature?.Controlled != false || creature.Summoned)
return 0;
int fame = creature.Fame;