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

Unstable 1.1.14.0

Browse Source
This commit is contained in:
Markus Isberg
2023-10-02 16:43:54 +03:00
parent 94f5a93a0c
commit cf8f0de659
606 changed files with 21906 additions and 11456 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/SharedSource/Characters/AI/EnemyAIController.cs
+31 -41
View File
@@ -344,12 +344,12 @@ namespace Barotrauma
private Identifier GetTargetingTag(AITarget aiTarget)
{
if (aiTarget?.Entity == null) { return Identifier.Empty; }
string targetingTag = string.Empty;
Identifier targetingTag = Identifier.Empty;
if (aiTarget.Entity is Character targetCharacter)
{
if (targetCharacter.IsDead)
{
targetingTag = "dead";
targetingTag = "dead".ToIdentifier();
}
else if (AIParams.TryGetTarget(targetCharacter.CharacterHealth.GetActiveAfflictionTags(), out CharacterParams.TargetParams tp) && tp.Threshold >= Character.GetDamageDoneByAttacker(targetCharacter))
{
@@ -357,11 +357,11 @@ namespace Barotrauma
}
else if (PetBehavior != null && aiTarget.Entity == PetBehavior.Owner)
{
targetingTag = "owner";
targetingTag = "owner".ToIdentifier();
}
else if (PetBehavior != null && (!Character.IsOnFriendlyTeam(targetCharacter) || IsAttackingOwner(targetCharacter)))
{
targetingTag = "hostile";
targetingTag = "hostile".ToIdentifier();
}
else if (AIParams.TryGetTarget(targetCharacter, out CharacterParams.TargetParams tP))
{
@@ -373,25 +373,25 @@ namespace Barotrauma
{
// Pets see other pets as pets by default.
// Monsters see them only as pet only when they have a matching ai target. Otherwise they use the other tags, specified below.
targetingTag = "pet";
targetingTag = "pet".ToIdentifier();
}
else if (targetCharacter.IsHusk && AIParams.HasTag("husk"))
{
targetingTag = "husk";
targetingTag = "husk".ToIdentifier();
}
else if (!Character.IsSameSpeciesOrGroup(targetCharacter))
{
if (enemy.CombatStrength > CombatStrength)
{
targetingTag = "stronger";
targetingTag = "stronger".ToIdentifier();
}
else if (enemy.CombatStrength < CombatStrength)
{
targetingTag = "weaker";
targetingTag = "weaker".ToIdentifier();
}
else
{
targetingTag = "equal";
targetingTag = "equal".ToIdentifier();
}
}
}
@@ -406,27 +406,27 @@ namespace Barotrauma
break;
}
}
if (targetingTag.IsNullOrEmpty())
if (targetingTag.IsEmpty)
{
if (targetItem.GetComponent<Sonar>() != null)
{
targetingTag = "sonar";
targetingTag = "sonar".ToIdentifier();
}
if (targetItem.GetComponent<Door>() != null)
{
targetingTag = "door";
targetingTag = "door".ToIdentifier();
}
}
}
else if (aiTarget.Entity is Structure)
{
targetingTag = "wall";
targetingTag = "wall".ToIdentifier();
}
else if (aiTarget.Entity is Hull)
{
targetingTag = "room";
targetingTag = "room".ToIdentifier();
}
return targetingTag.ToIdentifier();
return targetingTag;
}
public override void SelectTarget(AITarget target) => SelectTarget(target, 100);
@@ -767,7 +767,7 @@ namespace Barotrauma
mainLimb.body.SmoothRotate(rotation, Character.AnimController.SwimFastParams.TorsoTorque);
}
}
if (disableTailCoroutine == null && SelectedAiTarget.Entity is Item i && i.HasTag("guardianshelter"))
if (disableTailCoroutine == null && SelectedAiTarget.Entity is Item i && i.HasTag(Tags.GuardianShelter))
{
if (!CoroutineManager.IsCoroutineRunning(disableTailCoroutine))
{
@@ -864,10 +864,11 @@ namespace Barotrauma
}
// Ensure that the creature keeps inside the level
SteerInsideLevel(deltaTime);
float speed = Character.AnimController.GetCurrentSpeed(run && Character.CanRun);
steeringManager.Update(speed);
float targetMovement = useSteeringLengthAsMovementSpeed ? Steering.Length() : speed;
Character.AnimController.TargetMovement = Character.ApplyMovementLimits(Steering, targetMovement);
float defaultSpeed = Character.AnimController.GetCurrentSpeed(run && Character.CanRun);
//calculate a normalized Steering value at this point: we multiply it with the actual, desired speed in ApplyMovementLimits
steeringManager.Update(1.0f);
float speed = useSteeringLengthAsMovementSpeed ? Steering.Length() : defaultSpeed;
Character.AnimController.TargetMovement = Character.ApplyMovementLimits(Steering, speed);
if (Character.CurrentHull != null && Character.AnimController.InWater)
{
// Limit the swimming speed inside the sub.
@@ -1935,14 +1936,7 @@ namespace Barotrauma
}
else if (advance)
{
if (pathSteering != null)
{
pathSteering.SteeringSeek(steerPos, weight: 10, minGapWidth: minGapSize);
}
else
{
SteeringManager.SteeringSeek(steerPos, 10);
}
SteeringManager.SteeringSeek(steerPos, 10);
}
else
{
@@ -2310,7 +2304,7 @@ namespace Barotrauma
if (damageTarget != null)
{
Character.SetInput(item.IsShootable ? InputType.Shoot : InputType.Use, false, true);
item.Use(deltaTime, Character);
item.Use(deltaTime, user: Character);
}
}
}
@@ -2545,6 +2539,7 @@ namespace Barotrauma
item.body.LinearVelocity *= 0.9f;
item.body.LinearVelocity -= velocity * 0.25f;
bool wasBroken = item.Condition <= 0.0f;
item.LastEatenTime = (float)Timing.TotalTimeUnpaused;
item.AddDamage(Character, item.WorldPosition, new Attack(0.0f, 0.0f, 0.0f, 0.0f, 0.02f * Character.Params.EatingSpeed), deltaTime);
Character.ApplyStatusEffects(ActionType.OnEating, deltaTime);
if (item.Condition <= 0.0f)
@@ -3116,6 +3111,13 @@ namespace Barotrauma
// ignore if owner is tagged to be explicitly ignored (Feign Death)
continue;
}
var characterTargetingTag = GetTargetingTag(owner.AiTarget);
if (!characterTargetingTag.IsEmpty)
{
// if the enemy is configured to ignore the target character, ignore the provocative item they're holding/wearing too
var characterTargetingParams = GetTargetParams(characterTargetingTag);
if (characterTargetingParams?.State == AIState.Idle) { continue; }
}
}
}
if (targetCharacter != null)
@@ -4055,18 +4057,6 @@ namespace Barotrauma
}
return null;
}
public override void ServerWrite(IWriteMessage msg)
{
msg.WriteByte((byte)State);
PetBehavior?.ServerWrite(msg);
}
public override void ClientRead(IReadMessage msg)
{
State = (AIState)msg.ReadByte();
PetBehavior?.ClientRead(msg);
}
}
//the "memory" of the Character