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

fix: Fixes the limitation on static tiles for harvesting (#1396)

Browse source 
* fix: Fixes the limitation on static tiles for harvesting

* Fixes dirt targeting
This commit is contained in:
Kamron Batman 2023-04-22 09:14:42 -07:00 • committed by GitHub
parent 79c6f0375c
commit ba4c4627c3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 103 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

29
Projects/UOContent/Engines/Harvest/Core/HarvestSystem.cs
View file

@ -85,13 +85,13 @@ namespace Server.Engines.Harvest
return;
}
if (!GetHarvestDetails(from, tool, toHarvest, out var tileID, out var map, out var loc))
if (!GetHarvestDetails(from, tool, toHarvest, out var tileID, out var map, out var loc, out var isLand))
{
OnBadHarvestTarget(from, tool, toHarvest);
return;
}
if (!def.Validate(tileID))
if (!def.Validate(tileID, isLand))
{
OnBadHarvestTarget(from, tool, toHarvest);
return;
@ -367,14 +367,14 @@ namespace Server.Engines.Harvest
return false;
}
if (!GetHarvestDetails(from, tool, toHarvest, out var tileID, out var map, out var loc))
if (!GetHarvestDetails(from, tool, toHarvest, out var tileID, out var map, out var loc, out var isLand))
{
from.EndAction(locked);
OnBadHarvestTarget(from, tool, toHarvest);
return false;
}
if (!def.Validate(tileID))
if (!def.Validate(tileID, isLand))
{
from.EndAction(locked);
OnBadHarvestTarget(from, tool, toHarvest);
@ -423,13 +423,13 @@ namespace Server.Engines.Harvest
public virtual HarvestDefinition GetDefinition() => Definitions[0];
public virtual HarvestDefinition GetDefinition(int tileID)
public virtual HarvestDefinition GetDefinition(int tileID, bool isLand)
{
for (var i = 0; i < Definitions.Length; i++)
{
var check = Definitions[i];
if (check.Validate(tileID))
if (check.Validate(tileID, isLand))
{
return check;
}
@ -445,13 +445,13 @@ namespace Server.Engines.Harvest
return;
}
if (!GetHarvestDetails(from, tool, toHarvest, out var tileID, out var map, out var loc))
if (!GetHarvestDetails(from, tool, toHarvest, out var tileID, out var map, out var loc, out var isLand))
{
OnBadHarvestTarget(from, tool, toHarvest);
return;
}
var def = GetDefinition(tileID);
var def = GetDefinition(tileID, isLand);
if (def == null)
{
@ -487,33 +487,36 @@ namespace Server.Engines.Harvest
}
public virtual bool GetHarvestDetails(
Mobile from, Item tool, object toHarvest, out int tileID, out Map map,
out Point3D loc
Mobile from, Item tool, object toHarvest, out int tileID, out Map map, out Point3D loc, out bool isLand
)
{
if (toHarvest is Static staticObj && !staticObj.Movable)
if (toHarvest is Static { Movable: false } staticObj)
{
tileID = (staticObj.ItemID & 0x3FFF) | 0x4000;
tileID = staticObj.ItemID;
map = staticObj.Map;
loc = staticObj.GetWorldLocation();
isLand = false;
}
else if (toHarvest is StaticTarget staticTarget)
{
tileID = (staticTarget.ItemID & 0x3FFF) | 0x4000;
tileID = staticTarget.ItemID;
map = from.Map;
loc = staticTarget.Location;
isLand = false;
}
else if (toHarvest is LandTarget landTarget)
{
tileID = landTarget.TileID;
map = from.Map;
loc = landTarget.Location;
isLand = true;
}
else
{
tileID = 0;
map = null;
loc = Point3D.Zero;
isLand = false;
return false;
}