escapists/EscapistsReintroduced
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Retain aircraft through native landing and qualify bounded input diagnostics

Browse Source
This commit is contained in:
jakub
2026-09-19 20:34:18 +02:00
parent f870443b9b
commit 2fba12f987
129 changed files with 50369 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/ai/Scripts/Game/ERR/ERR_NativeAircraftRouteProbe.c
+99 -11
View File
@@ -4,6 +4,19 @@
modded class ERR_AircraftRouteFlight
{
float ERR_NativeRouteStageDeadline() { return m_StageDeadline; }
int ERR_NativeRouteActionUpdates() { return m_ActionUpdates; }
int ERR_NativeRouteHelicopterUpdates() { return m_HelicopterUpdates; }
bool ERR_NativeRouteFreshReadback(float now) { return m_Readback && m_LastControl >= 0 && now >= m_LastControl && now - m_LastControl <= 1000; }
}
// Read-only fixture access to the service's exact retained controller.
modded class ERR_AircraftService
{
ERR_AircraftRouteFlight ERR_NativeOriginalFlight(Vehicle aircraft)
{
ERR_AircraftServiceEntry entry = Find(aircraft);
if (entry) return entry.Flight;
return null;
}
}
modded class SCR_CharacterControllerComponent
{
@@ -30,6 +43,14 @@ class ERR_NativeAircraftRouteRules
if (cancellation) return state == ERR_AircraftFlightState.CANCELLED && cancellationCount == 1;
return state == ERR_AircraftFlightState.COMPLETE && cancellationCount == 0;
}
static bool CanStop(int state, bool contact, float height, float speed, float vertical, float upright, float displacement)
{
return state == ERR_AircraftFlightState.TRANSLATING && !contact && displacement >= 3 && ERR_AircraftFlightRules.Hover(height, speed, vertical, upright);
}
static bool CancelProof(bool airborneControl, bool landingHeld, bool sameDeadline, bool sameToken, bool frozenPoint, bool insideCorridor, float targetError, bool arrived)
{
return airborneControl && landingHeld && sameDeadline && sameToken && frozenPoint && insideCorridor && targetError >= 0 && targetError <= 0.75 && !arrived;
}
static bool TranslateProof(bool proven, bool held, float requestedDistance, float displacement, float targetError)
{
return proven && held && requestedDistance >= 10 && requestedDistance <= 28.05 && displacement >= requestedDistance - 0.75 && targetError >= 0 && targetError <= 0.75;
@@ -57,6 +78,7 @@ class ERR_NativeAircraftRouteProbe
protected FuelManagerComponent m_Fuel;
protected ref ERR_AircraftRouteEnvelope m_Envelope;
protected ref ERR_AircraftRouteFlight m_Flight;
protected ref ERR_AircraftService m_Service;
protected float m_Deadline;
protected float m_StageDeadline;
protected float m_Stable = -1;
@@ -66,6 +88,14 @@ class ERR_NativeAircraftRouteProbe
protected float m_ControlDeadline;
protected int m_CancelCount;
protected bool m_CancelFixture;
protected float m_CancelStable = -1;
protected float m_CancelAt = -1;
protected float m_LandingStable = -1;
protected int m_CancelActionUpdates;
protected int m_CancelHelicopterUpdates;
protected bool m_ContinuedAirborneControl;
protected bool m_LandingHeld;
protected vector m_CancelLandingPoint;
protected bool m_TranslationFixture;
protected bool m_TranslationObserved;
protected bool m_TranslationHeld;
@@ -99,7 +129,8 @@ class ERR_NativeAircraftRouteProbe
{
m_Mode = mode;
if (!GetGame() || !GetGame().GetWorld() || !Enabled() || s_Current) { m_Stopped = true; return; }
string outcome; System.GetCLIParam("errSmokeOutcome", outcome); m_CancelFixture = false; m_TranslationFixture = true;
string cancellation; m_CancelFixture = System.GetCLIParam("errSmokeRouteServiceCancel", cancellation) && cancellation == "1";
m_TranslationFixture = true;
m_Deadline = GetGame().GetWorld().GetWorldTime() + 300000;
s_Current = this;
}
@@ -197,6 +228,31 @@ class ERR_NativeAircraftRouteProbe
}
return false;
}
protected bool RetainedIdentity()
{
return m_Service && m_Flight && m_Service.ERR_NativeOriginalFlight(m_Aircraft) == m_Flight && m_Service.RegisteredCount() == 1 && m_Service.AttemptedOrders() == 1 && m_Service.OrderToken(m_Aircraft) == ORDER_TOKEN && m_Service.OrderDeadline(m_Aircraft) == m_ControlDeadline;
}
protected bool StartRetainedRoute()
{
if (m_Service || m_Flight) return Check(false, "one retained aircraft service only");
m_Service = new ERR_AircraftService(m_Mode);
if (!Check(m_Service.Register(m_Aircraft, m_Group, m_Pilot, m_Seat) && m_Service.RegisteredCount() == 1 && m_Service.Ready(m_Aircraft), "retention service registers one exact physical aircraft, original pilot/group/seat and current readiness")) return false;
m_ControllerStarts++;
bool started = m_Service.StartRoute(m_Aircraft, m_Envelope, ORDER_TOKEN, m_ControlDeadline);
m_Flight = m_Service.ERR_NativeOriginalFlight(m_Aircraft);
return Check(started && RetainedIdentity() && m_Service.Pending(m_Aircraft), "actual controller accepts one qualified original pilot/aircraft order through retention service");
}
protected bool StopRetainedRoute(float now)
{
if (m_CancelCount != 0 || !RetainedIdentity() || m_Service.Stopping()) return Check(false, "one explicit retained service stop only");
m_CancelCount = 1; m_CancelAt = now;
m_CancelActionUpdates = m_Flight.ERR_NativeRouteActionUpdates();
m_CancelHelicopterUpdates = m_Flight.ERR_NativeRouteHelicopterUpdates();
m_Service.Stop();
m_CancelLandingPoint = m_Flight.LandingPoint();
PrintFormat("ERR AIRCRAFT SERVICE STOP: token=%1 originalDeadline=%2 now=%3 landingPoint=%4 pending=%5 actions=%6 helicopterUpdates=%7", m_Flight.OrderToken(), m_ControlDeadline, now, m_CancelLandingPoint, m_Service.Pending(m_Aircraft), m_CancelActionUpdates, m_CancelHelicopterUpdates);
return Check(RetainedIdentity() && m_Service.Stopping() && m_Service.Pending(m_Aircraft) && !m_Service.Drained() && !m_Service.Ready(m_Aircraft) && m_Flight.State() == ERR_AircraftFlightState.LANDING && !m_Flight.Finished() && m_Flight.ERR_NativeControlDeadline() == m_ControlDeadline && m_Envelope.Contains(m_CancelLandingPoint, 1), "airborne service Stop retains original pending flight, frozen qualified landing point and immutable lease");
}
protected void Diagnostic(float now)
{
if (!m_Aircraft || !m_Controller || !m_Simulation || now < m_NextLog) return;
@@ -227,7 +283,7 @@ class ERR_NativeAircraftRouteProbe
if (m_Stopped) return -1;
if (!Enabled() || !m_Mode || m_Mode != ERR_GameMode.Get() || !m_Mode.Active() || now >= m_Deadline) { Check(false, "active exact mission and bounded300-second fixture"); return -1; }
if (!NoPlayers()) { Check(false, "fixture remains unclaimed by any human"); return -1; }
if (m_LastTick >= 0 && (now < m_LastTick || now - m_LastTick > 1500)) { m_Stable = -1; m_TranslationStable = -1; }
if (m_LastTick >= 0 && (now < m_LastTick || now - m_LastTick > 1500)) { m_Stable = -1; m_TranslationStable = -1; m_CancelStable = -1; m_LandingStable = -1; }
m_LastTick = now;
if (m_Step == 0)
{
@@ -268,15 +324,13 @@ class ERR_NativeAircraftRouteProbe
m_Envelope = ERR_AircraftRouteEnvelope.QualifyRoute(m_Mode, m_Aircraft, m_Pilot, m_Destination);
if (!Check(m_Envelope != null, "actual full corridor, both pads and complete native rotor/model footprint issue exact route qualification")) return -1;
m_InitialFuel = m_Fuel.GetTotalFuel();
m_Flight = new ERR_AircraftRouteFlight(); m_ControllerStarts++;
m_ControlDeadline = Math.Min(m_Deadline, now + 240000);
bool started;
started = m_Flight.StartRoute(m_Mode, m_Aircraft, m_Group, m_Pilot, m_Seat, m_Envelope, ORDER_TOKEN, m_ControlDeadline);
if (!Check(started, "actual controller accepts one qualified original pilot/aircraft order")) return -1;
if (!StartRetainedRoute()) return -1;
m_Step = 3; return 0;
}
if (m_Step == 3)
{
if (!RetainedIdentity()) { Check(false, "service retains exact original flight, token and deadline"); return -1; }
if (!OriginalOccupancy()) { Check(false, "original pilot remains conscious and in its exact seat/group"); return -1; }
bool engine = m_Controller.IsEngineOn(); if (engine && !m_LastEngine) m_EngineStarts++; m_LastEngine = engine;
vector transform[4]; m_Aircraft.GetWorldTransform(transform);
@@ -297,12 +351,41 @@ class ERR_NativeAircraftRouteProbe
else if (m_TranslationStable < 0) m_TranslationStable = now;
if (m_TranslationStable >= 0 && now - m_TranslationStable >= 5000) m_TranslationHeld = true;
}
m_Flight.Tick();
if (m_CancelFixture && m_CancelCount == 0)
{
bool canStop = m_TranslationObserved && ERR_NativeAircraftRouteRules.CanStop(m_Flight.State(), contact, height, m_Simulation.GetVelocity().Length(), m_Simulation.GetVelocity()[1], transform[1][1], vector.DistanceXZ(transform[3], m_TranslationOrigin));
if (!canStop) m_CancelStable = -1;
else if (m_CancelStable < 0) m_CancelStable = now;
if (m_CancelStable >= 0 && now - m_CancelStable >= 500 && !StopRetainedRoute(now)) return -1;
}
if (m_CancelCount == 1)
{
int state = m_Flight.State();
if (!m_Service.Stopping() || m_Service.Ready(m_Aircraft) || m_Flight.ERR_NativeControlDeadline() != m_ControlDeadline || m_Flight.OrderToken() != ORDER_TOKEN || m_Flight.LandingPoint() != m_CancelLandingPoint || !m_Envelope.Contains(m_CancelLandingPoint, 1)) { Check(false, "stopped service retains immutable original lease and qualified frozen landing point"); return -1; }
if (state != ERR_AircraftFlightState.LANDING && state != ERR_AircraftFlightState.SHUTDOWN && state != ERR_AircraftFlightState.CANCELLED) { Check(false, "service Stop permits only retained landing, shutdown or cancellation"); return -1; }
if (!m_Flight.Finished() && (!m_Service.Pending(m_Aircraft) || m_Service.Drained())) { Check(false, "airborne or shutting-down order remains pending until actual terminal observation"); return -1; }
if (state == ERR_AircraftFlightState.LANDING && !contact && height > 1 && m_Flight.ERR_NativeRouteActionUpdates() > m_CancelActionUpdates + 10 && m_Flight.ERR_NativeRouteHelicopterUpdates() > m_CancelHelicopterUpdates + 10 && m_Flight.ERR_NativeRouteFreshReadback(now)) m_ContinuedAirborneControl = true;
bool cancelledLanded = landed && vector.DistanceXZ(transform[3], m_CancelLandingPoint) <= 0.75;
if (!cancelledLanded) m_LandingStable = -1;
else if (m_LandingStable < 0) m_LandingStable = now;
}
m_Service.Tick();
if (m_CancelCount == 1 && m_Flight.State() == ERR_AircraftFlightState.SHUTDOWN)
{
if (!Check(landed && m_LandingStable >= 0 && now - m_LandingStable >= 2000, "service cancellation reaches shutdown only after two observed stable grounded seconds")) return -1;
m_LandingHeld = true;
}
if (!m_Flight.Finished()) return 0;
PrintFormat("ERR AIRCRAFT ROUTE FIXTURE RESULT: state=%1 token=%2 engineStarts=%3 controllerStarts=%4 wakes=%5 pilotHooks=%6 helicopterHooks=%7 reason=%8", m_Flight.State(), m_Flight.OrderToken(), m_EngineStarts, m_ControllerStarts, m_Wakes, m_PilotHooks, m_HelicopterHooks, m_Flight.Reason());
bool complete = ERR_NativeAircraftRouteRules.Terminal(m_CancelFixture, m_Flight.State(), m_CancelCount);
complete = complete && ERR_NativeAircraftRouteRules.PhysicalFinish(OriginalOccupancy(), landed, !m_Controller.IsEngineOn(), m_InitialFuel - m_Fuel.GetTotalFuel(), m_Wakes, m_EngineStarts, m_ControllerStarts, m_PilotHooks, m_HelicopterHooks);
if (m_TranslationFixture)
if (m_CancelFixture)
{
bool cancelled = ERR_NativeAircraftRouteRules.CancelProof(m_ContinuedAirborneControl, m_LandingHeld, m_Flight.ERR_NativeControlDeadline() == m_ControlDeadline, m_Flight.OrderToken() == ORDER_TOKEN, m_Flight.LandingPoint() == m_CancelLandingPoint, m_Envelope.Contains(m_CancelLandingPoint, 1), vector.DistanceXZ(transform[3], m_CancelLandingPoint), m_Flight.Arrived());
PrintFormat("ERR AIRCRAFT SERVICE CANCEL RESULT: stops=%1 elapsed=%2 actualAirborneControl=%3 landingHeld=%4 frozenLanding=%5 finalPosition=%6 targetError=%7", m_CancelCount, now - m_CancelAt, m_ContinuedAirborneControl, m_LandingHeld, m_CancelLandingPoint, transform[3], vector.DistanceXZ(transform[3], m_CancelLandingPoint));
complete = complete && cancelled && m_Service.Stopping() && !m_Service.Ready(m_Aircraft);
}
else if (m_TranslationFixture)
{
float requestedDistance = vector.DistanceXZ(m_TranslationOrigin, m_TranslationTarget);
float displacement = vector.DistanceXZ(transform[3], m_TranslationOrigin);
@@ -312,6 +395,7 @@ class ERR_NativeAircraftRouteProbe
complete = complete && translated && m_Flight.Arrived() && vector.DistanceXZ(transform[3], m_Destination) <= 0.75;
}
if (!Check(complete && m_Flight.OrderToken() == ORDER_TOKEN, "actual control order completes on original physical grounded aircraft with engine off, finite fuel use and exact pilot")) return -1;
if (!Check(RetainedIdentity() && m_Service.Drained() && !m_Service.Pending(m_Aircraft) && !m_Service.Retired(m_Aircraft), "retention service observes completed flight drained with original token/deadline and no pending order")) return -1;
m_Complete = true; Stop(); return 1;
}
return 0;
@@ -321,11 +405,12 @@ class ERR_NativeAircraftRouteProbe
if (m_Stopped) return;
m_Stopped = true;
if (s_Current == this) s_Current = null;
if (m_Flight && !m_Flight.Finished() && m_CancelCount == 0) m_Flight.Cancel("native fixture stopped");
if (m_Service && !m_Service.Stopping()) m_Service.Stop();
// End-of-test disposal is not successful flight or a production cancellation.
// These assets are fixture-owned only, never registered with mission cleanup.
// Release the controller before deleting disposable unclaimed physical assets.
m_Flight = null;
// Retain service/controller through guarded disposal; then observe ownership
// loss before releasing their references. No direct second Cancel or Tick.
bool context = GetGame() && GetGame().GetWorld() && GetGame().GetPlayerManager() && m_Mode && m_Mode == ERR_GameMode.Get();
bool faction = context && (!m_Group || (!m_PilotRequested && m_Group.GetAgentsCount() == 0 && !m_Group.GetFaction()) || m_Group.GetFaction() == m_Mode.EnemyFaction()) && (!m_Aircraft || SCR_FactionManager.SGetFaction(m_Aircraft) == m_Mode.EnemyFaction());
bool groupUnchanged = context && (!m_Group || m_Group.GetAgentsCount() == 0 || (m_Group.GetAgentsCount() == 1 && m_Pilot && ERR_Actors.Group(m_Pilot) == m_Group));
@@ -335,6 +420,9 @@ class ERR_NativeAircraftRouteProbe
ERR_Actors.DeleteSpawned(m_Group); ERR_Actors.DeleteSpawned(m_Pilot); ERR_Actors.DeleteSpawned(m_Aircraft);
}
else Print("ERR AIRCRAFT ROUTE FIXTURE CLEANUP: ownership changed; captured entities preserved");
if (m_Service) m_Service.Tick();
m_Flight = null;
m_Service = null;
m_Envelope = null;
}
void ~ERR_NativeAircraftRouteProbe() { Stop(); }