zydronium/project-meteor-server
1
0
Fork 0
mirror of https://bitbucket.org/Ioncannon/project-meteor-server.git synced 2025-07-24 11:28:22 +02:00
Code Issues Projects Releases Packages Wiki Activity

slightly smaller spawn leash

Browse source 
- removed try catch block
- todo: despawn actors on moving out of range
This commit is contained in:
Tahir Akhlaq 2017-06-06 04:14:55 +01:00
parent 4ad37f1011
commit bd97e72774
5 changed files with 334 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

75
FFXIVClassic Map Server/actors/Actor.cs
View file

@ -368,12 +368,33 @@ namespace FFXIVClassic_Map_Server.Actors
if (diffTime.Milliseconds >= deltaTime)
{
bool foundActor = false;
bool skipFollow = false;
// leash back to spawn
if (this.oldPositionX != 0.0f && this.oldPositionY != 0.0f && this.oldPositionZ != 0.0f)
{
var spawnDistance = Utils.Distance(positionX, positionY, positionZ, oldPositionX, oldPositionY, oldPositionZ);
if (spawnDistance >= 45)
{
skipFollow = true;
}
}
foreach (var actor in ((Area)zone).GetActorsAroundActor(this, 50))
{
if (actor is Player && actor != this)
{
var player = actor as Player;
if (skipFollow)
{
// todo: despawn self for player
continue;
}
var distance = Utils.Distance(positionX, positionY, positionZ, player.positionX, player.positionY, player.positionZ);
int maxDistance = player == target ? 25 : 15;
@ -414,16 +435,28 @@ namespace FFXIVClassic_Map_Server.Actors
break;
}
}
var diffMove = (DateTime.Now - lastMoveUpdate);
// 5 seconds before back to spawn
if ((DateTime.Now - lastMoveUpdate).Seconds >= 5 && !foundActor)
if (diffMove.Seconds >= 5 && !foundActor)
{
// 10 yalms spawn radius just because
this.isAtSpawn = Utils.Distance(positionX, positionY, positionZ, oldPositionX, oldPositionY, oldPositionZ) <= 18.0f;
// leash to spawn
this.isAtSpawn = Utils.Distance(positionX, positionY, positionZ, oldPositionX, oldPositionY, oldPositionZ) <= 25.0f;
if (this.isAtSpawn != true && this.target == null && oldPositionX != 0.0f && oldPositionY != 0.0f && oldPositionZ != 0.0f)
PathTo(oldPositionX, oldPositionY, oldPositionZ, 3.0f);
lastMoveUpdate = DateTime.Now;
if (this.target == null && skipFollow)
{
// not in spawn range
if (!this.isAtSpawn)
{
PathTo(oldPositionX, oldPositionY, oldPositionZ, 3.0f);
}
// within spawn range, find a random point
else if (diffMove.Seconds >= 15)
{
//Program.Log.Error("Picking random point to walk to! ");
PathTo(oldPositionX, oldPositionY, oldPositionZ, 2.5f, 25, 8.5f);
}
}
this.target = null;
}
lastAiUpdate = DateTime.Now;
@ -641,7 +674,7 @@ namespace FFXIVClassic_Map_Server.Actors
rotation = (float)dRot;
}
public void PathTo(float x, float y, float z, float stepSize = 0.70f, int maxPath = 40)
public void PathTo(float x, float y, float z, float stepSize = 0.70f, int maxPath = 40, float polyRadius = 0.0f)
{
var pos = new utils.Vector3(positionX, positionY, positionZ);
var dest = new utils.Vector3(x, y, z);
@ -649,7 +682,7 @@ namespace FFXIVClassic_Map_Server.Actors
var sw = new System.Diagnostics.Stopwatch();
sw.Start();
var path = utils.NavmeshUtils.GetPath(((Zone)GetZone()), pos, dest, stepSize, maxPath);
var path = utils.NavmeshUtils.GetPath(((Zone)GetZone()), pos, dest, stepSize, maxPath, polyRadius);
if (path != null)
{
@ -687,8 +720,30 @@ namespace FFXIVClassic_Map_Server.Actors
var player = target as Player;
if (this.target != target)
this.target = target;
{
#region super important performance critical code
var chatMode = Program.Random.Next(12);
var emphasis = Program.Random.Next(9);
var drag = Program.Random.Next(7);
string oni = "ONI";
string chan = "CHA";
for(var i = 0; i < emphasis; ++i)
oni += "I";
for (var i = 0; i < drag; ++i)
chan += "A";
oni += "-";
chan += "N";
player.SendMessage((uint)chatMode, "Rowena", oni + chan);
#endregion
this.target = target;
}
this.moveState = player.moveState;
this.moveSpeeds = player.moveSpeeds;

1
FFXIVClassic Map Server/dataobjects/Session.cs
View file

@ -120,6 +120,7 @@ namespace FFXIVClassic_Map_Server.dataobjects
}
// todo: this is retarded (checking moved crap demo added)
bool checkedThisTick = false;
//Add new actors or move
for (int i = 0; i < list.Count; i++)

7
FFXIVClassic Map Server/utils/NavmeshUtils.cs
View file

@ -122,7 +122,7 @@ namespace FFXIVClassic_Map_Server.utils
// Copyright (c) 2013-2016 Robert Rouhani <robert.rouhani@gmail.com> and other contributors (see CONTRIBUTORS file).
// Licensed under the MIT License - https://raw.github.com/Robmaister/SharpNav/master/LICENSE
public static List<Vector3> GetPath(FFXIVClassic_Map_Server.actors.area.Zone zone, Vector3 startVec, Vector3 endVec, float stepSize = 0.70f, int pathSize = 2048)
public static List<Vector3> GetPath(FFXIVClassic_Map_Server.actors.area.Zone zone, Vector3 startVec, Vector3 endVec, float stepSize = 0.70f, int pathSize = 45, float polyRadius = 0.0f)
{
var navMesh = zone.tiledNavMesh;
var navMeshQuery = zone.navMeshQuery;
@ -220,6 +220,11 @@ namespace FFXIVClassic_Map_Server.utils
iterPos = targetPos;
if (smoothPath.Count < smoothPath.Capacity)
{
if (polyRadius != 0.0f)
{
var randPoly = navMeshQuery.FindRandomPointAroundCircle(endPt, polyRadius);
iterPos = randPoly.Position;
}
smoothPath.Add(new Vector3(iterPos));
}
break;