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

Misc cleanups

Browse Source
This commit is contained in:
hondacrx
2021-03-04 12:07:37 -05:00
parent 0fdab8635d
commit 96b98cc4d3
3 changed files with 273 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/AI/ScriptedAI/ScriptedEscortAI.cs
+2 -2
View File
@@ -496,8 +496,8 @@ namespace Game.AI
public void SetDespawnAtEnd(bool despawn) { _despawnAtEnd = despawn; }
public void SetDespawnAtFar(bool despawn) { _despawnAtFar = despawn; }
bool GetAttack() { return _activeAttacker; } // used in EnterEvadeMode override
void SetCanAttack(bool attack) { _activeAttacker = attack; }
public bool IsActiveAttacker() { return _activeAttacker; } // used in EnterEvadeMode override
public void SetActiveAttacker(bool attack) { _activeAttacker = attack; }
ObjectGuid GetEventStarterGUID() { return _playerGUID; }
Source/Game/Movement/Generators/FlightPathMovementGenerator.cs
+271
View File
@@ -0,0 +1,271 @@
/*
* Copyright (C) 2012-2020 CypherCore <http://github.com/CypherCore>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
using Framework.Constants;
using Framework.GameMath;
using Game.DataStorage;
using Game.Entities;
using Game.Maps;
using System;
using System.Collections.Generic;
using System.Linq;
namespace Game.Movement
{
public class FlightPathMovementGenerator : MovementGeneratorMedium<Player>
{
uint GetPathAtMapEnd()
{
if (_currentNode >= _path.Count)
return (uint)_path.Count;
uint curMapId = _path[_currentNode].ContinentID;
for (int i = _currentNode; i < _path.Count; ++i)
{
if (_path[i].ContinentID != curMapId)
return (uint)i;
}
return (uint)_path.Count;
}
bool IsNodeIncludedInShortenedPath(TaxiPathNodeRecord p1, TaxiPathNodeRecord p2)
{
return p1.ContinentID != p2.ContinentID || Math.Pow(p1.Loc.X - p2.Loc.X, 2) + Math.Pow(p1.Loc.Y - p2.Loc.Y, 2) > (40.0f * 40.0f);
}
public void LoadPath(Player player, uint startNode = 0)
{
_path.Clear();
_currentNode = (int)startNode;
_pointsForPathSwitch.Clear();
var taxi = player.m_taxi.GetPath();
float discount = player.GetReputationPriceDiscount(player.m_taxi.GetFlightMasterFactionTemplate());
for (int src = 0, dst = 1; dst < taxi.Count; src = dst++)
{
uint path, cost;
Global.ObjectMgr.GetTaxiPath(taxi[src], taxi[dst], out path, out cost);
if (path > CliDB.TaxiPathNodesByPath.Keys.Max())
return;
var nodes = CliDB.TaxiPathNodesByPath[path];
if (!nodes.Empty())
{
TaxiPathNodeRecord start = nodes[0];
TaxiPathNodeRecord end = nodes[nodes.Length - 1];
bool passedPreviousSegmentProximityCheck = false;
for (uint i = 0; i < nodes.Length; ++i)
{
if (passedPreviousSegmentProximityCheck || src == 0 || _path.Empty() || IsNodeIncludedInShortenedPath(_path.Last(), nodes[i]))
{
if ((src == 0 || (IsNodeIncludedInShortenedPath(start, nodes[i]) && i >= 2)) &&
(dst == taxi.Count - 1 || (IsNodeIncludedInShortenedPath(end, nodes[i]) && i < nodes.Length - 1)))
{
passedPreviousSegmentProximityCheck = true;
_path.Add(nodes[i]);
}
}
else
{
_path.RemoveAt(_path.Count - 1);
_pointsForPathSwitch[_pointsForPathSwitch.Count - 1].PathIndex -= 1;
}
}
}
_pointsForPathSwitch.Add(new TaxiNodeChangeInfo((uint)(_path.Count - 1), (long)Math.Ceiling(cost * discount)));
}
}
public override void DoInitialize(Player owner)
{
Reset(owner);
InitEndGridInfo();
}
public override void DoFinalize(Player owner)
{
// remove flag to prevent send object build movement packets for flight state and crash (movement generator already not at top of stack)
owner.ClearUnitState(UnitState.InFlight);
owner.Dismount();
owner.RemoveUnitFlag(UnitFlags.RemoveClientControl | UnitFlags.TaxiFlight);
if (owner.m_taxi.Empty())
{
owner.GetHostileRefManager().SetOnlineOfflineState(true);
// update z position to ground and orientation for landing point
// this prevent cheating with landing point at lags
// when client side flight end early in comparison server side
owner.StopMoving();
owner.SetFallInformation(0, owner.GetPositionZ());
}
owner.RemovePlayerFlag(PlayerFlags.TaxiBenchmark);
owner.RestoreDisplayId();
}
public override void DoReset(Player owner)
{
owner.GetHostileRefManager().SetOnlineOfflineState(false);
owner.AddUnitState(UnitState.InFlight);
owner.AddUnitFlag(UnitFlags.RemoveClientControl | UnitFlags.TaxiFlight);
MoveSplineInit init = new MoveSplineInit(owner);
uint end = GetPathAtMapEnd();
init.args.path = new Vector3[end];
for (int i = (int)GetCurrentNode(); i != end; ++i)
{
Vector3 vertice = new Vector3(_path[i].Loc.X, _path[i].Loc.Y, _path[i].Loc.Z);
init.args.path[i] = vertice;
}
init.SetFirstPointId((int)GetCurrentNode());
init.SetFly();
init.SetSmooth();
init.SetUncompressed();
init.SetWalk(true);
init.SetVelocity(30.0f);
init.Launch();
}
public override bool DoUpdate(Player player, uint time_diff)
{
uint pointId = (uint)player.MoveSpline.CurrentPathIdx();
if (pointId > _currentNode)
{
bool departureEvent = true;
do
{
DoEventIfAny(player, _path[_currentNode], departureEvent);
while (!_pointsForPathSwitch.Empty() && _pointsForPathSwitch[0].PathIndex <= _currentNode)
{
_pointsForPathSwitch.RemoveAt(0);
player.m_taxi.NextTaxiDestination();
if (!_pointsForPathSwitch.Empty())
{
player.UpdateCriteria(CriteriaTypes.GoldSpentForTravelling, (uint)_pointsForPathSwitch[0].Cost);
player.ModifyMoney(-_pointsForPathSwitch[0].Cost);
}
}
if (pointId == _currentNode)
break;
if (_currentNode == _preloadTargetNode)
PreloadEndGrid();
_currentNode += (departureEvent ? 1 : 0);
departureEvent = !departureEvent;
}
while (true);
}
return _currentNode < (_path.Count - 1);
}
public void SetCurrentNodeAfterTeleport()
{
if (_path.Empty() || _currentNode >= _path.Count)
return;
uint map0 = _path[_currentNode].ContinentID;
for (int i = _currentNode + 1; i < _path.Count; ++i)
{
if (_path[i].ContinentID != map0)
{
_currentNode = i;
return;
}
}
}
void DoEventIfAny(Player player, TaxiPathNodeRecord node, bool departure)
{
uint eventid = departure ? node.DepartureEventID : node.ArrivalEventID;
if (eventid != 0)
{
Log.outDebug(LogFilter.Scripts, "Taxi {0} event {1} of node {2} of path {3} for player {4}", departure ? "departure" : "arrival", eventid, node.NodeIndex, node.PathID, player.GetName());
player.GetMap().ScriptsStart(ScriptsType.Event, eventid, player, player);
}
}
bool GetResetPos(Player player, out float x, out float y, out float z)
{
TaxiPathNodeRecord node = _path[_currentNode];
x = node.Loc.X;
y = node.Loc.Y;
z = node.Loc.Z;
return true;
}
void InitEndGridInfo()
{
int nodeCount = _path.Count; //! Number of nodes in path.
_endMapId = _path[nodeCount - 1].ContinentID; //! MapId of last node
_preloadTargetNode = (uint)nodeCount - 3;
_endGridX = _path[nodeCount - 1].Loc.X;
_endGridY = _path[nodeCount - 1].Loc.Y;
}
void PreloadEndGrid()
{
// used to preload the final grid where the flightmaster is
Map endMap = Global.MapMgr.FindBaseNonInstanceMap(_endMapId);
// Load the grid
if (endMap != null)
{
Log.outInfo(LogFilter.Server, "Preloading grid ({0}, {1}) for map {2} at node index {3}/{4}", _endGridX, _endGridY, _endMapId, _preloadTargetNode, _path.Count - 1);
endMap.LoadGrid(_endGridX, _endGridY);
}
else
Log.outInfo(LogFilter.Server, "Unable to determine map to preload flightmaster grid");
}
public override MovementGeneratorType GetMovementGeneratorType() { return MovementGeneratorType.Flight; }
public List<TaxiPathNodeRecord> GetPath() { return _path; }
bool HasArrived() { return (_currentNode >= _path.Count); }
public void SkipCurrentNode() { ++_currentNode; }
public uint GetCurrentNode() { return (uint)_currentNode; }
float _endGridX; //! X coord of last node location
float _endGridY; //! Y coord of last node location
uint _endMapId; //! map Id of last node location
uint _preloadTargetNode; //! node index where preloading starts
List<TaxiPathNodeRecord> _path = new List<TaxiPathNodeRecord>();
int _currentNode;
List<TaxiNodeChangeInfo> _pointsForPathSwitch = new List<TaxiNodeChangeInfo>(); //! node indexes and costs where TaxiPath changes
class TaxiNodeChangeInfo
{
public TaxiNodeChangeInfo(uint pathIndex, long cost)
{
PathIndex = pathIndex;
Cost = cost;
}
public uint PathIndex;
public long Cost;
}
}
}
Source/Game/Movement/Generators/WaypointMovement.cs
-247
View File
@@ -16,11 +16,7 @@
*/
using Framework.Constants;
using Framework.GameMath;
using Game.DataStorage;
using Game.Entities;
using Game.Maps;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -349,247 +345,4 @@ namespace Game.Movement
WaypointPath _path;
int _currentNode;
}
public class FlightPathMovementGenerator : MovementGeneratorMedium<Player>
{
uint GetPathAtMapEnd()
{
if (_currentNode >= _path.Count)
return (uint)_path.Count;
uint curMapId = _path[_currentNode].ContinentID;
for (int i = _currentNode; i < _path.Count; ++i)
{
if (_path[i].ContinentID != curMapId)
return (uint)i;
}
return (uint)_path.Count;
}
bool IsNodeIncludedInShortenedPath(TaxiPathNodeRecord p1, TaxiPathNodeRecord p2)
{
return p1.ContinentID != p2.ContinentID || Math.Pow(p1.Loc.X - p2.Loc.X, 2) + Math.Pow(p1.Loc.Y - p2.Loc.Y, 2) > (40.0f * 40.0f);
}
public void LoadPath(Player player, uint startNode = 0)
{
_path.Clear();
_currentNode = (int)startNode;
_pointsForPathSwitch.Clear();
var taxi = player.m_taxi.GetPath();
float discount = player.GetReputationPriceDiscount(player.m_taxi.GetFlightMasterFactionTemplate());
for (int src = 0, dst = 1; dst < taxi.Count; src = dst++)
{
uint path, cost;
Global.ObjectMgr.GetTaxiPath(taxi[src], taxi[dst], out path, out cost);
if (path > CliDB.TaxiPathNodesByPath.Keys.Max())
return;
var nodes = CliDB.TaxiPathNodesByPath[path];
if (!nodes.Empty())
{
TaxiPathNodeRecord start = nodes[0];
TaxiPathNodeRecord end = nodes[nodes.Length - 1];
bool passedPreviousSegmentProximityCheck = false;
for (uint i = 0; i < nodes.Length; ++i)
{
if (passedPreviousSegmentProximityCheck || src == 0 || _path.Empty() || IsNodeIncludedInShortenedPath(_path.Last(), nodes[i]))
{
if ((src == 0 || (IsNodeIncludedInShortenedPath(start, nodes[i]) && i >= 2)) &&
(dst == taxi.Count - 1 || (IsNodeIncludedInShortenedPath(end, nodes[i]) && i < nodes.Length - 1)))
{
passedPreviousSegmentProximityCheck = true;
_path.Add(nodes[i]);
}
}
else
{
_path.RemoveAt(_path.Count - 1);
_pointsForPathSwitch[_pointsForPathSwitch.Count - 1].PathIndex -= 1;
}
}
}
_pointsForPathSwitch.Add(new TaxiNodeChangeInfo((uint)(_path.Count - 1), (long)Math.Ceiling(cost * discount)));
}
}
public override void DoInitialize(Player owner)
{
Reset(owner);
InitEndGridInfo();
}
public override void DoFinalize(Player owner)
{
// remove flag to prevent send object build movement packets for flight state and crash (movement generator already not at top of stack)
owner.ClearUnitState(UnitState.InFlight);
owner.Dismount();
owner.RemoveUnitFlag(UnitFlags.RemoveClientControl | UnitFlags.TaxiFlight);
if (owner.m_taxi.Empty())
{
owner.GetHostileRefManager().SetOnlineOfflineState(true);
// update z position to ground and orientation for landing point
// this prevent cheating with landing point at lags
// when client side flight end early in comparison server side
owner.StopMoving();
owner.SetFallInformation(0, owner.GetPositionZ());
}
owner.RemovePlayerFlag(PlayerFlags.TaxiBenchmark);
owner.RestoreDisplayId();
}
public override void DoReset(Player owner)
{
owner.GetHostileRefManager().SetOnlineOfflineState(false);
owner.AddUnitState(UnitState.InFlight);
owner.AddUnitFlag(UnitFlags.RemoveClientControl | UnitFlags.TaxiFlight);
MoveSplineInit init = new MoveSplineInit(owner);
uint end = GetPathAtMapEnd();
init.args.path = new Vector3[end];
for (int i = (int)GetCurrentNode(); i != end; ++i)
{
Vector3 vertice = new Vector3(_path[i].Loc.X, _path[i].Loc.Y, _path[i].Loc.Z);
init.args.path[i] = vertice;
}
init.SetFirstPointId((int)GetCurrentNode());
init.SetFly();
init.SetSmooth();
init.SetUncompressed();
init.SetWalk(true);
init.SetVelocity(30.0f);
init.Launch();
}
public override bool DoUpdate(Player player, uint time_diff)
{
uint pointId = (uint)player.MoveSpline.CurrentPathIdx();
if (pointId > _currentNode)
{
bool departureEvent = true;
do
{
DoEventIfAny(player, _path[_currentNode], departureEvent);
while (!_pointsForPathSwitch.Empty() && _pointsForPathSwitch[0].PathIndex <= _currentNode)
{
_pointsForPathSwitch.RemoveAt(0);
player.m_taxi.NextTaxiDestination();
if (!_pointsForPathSwitch.Empty())
{
player.UpdateCriteria(CriteriaTypes.GoldSpentForTravelling, (uint)_pointsForPathSwitch[0].Cost);
player.ModifyMoney(-_pointsForPathSwitch[0].Cost);
}
}
if (pointId == _currentNode)
break;
if (_currentNode == _preloadTargetNode)
PreloadEndGrid();
_currentNode += (departureEvent ? 1 : 0);
departureEvent = !departureEvent;
}
while (true);
}
return _currentNode < (_path.Count - 1);
}
public void SetCurrentNodeAfterTeleport()
{
if (_path.Empty() || _currentNode >= _path.Count)
return;
uint map0 = _path[_currentNode].ContinentID;
for (int i = _currentNode + 1; i < _path.Count; ++i)
{
if (_path[i].ContinentID != map0)
{
_currentNode = i;
return;
}
}
}
void DoEventIfAny(Player player, TaxiPathNodeRecord node, bool departure)
{
uint eventid = departure ? node.DepartureEventID : node.ArrivalEventID;
if (eventid != 0)
{
Log.outDebug(LogFilter.Scripts, "Taxi {0} event {1} of node {2} of path {3} for player {4}", departure ? "departure" : "arrival", eventid, node.NodeIndex, node.PathID, player.GetName());
player.GetMap().ScriptsStart(ScriptsType.Event, eventid, player, player);
}
}
bool GetResetPos(Player player, out float x, out float y, out float z)
{
TaxiPathNodeRecord node = _path[_currentNode];
x = node.Loc.X;
y = node.Loc.Y;
z = node.Loc.Z;
return true;
}
void InitEndGridInfo()
{
int nodeCount = _path.Count; //! Number of nodes in path.
_endMapId = _path[nodeCount - 1].ContinentID; //! MapId of last node
_preloadTargetNode = (uint)nodeCount - 3;
_endGridX = _path[nodeCount - 1].Loc.X;
_endGridY = _path[nodeCount - 1].Loc.Y;
}
void PreloadEndGrid()
{
// used to preload the final grid where the flightmaster is
Map endMap = Global.MapMgr.FindBaseNonInstanceMap(_endMapId);
// Load the grid
if (endMap != null)
{
Log.outInfo(LogFilter.Server, "Preloading grid ({0}, {1}) for map {2} at node index {3}/{4}", _endGridX, _endGridY, _endMapId, _preloadTargetNode, _path.Count - 1);
endMap.LoadGrid(_endGridX, _endGridY);
}
else
Log.outInfo(LogFilter.Server, "Unable to determine map to preload flightmaster grid");
}
public override MovementGeneratorType GetMovementGeneratorType() { return MovementGeneratorType.Flight; }
public List<TaxiPathNodeRecord> GetPath() { return _path; }
bool HasArrived() { return (_currentNode >= _path.Count); }
public void SkipCurrentNode() { ++_currentNode; }
public uint GetCurrentNode() { return (uint)_currentNode; }
float _endGridX; //! X coord of last node location
float _endGridY; //! Y coord of last node location
uint _endMapId; //! map Id of last node location
uint _preloadTargetNode; //! node index where preloading starts
List<TaxiPathNodeRecord> _path = new List<TaxiPathNodeRecord>();
int _currentNode;
List<TaxiNodeChangeInfo> _pointsForPathSwitch = new List<TaxiNodeChangeInfo>(); //! node indexes and costs where TaxiPath changes
class TaxiNodeChangeInfo
{
public TaxiNodeChangeInfo(uint pathIndex, long cost)
{
PathIndex = pathIndex;
Cost = cost;
}
public uint PathIndex;
public long Cost;
}
}
}