Remove version key from AI configs

This has a lot of cascade effects and may remove support for some old syntaxes, such as [protect_unit].
wesnoth · Mar 22, 2016 · 9c2027a · 9c2027a
1 parent 0400661
commit 9c2027a
Show file tree

Hide file tree

Showing 23 changed files with 10 additions and 334 deletions.
diff --git a/data/ai/ais/ai_default_rca.cfg b/data/ai/ais/ai_default_rca.cfg
@@ -8,7 +8,6 @@
     id=ai_default_rca
     description=_"Multiplayer_AI^Default AI (RCA)" # wmllint: no spellcheck
     # RCA := Register Candidate Action; more info at http://forums.wesnoth.org/viewtopic.php?p=419625#p419625
-    version=10710
     [stage]
         id=main_loop
         name=ai_default_rca::candidate_action_evaluation_loop

diff --git a/data/ai/ais/ai_default_rca_strong.cfg b/data/ai/ais/ai_default_rca_strong.cfg
@@ -9,7 +9,6 @@
     id=ai_default_rca_strong
     description=_"Multiplayer_AI^Strong AI (RCA)" # wmllint: no spellcheck
     # RCA := Register Candidate Action; more info at http://forums.wesnoth.org/viewtopic.php?p=419625#p419625
-    version=10710
     [stage]
         id=main_loop
         name=ai_default_rca::candidate_action_evaluation_loop

diff --git a/data/ai/dev/ai_old_recruitment.cfg b/data/ai/dev/ai_old_recruitment.cfg
@@ -8,7 +8,6 @@
     id=ai_old_recruitment
     description=_"Multiplayer_AI^Dev AI: Default + Old Recruitment" # wmllint: no spellcheck
     # RCA := Register Candidate Action; more info at http://forums.wesnoth.org/viewtopic.php?p=419625#p419625
-    version=10710
     [stage]
         id=main_loop
         name=ai_default_rca::candidate_action_evaluation_loop

diff --git a/data/ai/dev/ai_sf_with_rca.cfg b/data/ai/dev/ai_sf_with_rca.cfg
@@ -7,7 +7,6 @@
 [ai]
     id=ai_sf_with_rca
     description=_"Multiplayer_AI^Dev AI: Strategy formulation with RCA " # wmllint: no spellcheck
-    version=11300
     [stage]
         id=main_loop
         name=testing_ai_default::strategy_formulation_with_rca

diff --git a/data/ai/dev/akihara_recruitment.cfg b/data/ai/dev/akihara_recruitment.cfg
@@ -7,7 +7,6 @@
 [ai]
     id=ai_dev_akihara
     description=_"Multiplayer_AI^Dev AI: Default + Experimental Recruitment (C++ Akihara)" # wmllint: no spellcheck
