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/Holiday Stuff/Christmas/2010/Addons/FireFliesDeed.cs
View file

@ -46,7 +46,7 @@ namespace Server.Items
public bool CouldFit(IPoint3D p, Map map)
{
if (map == null || !map.CanFit(p.X, p.Y, p.Z, ItemData.Height))
if (map?.CanFit(p.X, p.Y, p.Z, ItemData.Height) != true)
return false;
if (FacingSouth)

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

@ -301,13 +301,13 @@ namespace Server.Engines.Events
public static Point3D RandomMoongate(Mobile target)
{
switch (target.Map.MapID)
return target.Map.MapID switch
{
case 2: return Ilshenar_Locations[Utility.Random(Ilshenar_Locations.Length)];
case 3: return Malas_Locations[Utility.Random(Malas_Locations.Length)];
case 4: return Tokuno_Locations[Utility.Random(Tokuno_Locations.Length)];
default: return Felucca_Locations[Utility.Random(Felucca_Locations.Length)];
}
2 => Ilshenar_Locations[Utility.Random(Ilshenar_Locations.Length)],
3 => Malas_Locations[Utility.Random(Malas_Locations.Length)],
4 => Tokuno_Locations[Utility.Random(Tokuno_Locations.Length)],
_ => Felucca_Locations[Utility.Random(Felucca_Locations.Length)]
};
}
public override void Serialize(GenericWriter writer)

29
Projects/Scripts/Holiday Stuff/Halloween/2012/Engines/PlayerZombies.cs
View file

@ -76,10 +76,7 @@ namespace Server.Engines.Events
m_DeathQueue.Clear();
if ( DateTime.UtcNow <= HolidaySettings.FinishHalloween )
{
m_ClearTimer.Stop();
}
if ( DateTime.UtcNow <= HolidaySettings.FinishHalloween ) m_ClearTimer.Stop();
}
private static void Timer_Callback()
@ -89,20 +86,18 @@ namespace Server.Engines.Events
if ( DateTime.UtcNow <= HolidaySettings.FinishHalloween )
{
for( int index = 0; m_DeathQueue.Count > 0 && index < m_DeathQueue.Count; index++ )
{
if ( !ReAnimated.ContainsKey( m_DeathQueue[ index ] ) )
{
player = m_DeathQueue[ index ];
break;
}
}
if (player?.Deleted == false && ReAnimated.Count < m_TotalZombieLimit )
{
Map map = Utility.RandomBool() ? Map.Trammel : Map.Felucca;
Point3D home = ( GetRandomPointInRect( m_Cemetaries[ Utility.Random( m_Cemetaries.Length ) ], map ));
Point3D home = GetRandomPointInRect( m_Cemetaries[ Utility.Random( m_Cemetaries.Length ) ], map );
if ( map.CanSpawnMobile( home ) )
{
@ -141,13 +136,13 @@ namespace Server.Engines.Events
{
Name = $"{name}'s bones";
switch( Utility.Random( 10 ) )
Hue = Utility.Random(10) switch
{
case 0: Hue = 0xa09; break;
case 1: Hue = 0xa93; break;
case 2: Hue = 0xa47; break;
default: break;
}
0 => 0xa09,
1 => 0xa93,
2 => 0xa47,
_ => Hue
};
}
public PlayerBones( Serial serial )
@ -223,8 +218,8 @@ namespace Server.Engines.Events
case 2: PackItem( new Torso() ); break;
case 3: PackItem( new Bone() ); break;
case 4: PackItem( new RibCage() ); break;
case 5: if (m_DeadPlayer?.Deleted == false) { PackItem( new PlayerBones( m_DeadPlayer.Name ) ); } break;
default: break;
case 5: if (m_DeadPlayer?.Deleted == false) PackItem( new PlayerBones( m_DeadPlayer.Name ) );
break;
}
AddLoot( LootPack.Meager );
@ -242,13 +237,9 @@ namespace Server.Engines.Events
public override void OnDelete()
{
if ( HalloweenHauntings.ReAnimated != null )
{
if (m_DeadPlayer?.Deleted == false)
{
if ( HalloweenHauntings.ReAnimated.ContainsKey( m_DeadPlayer ) )
HalloweenHauntings.ReAnimated.Remove( m_DeadPlayer );
}
}
}
public override void Serialize( GenericWriter writer )

2
Projects/Scripts/Holiday Stuff/Valentine/2012/Items/CupidsArrow.cs
View file

@ -26,7 +26,7 @@ namespace Server.Items
set { m_To = value; InvalidateProperties(); }
}
public bool IsSigned => ( m_From != null && m_To != null );
public bool IsSigned => m_From != null && m_To != null;
[Constructible]
public CupidsArrow()