Revert AICombatOptions -> AutocombatPreferences

smanolloff · Oct 9, 2024 · fb3edb6 · fb3edb6
1 parent e6341ce
commit fb3edb6
Show file tree

Hide file tree

Showing 26 changed files with 70 additions and 91 deletions.
diff --git a/AI/BattleAI/BattleAI.cpp b/AI/BattleAI/BattleAI.cpp
@@ -14,7 +14,6 @@
 
 #include "StackWithBonuses.h"
 #include "EnemyInfo.h"
-#include "battle/AICombatOptions.h"
 #include "tbb/parallel_for.h"
 #include "../../lib/CStopWatch.h"
 #include "../../lib/CThreadHelper.h"
@@ -61,11 +60,10 @@ void logHexNumbers()
 #endif
 }
 
-void CBattleAI::initBattleInterface(std::shared_ptr<Environment> ENV, std::shared_ptr<CBattleCallback> CB, AICombatOptions aiCombatOptions_)
+void CBattleAI::initBattleInterface(std::shared_ptr<Environment> ENV, std::shared_ptr<CBattleCallback> CB)
 {
 	env = ENV;
 	cb = CB;
-	aiCombatOptions = aiCombatOptions_;
 	playerID = *CB->getPlayerID();
 	wasWaitingForRealize = CB->waitTillRealize;
 	wasUnlockingGs = CB->unlockGsWhenWaiting;
@@ -76,6 +74,12 @@ void CBattleAI::initBattleInterface(std::shared_ptr<Environment> ENV, std::share
 	logHexNumbers();
 }
 
+void CBattleAI::initBattleInterface(std::shared_ptr<Environment> ENV, std::shared_ptr<CBattleCallback> CB, AutocombatPreferences autocombatPreferences)
+{
+	initBattleInterface(ENV, CB);
+	autobattlePreferences = autocombatPreferences;
+}
+
 BattleAction CBattleAI::useHealingTent(const BattleID & battleID, const CStack *stack)
 {
 	auto healingTargets = cb->getBattle(battleID)->battleGetStacks(CBattleInfoEssentials::ONLY_MINE);
@@ -163,7 +167,7 @@ void CBattleAI::activeStack(const BattleID & battleID, const CStack * stack )
 
 		result = evaluator.selectStackAction(stack);
 
-		if(aiCombatOptions.enableSpellsUsage && !skipCastUntilNextBattle && evaluator.canCastSpell())
+		if(autobattlePreferences.enableSpellsUsage && !skipCastUntilNextBattle && evaluator.canCastSpell())
 		{
 			auto spelCasted = evaluator.attemptCastingSpell(stack);
 

diff --git a/AI/BattleAI/BattleAI.h b/AI/BattleAI/BattleAI.h
@@ -12,7 +12,6 @@
 #include "../../lib/battle/ReachabilityInfo.h"
 #include "PossibleSpellcast.h"
 #include "PotentialTargets.h"
-#include "battle/AICombatOptions.h"
 
 VCMI_LIB_NAMESPACE_BEGIN
 
@@ -69,7 +68,8 @@ class CBattleAI : public CBattleGameInterface
 	CBattleAI();
 	~CBattleAI();
 
-	void initBattleInterface(std::shared_ptr<Environment> ENV, std::shared_ptr<CBattleCallback> CB, AICombatOptions aiCombatOptions) override;
+	void initBattleInterface(std::shared_ptr<Environment> ENV, std::shared_ptr<CBattleCallback> CB) override;
+	void initBattleInterface(std::shared_ptr<Environment> ENV, std::shared_ptr<CBattleCallback> CB, AutocombatPreferences autocombatPreferences) override;
 
 	void activeStack(const BattleID & battleID, const CStack * stack) override; //called when it's turn of that stack
 	void yourTacticPhase(const BattleID & battleID, int distance) override;
@@ -95,5 +95,5 @@ class CBattleAI : public CBattleGameInterface
 	//void battleTriggerEffect(const BattleTriggerEffect & bte) override;
 	//void battleStart(const CCreatureSet *army1, const CCreatureSet *army2, int3 tile, const CGHeroInstance *hero1, const CGHeroInstance *hero2, BattleSide side) override; //called by engine when battle starts; side=0 - left, side=1 - right
 	//void battleCatapultAttacked(const CatapultAttack & ca) override; //called when catapult makes an attack
-	AICombatOptions aiCombatOptions;
+	AutocombatPreferences autobattlePreferences = AutocombatPreferences();
 };
diff --git a/AI/EmptyAI/CEmptyAI.cpp b/AI/EmptyAI/CEmptyAI.cpp
@@ -14,11 +14,10 @@
 #include "../../lib/CStack.h"
 #include "../../lib/battle/BattleAction.h"
 
-void CEmptyAI::initGameInterface(std::shared_ptr<Environment> ENV, std::shared_ptr<CCallback> CB, AICombatOptions aiCombatOptions_)
+void CEmptyAI::initGameInterface(std::shared_ptr<Environment> ENV, std::shared_ptr<CCallback> CB)
 {
 	cb = CB;
 	env = ENV;
-	aiCombatOptions = aiCombatOptions_;
 	human=false;
 	playerID = *cb->getPlayerID();
 }

diff --git a/AI/EmptyAI/CEmptyAI.h b/AI/EmptyAI/CEmptyAI.h
@@ -19,7 +19,7 @@ class CEmptyAI : public CGlobalAI
 	std::shared_ptr<CCallback> cb;
 
 public:
-	void initGameInterface(std::shared_ptr<Environment> ENV, std::shared_ptr<CCallback> CB, AICombatOptions aiCombatOptions) override;
+	void initGameInterface(std::shared_ptr<Environment> ENV, std::shared_ptr<CCallback> CB) override;
 	void yourTurn(QueryID queryID) override;
 	void yourTacticPhase(const BattleID & battleID, int distance) override;
 	void activeStack(const BattleID & battleID, const CStack * stack) override;

diff --git a/AI/MMAI b/AI/MMAI
diff --git a/AI/Nullkiller/AIGateway.cpp b/AI/Nullkiller/AIGateway.cpp
@@ -563,12 +563,11 @@ std::optional<BattleAction> AIGateway::makeSurrenderRetreatDecision(const Battle
 }
 
 
-void AIGateway::initGameInterface(std::shared_ptr<Environment> env, std::shared_ptr<CCallback> CB, AICombatOptions aiCombatOptions_)
+void AIGateway::initGameInterface(std::shared_ptr<Environment> env, std::shared_ptr<CCallback> CB)
 {
 	LOG_TRACE(logAi);
 	myCb = CB;
 	cbc = CB;
-	aiCombatOptions = aiCombatOptions_;
 	this->env = env;
 
 	NET_EVENT_HANDLER;

diff --git a/AI/Nullkiller/AIGateway.h b/AI/Nullkiller/AIGateway.h
@@ -99,7 +99,7 @@ class DLL_EXPORT AIGateway : public CAdventureAI
 
 	std::string getBattleAIName() const override;
 
-	void initGameInterface(std::shared_ptr<Environment> env, std::shared_ptr<CCallback> CB, AICombatOptions aiCombatOptions) override;
+	void initGameInterface(std::shared_ptr<Environment> env, std::shared_ptr<CCallback> CB) override;
 	void yourTurn(QueryID queryID) override;
 
 	void heroGotLevel(const CGHeroInstance * hero, PrimarySkill pskill, std::vector<SecondarySkill> & skills, QueryID queryID) override; //pskill is gained primary skill, interface has to choose one of given skills and call callback with selection id

diff --git a/AI/StupidAI/StupidAI.cpp b/AI/StupidAI/StupidAI.cpp
@@ -36,7 +36,7 @@ CStupidAI::~CStupidAI()
 	}
 }
 
-void CStupidAI::initBattleInterface(std::shared_ptr<Environment> ENV, std::shared_ptr<CBattleCallback> CB, AICombatOptions _aiCombatOptions)
+void CStupidAI::initBattleInterface(std::shared_ptr<Environment> ENV, std::shared_ptr<CBattleCallback> CB)
 {
 	print("init called, saving ptr to IBattleCallback");
 	env = ENV;
@@ -48,6 +48,11 @@ void CStupidAI::initBattleInterface(std::shared_ptr<Environment> ENV, std::share
 	CB->unlockGsWhenWaiting = false;
 }
 
+void CStupidAI::initBattleInterface(std::shared_ptr<Environment> ENV, std::shared_ptr<CBattleCallback> CB, AutocombatPreferences autocombatPreferences)
+{
+	initBattleInterface(ENV, CB);
+}
+
 void CStupidAI::actionFinished(const BattleID & battleID, const BattleAction &action)
 {
 	print("actionFinished called");

diff --git a/AI/StupidAI/StupidAI.h b/AI/StupidAI/StupidAI.h
@@ -12,7 +12,6 @@
 #include "../../lib/battle/BattleHex.h"
 #include "../../lib/battle/ReachabilityInfo.h"
 #include "../../lib/CGameInterface.h"
-#include "battle/AICombatOptions.h"
 
 class EnemyInfo;
 
@@ -30,7 +29,8 @@ class CStupidAI : public CBattleGameInterface
 	CStupidAI();
 	~CStupidAI();
 
-	void initBattleInterface(std::shared_ptr<Environment> ENV, std::shared_ptr<CBattleCallback> CB, AICombatOptions aiCombatOptions) override;
+	void initBattleInterface(std::shared_ptr<Environment> ENV, std::shared_ptr<CBattleCallback> CB) override;
+	void initBattleInterface(std::shared_ptr<Environment> ENV, std::shared_ptr<CBattleCallback> CB, AutocombatPreferences autocombatPreferences) override;
 
 	void actionFinished(const BattleID & battleID, const BattleAction &action) override;//occurs AFTER every action taken by any stack or by the hero
 	void actionStarted(const BattleID & battleID, const BattleAction &action) override;//occurs BEFORE every action taken by any stack or by the hero

diff --git a/AI/VCAI/VCAI.cpp b/AI/VCAI/VCAI.cpp
@@ -608,13 +608,13 @@ void VCAI::showWorldViewEx(const std::vector<ObjectPosInfo> & objectPositions, b
 	NET_EVENT_HANDLER;
 }
 
-void VCAI::initGameInterface(std::shared_ptr<Environment> ENV, std::shared_ptr<CCallback> CB, AICombatOptions aiCombatOptions_)
+void VCAI::initGameInterface(std::shared_ptr<Environment> ENV, std::shared_ptr<CCallback> CB)
 {
 	LOG_TRACE(logAi);
 	env = ENV;
 	myCb = CB;
 	cbc = CB;
-	aiCombatOptions = aiCombatOptions_;
+
 	ah->init(CB.get());
 
 	NET_EVENT_HANDLER; //sets ah->rm->cb

diff --git a/AI/VCAI/VCAI.h b/AI/VCAI/VCAI.h
@@ -131,7 +131,7 @@ class DLL_EXPORT VCAI : public CAdventureAI
 
 	std::string getBattleAIName() const override;
 
-	void initGameInterface(std::shared_ptr<Environment> ENV, std::shared_ptr<CCallback> CB, AICombatOptions aiCombatOptions) override;
+	void initGameInterface(std::shared_ptr<Environment> ENV, std::shared_ptr<CCallback> CB) override;
 	void yourTurn(QueryID queryID) override;
 
 	void heroGotLevel(const CGHeroInstance * hero, PrimarySkill pskill, std::vector<SecondarySkill> & skills, QueryID queryID) override; //pskill is gained primary skill, interface has to choose one of given skills and call callback with selection id

diff --git a/client/CPlayerInterface.cpp b/client/CPlayerInterface.cpp
@@ -21,7 +21,6 @@
 #include "adventureMap/CInGameConsole.h"
 #include "adventureMap/CList.h"
 
-#include "battle/AICombatOptions.h"
 #include "battle/BattleEffectsController.h"
 #include "battle/BattleFieldController.h"
 #include "battle/BattleInterface.h"
@@ -158,11 +157,10 @@ CPlayerInterface::~CPlayerInterface()
 	if (LOCPLINT == this)
 		LOCPLINT = nullptr;
 }
-void CPlayerInterface::initGameInterface(std::shared_ptr<Environment> ENV, std::shared_ptr<CCallback> CB, AICombatOptions aiCombatOptions_)
+void CPlayerInterface::initGameInterface(std::shared_ptr<Environment> ENV, std::shared_ptr<CCallback> CB)
 {
 	cb = CB;
 	env = ENV;
-	aiCombatOptions = aiCombatOptions_;
 
 	CCS->musich->loadTerrainMusicThemes();
 	initializeHeroTownList();
@@ -1795,9 +1793,12 @@ bool CPlayerInterface::capturedAllEvents()
 
 void CPlayerInterface::prepareAutoFightingAI(const BattleID &bid, const CCreatureSet *army1, const CCreatureSet *army2, int3 tile, const CGHeroInstance *hero1, const CGHeroInstance *hero2, BattleSide side)
 {
-	aiCombatOptions.enableSpellsUsage = settings["battle"]["enableAutocombatSpells"].Bool();
 	autofightingAI = CDynLibHandler::getNewBattleAI(settings["server"]["friendlyAI"].String());
-	autofightingAI->initBattleInterface(env, cb, aiCombatOptions);
+
+	AutocombatPreferences autocombatPreferences = AutocombatPreferences();
+	autocombatPreferences.enableSpellsUsage = settings["battle"]["enableAutocombatSpells"].Bool();
+
+	autofightingAI->initBattleInterface(env, cb, autocombatPreferences);
 	autofightingAI->battleStart(bid, army1, army2, tile, hero1, hero2, side, false);
 	isAutoFightOn = true;
 	cb->registerBattleInterface(autofightingAI);

diff --git a/client/CPlayerInterface.h b/client/CPlayerInterface.h
@@ -89,7 +89,7 @@ class CPlayerInterface : public CGameInterface, public IUpdateable
 protected: // Call-ins from server, should not be called directly, but only via GameInterface
 
 	void update() override;
-	void initGameInterface(std::shared_ptr<Environment> ENV, std::shared_ptr<CCallback> CB, AICombatOptions aiCombatOptions) override;
+	void initGameInterface(std::shared_ptr<Environment> ENV, std::shared_ptr<CCallback> CB) override;
 
 	void garrisonsChanged(ObjectInstanceID id1, ObjectInstanceID id2) override;
 	void buildChanged(const CGTownInstance *town, BuildingID buildingID, int what) override; //what: 1 - built, 2 - demolished

diff --git a/client/CServerHandler.cpp b/client/CServerHandler.cpp
@@ -15,7 +15,6 @@
 #include "ServerRunner.h"
 #include "GameChatHandler.h"
 #include "CPlayerInterface.h"
-#include "battle/AICombatOptions.h"
 #include "gui/CGuiHandler.h"
 #include "gui/WindowHandler.h"
 
@@ -94,7 +93,7 @@ void CServerHandler::endNetwork()
 	}
 }
 
-CServerHandler::CServerHandler(AICombatOptions aiCombatOptions)
+CServerHandler::CServerHandler()
 	: networkHandler(INetworkHandler::createHandler())
 	, lobbyClient(std::make_unique<GlobalLobbyClient>())
 	, gameChat(std::make_unique<GameChatHandler>())
@@ -106,7 +105,6 @@ CServerHandler::CServerHandler(AICombatOptions aiCombatOptions)
 	, serverMode(EServerMode::NONE)
 	, loadMode(ELoadMode::NONE)
 	, client(nullptr)
-	, aiCombatOptions(aiCombatOptions)
 {
 	uuid = boost::uuids::to_string(boost::uuids::random_generator()());
 }
@@ -614,8 +612,6 @@ void CServerHandler::startGameplay(VCMI_LIB_WRAP_NAMESPACE(CGameState) * gameSta
 	if(CMM)
 		CMM->disable();
 
-	client->aiCombatOptions = aiCombatOptions;
-
 	switch(si->mode)
 	{
 	case EStartMode::NEW_GAME:

diff --git a/client/CServerHandler.h b/client/CServerHandler.h
@@ -14,7 +14,6 @@
 #include "../lib/network/NetworkInterface.h"
 #include "../lib/StartInfo.h"
 #include "../lib/gameState/GameStatistics.h"
-#include "../lib/battle/AICombatOptions.h"
 
 VCMI_LIB_NAMESPACE_BEGIN
 
@@ -108,8 +107,6 @@ class CServerHandler final : public IServerAPI, public LobbyInfo, public INetwor
 
 	std::atomic<EClientState> state;
 
-	AICombatOptions aiCombatOptions;
-
 	void threadRunNetwork();
 	void waitForServerShutdown();
 
@@ -144,7 +141,7 @@ class CServerHandler final : public IServerAPI, public LobbyInfo, public INetwor
 	std::unique_ptr<CStopWatch> th;
 	std::unique_ptr<CClient> client;
 
-	CServerHandler(AICombatOptions aiCombatOptions = {});
+	CServerHandler();
 	~CServerHandler();
 
 	void resetStateForLobby(EStartMode mode, ESelectionScreen screen, EServerMode serverMode, const std::vector<std::string> & playerNames);

diff --git a/client/Client.cpp b/client/Client.cpp
@@ -330,7 +330,7 @@ void CClient::installNewPlayerInterface(std::shared_ptr<CGameInterface> gameInte
 	logGlobal->trace("\tInitializing the interface for player %s", color.toString());
 	auto cb = std::make_shared<CCallback>(gs, color, this);
 	battleCallbacks[color] = cb;
-	gameInterface->initGameInterface(playerEnvironments.at(color), cb, aiCombatOptions);
+	gameInterface->initGameInterface(playerEnvironments.at(color), cb);
 
 	installNewBattleInterface(gameInterface, color, battlecb);
 }
@@ -344,7 +344,7 @@ void CClient::installNewBattleInterface(std::shared_ptr<CBattleGameInterface> ba
 		logGlobal->trace("\tInitializing the battle interface for player %s", color.toString());
 		auto cbc = std::make_shared<CBattleCallback>(color, this);
 		battleCallbacks[color] = cbc;
-		battleInterface->initBattleInterface(playerEnvironments.at(color), cbc, aiCombatOptions);
+		battleInterface->initBattleInterface(playerEnvironments.at(color), cbc);
 	}
 }
 

diff --git a/client/Client.h b/client/Client.h
@@ -13,7 +13,6 @@
 #include <vcmi/Environment.h>
 
 #include "../lib/IGameCallback.h"
-#include "battle/AICombatOptions.h"
 
 VCMI_LIB_NAMESPACE_BEGIN
 
@@ -116,7 +115,6 @@ class CClient : public IGameCallback, public Environment
 	std::map<PlayerColor, std::vector<std::shared_ptr<IBattleEventsReceiver>>> additionalBattleInts;
 
 	std::unique_ptr<BattleAction> currentBattleAction;
-	AICombatOptions aiCombatOptions;
 
 	CClient();
 	~CClient();

diff --git a/client/battle/BattleWindow.cpp b/client/battle/BattleWindow.cpp
@@ -44,7 +44,6 @@
 #include "../../lib/battle/BattleInfo.h"
 #include "../../lib/CPlayerState.h"
 #include "../windows/settings/SettingsMainWindow.h"
-#include "battle/AICombatOptions.h"
 
 BattleWindow::BattleWindow(BattleInterface & Owner):
 	owner(Owner),
@@ -888,18 +887,7 @@ void BattleWindow::endWithAutocombat()
 		[this]()
 		{
 			owner.curInt->isAutoFightEndBattle = true;
-
-			auto ai = CDynLibHandler::getNewBattleAI(settings["server"]["friendlyAI"].String());
-
-			AICombatOptions aiCombatOptions = owner.curInt->aiCombatOptions;
-			aiCombatOptions.enableSpellsUsage = settings["battle"]["enableAutocombatSpells"].Bool();
-
-			ai->initBattleInterface(owner.curInt->env, owner.curInt->cb, aiCombatOptions);
-			ai->battleStart(owner.getBattleID(), owner.army1, owner.army2, int3(0,0,0), owner.attackingHeroInstance, owner.defendingHeroInstance, owner.getBattle()->battleGetMySide(), false);
-
-			owner.curInt->isAutoFightOn = true;
-			owner.curInt->cb->registerBattleInterface(ai);
-			owner.curInt->autofightingAI = ai;
+			owner.curInt->prepareAutoFightingAI(owner.getBattleID(), owner.army1, owner.army2, int3(0,0,0), owner.attackingHeroInstance, owner.defendingHeroInstance, owner.getBattle()->battleGetMySide());
 
 			owner.requestAutofightingAIToTakeAction();
 

diff --git a/launcher/settingsView/csettingsview_moc.cpp b/launcher/settingsView/csettingsview_moc.cpp
@@ -139,9 +139,9 @@ void CSettingsView::loadSettings()
 	ui->spinBoxFramerateLimit->setDisabled(settings["video"]["vsync"].Bool());
 	ui->sliderReservedArea->setValue(std::round(settings["video"]["reservedWidth"].Float() * 100));
 
-	ui->comboBoxFriendlyAI->setCurrentText(QString::fromStdString(settings["server"]["friendlyAI"].String());
-	ui->comboBoxNeutralAI->setCurrentText(QString::fromStdString(settings["server"]["neutralAI"].String());
-	ui->comboBoxEnemyAI->setCurrentText(QString::fromStdString(settings["server"]["enemyAI"].String());
+	ui->comboBoxFriendlyAI->setCurrentText(QString::fromStdString(settings["server"]["friendlyAI"].String()));
+	ui->comboBoxNeutralAI->setCurrentText(QString::fromStdString(settings["server"]["neutralAI"].String()));
+	ui->comboBoxEnemyAI->setCurrentText(QString::fromStdString(settings["server"]["enemyAI"].String()));
 
 	ui->comboBoxEnemyPlayerAI->setCurrentText(QString::fromStdString(settings["server"]["playerAI"].String()));
 	ui->comboBoxAlliedPlayerAI->setCurrentText(QString::fromStdString(settings["server"]["alliedAI"].String()));

diff --git a/lib/CGameInterface.cpp b/lib/CGameInterface.cpp
@@ -177,7 +177,7 @@ void CAdventureAI::battleStart(const BattleID & battleID, const CCreatureSet * a
 	assert(!battleAI);
 	assert(cbc);
 	battleAI = CDynLibHandler::getNewBattleAI(getBattleAIName());
-	battleAI->initBattleInterface(env, cbc, aiCombatOptions);
+	battleAI->initBattleInterface(env, cbc);
 	battleAI->battleStart(battleID, army1, army2, tile, hero1, hero2, side, replayAllowed);
 }
 

diff --git a/lib/CGameInterface.h b/lib/CGameInterface.h
@@ -9,7 +9,7 @@
  */
 #pragma once
 
-#include "battle/AICombatOptions.h"
+#include "battle/AutocombatPreferences.h"
 #include "IGameEventsReceiver.h"
 
 #include "spells/ViewSpellInt.h"
@@ -74,7 +74,8 @@ class DLL_LINKAGE CBattleGameInterface : public IBattleEventsReceiver
 	std::string dllName;
 
 	virtual ~CBattleGameInterface() {};
-	virtual void initBattleInterface(std::shared_ptr<Environment> ENV, std::shared_ptr<CBattleCallback> CB, AICombatOptions aiCombatOptions){};
+	virtual void initBattleInterface(std::shared_ptr<Environment> ENV, std::shared_ptr<CBattleCallback> CB){};
+	virtual void initBattleInterface(std::shared_ptr<Environment> ENV, std::shared_ptr<CBattleCallback> CB, AutocombatPreferences autocombatPreferences){};
 
 	//battle call-ins
 	virtual void activeStack(const BattleID & battleID, const CStack * stack)=0; //called when it's turn of that stack
@@ -85,10 +86,8 @@ class DLL_LINKAGE CBattleGameInterface : public IBattleEventsReceiver
 class DLL_LINKAGE CGameInterface : public CBattleGameInterface, public IGameEventsReceiver
 {
 public:
-	AICombatOptions aiCombatOptions;
-
 	virtual ~CGameInterface() = default;
-	virtual void initGameInterface(std::shared_ptr<Environment> ENV, std::shared_ptr<CCallback> CB, AICombatOptions aiCombatOptions){};
+	virtual void initGameInterface(std::shared_ptr<Environment> ENV, std::shared_ptr<CCallback> CB){};
 	virtual void yourTurn(QueryID askID){}; //called AFTER playerStartsTurn(player)
 
 	//pskill is gained primary skill, interface has to choose one of given skills and call callback with selection id