Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/VMap: Add outdoor state to Map::GetFullTerrainStatusForPosition. Add WorldObject::IsOutdoors, basic member access.

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/e47e95b6dc89a7332ae4d5d833639e4f30f3d8c5)
This commit is contained in:
hondacrx
2021-08-09 11:33:30 -04:00
parent 37fd6936fd
commit 06fe13fbab
5 changed files with 30 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Chat/Commands/MiscCommands.cs
+1 -1
View File
@@ -939,7 +939,7 @@ namespace Game.Chat
if (haveVMap)
{
if (map.IsOutdoors(obj.GetPhaseShift(), obj.GetPositionX(), obj.GetPositionY(), obj.GetPositionZ()))
if (obj.IsOutdoors())
handler.SendSysMessage(CypherStrings.GpsPositionOutdoors);
else
handler.SendSysMessage(CypherStrings.GpsPositionIndoors);
Source/Game/Entities/Object/WorldObject.cs
+4
View File
@@ -127,6 +127,7 @@ namespace Game.Entities
if (area.ParentAreaID != 0)
m_zoneId = area.ParentAreaID;
m_outdoors = data.outdoors;
m_staticFloorZ = data.FloorZ;
}
@@ -1026,6 +1027,8 @@ namespace Game.Entities
public void GetZoneAndAreaId(out uint zoneid, out uint areaid) { zoneid = m_zoneId; areaid = m_areaId; }
public bool IsOutdoors() { return m_outdoors; }
public bool IsInWorldPvpZone()
{
switch (GetZoneId())
@@ -2389,6 +2392,7 @@ namespace Game.Entities
uint m_zoneId;
uint m_areaId;
float m_staticFloorZ;
bool m_outdoors;
public MovementInfo m_movementInfo;
string _name;
Source/Game/Entities/Player/Player.cs
+3 -8
View File
@@ -6145,16 +6145,11 @@ namespace Game.Entities
if (IsInFlight())
return;
bool isOutdoor;
uint areaId = GetMap().GetAreaId(GetPhaseShift(), GetPositionX(), GetPositionY(), GetPositionZ(), out isOutdoor);
AreaTableRecord areaEntry = CliDB.AreaTableStorage.LookupByKey(areaId);
if (WorldConfig.GetBoolValue(WorldCfg.VmapIndoorCheck) && !isOutdoor)
if (WorldConfig.GetBoolValue(WorldCfg.VmapIndoorCheck) && !IsOutdoors())
RemoveAurasWithAttribute(SpellAttr0.OutdoorsOnly);
if (areaId == 0)
return;
uint areaId = GetAreaId();
var areaEntry = CliDB.AreaTableStorage.LookupByKey(areaId);
if (areaEntry == null)
{
Log.outError(LogFilter.Player, "Player '{0}' ({1}) discovered unknown area (x: {2} y: {3} z: {4} map: {5})",
Source/Game/Maps/Map.cs
+20 -11
View File
@@ -1775,7 +1775,7 @@ namespace Game.Maps
return -500.0f;
}
private bool IsOutdoorWMO(uint mogpFlags, int adtId, int rootId, int groupId, WMOAreaTableRecord wmoEntry, AreaTableRecord atEntry)
private bool IsOutdoorWMO(uint mogpFlags, WMOAreaTableRecord wmoEntry, AreaTableRecord atEntry)
{
if (wmoEntry != null && atEntry != null)
{
@@ -1785,16 +1785,15 @@ namespace Game.Maps
return false;
}
bool outdoor = Convert.ToBoolean(mogpFlags & 0x8);
if (wmoEntry != null)
{
if (Convert.ToBoolean(wmoEntry.Flags & 4))
return true;
if ((wmoEntry.Flags & 2) != 0)
outdoor = false;
return false;
}
return outdoor;
return (mogpFlags & 0x8) != 0;
}
public bool IsOutdoors(PhaseShift phaseShift, float x, float y, float z)
@@ -1814,7 +1813,7 @@ namespace Game.Maps
wmoEntry.AreaTableID);
atEntry = CliDB.AreaTableStorage.LookupByKey(wmoEntry.AreaTableID);
}
return IsOutdoorWMO(mogpFlags, adtId, rootId, groupId, wmoEntry, atEntry);
return IsOutdoorWMO(mogpFlags, wmoEntry, atEntry);
}
private bool GetAreaInfo(PhaseShift phaseShift, float x, float y, float z, out uint flags, out int adtId, out int rootId, out int groupId)
@@ -1922,7 +1921,7 @@ namespace Game.Maps
}
if (haveAreaInfo)
isOutdoors = IsOutdoorWMO(mogpFlags, adtId, rootId, groupId, wmoEntry, atEntry);
isOutdoors = IsOutdoorWMO(mogpFlags, wmoEntry, atEntry);
else
isOutdoors = true;
@@ -2069,21 +2068,27 @@ namespace Game.Maps
// area lookup
AreaTableRecord areaEntry = null;
if (vmapData.areaInfo.HasValue && (z <= mapHeight || mapHeight <= vmapData.floorZ))
WMOAreaTableRecord wmoEntry = null;
// the vmap floor is our floor if either
// - the vmap floor is above the gridmap floor
// or
// - we are below the gridmap floor
if (vmapData.areaInfo.HasValue && (MathFunctions.fuzzyLt(z, mapHeight - MapConst.GroundHeightTolerance) || mapHeight <= vmapData.floorZ))
{
WMOAreaTableRecord wmoEntry = Global.DB2Mgr.GetWMOAreaTable(vmapData.areaInfo.Value.RootId, vmapData.areaInfo.Value.AdtId, vmapData.areaInfo.Value.GroupId);
wmoEntry = Global.DB2Mgr.GetWMOAreaTable(vmapData.areaInfo.Value.RootId, vmapData.areaInfo.Value.AdtId, vmapData.areaInfo.Value.GroupId);
if (wmoEntry != null)
areaEntry = CliDB.AreaTableStorage.LookupByKey(wmoEntry.AreaTableID);
}
if (areaEntry != null)
{
data.FloorZ = vmapData.floorZ;
data.AreaId = areaEntry.Id;
data.FloorZ = vmapData.floorZ;
data.outdoors = IsOutdoorWMO(vmapData.areaInfo.Value.MogpFlags, wmoEntry, areaEntry);
}
else
{
data.FloorZ = mapHeight;
if (gmap != null)
data.AreaId = gmap.GetArea(x, y);
else
@@ -2094,6 +2099,9 @@ namespace Game.Maps
if (data.AreaId != 0)
areaEntry = CliDB.AreaTableStorage.LookupByKey(data.AreaId);
data.FloorZ = mapHeight;
data.outdoors = true; // @todo default true taken from old GetAreaId check, maybe review
}
// liquid processing
@@ -5550,6 +5558,7 @@ namespace Game.Maps
public uint AreaId;
public float FloorZ;
public bool outdoors;
public ZLiquidStatus LiquidStatus;
public Optional<AreaInfo> areaInfo;
public Optional<LiquidData> LiquidInfo;
Source/Game/Spells/Spell.cs
+2 -4
View File
@@ -4588,12 +4588,10 @@ namespace Game.Spells
if (m_caster.IsTypeId(TypeId.Player) && Global.VMapMgr.IsLineOfSightCalcEnabled())
{
if (m_spellInfo.HasAttribute(SpellAttr0.OutdoorsOnly) &&
!m_caster.GetMap().IsOutdoors(m_caster.GetPhaseShift(), m_caster.posX, m_caster.posY, m_caster.posZ))
if (m_spellInfo.HasAttribute(SpellAttr0.OutdoorsOnly) && !m_caster.IsOutdoors())
return SpellCastResult.OnlyOutdoors;
if (m_spellInfo.HasAttribute(SpellAttr0.IndoorsOnly) &&
m_caster.GetMap().IsOutdoors(m_caster.GetPhaseShift(), m_caster.posX, m_caster.posY, m_caster.posZ))
if (m_spellInfo.HasAttribute(SpellAttr0.IndoorsOnly) && m_caster.IsOutdoors())
return SpellCastResult.OnlyIndoors;
}