-    version=10800
     [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
@@ -9,7 +9,6 @@
     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
     # this description is, again, needed for MP AI (it shows in AI list under this description
-    version=10710 # no spaces here, version should be parsed as int. This version marker is a sign that ALL snippets of AI are written using new syntax
 
     {AI_SIMPLE_FORMULA_AI_EXPERIMENTAL_RECRUITMENT}
     [stage]

diff --git a/data/ai/dev/formula_ai_poisoning.cfg b/data/ai/dev/formula_ai_poisoning.cfg
@@ -7,7 +7,6 @@
 [ai]
     id=default_ai_poisoning
     description=_"Multiplayer_AI^Dev AI: Default + Poisoning (Formula AI)" # wmllint: no spellcheck
-    version=10710
     [stage]
         id=main_loop
         name=ai_default_rca::candidate_action_evaluation_loop

diff --git a/data/ai/dev/idle_ai.cfg b/data/ai/dev/idle_ai.cfg
@@ -2,6 +2,5 @@
 [ai]
     id=ai_idle
     description=_"Multiplayer_AI^Dev AI: Idle AI" # wmllint: no spellcheck
-    version=10703
     #well, we can just fall back to idle ai. But we can just do nothing, and it will work (if no additional stages are brought in by other config sources - MP faction config, scenario config, era config, defaults, etc
 [/ai]
diff --git a/data/ai/dev/testing_recruiting.cfg b/data/ai/dev/testing_recruiting.cfg
@@ -7,7 +7,6 @@
 [ai]
     id=testing_ai_recruitment
     description=_"Multiplayer_AI^Dev AI: Default + Experimental Recruitment (C++)" # wmllint: no spellcheck
-    version=10800
     [stage]
         id=main_loop
         name=ai_default_rca::candidate_action_evaluation_loop

diff --git a/data/ai/micro_ais/scenarios/lurkers.cfg b/data/ai/micro_ais/scenarios/lurkers.cfg
@@ -274,7 +274,6 @@
         income=-2
 
         [ai]
-            version=10710
             [stage]
                 id=main_loop
                 name=ai_default_rca::candidate_action_evaluation_loop

diff --git a/data/ai/micro_ais/scenarios/patrols.cfg b/data/ai/micro_ais/scenarios/patrols.cfg
@@ -56,7 +56,6 @@
         gold=0
         recruit=""
         [ai]
-            version=10703
             [engine]
                 name=lua
                 code= <<

diff --git a/data/ai/micro_ais/scenarios/protect_unit.cfg b/data/ai/micro_ais/scenarios/protect_unit.cfg
@@ -52,7 +52,6 @@
 
         {ai/aliases/stable_singleplayer.cfg}
         [ai]
-            version=10710
             [engine]
                 name="lua"
                 code= <<

diff --git a/data/ai/scenarios/scenario-lua-ai.cfg b/data/ai/scenarios/scenario-lua-ai.cfg
@@ -216,7 +216,6 @@ Gs^Fp       , Gs^Fp       , Wwf         , Wwf         , Mm          , Rd
         [/unit]
 
         [ai]
-            version=10710
             [goal]
                 name=protect_location
                 value=5

diff --git a/data/ai/scenarios/scenario-no_engine.cfg b/data/ai/scenarios/scenario-no_engine.cfg
@@ -216,7 +216,6 @@ Gs^Fp       , Gs^Fp       , Wwf         , Wwf         , Mm          , Rd
         [/unit]
 
         [ai]
-            version=10710
             [goal]
                 name=protect_location
                 value=5

diff --git a/data/campaigns/Legend_of_Wesmere/scenarios/chapter1/03_Kalian_under_Attack.cfg b/data/campaigns/Legend_of_Wesmere/scenarios/chapter1/03_Kalian_under_Attack.cfg
@@ -196,7 +196,6 @@
         recruit=""
         faction=Custom
         [ai]
-            version=10703
             [engine]
                 name=lua
                 code=<<

diff --git a/data/campaigns/Legend_of_Wesmere/scenarios/chapter4/16_The_Chief_Must_Die.cfg b/data/campaigns/Legend_of_Wesmere/scenarios/chapter4/16_The_Chief_Must_Die.cfg
@@ -249,7 +249,6 @@
         team_name=orcs
         faction=Custom
         [ai]
-            version=10703
             [stage]
                 engine=fai
                 name=unit_formulas

diff --git a/data/core/macros/ai.cfg b/data/core/macros/ai.cfg
@@ -371,7 +371,7 @@
 
 #define AI_NEW_SYNTAX
     # use stable 1.8 ai syntax
-    version=10710
+    # Deprecated; no longer does anything
 #enddef
 
 #define AI_SCALE_ATTACK_DEPTH_BY_DIFFICULTY
@@ -545,7 +545,6 @@
     # move-to-enemy candidate actions.
     # Put this into the [side][ai] tag.
     # Does not work in [modify_side][ai] or [modify_ai] at the moment.
-    version=10710
     [engine]
         name="lua"
         code= <<

diff --git a/data/scenario-formula.cfg b/data/scenario-formula.cfg
@@ -217,7 +217,6 @@ Gs^Fp       , Gs^Fp       , Wwf         , Wwf         , Mm          , Rd
         [/unit]
 
         [ai]
-            version=10703
             [stage]
                 engine=fai
                 name=unit_formulas

diff --git a/data/schema.cfg b/data/schema.cfg
@@ -74,7 +74,6 @@
 
         description="required string" #maybe string translatable?
         id="required identifier"
-        version="required integer"
     [/ai]
     [ais]
         _ai="repeated ai"