Author: esr
Date: Wed Nov 26 20:08:51 2008
New Revision: 31096
URL: http://svn.gna.org/viewcvs/wesnoth?rev=31096&view=rev
Log:
Fix more recruitment-pattern glitches.
Modified:
trunk/data/campaigns/Heir_To_The_Throne/scenarios/20a_North_Elves.cfg
trunk/data/campaigns/Sceptre_of_Fire/scenarios/8_The_Dragon.cfg
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/10_Saving_Inarix.cfg
trunk/data/campaigns/The_Hammer_of_Thursagan/scenarios/03_Strange_Allies.cfg
trunk/data/campaigns/The_South_Guard/scenarios/04_Vale_of_Tears.cfg
trunk/data/campaigns/Under_the_Burning_Suns/scenarios/11_Battle_for_Zocthanol_Isle.cfg
trunk/data/tools/wmllint
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=31096&r1=31095&r2=31096&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 Wed
Nov 26 20:08:51 2008
@@ -82,7 +82,11 @@
{ATTACK_DEPTH 4 5 6}
passive_leader=yes
simple_targetting=yes
+#ifdef EASY
+ recruitment_pattern=scout,fighter,fighter,archer
+#else
recruitment_pattern=scout,fighter,fighter,mixed fighter,archer
+#endif
villages_per_scout=0
village_value=0
[target]
Modified: trunk/data/campaigns/Sceptre_of_Fire/scenarios/8_The_Dragon.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Sceptre_of_Fire/scenarios/8_The_Dragon.cfg?rev=31096&r1=31095&r2=31096&view=diff
==============================================================================
--- trunk/data/campaigns/Sceptre_of_Fire/scenarios/8_The_Dragon.cfg (original)
+++ trunk/data/campaigns/Sceptre_of_Fire/scenarios/8_The_Dragon.cfg Wed Nov 26
20:08:51 2008
@@ -45,7 +45,7 @@
aggression=0.8
caution=0.2
village_value=10
- recruitment_pattern=scout,fighter,fighter,archer,mixed
fighter,archer
+ recruitment_pattern=scout,fighter,fighter,mixed fighter
recruitment_ignore_bad_movement=yes
recruitment_ignore_bad_combat=yes
#grouping causes the dwarves to wait for the elves, who move slower
@@ -62,7 +62,7 @@
aggression=1.0
caution=0.0
village_value=10
- recruitment_pattern=scout,fighter,fighter,archer,mixed
fighter,archer
+ recruitment_pattern=scout,fighter,fighter,mixed fighter
recruitment_ignore_bad_movement=yes
recruitment_ignore_bad_combat=yes
grouping=none
Modified:
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/10_Saving_Inarix.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/10_Saving_Inarix.cfg?rev=31096&r1=31095&r2=31096&view=diff
==============================================================================
--- trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/10_Saving_Inarix.cfg
(original)
+++ trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/10_Saving_Inarix.cfg
Wed Nov 26 20:08:51 2008
@@ -101,7 +101,7 @@
side=3
canrecruit=yes
[ai]
- recruitment_pattern=scout, fighter, fighter, fighter, mixed
fighter, archer
+ recruitment_pattern=scout, fighter, fighter, fighter, mixed fighter
aggression=1.0
villages_per_scout=10
[target]
Modified:
trunk/data/campaigns/The_Hammer_of_Thursagan/scenarios/03_Strange_Allies.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/The_Hammer_of_Thursagan/scenarios/03_Strange_Allies.cfg?rev=31096&r1=31095&r2=31096&view=diff
==============================================================================
---
trunk/data/campaigns/The_Hammer_of_Thursagan/scenarios/03_Strange_Allies.cfg
(original)
+++
trunk/data/campaigns/The_Hammer_of_Thursagan/scenarios/03_Strange_Allies.cfg
Wed Nov 26 20:08:51 2008
@@ -107,11 +107,9 @@
#ifdef EASY
recruit=Footpad, Thug, Poacher
#endif
-
#ifdef NORMAL
recruit=Footpad, Thug, Outlaw, Poacher
#endif
-
#ifdef HARD
recruit=Footpad, Thug, Outlaw, Bandit, Poacher, Trapper
#endif
Modified: trunk/data/campaigns/The_South_Guard/scenarios/04_Vale_of_Tears.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/The_South_Guard/scenarios/04_Vale_of_Tears.cfg?rev=31096&r1=31095&r2=31096&view=diff
==============================================================================
--- trunk/data/campaigns/The_South_Guard/scenarios/04_Vale_of_Tears.cfg
(original)
+++ trunk/data/campaigns/The_South_Guard/scenarios/04_Vale_of_Tears.cfg Wed Nov
26 20:08:51 2008
@@ -76,7 +76,11 @@
canrecruit=yes
[ai]
+#ifdef EASY
+ recruitment_pattern=fighter
+#else
recruitment_pattern=fighter,archer
+#endif
{QUANTITY aggression 0.5 0.6 0.7}
{ATTACK_DEPTH 3 4 5}
[target]
@@ -114,7 +118,7 @@
canrecruit=yes
[ai]
- recruitment_pattern=fighter,scout,archer
+ recruitment_pattern=mixed fighter,scout,archer
{QUANTITY aggression 0.2 0.3 0.4}
[target]
id=Ethiliel
Modified:
trunk/data/campaigns/Under_the_Burning_Suns/scenarios/11_Battle_for_Zocthanol_Isle.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Under_the_Burning_Suns/scenarios/11_Battle_for_Zocthanol_Isle.cfg?rev=31096&r1=31095&r2=31096&view=diff
==============================================================================
---
trunk/data/campaigns/Under_the_Burning_Suns/scenarios/11_Battle_for_Zocthanol_Isle.cfg
(original)
+++
trunk/data/campaigns/Under_the_Burning_Suns/scenarios/11_Battle_for_Zocthanol_Isle.cfg
Wed Nov 26 20:08:51 2008
@@ -81,8 +81,11 @@
#endif
[ai]
- recruitment_pattern=scout, healer, archer, scout, archer
-
+#ifdef HARD
+ recruitment_pattern=scout, healer, scout, archer
+#else
+ recruitment_pattern=scout, healer, scout
+#endif
aggression=0.75
caution=0.1
Modified: trunk/data/tools/wmllint
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/tools/wmllint?rev=31096&r1=31095&r2=31096&view=diff
==============================================================================
--- trunk/data/tools/wmllint (original)
+++ trunk/data/tools/wmllint Wed Nov 26 20:08:51 2008
@@ -725,20 +725,24 @@
"Consistency-check state information picked up by sanity_check"
derivedlist = map(lambda x: x[2], derived_units)
baselist = map(lambda x: x[3], derived_units)
+ derivations = dict(zip(derivedlist, baselist))
for (filename, recruitdict, patterndict) in sides:
for (rdifficulty, (rl, recruit)) in recruitdict.items():
utypes = []
for rtype in recruit:
+ base = rtype
if rtype not in unit_types:
# Assume WML coder knew what he was doing if macro
reference
if not rtype.startswith("{"):
print '"%s", line %d: %s is not a known unit type' %
(filename, rl, rtype)
continue
elif rtype not in usage:
- if not rtype in derivedlist:
+ if rtype in derivedlist:
+ base = derivations[rtype]
+ else:
print '"%s", line %d: %s has no usage type' %
(filename, rl, rtype)
continue
- utype = usage[rtype]
+ utype = usage[base]
utypes.append(utype)
for (pdifficulty, (pl, recruit_pattern)) in
patterndict.items():
if condition_match(pdifficulty, rdifficulty):
@@ -760,7 +764,7 @@
if utype not in utypes:
rshow = '.'
if rdifficulty is not None:
- rshow = ' and difficulty ' + rdifficulty +
'.'
+ rshow = ' at difficulty ' + rdifficulty +
'.'
print '"%s", line %d: no %s units
recruitable%s' % (filename, pl, utype, rshow)
if movetypes:
for (unit_id, filename, line, movetype) in unit_movetypes:
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
