mail[Wesnoth-commits] r33435 - in /trunk: data/campaigns/An_Orcish_Incursion/scenarios/ data/campaigns/Descent_Into_Darkness/scenarios/ data/campa...


Others Months | Index by Date | Thread Index
>>   [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Header


Content

Posted by esr on March 08, 2009 - 17:08:
Author: esr
Date: Sun Mar  8 17:08:54 2009
New Revision: 33435

URL: http://svn.gna.org/viewcvs/wesnoth?rev=33435&view=rev
Log:
AI attributes "simple_targeting" and "scout_village_targeting" were not 
spelled
consistently, and the engine spelling was wrong. Fix this, by teaching wmllint
to fix it.  The wki will be updated simultaneously with this commit, 

Modified:
    trunk/data/campaigns/An_Orcish_Incursion/scenarios/4_Valley_of_Trolls.cfg
    
trunk/data/campaigns/Descent_Into_Darkness/scenarios/03_A_Haunting_in_Winter.cfg
    trunk/data/campaigns/Descent_Into_Darkness/scenarios/05_Orc_War.cfg
    
trunk/data/campaigns/Heir_To_The_Throne/scenarios/01_The_Elves_Besieged.cfg
    
trunk/data/campaigns/Heir_To_The_Throne/scenarios/05a_Muff_Malal_Peninsula.cfg
    
trunk/data/campaigns/Heir_To_The_Throne/scenarios/09_The_Valley_of_Death.cfg
    trunk/data/campaigns/Heir_To_The_Throne/scenarios/20a_North_Elves.cfg
    trunk/data/campaigns/Legend_of_Wesmere/scenarios/03_Kalian.cfg
    trunk/data/campaigns/Liberty/scenarios/05_Hide_and_Seek.cfg
    trunk/data/campaigns/Liberty/scenarios/08_Glory.cfg
    trunk/data/campaigns/Northern_Rebirth/scenarios/10a_Stolen_Gold.cfg
    trunk/data/campaigns/Northern_Rebirth/scenarios/13a_Showdown.cfg
    
trunk/data/campaigns/Under_the_Burning_Suns/scenarios/02_Across_the_Harsh_Sands.cfg
    trunk/data/core/about.cfg
    trunk/data/tools/wmllint
    trunk/src/ai.cpp
    trunk/src/ai_move.cpp

Modified: 
trunk/data/campaigns/An_Orcish_Incursion/scenarios/4_Valley_of_Trolls.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/An_Orcish_Incursion/scenarios/4_Valley_of_Trolls.cfg?rev=33435&r1=33434&r2=33435&view=diff
==============================================================================
--- trunk/data/campaigns/An_Orcish_Incursion/scenarios/4_Valley_of_Trolls.cfg 
(original)
+++ trunk/data/campaigns/An_Orcish_Incursion/scenarios/4_Valley_of_Trolls.cfg 
Sun Mar  8 17:08:54 2009
@@ -53,7 +53,7 @@
         [/ai]
         [ai]
             aggression=-0.1
-            simple_targetting=yes
+            simple_targeting=yes
             turns="1,2,3,7,8,9,13,14,15,19,20,21"
             grouping=none
             attack_depth=5
@@ -86,7 +86,7 @@
             turns="1,2,3,7,8,9,13,14,15,19,20,21"
             grouping=none
             attack_depth=5
-            simple_targetting=yes
+            simple_targeting=yes
         [/ai]
     [/side]
 

Modified: 
trunk/data/campaigns/Descent_Into_Darkness/scenarios/03_A_Haunting_in_Winter.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Descent_Into_Darkness/scenarios/03_A_Haunting_in_Winter.cfg?rev=33435&r1=33434&r2=33435&view=diff
==============================================================================
--- 
trunk/data/campaigns/Descent_Into_Darkness/scenarios/03_A_Haunting_in_Winter.cfg
 (original)
+++ 
trunk/data/campaigns/Descent_Into_Darkness/scenarios/03_A_Haunting_in_Winter.cfg
 Sun Mar  8 17:08:54 2009
@@ -96,7 +96,7 @@
             aggression=4.0
             caution=0.0
             grouping=no
-            simple_targetting=yes
+            simple_targeting=yes
             village_value=0
             [target]
                 id=Malin Keshar

Modified: trunk/data/campaigns/Descent_Into_Darkness/scenarios/05_Orc_War.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Descent_Into_Darkness/scenarios/05_Orc_War.cfg?rev=33435&r1=33434&r2=33435&view=diff
==============================================================================
--- trunk/data/campaigns/Descent_Into_Darkness/scenarios/05_Orc_War.cfg 
(original)
+++ trunk/data/campaigns/Descent_Into_Darkness/scenarios/05_Orc_War.cfg Sun 
Mar  8 17:08:54 2009
@@ -104,7 +104,7 @@
         fog=no
         shroud=no
         [ai]
-            scout_village_targetting=2
+            scout_village_targeting=2
             village_value=0.5
             [target]
                 id=Malin Keshar

Modified: 
trunk/data/campaigns/Heir_To_The_Throne/scenarios/01_The_Elves_Besieged.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Heir_To_The_Throne/scenarios/01_The_Elves_Besieged.cfg?rev=33435&r1=33434&r2=33435&view=diff
==============================================================================
--- 
trunk/data/campaigns/Heir_To_The_Throne/scenarios/01_The_Elves_Besieged.cfg 
(original)
+++ 
trunk/data/campaigns/Heir_To_The_Throne/scenarios/01_The_Elves_Besieged.cfg 
Sun Mar  8 17:08:54 2009
@@ -134,7 +134,7 @@
     [ai]
         recruitment_ignore_bad_movement=yes
         recruitment_ignore_bad_combat=yes
-        simple_targetting=yes
+        simple_targeting=yes
     [/ai]
 #enddef
 

Modified: 
trunk/data/campaigns/Heir_To_The_Throne/scenarios/05a_Muff_Malal_Peninsula.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Heir_To_The_Throne/scenarios/05a_Muff_Malal_Peninsula.cfg?rev=33435&r1=33434&r2=33435&view=diff
==============================================================================
--- 
trunk/data/campaigns/Heir_To_The_Throne/scenarios/05a_Muff_Malal_Peninsula.cfg
 (original)
+++ 
trunk/data/campaigns/Heir_To_The_Throne/scenarios/05a_Muff_Malal_Peninsula.cfg
 Sun Mar  8 17:08:54 2009
@@ -71,7 +71,7 @@
             grouping=no
             aggression=1.0
             caution=-1.0
-            simple_targetting=yes
+            simple_targeting=yes
             {ATTACK_DEPTH 1 4 5}
         [/ai]
         {GOLD 20 50 100}

Modified: 
trunk/data/campaigns/Heir_To_The_Throne/scenarios/09_The_Valley_of_Death.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Heir_To_The_Throne/scenarios/09_The_Valley_of_Death.cfg?rev=33435&r1=33434&r2=33435&view=diff
==============================================================================
--- 
trunk/data/campaigns/Heir_To_The_Throne/scenarios/09_The_Valley_of_Death.cfg 
(original)
+++ 
trunk/data/campaigns/Heir_To_The_Throne/scenarios/09_The_Valley_of_Death.cfg 
Sun Mar  8 17:08:54 2009
@@ -61,7 +61,7 @@
 #define VOD_AI_PARMS
     [ai]
         grouping=no
-        simple_targetting=yes
+        simple_targeting=yes
         recruitment_ignore_bad_combat=yes
         recruitment_ignore_bad_movement=yes
         aggression=1.0

Modified: 
trunk/data/campaigns/Heir_To_The_Throne/scenarios/20a_North_Elves.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Heir_To_The_Throne/scenarios/20a_North_Elves.cfg?rev=33435&r1=33434&r2=33435&view=diff
==============================================================================
--- trunk/data/campaigns/Heir_To_The_Throne/scenarios/20a_North_Elves.cfg 
(original)
+++ trunk/data/campaigns/Heir_To_The_Throne/scenarios/20a_North_Elves.cfg Sun 
Mar  8 17:08:54 2009
@@ -80,7 +80,7 @@
         [ai]
             {ATTACK_DEPTH 4 5 6}
             passive_leader=yes
-            simple_targetting=yes
+            simple_targeting=yes
 #ifndef HARD
             recruitment_pattern=scout,fighter,fighter,archer
 #else
@@ -139,7 +139,7 @@
         [ai]
             {ATTACK_DEPTH 4 5 6}
             passive_leader=yes
-            simple_targetting=yes
+            simple_targeting=yes
 #ifdef EASY
             recruitment_pattern=scout,fighter,fighter,archer
 #endif

Modified: trunk/data/campaigns/Legend_of_Wesmere/scenarios/03_Kalian.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Legend_of_Wesmere/scenarios/03_Kalian.cfg?rev=33435&r1=33434&r2=33435&view=diff
==============================================================================
--- trunk/data/campaigns/Legend_of_Wesmere/scenarios/03_Kalian.cfg (original)
+++ trunk/data/campaigns/Legend_of_Wesmere/scenarios/03_Kalian.cfg Sun Mar  8 
17:08:54 2009
@@ -165,7 +165,7 @@
         [ai]
             villages_per_scout=3
             village_value=50
-            scout_village_targetting=50
+            scout_village_targeting=50
             recruitment_pattern=scout,scout,scout,fighter,archer,mixed 
fighter
         [/ai]
 #disabled as long as the ai behaves strange

Modified: trunk/data/campaigns/Liberty/scenarios/05_Hide_and_Seek.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Liberty/scenarios/05_Hide_and_Seek.cfg?rev=33435&r1=33434&r2=33435&view=diff
==============================================================================
--- trunk/data/campaigns/Liberty/scenarios/05_Hide_and_Seek.cfg (original)
+++ trunk/data/campaigns/Liberty/scenarios/05_Hide_and_Seek.cfg Sun Mar  8 
17:08:54 2009
@@ -72,7 +72,7 @@
             aggression=2.0
             caution=0.0
             grouping=no
-            simple_targetting=yes
+            simple_targeting=yes
         [/ai]
         shroud=no
         fog=yes

Modified: trunk/data/campaigns/Liberty/scenarios/08_Glory.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Liberty/scenarios/08_Glory.cfg?rev=33435&r1=33434&r2=33435&view=diff
==============================================================================
--- trunk/data/campaigns/Liberty/scenarios/08_Glory.cfg (original)
+++ trunk/data/campaigns/Liberty/scenarios/08_Glory.cfg Sun Mar  8 17:08:54 
2009
@@ -132,7 +132,7 @@
             turns=1-6
             caution=0.2
             aggression=0.8
-            scout_village_targetting=1
+            scout_village_targeting=1
 
             [target]
                 side=1,5
@@ -155,7 +155,7 @@
             turns=7-FOREVER
             caution=0.1
             aggression=0.9
-            scout_village_targetting=1
+            scout_village_targeting=1
 
             [target]
                 side=1,5

Modified: trunk/data/campaigns/Northern_Rebirth/scenarios/10a_Stolen_Gold.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Northern_Rebirth/scenarios/10a_Stolen_Gold.cfg?rev=33435&r1=33434&r2=33435&view=diff
==============================================================================
--- trunk/data/campaigns/Northern_Rebirth/scenarios/10a_Stolen_Gold.cfg 
(original)
+++ trunk/data/campaigns/Northern_Rebirth/scenarios/10a_Stolen_Gold.cfg Sun 
Mar  8 17:08:54 2009
@@ -331,7 +331,7 @@
         user_team_name=_"Trolls"
 
         [ai]
-            simple_targetting=yes
+            simple_targeting=yes
             recruitment_ignore_bad_combat=yes
             recruitment_ignore_bad_movement=yes
             aggression=1.0
@@ -361,7 +361,7 @@
         team_name=trolls
         user_team_name=_"Trolls"
         [ai]
-            simple_targetting=yes
+            simple_targeting=yes
             recruitment_ignore_bad_combat=yes
             recruitment_ignore_bad_movement=yes
             aggression=1.0
@@ -391,7 +391,7 @@
         team_name=trolls
         user_team_name=_"Trolls"
         [ai]
-            simple_targetting=yes
+            simple_targeting=yes
             recruitment_ignore_bad_combat=yes
             recruitment_ignore_bad_movement=yes
             aggression=1.0
@@ -422,7 +422,7 @@
         team_name=trolls
         user_team_name=_"Trolls"
         [ai]
-            simple_targetting=yes
+            simple_targeting=yes
             recruitment_ignore_bad_combat=yes
             recruitment_ignore_bad_movement=yes
             aggression=1.0

Modified: trunk/data/campaigns/Northern_Rebirth/scenarios/13a_Showdown.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Northern_Rebirth/scenarios/13a_Showdown.cfg?rev=33435&r1=33434&r2=33435&view=diff
==============================================================================
--- trunk/data/campaigns/Northern_Rebirth/scenarios/13a_Showdown.cfg 
(original)
+++ trunk/data/campaigns/Northern_Rebirth/scenarios/13a_Showdown.cfg Sun Mar  
8 17:08:54 2009
@@ -250,7 +250,7 @@
         user_team_name=_"Alliance"
         persistent=yes
         [ai]
-            simple_targetting=yes
+            simple_targeting=yes
             recruitment_ignore_bad_combat=yes
             recruitment_ignore_bad_movement=yes
             aggression=1.0

Modified: 
trunk/data/campaigns/Under_the_Burning_Suns/scenarios/02_Across_the_Harsh_Sands.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Under_the_Burning_Suns/scenarios/02_Across_the_Harsh_Sands.cfg?rev=33435&r1=33434&r2=33435&view=diff
==============================================================================
--- 
trunk/data/campaigns/Under_the_Burning_Suns/scenarios/02_Across_the_Harsh_Sands.cfg
 (original)
+++ 
trunk/data/campaigns/Under_the_Burning_Suns/scenarios/02_Across_the_Harsh_Sands.cfg
 Sun Mar  8 17:08:54 2009
@@ -101,7 +101,7 @@
             caution=0.00
 #ifdef EASY
             # monsters are extra dumb
-            simple_targetting=yes
+            simple_targeting=yes
             grouping=no
 #endif
 #ifdef NORMAL

Modified: trunk/data/core/about.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/about.cfg?rev=33435&r1=33434&r2=33435&view=diff
==============================================================================
--- trunk/data/core/about.cfg (original)
+++ trunk/data/core/about.cfg Sun Mar  8 17:08:54 2009
@@ -146,7 +146,7 @@
     [entry]
         name = "Pauli Nieminen (suokko)"
         email = "paniemin_AT_cc.hut.fi"
-        comment = "Bug fixing; ussualy targetting MP or WML engine"
+        comment = "Bug fixing; usualy targeting MP or WML engine"
     [/entry]
     [entry]
         name = "Philippe Plantier (Ayin)"

Modified: trunk/data/tools/wmllint
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/tools/wmllint?rev=33435&r1=33434&r2=33435&view=diff
==============================================================================
--- trunk/data/tools/wmllint (original)
+++ trunk/data/tools/wmllint Sun Mar  8 17:08:54 2009
@@ -444,6 +444,8 @@
         ("titlescreen/landscapecastle.jpg",
          "story/landscape-castle.jpg"),
         ("LABEL_PERSISTANT", "LABEL_PERSISTENT"),
+        # Changed just before 1.5.13
+        ("targetting", "targeting"),
         )
 
 def validate_stack(stack, filename, lineno):

