From 0e0d884a9714c47554b0e0ca237c1d41fac0cbef Mon Sep 17 00:00:00 2001 From: NovaRain Date: Fri, 24 Jun 2022 09:39:31 +0800 Subject: [PATCH] Changed the mode 1 of NPC combat control * now requires sfall debugging mode to control all critters. --- artifacts/ddraw.ini | 2 +- sfall/Modules/PartyControl.cpp | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/artifacts/ddraw.ini b/artifacts/ddraw.ini index c0536b78..ceee71c6 100644 --- a/artifacts/ddraw.ini +++ b/artifacts/ddraw.ini @@ -623,7 +623,7 @@ PipboyTimeAnimDelay=50 ;Allows you to directly control other critters in combat ;Set to 0 to disable -;Set to 1 to control all critters in combat +;Set to 1 to control all critters in combat (allowed only in sfall debugging mode) ;Set to 2 to control all party members ControlCombat=0 ;If you want to control only specific critters, uncomment the ControlCombatPIDList line and set a comma delimited list of PIDs diff --git a/sfall/Modules/PartyControl.cpp b/sfall/Modules/PartyControl.cpp index 81445d7b..11d02ac3 100644 --- a/sfall/Modules/PartyControl.cpp +++ b/sfall/Modules/PartyControl.cpp @@ -478,6 +478,8 @@ void PartyControl::OnGameLoad() { void PartyControl::init() { Mode = IniReader::GetConfigInt("Misc", "ControlCombat", 0); if (Mode > 2) Mode = 0; + else if (Mode == 1 && !isDebug) Mode = 2; + if (Mode > 0) { dlogr("Initializing party control...", DL_INIT); std::vector pidList = IniReader::GetConfigList("Misc", "ControlCombatPIDList", "", 512);