games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-24 08:32:34 +02:00
Code Issues Releases Activity

Merge pull request #3793 from IvanSavenko/nkai_ignore_garrisons

Browse Source 
(NKAI) Add option to ignore troops in on-map garrisons
This commit is contained in:
Ivan Savenko 2024-04-22 17:08:27 +03:00 committed by GitHub
commit d14966a606
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 36 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
AI/Nullkiller/AIGateway.cpp
View File

@ -11,6 +11,7 @@
#include "../../lib/ArtifactUtils.h"
#include "../../lib/UnlockGuard.h"
#include "../../lib/StartInfo.h"
#include "../../lib/mapObjects/MapObjects.h"
#include "../../lib/mapObjects/ObjectTemplate.h"
#include "../../lib/mapObjects/CGHeroInstance.h"
@ -750,7 +751,7 @@ void AIGateway::showGarrisonDialog(const CArmedInstance * up, const CGHeroInstan
//you can't request action from action-response thread
requestActionASAP([=]()
{
if(removableUnits && up->tempOwner == down->tempOwner)
if(removableUnits && up->tempOwner == down->tempOwner && nullkiller->settings->isGarrisonTroopsUsageAllowed() && !cb->getStartInfo()->isSteadwickFallCampaignMission())
{
pickBestCreatures(down, up);
}

33
AI/Nullkiller/Engine/Settings.cpp
View File

@ -18,7 +18,7 @@
#include "../../../lib/modding/CModHandler.h"
#include "../../../lib/VCMI_Lib.h"
#include "../../../lib/filesystem/Filesystem.h"
#include "../../../lib/json/JsonNode.h"
#include "../../../lib/json/JsonUtils.h"
namespace NKAI
{
@ -28,29 +28,11 @@ namespace NKAI
scoutHeroTurnDistanceLimit(5),
maxGoldPressure(0.3f),
maxpass(10),
allowObjectGraph(false)
allowObjectGraph(false),
useTroopsFromGarrisons(false)
{
ResourcePath resource("config/ai/nkai/nkai-settings", EResType::JSON);
JsonNode node = JsonUtils::assembleFromFiles("config/ai/nkai/nkai-settings");
loadFromMod("core", resource);
for(const auto & modName : VLC->modh->getActiveMods())
{
if(CResourceHandler::get(modName)->existsResource(resource))
loadFromMod(modName, resource);
}
}
void Settings::loadFromMod(const std::string & modName, const ResourcePath & resource)
{
if(!CResourceHandler::get(modName)->existsResource(resource))
{
logGlobal->error("Failed to load font %s from mod %s", resource.getName(), modName);
return;
}
JsonNode node(JsonPath::fromResource(resource), modName);
if(node.Struct()["maxRoamingHeroes"].isNumber())
{
maxRoamingHeroes = node.Struct()["maxRoamingHeroes"].Integer();
@ -80,5 +62,10 @@ namespace NKAI
{
allowObjectGraph = node.Struct()["allowObjectGraph"].Bool();
}
if(!node.Struct()["useTroopsFromGarrisons"].isNull())
{
useTroopsFromGarrisons = node.Struct()["useTroopsFromGarrisons"].Bool();
}
}
}
}

7
AI/Nullkiller/Engine/Settings.h
View File

@ -27,6 +27,7 @@ namespace NKAI
int maxpass;
float maxGoldPressure;
bool allowObjectGraph;
bool useTroopsFromGarrisons;
public:
Settings();
@ -37,8 +38,6 @@ namespace NKAI
int getMainHeroTurnDistanceLimit() const { return mainHeroTurnDistanceLimit; }
int getScoutHeroTurnDistanceLimit() const { return scoutHeroTurnDistanceLimit; }
bool isObjectGraphAllowed() const { return allowObjectGraph; }
private:
void loadFromMod(const std::string & modName, const ResourcePath & resource);
bool isGarrisonTroopsUsageAllowed() const { return useTroopsFromGarrisons; }
};
}
}

3
AI/VCAI/VCAI.cpp
View File

@ -16,6 +16,7 @@
#include "../../lib/ArtifactUtils.h"
#include "../../lib/UnlockGuard.h"
#include "../../lib/StartInfo.h"
#include "../../lib/mapObjects/MapObjects.h"
#include "../../lib/mapObjects/ObjectTemplate.h"
#include "../../lib/CConfigHandler.h"
@ -732,7 +733,7 @@ void VCAI::showGarrisonDialog(const CArmedInstance * up, const CGHeroInstance *
//you can't request action from action-response thread
requestActionASAP([=]()
{
if(removableUnits)
if(removableUnits && !cb->getStartInfo()->isSteadwickFallCampaignMission())
pickBestCreatures(down, up);
answerQuery(queryID, 0);

3
config/ai/nkai/nkai-settings.json
View File

@ -3,5 +3,6 @@
"maxpass" : 30,
"mainHeroTurnDistanceLimit" : 10,
"scoutHeroTurnDistanceLimit" : 5,
"maxGoldPressure" : 0.3
"maxGoldPressure" : 0.3,
"useTroopsFromGarrisons" : true
}

14
lib/StartInfo.cpp
View File

@ -89,6 +89,20 @@ std::string StartInfo::getCampaignName() const
return VLC->generaltexth->allTexts[508];
}
bool StartInfo::isSteadwickFallCampaignMission() const
{
if (!campState)
return false;
if (campState->getFilename() != "DATA/EVIL1")
return false;
if (campState->currentScenario() != CampaignScenarioID(2))
return false;
return true;
}
void LobbyInfo::verifyStateBeforeStart(bool ignoreNoHuman) const
{
if(!mi || !mi->mapHeader)

3
lib/StartInfo.h
View File

@ -136,6 +136,9 @@ struct DLL_LINKAGE StartInfo
// TODO: Must be client-side
std::string getCampaignName() const;
/// Controls hardcoded check for "Steadwick's Fall" scenario from "Dungeon and Devils" campaign
bool isSteadwickFallCampaignMission() const;
template <typename Handler>
void serialize(Handler &h)
{