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

Cleans up ore (#637)

Browse source
This commit is contained in:
Kamron Batman 2021-06-12 14:15:10 -07:00 • committed by GitHub
parent 61c49b8faa
commit c79a8a4002
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 283 additions and 459 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Projects/UOContent/Engines/CannedEvil/ChampionSpawn.cs
View file

@ -1171,7 +1171,7 @@ namespace Server.Engines.CannedEvil
public void RegisterDamage(Mobile from, int amount)
{
if (@from?.Player != true)
if (from?.Player != true)
{
return;
}

82
Projects/UOContent/Engines/Harvest/Mining.cs
View file

@ -379,59 +379,61 @@ namespace Server.Engines.Harvest
HarvestBank bank, HarvestResource resource, object harvested
)
{
if (tool is GargoylesPickaxe && def == OreAndStone && Utility.RandomDouble() < 0.1)
if (tool is not GargoylesPickaxe || def != OreAndStone || !(Utility.RandomDouble() < 0.1))
{
var res = vein.PrimaryResource;
return;
}
if (res == resource && res.Types.Length >= 3)
var res = vein.PrimaryResource;
if (res == resource && res.Types.Length >= 3)
{
var map = from.Map;
if (map == null)
{
var map = from.Map;
return;
}
if (map == null)
try
{
var spawned = res.Types[2].CreateEntityInstance<BaseCreature>(25);
if (spawned != null)
{
return;
}
var offset = Utility.Random(8) * 2;
try
{
var spawned = res.Types[2].CreateEntityInstance<BaseCreature>(25);
if (spawned != null)
for (var i = 0; i < m_Offsets.Length; i += 2)
{
var offset = Utility.Random(8) * 2;
var x = from.X + m_Offsets[(offset + i) % m_Offsets.Length];
var y = from.Y + m_Offsets[(offset + i + 1) % m_Offsets.Length];
for (var i = 0; i < m_Offsets.Length; i += 2)
if (map.CanSpawnMobile(x, y, from.Z))
{
var x = from.X + m_Offsets[(offset + i) % m_Offsets.Length];
var y = from.Y + m_Offsets[(offset + i + 1) % m_Offsets.Length];
if (map.CanSpawnMobile(x, y, from.Z))
{
spawned.OnBeforeSpawn(new Point3D(x, y, from.Z), map);
spawned.MoveToWorld(new Point3D(x, y, from.Z), map);
spawned.Combatant = from;
return;
}
var z = map.GetAverageZ(x, y);
if ((z - from.Z).Abs() < 10 && map.CanSpawnMobile(x, y, z))
{
spawned.OnBeforeSpawn(new Point3D(x, y, z), map);
spawned.MoveToWorld(new Point3D(x, y, z), map);
spawned.Combatant = from;
return;
}
spawned.OnBeforeSpawn(new Point3D(x, y, from.Z), map);
spawned.MoveToWorld(new Point3D(x, y, from.Z), map);
spawned.Combatant = from;
return;
}
spawned.OnBeforeSpawn(from.Location, from.Map);
spawned.MoveToWorld(from.Location, from.Map);
spawned.Combatant = from;
var z = map.GetAverageZ(x, y);
if ((z - from.Z).Abs() < 10 && map.CanSpawnMobile(x, y, z))
{
spawned.OnBeforeSpawn(new Point3D(x, y, z), map);
spawned.MoveToWorld(new Point3D(x, y, z), map);
spawned.Combatant = from;
return;
}
}
spawned.OnBeforeSpawn(from.Location, from.Map);
spawned.MoveToWorld(from.Location, from.Map);
spawned.Combatant = from;
}
catch
{
// ignored
}
}
catch
{
// ignored
}
}
}