0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Allow [modification] to add [ai]s

Browse source
This commit is contained in:
Alexander van Gessel 2013-06-10 17:18:51 +02:00
parent 997d7d5921
commit 828fb35678
3 changed files with 35 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/ai/configuration.cpp
View file

@ -58,6 +58,7 @@ void configuration::init(const config &game_config)
{
ai_configurations_.clear();
era_ai_configurations_.clear();
mod_ai_configurations_.clear();
well_known_aspects.clear();
well_known_aspects.push_back(well_known_aspect("advancements"));
well_known_aspects.push_back(well_known_aspect("aggression"));
@ -117,17 +118,17 @@ void configuration::init(const config &game_config)
}
}
void configuration::add_era_ai_from_config(const config &era)
namespace {
void extract_ai_configurations(std::map<std::string, description> &storage, const config &input)
{
era_ai_configurations_.clear();
BOOST_FOREACH(const config &ai_configuration, era.child_range("ai")) {
BOOST_FOREACH(const config &ai_configuration, input.child_range("ai")) {
const std::string &id = ai_configuration["id"];
if (id.empty()){
ERR_AI_CONFIGURATION << "skipped AI config due to missing id" << ". Config contains:"<< std::endl << ai_configuration << std::endl;
continue;
}
if (era_ai_configurations_.count(id)>0){
if (storage.count(id)>0){
ERR_AI_CONFIGURATION << "skipped AI config due to duplicate id [" << id << "]. Config contains:"<< std::endl << ai_configuration << std::endl;
continue;
}
@ -137,10 +138,25 @@ void configuration::add_era_ai_from_config(const config &era)
desc.text = ai_configuration["description"].str();
desc.cfg=ai_configuration;
era_ai_configurations_.insert(std::make_pair(id,desc));
storage.insert(std::make_pair(id,desc));
LOG_AI_CONFIGURATION << "loaded AI config: " << ai_configuration["description"] << std::endl;
}
}
}
void configuration::add_era_ai_from_config(const config &era)
{
era_ai_configurations_.clear();
extract_ai_configurations(era_ai_configurations_, era);
}
void configuration::add_mod_ai_from_config(config::const_child_itors mods)
{
mod_ai_configurations_.clear();
BOOST_FOREACH(const config &mod, mods) {
extract_ai_configurations(mod_ai_configurations_, mod);
}
}
std::vector<description*> configuration::get_available_ais(){
std::vector<description*> ais_list;
@ -152,6 +168,10 @@ std::vector<description*> configuration::get_available_ais(){
ais_list.push_back(&desc->second);
DBG_AI_CONFIGURATION << "has ai with config: "<< std::endl << desc->second.cfg<< std::endl;
}
for(description_map::iterator desc = mod_ai_configurations_.begin(); desc!=mod_ai_configurations_.end(); ++desc) {
ais_list.push_back(&desc->second);
DBG_AI_CONFIGURATION << "has ai with config: "<< std::endl << desc->second.cfg<< std::endl;
}
return ais_list;
}
@ -161,7 +181,12 @@ const config& configuration::get_ai_config_for(const std::string &id)
if (cfg_it==ai_configurations_.end()){
description_map::iterator era_cfg_it = era_ai_configurations_.find(id);
if (era_cfg_it==era_ai_configurations_.end()){
return default_config_;
description_map::iterator mod_cfg_it = mod_ai_configurations_.find(id);
if (mod_cfg_it==mod_ai_configurations_.end()) {
return default_config_;
} else {
return mod_cfg_it->second.cfg;
}
} else {
return era_cfg_it->second.cfg;
}
@ -172,6 +197,7 @@ const config& configuration::get_ai_config_for(const std::string &id)
configuration::description_map configuration::ai_configurations_ = configuration::description_map();
configuration::description_map configuration::era_ai_configurations_ = configuration::description_map();
configuration::description_map configuration::mod_ai_configurations_ = configuration::description_map();
config configuration::default_config_ = config();
bool configuration::get_side_config_from_file(const std::string& file, config& cfg ){

2
src/ai/configuration.hpp
View file

@ -65,6 +65,7 @@ public:
*/
static void init(const config &game_config);
static void add_era_ai_from_config(const config &game_config);
static void add_mod_ai_from_config(config::const_child_itors configs);
/**
@ -153,6 +154,7 @@ private:
typedef std::map<std::string, description> description_map;
static description_map ai_configurations_;
static description_map era_ai_configurations_;
static description_map mod_ai_configurations_;
static config default_config_;
};

1
src/multiplayer_connect.cpp
View file

@ -1628,6 +1628,7 @@ void connect::lists_init()
// AI algorithms
const config &era = level_.child("era");
ai::configuration::add_era_ai_from_config(era);
ai::configuration::add_mod_ai_from_config(level_.child_range("modification"));
ai_algorithms_ = ai::configuration::get_available_ais();
// Factions