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

More resharper cleanup

Browse Source
This commit is contained in:
Regalis11
2015-06-07 18:03:08 +03:00
parent f786cd3016
commit 34b79c85d6
62 changed files with 99 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Subsurface/Characters/AI/EnemyAIController.cs
+9 -14
View File
@@ -331,7 +331,7 @@ namespace Subsurface
selectedTarget = null;
selectedTargetMemory = null;
this.targetValue = 0.0f;
targetValue = 0.0f;
UpdateTargetMemories();
@@ -372,7 +372,7 @@ namespace Subsurface
valueModifier = valueModifier * targetMemory.Priority / dist;
//dist -= targetMemory.Priority;
if (Math.Abs(valueModifier) > Math.Abs(this.targetValue) && (dist < target.SightRange * sight || dist < target.SoundRange * hearing))
if (Math.Abs(valueModifier) > Math.Abs(targetValue) && (dist < target.SightRange * sight || dist < target.SoundRange * hearing))
{
Vector2 rayStart = character.animController.limbs[0].SimPosition;
Vector2 rayEnd = target.Position;
@@ -408,12 +408,12 @@ namespace Subsurface
//float newTargetValue = valueModifier/dist;
if (selectedTarget == null || Math.Abs(valueModifier) > Math.Abs(this.targetValue))
if (selectedTarget == null || Math.Abs(valueModifier) > Math.Abs(targetValue))
{
selectedTarget = target;
selectedTargetMemory = targetMemory;
this.targetValue = valueModifier;
targetValue = valueModifier;
Debug.WriteLine(selectedTarget.entity+": "+targetValue);
}
}
@@ -479,18 +479,13 @@ namespace Subsurface
wallAttackPos.X = message.ReadFloat();
wallAttackPos.Y = message.ReadFloat();
float wanderAngle = message.ReadFloat();
float updateTargetsTimer = message.ReadFloat();
float raycastTimer = message.ReadFloat();
float coolDownTimer = message.ReadFloat();
steeringManager.WanderAngle = message.ReadFloat();
updateTargetsTimer = message.ReadFloat();
raycastTimer = message.ReadFloat();
coolDownTimer = message.ReadFloat();
int targetID = message.ReadInt32();
steeringManager.WanderAngle = wanderAngle;
this.updateTargetsTimer = updateTargetsTimer;
this.raycastTimer = raycastTimer;
this.coolDownTimer = coolDownTimer;
if (targetID>-1)
targetEntity = Entity.FindEntityByID(targetID) as IDamageable;
Subsurface/Characters/AI/SteeringPath.cs
+1 -1
View File
@@ -30,7 +30,7 @@ namespace Subsurface
public Vector2 GetNode(Vector2 pos)
{
if (nodes.Count == 0) return Vector2.Zero;
if (currentNode==null || currentNode==Vector2.Zero || Vector2.Distance(pos, currentNode)<minDistance) currentNode = nodes.Dequeue();
if (currentNode==Vector2.Zero || Vector2.Distance(pos, currentNode)<minDistance) currentNode = nodes.Dequeue();
return currentNode;
}