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

AI attributes "simple_targeting" and "scout_village_targeting"...

Browse source 
...were not spelled consistently, and the engine spelling was
wrong. Fix this, by teaching wmllint to fix it.  The wiki will be
updated simultaneously with this commit,
This commit is contained in:
Eric S. Raymond 2009-03-08 16:08:54 +00:00
parent a2127b28b6
commit 9811794d61
17 changed files with 30 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
data/campaigns/An_Orcish_Incursion/scenarios/4_Valley_of_Trolls.cfg
View file

@ -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]

2
data/campaigns/Descent_Into_Darkness/scenarios/03_A_Haunting_in_Winter.cfg
View file

@ -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

2
data/campaigns/Descent_Into_Darkness/scenarios/05_Orc_War.cfg
View file

@ -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

2
data/campaigns/Heir_To_The_Throne/scenarios/01_The_Elves_Besieged.cfg
View file

@ -134,7 +134,7 @@
[ai]
recruitment_ignore_bad_movement=yes
recruitment_ignore_bad_combat=yes
simple_targetting=yes
simple_targeting=yes
[/ai]
#enddef

2
data/campaigns/Heir_To_The_Throne/scenarios/05a_Muff_Malal_Peninsula.cfg
View file

@ -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}

2
data/campaigns/Heir_To_The_Throne/scenarios/09_The_Valley_of_Death.cfg
View file

@ -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

4
data/campaigns/Heir_To_The_Throne/scenarios/20a_North_Elves.cfg
View file

@ -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

2
data/campaigns/Legend_of_Wesmere/scenarios/03_Kalian.cfg
View file

@ -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

2
data/campaigns/Liberty/scenarios/05_Hide_and_Seek.cfg
View file

@ -72,7 +72,7 @@
aggression=2.0
caution=0.0
grouping=no
simple_targetting=yes
simple_targeting=yes
[/ai]
shroud=no
fog=yes

4
data/campaigns/Liberty/scenarios/08_Glory.cfg
View file

@ -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

8
data/campaigns/Northern_Rebirth/scenarios/10a_Stolen_Gold.cfg
View file

@ -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

2
data/campaigns/Northern_Rebirth/scenarios/13a_Showdown.cfg
View file

@ -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

2
data/campaigns/Under_the_Burning_Suns/scenarios/02_Across_the_Harsh_Sands.cfg
View file

@ -101,7 +101,7 @@
caution=0.00
#ifdef EASY
# monsters are extra dumb
simple_targetting=yes
simple_targeting=yes
grouping=no
#endif
#ifdef NORMAL

2
data/core/about.cfg
View file

@ -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)"

2
data/tools/wmllint
View file

@ -444,6 +444,8 @@ linechanges = (
("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):

2
src/ai.cpp
View file

@ -1089,7 +1089,7 @@ void ai::do_move()
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) {

13
src/ai_move.cpp
View file

@ -523,7 +523,7 @@ std::pair<map_location,map_location> ai::choose_move(std::vector<target>& target
//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 @@ std::pair<map_location,map_location> ai::choose_move(std::vector<target>& target
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 @@ std::pair<map_location,map_location> ai::choose_move(std::vector<target>& target
}
}
LOG_AI << "done complex targetting...\n";
LOG_AI << "done complex targeting...\n";
} else {
u = units_.end();
}