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

Integrate owned Intel rerolls, discovery feedback and fair HQ reports

Browse Source
This commit is contained in:
jakub
2026-09-19 23:00:02 +02:00
parent 6cf989a060
commit 27989b85a3
46 changed files with 5756 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/chat/Scripts/Game/ERR/ERR_AdminCommands.c
+16 -1
View File
@@ -17,6 +17,21 @@ modded class ERR_AdminService
}
protected override bool Extension(ERR_GameMode mode, string arguments, array<string> replies)
{
if (arguments == "intel show")
{
replies.Insert("aiIntelChancePercent=" + mode.Settings().Get("aiIntelChancePercent").ToString());
replies.Insert("intelRevealChancePercent=" + mode.Settings().Get("intelRevealChancePercent").ToString());
return true;
}
if (arguments == "intel reroll" || arguments == "intel reroll show")
{
ERR_IntelService intel = mode.Intel();
if (!intel) { replies.Insert("Intel service unavailable."); return true; }
if (arguments == "intel reroll" && !intel.BeginReroll())
replies.Insert("Intel reroll could not start. It requires an active round and no running reroll.");
replies.Insert(intel.RerollStatus());
return true;
}
if (arguments != "status" && arguments != "hq show" && arguments != "hq log") return super.Extension(mode, arguments, replies);
ERR_HQ hq = ERR_HQ.Cast(mode.Command());
if (!hq) { replies.Insert("HQ unavailable"); return true; }
@@ -31,6 +46,6 @@ modded class ERR_AdminService
}
protected override string Help()
{
return super.Help() + " | hq show|log | hq interval|squads|radius show|set N | intel carrying show|set N";
return super.Help() + " | hq show|log | hq interval|squads|radius show|set N | intel show | intel carrying show|set N | intel reroll [show]";
}
}
addons/chat/Scripts/Game/ERR/ERR_NativeSmoke.c
+68
View File
@@ -39,6 +39,11 @@ modded class ERR_GameMode
protected ref ERR_NativeRadioProbe m_ERRRadioProbe;
protected ref ERR_NativeHQResponseProof m_ERRHQResponseProof;
protected ref array<IEntity> m_ERRCacheFolders = {};
protected int m_ERRIntelRerollStage;
protected float m_ERRIntelRerollDeadline;
protected ref array<IEntity> m_ERRIntelActors = {};
protected ref array<IEntity> m_ERRRetiredIntel = {};
protected override void EOnInit(IEntity owner)
{
@@ -75,6 +80,68 @@ modded class ERR_GameMode
Print("ERR SMOKE: scripted integration test enabled; gameplay acceptance remains separate");
}
// Ordinary victory fixture additionally exercises the actual administrator
// reroll against native enemy inventories. Scripted, not remote UI evidence.
protected bool ERR_CheckIntelReroll(float now)
{
if (m_ERRIntelRerollStage == 3) return true;
if (m_ERRIntelRerollStage == 0)
{
if (!ERR_Check(Sites() && Sites().Find("everon-supply-2") && Sites().Find("everon-supply-2").Group, "reroll cache group is ready")) return false;
array<AIAgent> guards = {};
Sites().Find("everon-supply-2").Group.GetAgents(guards);
foreach (AIAgent guard : guards)
{
if (!guard) continue;
IEntity actor = guard.GetControlledEntity();
if (ERR_Actors.Alive(actor) && !ERR_Actors.Player(actor)) m_ERRIntelActors.Insert(actor);
}
if (!ERR_Check(!m_ERRIntelActors.IsEmpty(), "reroll observes original living cache guards")) return false;
array<string> replies = {};
string before = m_Intel.RerollStatus();
m_Admin.Execute(this, false, "intel reroll", replies);
if (!ERR_Check(m_Intel.RerollStatus() == before && !m_Intel.RerollRunning(), "unauthorized reroll cannot start a batch")) return false;
if (!ERR_Check(m_Settings.Set("aiIntelChancePercent", 100), "native reroll captured chance configured")) return false;
m_Admin.Execute(this, true, "intel reroll", replies);
if (!ERR_Check(m_Intel.RerollRunning() && !m_Intel.BeginReroll(), "administrator starts one batch; overlapping reroll rejected")) return false;
if (!ERR_Check(m_Settings.Set("aiIntelChancePercent", 0), "live setting change does not alter captured batch chance")) return false;
m_ERRIntelRerollDeadline = now + 90000;
m_ERRIntelRerollStage = 1;
return false;
}
if (now >= m_ERRIntelRerollDeadline) return ERR_Check(false, "native reroll exceeded bounded fixture deadline");
if (m_Intel.RerollRunning()) return false;
Print("ERR INTEL REROLL: " + m_Intel.RerollStatus());
if (!ERR_Check(m_Intel.RerollStatus().IndexOf(", 0 failed,") >= 0, "native inventory reroll completes without failed operations")) return false;
foreach (IEntity actor : m_ERRIntelActors)
{
if (!ERR_Check(ERR_Actors.Alive(actor), "original cache guard survives the reroll fixture")) return false;
array<IEntity> folders = {};
ERR_DiscoveryService.Folders(InventoryStorageManagerComponent.Cast(actor.FindComponent(InventoryStorageManagerComponent)), folders);
if (m_ERRIntelRerollStage == 1)
{
if (!ERR_Check(folders.Count() == 1, "captured 100 percent batch assigns one native folder despite live zero setting")) return false;
m_ERRRetiredIntel.Insert(folders[0]);
}
else if (!ERR_Check(folders.IsEmpty(), "zero percent reroll removes original native AI folders without replacements")) return false;
}
array<IEntity> carried = {};
ERR_DiscoveryService.Folders(InventoryStorageManagerComponent.Cast(m_ERRSmokePlayer.FindComponent(InventoryStorageManagerComponent)), carried);
foreach (IEntity document : m_ERRCacheFolders)
if (!ERR_Check(carried.Contains(document), "reroll preserves player's exact collected clue documents")) return false;
if (!ERR_Check(m_ERRSmokeRadio.Knowledge() == 2, "reroll preserves already identified radio")) return false;
if (m_ERRIntelRerollStage == 1)
{
if (!ERR_Check(m_Intel.BeginReroll(), "next independent batch uses current zero probability")) return false;
m_ERRIntelRerollStage = 2;
return false;
}
foreach (IEntity retired : m_ERRRetiredIntel)
if (!ERR_Check(retired && Discovery().IsSpent(retired) && m_OwnedEntities.Contains(retired), "retired native document remains spent and owned for round cleanup")) return false;
m_ERRIntelRerollStage = 3;
return true;
}
protected bool ERR_Check(bool condition, string name)
{
if (condition) { Print("ERR SMOKE PASS: " + name); return true; }
@@ -499,6 +566,7 @@ modded class ERR_GameMode
}
else if (m_ERRSmokeStep == 3)
{
if (!ERR_CheckIntelReroll(now)) return;
if (!ERR_Check(m_ERRSmokeRadio.Knowledge() == 2, "carried intel identifies radio through intel service")) return;
if (!ERR_Check(!TuneRadio(m_ERRSmokePlayer, m_ERRSmokeRadio), "radio rejects distant player")) return;
ERR_MovePlayer(m_ERRSmokeRadio.Position() + "2 0 0");