vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Enemies move faster when attacking/fleeing

Browse Source
This commit is contained in:
Joonas Rikkonen
2017-06-13 17:08:23 +03:00
parent c5ce1be6c2
commit 3c3c530b44
2 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/Source/Characters/AI/EnemyAIController.cs
+21 -14
View File
@@ -1,9 +1,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics;
using System.Xml.Linq; using System.Xml.Linq;
using FarseerPhysics; using FarseerPhysics;
using Lidgren.Network;
using Microsoft.Xna.Framework; using Microsoft.Xna.Framework;
using FarseerPhysics.Dynamics; using FarseerPhysics.Dynamics;
using Microsoft.Xna.Framework.Graphics; using Microsoft.Xna.Framework.Graphics;
@@ -158,22 +156,33 @@ namespace Barotrauma
steeringManager = Character.Submarine == null ? outsideSteering : insideSteering; steeringManager = Character.Submarine == null ? outsideSteering : insideSteering;
bool run = false;
switch (state) switch (state)
{ {
case AiState.None: case AiState.None:
UpdateNone(deltaTime); UpdateNone(deltaTime);
break; break;
case AiState.Attack: case AiState.Attack:
run = coolDownTimer <= 0.0f;
UpdateAttack(deltaTime); UpdateAttack(deltaTime);
break; break;
case AiState.Escape: case AiState.Escape:
run = true;
UpdateEscape(deltaTime); UpdateEscape(deltaTime);
break; break;
default: default:
throw new NotImplementedException(); throw new NotImplementedException();
} }
steeringManager.Update(); if (run)
{
steeringManager.Update(Character.AnimController.InWater ?
Character.AnimController.SwimSpeedMultiplier : Character.AnimController.RunSpeedMultiplier);
}
else
{
steeringManager.Update();
}
} }
private void UpdateNone(float deltaTime) private void UpdateNone(float deltaTime)
@@ -259,7 +268,7 @@ namespace Barotrauma
} }
if (attackLimb != null) if (attackLimb != null)
{ {
steeringManager.SteeringSeek(attackSimPosition - (attackLimb.SimPosition - SimPosition)); steeringManager.SteeringSeek(attackSimPosition - (attackLimb.SimPosition - SimPosition), 3);
if (steeringManager is IndoorsSteeringManager) if (steeringManager is IndoorsSteeringManager)
{ {
@@ -276,7 +285,7 @@ namespace Barotrauma
private void UpdateEscape(float deltaTime) private void UpdateEscape(float deltaTime)
{ {
SteeringManager.SteeringManual(deltaTime, Vector2.Normalize(SimPosition - selectedAiTarget.SimPosition)); SteeringManager.SteeringManual(deltaTime, Vector2.Normalize(SimPosition - selectedAiTarget.SimPosition) * 5);
SteeringManager.SteeringWander(1.0f); SteeringManager.SteeringWander(1.0f);
SteeringManager.SteeringAvoid(deltaTime, 2f); SteeringManager.SteeringAvoid(deltaTime, 2f);
} }
@@ -285,18 +294,16 @@ namespace Barotrauma
{ {
coolDownTimer -= deltaTime; coolDownTimer -= deltaTime;
attackingLimb = null; attackingLimb = null;
if (selectedAiTarget.Entity is Hull || float dist = Vector2.Distance(attackPosition, Character.SimPosition);
Vector2.Distance(attackPosition, Character.AnimController.Limbs[0].SimPosition) < ConvertUnits.ToSimUnits(500.0f))
if (dist < ConvertUnits.ToSimUnits(500.0f))
{ {
steeringManager.SteeringSeek(attackPosition, -0.8f); steeringManager.SteeringSeek(attackPosition, -0.8f);
steeringManager.SteeringAvoid(deltaTime, 1.0f); steeringManager.SteeringManual(deltaTime, Vector2.Normalize(Character.SimPosition - attackPosition) * (1.0f - (dist / 500.0f)));
}
else
{
steeringManager.SteeringSeek(attackPosition, -0.5f);
steeringManager.SteeringAvoid(deltaTime, 1.0f);
} }
steeringManager.SteeringAvoid(deltaTime, 1.0f);
} }
private void GetTargetEntity() private void GetTargetEntity()
Barotrauma/Source/Characters/Character.cs
+1 -1
View File
@@ -789,7 +789,7 @@ namespace Barotrauma
// - crouching // - crouching
// - moving backwards // - moving backwards
if (selectedCharacter == null && if (selectedCharacter == null &&
!((HumanoidAnimController)AnimController).Crouching && (!(AnimController is HumanoidAnimController) || !((HumanoidAnimController)AnimController).Crouching) &&
Math.Sign(targetMovement.X) != -Math.Sign(AnimController.Dir)) Math.Sign(targetMovement.X) != -Math.Sign(AnimController.Dir))
{ {
targetMovement *= AnimController.InWater ? AnimController.SwimSpeedMultiplier : AnimController.RunSpeedMultiplier; targetMovement *= AnimController.InWater ? AnimController.SwimSpeedMultiplier : AnimController.RunSpeedMultiplier;