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

Creates random element extension (#196)

Browse source
This commit is contained in:
Kamron Batman 2020-08-21 19:50:36 -07:00 • committed by GitHub
parent 0926b5abaa
commit 4403d6c1c7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
84 changed files with 226 additions and 330 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Projects/UOContent/Items/Maps/TreasureMap.cs
View file

@ -163,10 +163,7 @@ namespace Server.Items
if (m_Locations == null)
LoadLocations();
if (m_Locations.Length > 0)
return m_Locations[Utility.Random(m_Locations.Length)];
return Point2D.Zero;
return m_Locations?.RandomElement() ?? Point2D.Zero;
}
public static Point2D GetRandomHavenLocation()
@ -174,10 +171,7 @@ namespace Server.Items
if (m_HavenLocations == null)
LoadLocations();
if (m_HavenLocations.Length > 0)
return m_HavenLocations[Utility.Random(m_HavenLocations.Length)];
return Point2D.Zero;
return m_HavenLocations?.RandomElement() ?? Point2D.Zero;
}
private static void LoadLocations()
@ -225,8 +219,7 @@ namespace Server.Items
try
{
bc = (BaseCreature)ActivatorUtil.CreateInstance(
m_SpawnTypes[level][Utility.Random(m_SpawnTypes[level].Length)]);
bc = (BaseCreature)ActivatorUtil.CreateInstance(m_SpawnTypes[level].RandomElement());
}
catch
{