Author: ai0867
Date: Tue Sep 16 23:04:51 2008
New Revision: 29503
URL: http://svn.gna.org/viewcvs/wesnoth?rev=29503&view=rev
Log:
* Used wmllint to update the formula/test scenarios.
Modified:
trunk/data/scenario-formula-recruitment.cfg
trunk/data/scenario-formula.cfg
trunk/data/scenario-test.cfg
Modified: trunk/data/scenario-formula-recruitment.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/scenario-formula-recruitment.cfg?rev=29503&r1=29502&r2=29503&view=diff
==============================================================================
--- trunk/data/scenario-formula-recruitment.cfg (original)
+++ trunk/data/scenario-formula-recruitment.cfg Tue Sep 16 23:04:51 2008
@@ -1,10 +1,9 @@
+#textdomain wesnoth
# @file data/scenario-test.cfg
-#textdomain wesnoth
[test]
name="Test scenario"
- map_data="
- border_size=1
+ map_data=" border_size=1
usage=map
Hh , Hh , Gg , Wwf , Wwf , Gs^Fp
, Mm , Hh , Gg , Gs^Fp , Gg , Hh
, Gg , Mm , Hh , Mm , Wwf ,
Wwf , Hh , Gs^Fp , Hh , Mm , Mm
@@ -43,7 +42,7 @@
[side]
type=Dwarvish Steelclad
side=1
- canrecruit=1
+ canrecruit=yes
recruit=Dwarvish Guardsman,Dwarvish Fighter,Dwarvish
Thunderer,Thief,Poacher,Footpad
gold=100
controller=ai
@@ -53,7 +52,7 @@
name=FormulaAI
type=Lieutenant
side=2
- canrecruit=1
+ canrecruit=yes
recruit=Spearman,Mage,Bowman,Horseman,Cavalryman,Heavy
Infantryman,Fencer,Merman Fighter
gold=100
Modified: trunk/data/scenario-formula.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/scenario-formula.cfg?rev=29503&r1=29502&r2=29503&view=diff
==============================================================================
--- trunk/data/scenario-formula.cfg (original)
+++ trunk/data/scenario-formula.cfg Tue Sep 16 23:04:51 2008
@@ -1,10 +1,9 @@
+#textdomain wesnoth
# @file data/scenario-test.cfg
-#textdomain wesnoth
[test]
name="Test scenario"
- map_data="
- border_size=1
+ map_data=" border_size=1
usage=map
Hh , Hh , Gg , Wwf , Wwf , Gs^Fp
, Mm , Hh , Gg , Gs^Fp , Gg , Hh
, Gg , Mm , Hh , Mm , Wwf ,
Wwf , Hh , Gs^Fp , Hh , Mm , Mm
@@ -44,7 +43,7 @@
type=Dwarvish Steelclad
id=side_1_leader
side=1
- canrecruit=1
+ canrecruit=yes
recruit=Dwarvish Guardsman,Dwarvish Fighter,Dwarvish
Thunderer,Thief,Poacher,Footpad
gold=100
controller=human
@@ -52,7 +51,7 @@
x,y=10,8
type="Elvish Archer"
hitpoints=1
- generate_description=yes
+ generate_name=yes
[/unit]
[/side]
@@ -61,7 +60,7 @@
name=FormulaAI
type=Dark Sorcerer
side=2
- canrecruit=1
+ canrecruit=yes
recruit=Skeleton,Skeleton Archer,Walking Corpse,Ghost,Vampire Bat,Dark
Adept,Ghoul
gold=100
shroud=yes
@@ -69,7 +68,7 @@
[unit]
x,y=8,5
type="Orcish Archer"
- generate_description=yes
+ generate_name=yes
formula="if(attack, attack, move(me.loc,
choose(unit_moves(me.loc), -distance_between(self, me.vars.guard_loc))))
where attack = choose(filter(attacks, units = [me.loc]
and distance_between(me.vars.guard_loc, target) <= me.vars.guard_radius),
avg_damage_inflicted)"
[ai_vars]
@@ -80,29 +79,29 @@
[unit]
x,y=3,8
type="Walking Corpse"
- generate_description=yes
+ generate_name=yes
formula="move(me.loc,
nearest_loc(nearest_loc(me.loc,map(filter(map.terrain,id='castle'),loc)),unit_moves(me.loc)))"
[/unit]
[unit]
x,y=6,20
type="Ghost"
- generate_description=yes
+ generate_name=yes
[/unit]
[unit]
x,y=15,22
type="Ghost"
- generate_description=yes
+ generate_name=yes
[/unit]
[unit]
x,y=12,19
type="Ghost"
- generate_description=yes
+ generate_name=yes
[/unit]
[unit]
x,y=10,6
type="Lich"
experience=149
- generate_description=yes
+ generate_name=yes
[/unit]
ai_algorithm=formula_ai
Modified: trunk/data/scenario-test.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/scenario-test.cfg?rev=29503&r1=29502&r2=29503&view=diff
==============================================================================
--- trunk/data/scenario-test.cfg (original)
+++ trunk/data/scenario-test.cfg Tue Sep 16 23:04:51 2008
@@ -59,7 +59,7 @@
x,y=4,8
type="Elvish Avenger"
id=statue
- generate_description=yes
+ generate_name=yes
hitpoints=4
[status]
stoned=on
@@ -68,39 +68,39 @@
[unit]
x,y=12,8
type="Thief"
- generate_description=yes
+ generate_name=yes
hitpoints=1
[/unit]
[unit]
x,y=9,8
type="Peasant"
- generate_description=yes
+ generate_name=yes
[/unit]
[unit]
x,y=18,9
type="Arch Mage"
- generate_description=yes
+ generate_name=yes
[/unit]
[unit]
x,y=17,10
type="Elvish Druid"
- generate_description=yes
+ generate_name=yes
[/unit]
[unit]
x,y=19,10
type="Lich"
- generate_description=yes
+ generate_name=yes
[/unit]
[unit]
x,y=17,11
type="Elvish Shyde"
- generate_description=yes
+ generate_name=yes
[/unit]
[unit]
x,y=18,11
type="Arch Mage"
gender="female"
- generate_description=yes
+ generate_name=yes
[/unit]
[/side]
@@ -117,12 +117,12 @@
[unit]
x,y=12,13
type="Orcish Archer"
- generate_description=yes
+ generate_name=yes
[/unit]
[unit]
x,y=10,7
type="Orcish Archer"
- generate_description=yes
+ generate_name=yes
[/unit]
[/side]
[event]
@@ -386,7 +386,7 @@
x,y="$xx1","$yy1"
type="Orcish Warlord"
id="Bozo"
- generate_description=yes
+ generate_name=yes
[/unit]
[message]
@@ -750,8 +750,7 @@
[terrain_mask]
x,y=20,1
- mask="
-usage=mask
+ mask="usage=mask
_s, _s, _s, _s, Aa, Aa, _s, _s, _s, _s
_s, _s, _s, Aa, Aa, Aa, Aa, _s, _s, _s
@@ -807,8 +806,7 @@
[terrain_mask]
x,y=8,11
- mask="
-usage=mask
+ mask="usage=mask
^Ft, ^Ft, ^Ft, ^Ft
^Ft, ^Ft, ^Ft, ^Ft
@@ -847,8 +845,7 @@
[terrain_mask]
x,y=8,11
- mask="
-usage=mask
+ mask="usage=mask
Ww, Ww, Ww, Ww
Ww, Ww, Ww, Ww
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