Modified: trunk/src/ai.cpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/ai.cpp?rev=33435&r1=33434&r2=33435&view=diff
==============================================================================
--- trunk/src/ai.cpp (original)
+++ trunk/src/ai.cpp Sun Mar  8 17:08:54 2009
@@ -1089,7 +1089,7 @@
 
        find_threats();
 
-       LOG_AI << "move/targetting phase\n";
+       LOG_AI << "move/targeting phase\n";
 
        const bool met_invisible_unit = 
move_to_targets(possible_moves,srcdst,dstsrc,enemy_dstsrc,leader);
        if(met_invisible_unit) {

Modified: trunk/src/ai_move.cpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/ai_move.cpp?rev=33435&r1=33434&r2=33435&view=diff
==============================================================================
--- trunk/src/ai_move.cpp (original)
+++ trunk/src/ai_move.cpp Sun Mar  8 17:08:54 2009
@@ -523,7 +523,7 @@
 
                        //scouts also get a bonus for going after villages
                        if(tg->type == target::VILLAGE) {
-                               rating *= 
lexical_cast_default<int>(current_team().ai_parameters()["scout_village_targetting"],3);
+                               rating *= 
lexical_cast_default<int>(current_team().ai_parameters()["scout_village_targeting"],3);
                        }
                }
 
@@ -548,12 +548,13 @@
                return std::pair<location,location>();
        }
 
-       //if we have the 'simple_targetting' flag set, then we don't see if 
any other
-       //units can put a better bid forward for this target
-       const bool dumb_ai = 
utils::string_bool(current_team().ai_parameters()["simple_targetting"]);
+       //if we have the 'simple_targeting' flag set, then we don't
+       //see if any other units can put a better bid forward for this
+       //target
+       const bool dumb_ai = 
utils::string_bool(current_team().ai_parameters()["simple_targeting"]);
 
        if(dumb_ai == false) {
-               LOG_AI << "complex targetting...\n";
+               LOG_AI << "complex targeting...\n";
                //now see if any other unit can put a better bid forward
                for(++u; u != units_.end(); ++u) {
                        if(u->second.side() != team_num_ || 
u->second.can_recruit() ||
@@ -611,7 +612,7 @@
                        }
                }
 
-               LOG_AI << "done complex targetting...\n";
+               LOG_AI << "done complex targeting...\n";
        } else {
                u = units_.end();
        }




Related Messages


Powered by MHonArc, Updated Sun Mar 08 17:40:33 2009