From 4d43b218ee1ac640c5f20a1e729436f71fc98466 Mon Sep 17 00:00:00 2001 From: mattsc Date: Thu, 13 Dec 2018 14:46:29 -0800 Subject: [PATCH] AI configuration: invert mp_rank based ordering This is supposed to be equivalent to the campaign rank, so it should be in ascending order. --- data/ai/ais/ai_default_rca.cfg | 2 +- data/ai/ais/ai_generic_rush.cfg | 2 +- data/ai/dev/ai_default_rca_alternate_recruiting.cfg | 2 +- data/ai/dev/formula_ai.cfg | 2 +- data/ai/dev/formula_ai_poisoning.cfg | 2 +- src/ai/configuration.cpp | 6 +++--- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/data/ai/ais/ai_default_rca.cfg b/data/ai/ais/ai_default_rca.cfg index 6e7d4afea862..f97b785b8153 100644 --- a/data/ai/ais/ai_default_rca.cfg +++ b/data/ai/ais/ai_default_rca.cfg @@ -8,7 +8,7 @@ id=ai_default_rca description=_"Multiplayer_AI^Default AI (RCA)" # wmllint: no spellcheck # RCA := Register Candidate Action; more info at https://forums.wesnoth.org/viewtopic.php?p=419625#p419625 - mp_rank=1010 + mp_rank=1000 [stage] id=main_loop name=ai_default_rca::candidate_action_evaluation_loop diff --git a/data/ai/ais/ai_generic_rush.cfg b/data/ai/ais/ai_generic_rush.cfg index 56a7703aee29..f3d760ab49cb 100644 --- a/data/ai/ais/ai_generic_rush.cfg +++ b/data/ai/ais/ai_generic_rush.cfg @@ -8,6 +8,6 @@ [ai] id=experimental_ai description=_"Multiplayer_AI^Experimental AI" # wmllint: no spellcheck - mp_rank=1000 + mp_rank=1010 {EXPERIMENTAL_AI} [/ai] diff --git a/data/ai/dev/ai_default_rca_alternate_recruiting.cfg b/data/ai/dev/ai_default_rca_alternate_recruiting.cfg index c7563cb99c30..17fd057b0b96 100644 --- a/data/ai/dev/ai_default_rca_alternate_recruiting.cfg +++ b/data/ai/dev/ai_default_rca_alternate_recruiting.cfg @@ -9,7 +9,7 @@ id=ai_default_rca_alternate_recruiting description=_"Multiplayer_AI^Dev AI: Default AI (RCA) with Alternate Recruiting" # wmllint: no spellcheck # RCA := Register Candidate Action; more info at https://forums.wesnoth.org/viewtopic.php?p=419625#p419625 - mp_rank=100 + mp_rank=100000 [stage] id=main_loop name=ai_default_rca::candidate_action_evaluation_loop diff --git a/data/ai/dev/formula_ai.cfg b/data/ai/dev/formula_ai.cfg index 09b2e3d5e1cc..0141cb9f7d86 100644 --- a/data/ai/dev/formula_ai.cfg +++ b/data/ai/dev/formula_ai.cfg @@ -8,7 +8,7 @@ [ai] id=formula_ai # id is needed to uniquely identify a MP AI, it is not needed in the scenario AI description=_"Multiplayer_AI^Dev AI: Default + Experimental Recruitment (Formula AI)" # wmllint: no spellcheck - mp_rank=100 + mp_rank=100000 # this description is, again, needed for MP AI (it shows in AI list under this description [stage] diff --git a/data/ai/dev/formula_ai_poisoning.cfg b/data/ai/dev/formula_ai_poisoning.cfg index de9fe810e36e..68e6da2543b9 100644 --- a/data/ai/dev/formula_ai_poisoning.cfg +++ b/data/ai/dev/formula_ai_poisoning.cfg @@ -7,7 +7,7 @@ [ai] id=formula_ai_poisoning description=_"Multiplayer_AI^Dev AI: Default + Poisoning (Formula AI)" # wmllint: no spellcheck - mp_rank=100 + mp_rank=100000 [stage] id=main_loop name=ai_default_rca::candidate_action_evaluation_loop diff --git a/src/ai/configuration.cpp b/src/ai/configuration.cpp index 0611e493b27a..ee5107148d99 100644 --- a/src/ai/configuration.cpp +++ b/src/ai/configuration.cpp @@ -69,7 +69,7 @@ void configuration::init(const config &game_config) description desc; desc.id=id; - desc.mp_rank=ai_configuration["mp_rank"].to_int(0); + desc.mp_rank=ai_configuration["mp_rank"].to_int(std::numeric_limits::max()); desc.text = ai_configuration["description"].t_str(); desc.cfg=ai_configuration; @@ -96,7 +96,7 @@ void extract_ai_configurations(std::map &storage, cons description desc; desc.id=id; desc.text = ai_configuration["description"].t_str(); - desc.mp_rank = ai_configuration["mp_rank"].to_int(0); + desc.mp_rank = ai_configuration["mp_rank"].to_int(std::numeric_limits::max()); desc.cfg=ai_configuration; storage.emplace(id, desc); @@ -148,7 +148,7 @@ std::vector configuration::get_available_ais() // Sort by mp_rank. For same mp_rank, keep alphabetical order. std::stable_sort(ais_list.begin(), ais_list.end(), [](const description* a, const description* b) { - return a->mp_rank > b->mp_rank; + return a->mp_rank < b->mp_rank; } );