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

(546717195) Use the AIObjectiveFightIntruders.IsValidTarget for deciding whether or not the button should flash.

Browse Source
This commit is contained in:
Joonas Rikkonen
2019-05-16 06:55:43 +03:00
parent 5435adc9b4
commit f38aa90847
20 changed files with 200 additions and 243 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/Source/Characters/AI/HumanAIController.cs
+69 -50
View File
@@ -15,14 +15,14 @@ namespace Barotrauma
private float sortTimer;
private float crouchRaycastTimer;
private float reportTimer;
private float reactTimer;
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);
reportTimer = Rand.Range(0f, reportInterval);
reactTimer = Rand.Range(0f, reactionTime);
sortTimer = Rand.Range(0f, sortObjectiveInterval);
hullVisibilityTimer = Rand.Range(0f, hullVisibilityTimer);
InitProjSpecific();
@@ -118,23 +118,22 @@ namespace Barotrauma
objectiveManager.SortObjectives();
sortTimer = sortObjectiveInterval;
}
if (reportTimer > 0.0f)
if (reactTimer > 0.0f)
{
reportTimer -= deltaTime;
reactTimer -= deltaTime;
}
else
{
if (Character.CurrentHull != null)
{
VisibleHulls.ForEach(h => PropagateHullSafety(Character.Controlled, h));
VisibleHulls.ForEach(h => PropagateHullSafety(Character, h));
}
if (Character.SpeechImpediment < 100.0f)
{
ReportProblems();
UpdateSpeaking();
}
reportTimer = reportInterval;
reactTimer = reactionTime * Rand.Range(0.75f, 1.25f);
}
if (objectiveManager.CurrentObjective == null) { return; }
@@ -374,14 +373,38 @@ namespace Barotrauma
{
foreach (var hull in VisibleHulls)
{
foreach (Character c in Character.CharacterList)
{
if (c.CurrentHull != hull) { continue; }
if (AIObjectiveFightIntruders.IsValidTarget(c, Character))
{
AddTargets<AIObjectiveFightIntruders, Character>(Character, c);
if (newOrder == null)
{
var orderPrefab = Order.PrefabList.Find(o => o.AITag == "reportintruders");
newOrder = new Order(orderPrefab, c.CurrentHull, null);
}
}
}
if (AIObjectiveExtinguishFires.IsValidTarget(hull, Character))
{
if (AddTargets<AIObjectiveExtinguishFires, Hull>(Character, hull))
AddTargets<AIObjectiveExtinguishFires, Hull>(Character, hull);
if (newOrder == null)
{
if (hull == Character.CurrentHull)
var orderPrefab = Order.PrefabList.Find(o => o.AITag == "reportfire");
newOrder = new Order(orderPrefab, hull, null);
}
}
foreach (Character c in Character.CharacterList)
{
if (c.CurrentHull != hull) { continue; }
if (AIObjectiveRescueAll.IsValidTarget(c, Character))
{
AddTargets<AIObjectiveRescueAll, Character>(c, Character);
if (newOrder == null)
{
var orderPrefab = Order.PrefabList.Find(o => o.AITag == "reportfire");
newOrder = new Order(orderPrefab, Character.CurrentHull, null);
var orderPrefab = Order.PrefabList.Find(o => o.AITag == "requestfirstaid");
newOrder = new Order(orderPrefab, c.CurrentHull, null);
}
}
}
@@ -389,13 +412,11 @@ namespace Barotrauma
{
if (AIObjectiveFixLeaks.IsValidTarget(gap, Character))
{
if (AddTargets<AIObjectiveFixLeaks, Gap>(Character, gap))
AddTargets<AIObjectiveFixLeaks, Gap>(Character, gap);
if (newOrder == null)
{
if (hull == Character.CurrentHull)
{
var orderPrefab = Order.PrefabList.Find(o => o.AITag == "reportbreach");
newOrder = new Order(orderPrefab, Character.CurrentHull, null);
}
var orderPrefab = Order.PrefabList.Find(o => o.AITag == "reportbreach");
newOrder = new Order(orderPrefab, hull, null);
}
}
}
@@ -405,39 +426,14 @@ namespace Barotrauma
if (AIObjectiveRepairItems.IsValidTarget(item, Character))
{
if (item.Repairables.All(r => item.Condition > r.ShowRepairUIThreshold)) { continue; }
if (AddTargets<AIObjectiveRepairItems, Item>(Character, item))
AddTargets<AIObjectiveRepairItems, Item>(Character, item);
if (newOrder == null)
{
if (hull == Character.CurrentHull)
{
var orderPrefab = Order.PrefabList.Find(o => o.AITag == "reportbrokendevices");
newOrder = new Order(orderPrefab, Character.CurrentHull, item.Repairables?.FirstOrDefault());
}
var orderPrefab = Order.PrefabList.Find(o => o.AITag == "reportbrokendevices");
newOrder = new Order(orderPrefab, item.CurrentHull, item.Repairables?.FirstOrDefault());
}
}
}
foreach (Character c in Character.CharacterList)
{
if (c.CurrentHull != hull) { continue; }
if (AIObjectiveFightIntruders.IsValidTarget(c, Character))
{
if (AddTargets<AIObjectiveFightIntruders, Character>(Character, c))
{
if (hull == Character.CurrentHull)
{
var orderPrefab = Order.PrefabList.Find(o => o.AITag == "reportintruders");
newOrder = new Order(orderPrefab, Character.CurrentHull, null);
}
}
}
}
}
if (Character.Bleeding > 1.0f || Character.Vitality < Character.MaxVitality * 0.1f)
{
if (AddTargets<AIObjectiveRescueAll, Character>(Character, Character))
{
var orderPrefab = Order.PrefabList.Find(o => o.AITag == "requestfirstaid");
newOrder = new Order(orderPrefab, Character.CurrentHull, null);
}
}
}
if (newOrder != null)
@@ -646,6 +642,7 @@ 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)
@@ -740,12 +737,34 @@ namespace Barotrauma
public float GetHullSafety(Hull hull, Character character, IEnumerable<Hull> visibleHulls = null)
{
if (hull == null) { return 0; }
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;
}
}
bool ignoreFire = ObjectiveManager.IsCurrentObjective<AIObjectiveExtinguishFires>() || ObjectiveManager.IsCurrentObjective<AIObjectiveExtinguishFire>();
bool ignoreWater = HasDivingSuit(character);
bool ignoreOxygen = ignoreWater || HasDivingMask(character);
bool ignoreEnemies = ObjectiveManager.IsCurrentObjective<AIObjectiveFightIntruders>();
return GetHullSafety(hull, visibleHulls, character, ignoreWater, ignoreOxygen, ignoreFire, ignoreEnemies);
float safety = GetHullSafety(hull, visibleHulls, character, ignoreWater, ignoreOxygen, ignoreFire, ignoreEnemies);
if (updateCurrentHullSafety)
{
CurrentHullSafety = safety;
}
return safety;
}
public static float GetHullSafety(Hull hull, IEnumerable<Hull> visibleHulls, Character character, bool ignoreWater = false, bool ignoreOxygen = false, bool ignoreFire = false, bool ignoreEnemies = false)