mirrors/project-meteor-server
1
Fork 0
mirror of https://bitbucket.org/Ioncannon/project-meteor-server.git synced 2025-04-23 05:07:47 +00:00
Code Activity

fixed auto attacking self/npcs

Browse source
This commit is contained in:
Tahir Akhlaq 2017-08-24 16:36:56 +01:00
parent 5e2487c8cc
commit 88abd59ec3
4 changed files with 20 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
FFXIVClassic Map Server/actors/chara/ai/AIContainer.cs
View file

@ -186,7 +186,7 @@ namespace FFXIVClassic_Map_Server.actors.chara.ai
public bool IsEngaged() public bool IsEngaged()
{ {
// todo: check this is legit // todo: check this is legit
return owner.currentMainState == SetActorStatePacket.MAIN_STATE_ACTIVE; return owner.currentMainState == SetActorStatePacket.MAIN_STATE_ACTIVE && owner.target != null;
} }
public bool IsDead() public bool IsDead()

16
FFXIVClassic Map Server/actors/chara/ai/TargetFind.cs
View file

@ -89,7 +89,7 @@ namespace FFXIVClassic_Map_Server.actors.chara.ai
{ {
this.target = null; this.target = null;
this.findType = TargetFindCharacterType.None; this.findType = TargetFindCharacterType.None;
this.validTarget = ValidTarget.None; this.validTarget = ValidTarget.Enemy;
this.aoeType = TargetFindAOEType.None; this.aoeType = TargetFindAOEType.None;
this.targetPosition = null; this.targetPosition = null;
this.extents = 0.0f; this.extents = 0.0f;
@ -325,13 +325,23 @@ namespace FFXIVClassic_Map_Server.actors.chara.ai
if ((validTarget & ValidTarget.Corpse) == 0 && target.IsDead()) if ((validTarget & ValidTarget.Corpse) == 0 && target.IsDead())
return false; return false;
bool targetingPlayer = target is Player; bool targetingPlayer = target.currentSubState == SetActorStatePacket.SUB_STATE_PLAYER;
if ((validTarget & ValidTarget.Ally) != 0 && target.currentSubState != owner.currentSubState)
return false;
if ((validTarget & ValidTarget.Enemy) != 0 && target.currentSubState != (owner.currentSubState == SetActorStatePacket.SUB_STATE_MONSTER ?
SetActorStatePacket.SUB_STATE_PLAYER : SetActorStatePacket.SUB_STATE_MONSTER))
return false;
if ((validTarget & ValidTarget.NPC) != 0 && target.currentSubState != SetActorStatePacket.SUB_STATE_NONE)
return false;
// todo: why is player always zoning? // todo: why is player always zoning?
// cant target if zoning // cant target if zoning
if (targetingPlayer && ((Player)target).playerSession.isUpdatesLocked) if (targetingPlayer && ((Player)target).playerSession.isUpdatesLocked)
{ {
owner.Disengage(); owner.aiContainer.ChangeTarget(null);
return false; return false;
} }

1
FFXIVClassic Map Server/actors/chara/ai/controllers/PlayerController.cs
View file

@ -57,6 +57,7 @@ namespace FFXIVClassic_Map_Server.actors.chara.ai.controllers
public override void Disengage() public override void Disengage()
{ {
// todo: // todo:
base.Disengage();
return; return;
} }

9
FFXIVClassic Map Server/actors/chara/ai/state/AttackState.cs
View file

@ -44,15 +44,16 @@ namespace FFXIVClassic_Map_Server.actors.chara.ai.state
return true; return true;
} }
*/ */
if (owner.target != target || owner.target?.actorId != owner.currentLockedTarget)
owner.aiContainer.ChangeTarget(target = Server.GetWorldManager().GetActorInWorld(owner.currentLockedTarget) as Character);
if (target == null || target.IsDead()) if (target == null || target.IsDead())
{ {
//if (owner.currentSubState == SetActorStatePacket.SUB_STATE_MONSTER)
// target = ((BattleNpc)owner).hateContainer.GetMostHatedTarget();
} }
else else
{ {
if (owner.target != target || owner.target.actorId != owner.currentLockedTarget)
owner.aiContainer.ChangeTarget(target = Server.GetWorldManager().GetActorInWorld(owner.currentLockedTarget) as Character);
if (IsAttackReady()) if (IsAttackReady())
{ {
if (CanAttack()) if (CanAttack())