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

(69d6e11bf) shuttle tweaks

Browse Source
This commit is contained in:
Joonas Rikkonen
2019-05-16 06:53:38 +03:00
parent f2e936e4d3
commit dbc35568cd
17 changed files with 311 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/Source/Characters/AI/HumanAIController.cs
+10 -33
View File
@@ -15,14 +15,14 @@ namespace Barotrauma
private float sortTimer;
private float crouchRaycastTimer;
private float reactTimer;
private float reportTimer;
private float hullVisibilityTimer;
private bool shouldCrouch;
const float reactionTime = 0.5f;
const float hullVisibilityInterval = 0.5f;
const float crouchRaycastInterval = 1;
const float reportInterval = 1;
const float sortObjectiveInterval = 1;
const float hullVisibilityInterval = 1;
public static float HULL_SAFETY_THRESHOLD = 50;
@@ -72,7 +72,7 @@ namespace Barotrauma
insideSteering = new IndoorsSteeringManager(this, true, false);
outsideSteering = new SteeringManager(this);
objectiveManager = new AIObjectiveManager(c);
reactTimer = Rand.Range(0f, reactionTime);
reportTimer = Rand.Range(0f, reportInterval);
sortTimer = Rand.Range(0f, sortObjectiveInterval);
hullVisibilityTimer = Rand.Range(0f, hullVisibilityTimer);
InitProjSpecific();
@@ -119,22 +119,22 @@ namespace Barotrauma
sortTimer = sortObjectiveInterval;
}
if (reactTimer > 0.0f)
if (reportTimer > 0.0f)
{
reactTimer -= deltaTime;
reportTimer -= deltaTime;
}
else
{
if (Character.CurrentHull != null)
{
VisibleHulls.ForEach(h => PropagateHullSafety(Character, h));
VisibleHulls.ForEach(h => PropagateHullSafety(Character.Controlled, h));
}
if (Character.SpeechImpediment < 100.0f)
{
ReportProblems();
UpdateSpeaking();
}
reactTimer = reactionTime * Rand.Range(0.75f, 1.25f);
reportTimer = reportInterval;
}
if (objectiveManager.CurrentObjective == null) { return; }
@@ -646,7 +646,6 @@ namespace Barotrauma
DoForEachCrewMember(character, (humanAi) => humanAi.RefreshHullSafety(hull));
}
public float CurrentHullSafety { get; private set; }
private void RefreshHullSafety(Hull hull)
{
if (GetHullSafety(hull, Character, VisibleHulls) > HULL_SAFETY_THRESHOLD)
@@ -741,34 +740,12 @@ namespace Barotrauma
public float GetHullSafety(Hull hull, Character character, IEnumerable<Hull> visibleHulls = null)
{
bool updateCurrentHullSafety = character == Character && character.CurrentHull == hull;
if (hull == null)
{
if (updateCurrentHullSafety)
{
CurrentHullSafety = 0;
}
return 0;
}
if (character == Character)
{
// If the character is this character, we can use the cached hulls.
// If no visible hulls are provided, the calculations don't take visible/adjacent hulls into account.
if (visibleHulls == null)
{
visibleHulls = VisibleHulls;
}
}
if (hull == null) { return 0; }
bool ignoreFire = ObjectiveManager.IsCurrentObjective<AIObjectiveExtinguishFires>() || ObjectiveManager.IsCurrentObjective<AIObjectiveExtinguishFire>();
bool ignoreWater = HasDivingSuit(character);
bool ignoreOxygen = ignoreWater || HasDivingMask(character);
bool ignoreEnemies = ObjectiveManager.IsCurrentObjective<AIObjectiveFightIntruders>();
float safety = GetHullSafety(hull, visibleHulls, character, ignoreWater, ignoreOxygen, ignoreFire, ignoreEnemies);
if (updateCurrentHullSafety)
{
CurrentHullSafety = safety;
}
return safety;
return GetHullSafety(hull, visibleHulls, character, ignoreWater, ignoreOxygen, ignoreFire, ignoreEnemies);
}
public static float GetHullSafety(Hull hull, IEnumerable<Hull> visibleHulls, Character character, bool ignoreWater = false, bool ignoreOxygen = false, bool ignoreFire = false, bool ignoreEnemies = false)