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

Clean up the unit-generator macros.

Browse source 
This change has been checked against UMC.
This commit is contained in:
Eric S. Raymond 2008-11-19 14:34:05 +00:00
parent a1414e2ecf
commit 7927d33428
40 changed files with 305 additions and 242 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/campaigns/An_Orcish_Incursion/scenarios/1_Defend_the_Forest.cfg
View file

@ -109,7 +109,7 @@ Elves can move quickly and safely among the trees. Pick off the enemy grunts wit
[/objective]
[/objectives]
{LOYAL_UNIT 1 "Elvish Rider" 15 18 "Lomarfel" (_ "Lomarfel")} # wmllint: recognize Lomarfel
{NAMED_LOYAL_UNIT 1 "Elvish Rider" 15 18 "Lomarfel" (_ "Lomarfel")} # wmllint: recognize Lomarfel
[/event]
[event]

12
data/campaigns/Descent_Into_Darkness/scenarios/01_Saving_Parthyn.cfg
View file

@ -158,13 +158,13 @@
{PLACE_IMAGE scenery/signpost.png 24 20}
# Place starting units for Drogan and Malin
{LOYAL_UNIT 1 (Spearman) 30 11 (Kerith) ( _ "Kerith")}
{LOYAL_UNIT 1 (Bowman) 31 12 (Owain) ( _ "Owain")}
{LOYAL_UNIT 1 (Spearman) 31 13 (Aethun) ( _ "Aethun")}
{NAMED_LOYAL_UNIT 1 (Spearman) 30 11 (Kerith) ( _ "Kerith")}
{NAMED_LOYAL_UNIT 1 (Bowman) 31 12 (Owain) ( _ "Owain")}
{NAMED_LOYAL_UNIT 1 (Spearman) 31 13 (Aethun) ( _ "Aethun")}
{LOYAL_UNIT 3 (Spearman) 5 17 (Yran) ( _ "Yran")}
{LOYAL_UNIT 3 (Swordsman) 6 17 (Luddry) ( _ "Luddy")}
{LOYAL_UNIT 3 (Spearman) 6 18 (Gwilam) ( _ "Gwilam")}
{NAMED_LOYAL_UNIT 3 (Spearman) 5 17 (Yran) ( _ "Yran")}
{NAMED_LOYAL_UNIT 3 (Swordsman) 6 17 (Luddry) ( _ "Luddy")}
{NAMED_LOYAL_UNIT 3 (Spearman) 6 18 (Gwilam) ( _ "Gwilam")}
{VARIABLE malin_used_necromancy 0}
[/event]

4
data/campaigns/Descent_Into_Darkness/scenarios/02_Peaceful_Valley.cfg
View file

@ -294,8 +294,8 @@
type=Walking Corpse
x,y=4,1
[/filter]
{LOYAL_UNIT 2 (Goblin Spearman) 3 2 Shaun (_ "Shaun")}
{LOYAL_UNIT 2 (Goblin Spearman) 5 2 Ed (_ "Ed")}
{NAMED_LOYAL_UNIT 2 (Goblin Spearman) 3 2 Shaun (_ "Shaun")}
{NAMED_LOYAL_UNIT 2 (Goblin Spearman) 5 2 Ed (_ "Ed")}
{SPEAK Ed (_ "Any zombies out there?")}
{SPEAK Shaun (_ "Don't say that!")}
{SPEAK Ed (_ "What?")}

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

@ -134,7 +134,7 @@
{SET_VILLAGE 3 10 10}
# Set dwarf watchman
{LOYAL_UNIT 2 (Dwarvish Guardsman) 14 12 Watchman (_ "Watchman")}
{NAMED_LOYAL_UNIT 2 (Dwarvish Guardsman) 14 12 Watchman (_ "Watchman")}
# Ghost variable
{VARIABLE ghost_was_freed no}

6
data/campaigns/Descent_Into_Darkness/scenarios/06_Return_to_Parthyn.cfg
View file

@ -171,9 +171,9 @@
{PLACE_IMAGE scenery/signpost.png 27 13}
# Drogan has some guards at the river fort
{LOYAL_UNIT 3 (Spearman) 30 11 (River fort guard) ( _ "River fort guard")}
{LOYAL_UNIT 3 (Bowman) 31 12 (River fort guard) ( _ "River fort guard")}
{LOYAL_UNIT 3 (Spearman) 31 13 (River fort guard) ( _ "River fort guard")}
{NAMED_LOYAL_UNIT 3 (Spearman) 30 11 (River fort guard) ( _ "River fort guard")}
{NAMED_LOYAL_UNIT 3 (Bowman) 31 12 (River fort guard) ( _ "River fort guard")}
{NAMED_LOYAL_UNIT 3 (Spearman) 31 13 (River fort guard) ( _ "River fort guard")}
[/event]
[event]

2
data/campaigns/Heir_To_The_Throne/scenarios/04_The_Bay_of_Pearls.cfg
View file

@ -265,7 +265,7 @@
kill=yes
[/store_unit]
{LOYAL_UNIT 2 (Sea Orc) $bugg_flip.x $bugg_flip.y (Bugg) ( _ "Bugg")}
{NAMED_LOYAL_UNIT 2 (Sea Orc) $bugg_flip.x $bugg_flip.y (Bugg) ( _ "Bugg")}
{CLEAR_VARIABLE bugg_flip}

6
data/campaigns/Heir_To_The_Throne/scenarios/05b_Isle_of_the_Damned.cfg
View file

@ -170,8 +170,8 @@
[event]
name=start
{LOYAL_UNIT 1 (Merman Fighter) 27 12 (Kalba) ( _ "Kalba")}
{LOYAL_UNIT 1 (Merman Fighter) 31 14 (Gnaba) ( _ "Gnaba")}
{NAMED_LOYAL_UNIT 1 (Merman Fighter) 27 12 (Kalba) ( _ "Kalba")}
{NAMED_LOYAL_UNIT 1 (Merman Fighter) 31 14 (Gnaba) ( _ "Gnaba")}
# wmllint: recognize Kalba
# wmllint: recognize Gnaba
@ -192,7 +192,7 @@
message= _ "There are still some bands of humans hiding on the island, my lord. If you recruit some of them to help, we might have some hope of holding off the undead hordes!"
[/message]
{LOYAL_UNIT 1 (Outlaw) 20 10 (Delurin) ( _ "Delurin")}
{NAMED_LOYAL_UNIT 1 (Outlaw) 20 10 (Delurin) ( _ "Delurin")}
# wmllint: recognize Delurin
[redraw]

4
data/campaigns/Heir_To_The_Throne/scenarios/07_Crossroads.cfg
View file

@ -457,7 +457,7 @@
y=14,13,13
[/move_unit_fake]
{LOYAL_UNIT 1 (Elvish Archer) 11 13 (Niodien) ( _ "Niodien")}
{NAMED_LOYAL_UNIT 1 (Elvish Archer) 11 13 (Niodien) ( _ "Niodien")}
# wmllint: recognize Niodien
[message]
@ -479,7 +479,7 @@
y=16,16,15
[/move_unit_fake]
{LOYAL_UNIT 1 (Elvish Fighter) 5 15 (Loflar) ( _ "Loflar")}
{NAMED_LOYAL_UNIT 1 (Elvish Fighter) 5 15 (Loflar) ( _ "Loflar")}
# wmllint: recognize Loflar
[message]

28
data/campaigns/Heir_To_The_Throne/scenarios/08_The_Princess_of_Wesnoth.cfg
View file

@ -187,9 +187,9 @@
[event]
name=turn 5
{LOYAL_UNIT 2 (Lieutenant) 27 12 (Jibb) ( _ "Jibb")}
{LOYAL_UNIT 2 (Swordsman) 27 12 (Monry) ( _ "Monry")}
{LOYAL_UNIT 2 (Swordsman) 27 12 (Gleran) ( _ "Gleran")}
{NAMED_LOYAL_UNIT 2 (Lieutenant) 27 12 (Jibb) ( _ "Jibb")}
{NAMED_LOYAL_UNIT 2 (Swordsman) 27 12 (Monry) ( _ "Monry")}
{NAMED_LOYAL_UNIT 2 (Swordsman) 27 12 (Gleran) ( _ "Gleran")}
[message]
speaker="Li'sar"
@ -198,9 +198,9 @@
[/event]
[event]
name=turn 10
{LOYAL_UNIT 2 (Lieutenant) 27 12 (Rogerus) ( _ "Rogerus")}
{LOYAL_UNIT 2 (Swordsman) 27 12 (Rurcyn) ( _ "Rurcyn")}
{LOYAL_UNIT 2 (Swordsman) 27 12 (Blyr) ( _ "Blyr")}
{NAMED_LOYAL_UNIT 2 (Lieutenant) 27 12 (Rogerus) ( _ "Rogerus")}
{NAMED_LOYAL_UNIT 2 (Swordsman) 27 12 (Rurcyn) ( _ "Rurcyn")}
{NAMED_LOYAL_UNIT 2 (Swordsman) 27 12 (Blyr) ( _ "Blyr")}
[message]
speaker="Li'sar"
@ -319,7 +319,7 @@
y=41,42,42,41,40
[/move_unit_fake]
{LOYAL_UNIT 2 (Duelist) 6 40 (Ronry) ( _ "Ronry")}
{NAMED_LOYAL_UNIT 2 (Duelist) 6 40 (Ronry) ( _ "Ronry")}
# wmllint: recognize Ronry
[scroll_to_unit]
@ -327,11 +327,11 @@
y=40
[/scroll_to_unit]
#ifdef NORMAL
{LOYAL_UNIT 2 (Fencer) 6 41 (Ligwyn) ( _ "Ligwyn")}
{NAMED_LOYAL_UNIT 2 (Fencer) 6 41 (Ligwyn) ( _ "Ligwyn")}
#endif
#ifdef HARD
{LOYAL_UNIT 2 (Fencer) 6 41 (Ligwyn) ( _ "Ligwyn")}
{LOYAL_UNIT 2 (Fencer) 5 42 (Owaryn) ( _ "Owaryn")}
{NAMED_LOYAL_UNIT 2 (Fencer) 6 41 (Ligwyn) ( _ "Ligwyn")}
{NAMED_LOYAL_UNIT 2 (Fencer) 5 42 (Owaryn) ( _ "Owaryn")}
#endif
[message]
@ -375,7 +375,7 @@
name=dagger-swish.wav
[/sound]
{LOYAL_UNIT 2 (Duelist) 4 41 (Ronry) ( _ "Ronry")}
{NAMED_LOYAL_UNIT 2 (Duelist) 4 41 (Ronry) ( _ "Ronry")}
[scroll_to_unit]
x=4
@ -389,11 +389,11 @@
[/message]
#ifdef NORMAL
{LOYAL_UNIT 2 (Fencer) 4 41 (Ligwyn) ( _ "Ligwyn")}
{NAMED_LOYAL_UNIT 2 (Fencer) 4 41 (Ligwyn) ( _ "Ligwyn")}
#endif
#ifdef HARD
{LOYAL_UNIT 2 (Fencer) 4 41 (Ligwyn) ( _ "Ligwyn")}
{LOYAL_UNIT 2 (Fencer) 4 41 (Owaryn) ( _ "Owaryn")}
{NAMED_LOYAL_UNIT 2 (Fencer) 4 41 (Ligwyn) ( _ "Ligwyn")}
{NAMED_LOYAL_UNIT 2 (Fencer) 4 41 (Owaryn) ( _ "Owaryn")}
#endif
[message]

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

@ -285,9 +285,9 @@
[/modifications]
[/unit]
{LOYAL_UNIT 1 (White Mage) 20 48 (Heldra) ( _ "Heldra")}
{LOYAL_UNIT 1 (White Mage) 20 48 (Marcus) ( _ "Marcus")}
{LOYAL_UNIT 1 (White Mage) 20 48 (Haldar) ( _ "Haldar")}
{NAMED_LOYAL_UNIT 1 (White Mage) 20 48 (Heldra) ( _ "Heldra")}
{NAMED_LOYAL_UNIT 1 (White Mage) 20 48 (Marcus) ( _ "Marcus")}
{NAMED_LOYAL_UNIT 1 (White Mage) 20 48 (Haldar) ( _ "Haldar")}
[message]
speaker=Moremirmu

22
data/campaigns/Heir_To_The_Throne/scenarios/10_Gryphon_Mountain.cfg
View file

@ -104,9 +104,9 @@
id=Kalenz
[/recall]
{LOYAL_UNIT 3 (Sleeping Gryphon) 12 18 (Graak) ( _ "Graak")}
{LOYAL_UNIT 3 (Sleeping Gryphon) 16 16 (Grook) ( _ "Grook")}
{LOYAL_UNIT 3 (Sleeping Gryphon) 10 14 (Gruak) ( _ "Gruak")}
{NAMED_LOYAL_UNIT 3 (Sleeping Gryphon) 12 18 (Graak) ( _ "Graak")}
{NAMED_LOYAL_UNIT 3 (Sleeping Gryphon) 16 16 (Grook) ( _ "Grook")}
{NAMED_LOYAL_UNIT 3 (Sleeping Gryphon) 10 14 (Gruak) ( _ "Gruak")}
# wmllint: recognize Graak
# wmllint: recognize Grook
# wmllint: recognize Gruak
@ -314,8 +314,8 @@
#
# Put some more gryphons up there and view the mountain
#
{LOYAL_UNIT 3 (Gryphon) 13 14 (Graik) ( _ "Graik")}
{LOYAL_UNIT 3 (Gryphon) 13 18 (Griak) ( _ "Griak")}
{NAMED_LOYAL_UNIT 3 (Gryphon) 13 14 (Graik) ( _ "Graik")}
{NAMED_LOYAL_UNIT 3 (Gryphon) 13 18 (Griak) ( _ "Griak")}
[scroll_to]
x,y=13,16
[/scroll_to]
@ -410,7 +410,7 @@
[kill]
id=Graak
[/kill]
{LOYAL_UNIT 3 (Gryphon) 12 18 (Rampant Graak) ( _ "Rampant Graak")}
{NAMED_LOYAL_UNIT 3 (Gryphon) 12 18 (Rampant Graak) ( _ "Rampant Graak")}
[/event]
[event]
@ -421,7 +421,7 @@
[kill]
id=Grook
[/kill]
{LOYAL_UNIT 3 (Gryphon) 16 16 (Rampant Grook) ( _ "Rampant Grook")}
{NAMED_LOYAL_UNIT 3 (Gryphon) 16 16 (Rampant Grook) ( _ "Rampant Grook")}
[/event]
[event]
@ -432,7 +432,7 @@
[kill]
id=Gruak
[/kill]
{LOYAL_UNIT 3 (Gryphon) 10 14 (Rampant Gruak) ( _ "Rampant Gruak")}
{NAMED_LOYAL_UNIT 3 (Gryphon) 10 14 (Rampant Gruak) ( _ "Rampant Gruak")}
[/event]
#
@ -447,7 +447,7 @@
[kill]
id=Graak
[/kill]
{LOYAL_UNIT 3 (Gryphon) 12 18 (Rampant Graak) ( _ "Rampant Graak")}
{NAMED_LOYAL_UNIT 3 (Gryphon) 12 18 (Rampant Graak) ( _ "Rampant Graak")}
[/event]
[event]
@ -458,7 +458,7 @@
[kill]
id=Grook
[/kill]
{LOYAL_UNIT 3 (Gryphon) 16 16 (Rampant Grook) ( _ "Rampant Grook")}
{NAMED_LOYAL_UNIT 3 (Gryphon) 16 16 (Rampant Grook) ( _ "Rampant Grook")}
[/event]
[event]
@ -469,7 +469,7 @@
[kill]
id=Gruak
[/kill]
{LOYAL_UNIT 3 (Gryphon) 10 14 (Rampant Gruak) ( _ "Rampant Gruak")}
{NAMED_LOYAL_UNIT 3 (Gryphon) 10 14 (Rampant Gruak) ( _ "Rampant Gruak")}
[/event]
#

4
data/campaigns/Heir_To_The_Throne/scenarios/11_The_Ford_of_Abez.cfg
View file

@ -359,10 +359,10 @@
[event]
name=turn 5
{LOYAL_UNIT 4 (Sea Serpent) 1 15 (Sea Serpent) ( _ "Sea Serpent")}
{NAMED_LOYAL_UNIT 4 (Sea Serpent) 1 15 (Sea Serpent) ( _ "Sea Serpent")}
#define SEA_CREATURE
{LOYAL_UNIT 4 (Cuttle Fish) 1 15 (Cuttle Fish) ( _ "Cuttle Fish")}
{NAMED_LOYAL_UNIT 4 (Cuttle Fish) 1 15 (Cuttle Fish) ( _ "Cuttle Fish")}
#enddef
{SEA_CREATURE}

8
data/campaigns/Heir_To_The_Throne/scenarios/13_The_Dwarven_Doors.cfg
View file

@ -136,7 +136,7 @@
[/label]
#define LISAR_GUARD_DOORS
{LOYAL_UNIT 2 (Royal Guard) 8 44 (Royal Guard) ( _ "Royal Guard")}
{NAMED_LOYAL_UNIT 2 (Royal Guard) 8 44 (Royal Guard) ( _ "Royal Guard")}
#enddef
[event]
@ -312,7 +312,7 @@
role=Outlaw_Advisor
[/have_unit]
[then]
{LOYAL_UNIT 1 (Bandit) 18 24 (Uncle Somf) ( _ "Uncle Somf")}
{NAMED_LOYAL_UNIT 1 (Bandit) 18 24 (Uncle Somf) ( _ "Uncle Somf")}
[message]
speaker=unit
@ -615,7 +615,7 @@
y=10-15
[/filter]
{LOYAL_UNIT 5 (Cuttle Fish) 13 13 (Cuttle Fish) ( _ "Cuttle Fish")}
{NAMED_LOYAL_UNIT 5 (Cuttle Fish) 13 13 (Cuttle Fish) ( _ "Cuttle Fish")}
# wmllint: recognize Cuttle Fish
[message]
@ -645,7 +645,7 @@
message= _ "But Konrad's party was not alone in entering the caves..."
[/message]
{LOYAL_UNIT 2 (Princess) 8 44 (Li'sar) ( _ "Li'sar")}
{NAMED_LOYAL_UNIT 2 (Princess) 8 44 (Li'sar) ( _ "Li'sar")}
# wmllint: recognize Li'sar
{LISAR_GUARD_DOORS}
{LISAR_GUARD_DOORS}

2
data/campaigns/Heir_To_The_Throne/scenarios/14_Plunging_Into_the_Darkness.cfg
View file

@ -89,7 +89,7 @@
ai_special=guardian
[/unit]
{LOYAL_UNIT 2 (Giant Spider) 16 40 (Hywyn) ( _ "Hywyn")}
{NAMED_LOYAL_UNIT 2 (Giant Spider) 16 40 (Hywyn) ( _ "Hywyn")}
[/side]
[side]

2
data/campaigns/Heir_To_The_Throne/scenarios/15_The_Lost_General.cfg
View file

@ -144,7 +144,7 @@
side=1
[/filter]
{LOYAL_UNIT 2 (Dwarvish Fighter) 17 24 (Burlin) ( _ "Burlin")}
{NAMED_LOYAL_UNIT 2 (Dwarvish Fighter) 17 24 (Burlin) ( _ "Burlin")}
# wmllint: recognize Burlin
[message]

4
data/campaigns/Heir_To_The_Throne/scenarios/16_Hasty_Alliance.cfg
View file

@ -231,12 +231,12 @@
[/music]
#define HASTY_TROLL X Y
{LOYAL_UNIT 3 (Troll) {X} {Y} (Troll) ( _ "Troll")}
{NAMED_LOYAL_UNIT 3 (Troll) {X} {Y} (Troll) ( _ "Troll")}
[redraw]
[/redraw]
#enddef
#define HASTY_GOBLIN_KNIGHT X Y
{LOYAL_UNIT 3 (Goblin Knight) {X} {Y} (Goblin Knight) ( _ "Goblin Knight")}
{NAMED_LOYAL_UNIT 3 (Goblin Knight) {X} {Y} (Goblin Knight) ( _ "Goblin Knight")}
[redraw]
[/redraw]
#enddef

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

@ -533,7 +533,7 @@
y=1,$temp_y
side=4
[/move_unit_fake]
{LOYAL_UNIT 4 (Elvish Rider) $temp_x $temp_y (Glarilon) ( _ "Glarilon")}
{NAMED_LOYAL_UNIT 4 (Elvish Rider) $temp_x $temp_y (Glarilon) ( _ "Glarilon")}
# wmllint: recognize Glarilon
[message]
speaker=Glarilon
@ -546,7 +546,7 @@
y=38,$temp_y
side=4
[/move_unit_fake]
{LOYAL_UNIT 4 (Elvish Rider) $temp_x $temp_y (Thalindil) ( _ "Thalindil")}
{NAMED_LOYAL_UNIT 4 (Elvish Rider) $temp_x $temp_y (Thalindil) ( _ "Thalindil")}
# wmllint: recognize Thalindil
[message]
speaker=Thalindil
@ -577,7 +577,7 @@
y=18,$temp_y
side=4
[/move_unit_fake]
{LOYAL_UNIT 4 (Elvish Rider) $temp_x $temp_y (Rholandir) ( _ "Rholandir")}
{NAMED_LOYAL_UNIT 4 (Elvish Rider) $temp_x $temp_y (Rholandir) ( _ "Rholandir")}
# wmllint: recognize Rholandir
[message]
speaker=Rholandir

6
data/campaigns/Heir_To_The_Throne/scenarios/22_Return_to_Wesnoth.cfg
View file

@ -193,9 +193,9 @@
message= _ "These intruders are stronger than we expected. Call in the reinforcements!"
[/message]
{LOYAL_UNIT 4 (Halberdier) 33 37 (Dacayan) ( _ "Dacayan")}
{LOYAL_UNIT 4 (Halberdier) 32 37 (Ceomyr) ( _ "Ceomyr")}
{LOYAL_UNIT 4 (Halberdier) 34 37 (Gwellyn) ( _ "Gwellyn")}
{NAMED_LOYAL_UNIT 4 (Halberdier) 33 37 (Dacayan) ( _ "Dacayan")}
{NAMED_LOYAL_UNIT 4 (Halberdier) 32 37 (Ceomyr) ( _ "Ceomyr")}
{NAMED_LOYAL_UNIT 4 (Halberdier) 34 37 (Gwellyn) ( _ "Gwellyn")}
# wmllint: recognize Dacayan
#a little attempt at comic relief

2
data/campaigns/Heir_To_The_Throne/scenarios/23_Test_of_the_Clans.cfg
View file

@ -484,7 +484,7 @@
# Re-create Lord Bayar so he can talk. He's not dead;
# he's just out of commission.
#
{LOYAL_UNIT 5 (Grand Knight) 8 54 (Lord Bayar) (_ "Lord Bayar")}
{NAMED_LOYAL_UNIT 5 (Grand Knight) 8 54 (Lord Bayar) (_ "Lord Bayar")}
{BONUS_VICTORY}
[/event]

8
data/campaigns/Heir_To_The_Throne/scenarios/24_Battle_for_Wesnoth.cfg
View file

@ -178,7 +178,7 @@
numerical_equals=1
[/variable]
[then]
{LOYAL_UNIT 1 (Grand Knight) 39 4 (Lord Bayar) (_ "Lord Bayar")}
{NAMED_LOYAL_UNIT 1 (Grand Knight) 39 4 (Lord Bayar) (_ "Lord Bayar")}
[/then]
[/if]
[if]
@ -187,7 +187,7 @@
numerical_equals=1
[/variable]
[then]
{LOYAL_UNIT 1 (Grand Knight) 39 3 (Sir Daryn) (_ "Sir Daryn")}
{NAMED_LOYAL_UNIT 1 (Grand Knight) 39 3 (Sir Daryn) (_ "Sir Daryn")}
[/then]
[/if]
[if]
@ -196,7 +196,7 @@
numerical_equals=1
[/variable]
[then]
{LOYAL_UNIT 1 (Grand Knight) 39 9 (Sir Ruga) (_ "Sir Ruga")}
{NAMED_LOYAL_UNIT 1 (Grand Knight) 39 9 (Sir Ruga) (_ "Sir Ruga")}
[/then]
[/if]
[if]
@ -205,7 +205,7 @@
numerical_equals=1
[/variable]
[then]
{LOYAL_UNIT 1 (Grand Knight) 39 8 (Sir Alric) (_ "Sir Alric")}
{NAMED_LOYAL_UNIT 1 (Grand Knight) 39 8 (Sir Alric) (_ "Sir Alric")}
[/then]
[/if]
[/event]

6
data/campaigns/Liberty/scenarios/07_The_Hunters.cfg
View file

@ -124,8 +124,8 @@
[recall]
id=Harper
[/recall]
{LOYAL_UNIT 1 Outlaw 30 17 Jingo ( _ "Jingo")}
{LOYAL_UNIT 1 Outlaw 32 17 Majel ( _ "Majel")}
{NAMED_LOYAL_UNIT 1 Outlaw 30 17 Jingo ( _ "Jingo")}
{NAMED_LOYAL_UNIT 1 Outlaw 32 17 Majel ( _ "Majel")}
# wmllint: recognize Jingo
# wmllint: recognize Majel
[/event]
@ -154,7 +154,7 @@
message= _ "The garrison. The towers of Halstead are more than a garrison, nephew, they are a fortress. They used to protect this area from the enemies of Wesnoth; I never imagined they would house the enemies of Wesnoth."
[/message]
{LOYAL_UNIT 1 Dragoon 11 1 (Pitcher) ( _ "Pitcher")}
{NAMED_LOYAL_UNIT 1 Dragoon 11 1 (Pitcher) ( _ "Pitcher")}
# wmllint: recognize Pitcher
{MOVE_UNIT id=Pitcher 20 14}

84
data/campaigns/Northern_Rebirth/scenarios/08b_Ray_of_Hope.cfg
View file

@ -345,50 +345,50 @@
{PLACE_IMAGE items/ankh-necklace.png 87 66}
#ifdef EASY
{LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
#endif
#ifdef NORMAL
{LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
#endif
#ifdef HARD
{LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
#endif
#ifdef NIGHTMARE
{LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 2 (Tentacle of the Deep) 91 38 (Tentacle) ( _ "Tentacle")}
#endif
@ -555,14 +555,14 @@
y=62-69
[/filter]
{LOYAL_UNIT 2 (Giant Spider) 95 60 (Giant Spider) ( _ "Giant Spider")}
{LOYAL_UNIT 2 (Giant Spider) 97 62 (Giant Spider) ( _ "Giant Spider")}
{LOYAL_UNIT 2 (Giant Spider) 97 68 (Giant Spider) ( _ "Giant Spider")}
{LOYAL_UNIT 2 (Giant Spider) 95 70 (Giant Spider) ( _ "Giant Spider")}
{LOYAL_UNIT 2 (Giant Spider) 89 74 (Giant Spider) ( _ "Giant Spider")}
{LOYAL_UNIT 2 (Giant Spider) 84 72 (Giant Spider) ( _ "Giant Spider")}
{LOYAL_UNIT 2 (Giant Spider) 78 70 (Giant Spider) ( _ "Giant Spider")}
{LOYAL_UNIT 2 (Giant Spider) 76 68 (Giant Spider) ( _ "Giant Spider")}
{NAMED_LOYAL_UNIT 2 (Giant Spider) 95 60 (Giant Spider) ( _ "Giant Spider")}
{NAMED_LOYAL_UNIT 2 (Giant Spider) 97 62 (Giant Spider) ( _ "Giant Spider")}
{NAMED_LOYAL_UNIT 2 (Giant Spider) 97 68 (Giant Spider) ( _ "Giant Spider")}
{NAMED_LOYAL_UNIT 2 (Giant Spider) 95 70 (Giant Spider) ( _ "Giant Spider")}
{NAMED_LOYAL_UNIT 2 (Giant Spider) 89 74 (Giant Spider) ( _ "Giant Spider")}
{NAMED_LOYAL_UNIT 2 (Giant Spider) 84 72 (Giant Spider) ( _ "Giant Spider")}
{NAMED_LOYAL_UNIT 2 (Giant Spider) 78 70 (Giant Spider) ( _ "Giant Spider")}
{NAMED_LOYAL_UNIT 2 (Giant Spider) 76 68 (Giant Spider) ( _ "Giant Spider")}
# wmllint: recognize Giant Spider
[message]

16
data/campaigns/The_Rise_Of_Wesnoth/scenarios/03_A_Harrowing_Escape.cfg
View file

@ -342,16 +342,16 @@ SW - The Midlands."
side=3
amount=60
[/gold]
{LOYAL_UNIT 3 (Orcish Slayer) 25 40 (Hashnak) ( _ "Hashnak")}
{NAMED_LOYAL_UNIT 3 (Orcish Slayer) 25 40 (Hashnak) ( _ "Hashnak")}
#else
[gold]
side=3
amount=90
[/gold]
{LOYAL_UNIT 3 (Orcish Slayer) 25 40 (Hashnak) ( _ "Hashnak")}
{LOYAL_UNIT 3 (Orcish Assassin) 24 40 (Grork) ( _ "Grork")}
{LOYAL_UNIT 3 (Orcish Assassin) 26 40 (Vigdish) ( _ "Vigdish")}
{NAMED_LOYAL_UNIT 3 (Orcish Slayer) 25 40 (Hashnak) ( _ "Hashnak")}
{NAMED_LOYAL_UNIT 3 (Orcish Assassin) 24 40 (Grork) ( _ "Grork")}
{NAMED_LOYAL_UNIT 3 (Orcish Assassin) 26 40 (Vigdish) ( _ "Vigdish")}
#endif
# wmllint: recognize Hashnak
@ -404,16 +404,16 @@ SW - The Midlands."
amount=60
[/gold]
{LOYAL_UNIT 2 (Orcish Slayer) 25 40 (Hashnak) ( _ "Hashnak")}
{NAMED_LOYAL_UNIT 2 (Orcish Slayer) 25 40 (Hashnak) ( _ "Hashnak")}
#else
[gold]
side=2
amount=90
[/gold]
{LOYAL_UNIT 2 (Orcish Slayer) 25 40 (Hashnak) ( _ "Hashnak")}
{LOYAL_UNIT 2 (Orcish Assassin) 24 40 (Grork) ( _ "Grork")}
{LOYAL_UNIT 2 (Orcish Assassin) 26 40 (Vigdish) ( _ "Vigdish")}
{NAMED_LOYAL_UNIT 2 (Orcish Slayer) 25 40 (Hashnak) ( _ "Hashnak")}
{NAMED_LOYAL_UNIT 2 (Orcish Assassin) 24 40 (Grork) ( _ "Grork")}
{NAMED_LOYAL_UNIT 2 (Orcish Assassin) 26 40 (Vigdish) ( _ "Vigdish")}
#endif
[message]
speaker=Tan-Schmog

6
data/campaigns/The_Rise_Of_Wesnoth/scenarios/04a_The_River_Road.cfg
View file

@ -199,7 +199,7 @@
y=6
side=1
[/filter]
{LOYAL_UNIT 2 (Giant Scorpion) 16 5 () ( _ "Scorpion")}
{NAMED_LOYAL_UNIT 2 (Giant Scorpion) 16 5 () ( _ "Scorpion")}
[/event]
[event]
@ -209,7 +209,7 @@
y=25
side=1
[/filter]
{LOYAL_UNIT 3 (Giant Scorpion) 10 27 () ( _ "Scorpion")}
{NAMED_LOYAL_UNIT 3 (Giant Scorpion) 10 27 () ( _ "Scorpion")}
[/event]
[event]
@ -219,7 +219,7 @@
y=33
side=1
[/filter]
{LOYAL_UNIT 4 (Giant Scorpion) 32 33 () ( _ "Scorpion")}
{NAMED_LOYAL_UNIT 4 (Giant Scorpion) 32 33 () ( _ "Scorpion")}
[/event]
#define TEMPLE_HELP X Y

16
data/campaigns/The_Rise_Of_Wesnoth/scenarios/04b_The_Midlands.cfg
View file

@ -253,7 +253,7 @@
y=35,34,34,33
[/move_unit_fake]
{LOYAL_UNIT 3 (Goblin Knight) 11 33 (Grilg) ( _ "Grilg")}
{NAMED_LOYAL_UNIT 3 (Goblin Knight) 11 33 (Grilg) ( _ "Grilg")}
# wmllint: recognize Grilg
[message]
@ -261,10 +261,10 @@
message= _ "What? More humans here? Get them!"
[/message]
{LOYAL_UNIT 3 (Wolf Rider) 10 33 () ( _ "Rider")}
{LOYAL_UNIT 3 (Wolf Rider) 12 33 () ( _ "Rider")}
{NAMED_LOYAL_UNIT 3 (Wolf Rider) 10 33 () ( _ "Rider")}
{NAMED_LOYAL_UNIT 3 (Wolf Rider) 12 33 () ( _ "Rider")}
#ifdef HARD
{LOYAL_UNIT 3 (Goblin Pillager) 11 34 () ( _ "Rider")}
{NAMED_LOYAL_UNIT 3 (Goblin Pillager) 11 34 () ( _ "Rider")}
#endif
[/event]
@ -282,7 +282,7 @@
y=35,34,33
[/move_unit_fake]
{LOYAL_UNIT 4 (Orcish Slayer) 36 33 (Vrogar) ( _ "Vrogar")}
{NAMED_LOYAL_UNIT 4 (Orcish Slayer) 36 33 (Vrogar) ( _ "Vrogar")}
# wmllint: recognize Vrogar
[message]
@ -291,10 +291,10 @@
message= _ "How'd they get behind us? I hate to miss such tasty meat."
[/message]
{LOYAL_UNIT 4 (Orcish Assassin) 35 34 (Assassin) ( _ "Assassin")}
{LOYAL_UNIT 4 (Orcish Assassin) 37 34 (Assassin) ( _ "Assassin")}
{LOYAL_UNIT 4 (Orcish Assassin) 35 34}
{LOYAL_UNIT 4 (Orcish Assassin) 37 34}
#ifdef HARD
{LOYAL_UNIT 4 (Orcish Crossbowman) 36 34 (Crossbow) ( _ "Crossbow")}
{LOYAL_UNIT 4 (Orcish Crossbowman) 36 34}
#endif
[/event]

36
data/campaigns/The_Rise_Of_Wesnoth/scenarios/06_Temple_of_the_Deep.cfg
View file

@ -55,28 +55,28 @@
name=prestart
#ifdef EASY
{LOYAL_UNIT 2 (Tentacle of the Deep) 3 16 () ( _ "Tentacle")}
{LOYAL_UNIT 2 (Tentacle of the Deep) 22 16 () ( _ "Tentacle")}
{LOYAL_UNIT 2 (Tentacle of the Deep) 10 16 () ( _ "Tentacle")}
{LOYAL_UNIT 2 (Tentacle of the Deep) 16 16 () ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 2 (Tentacle of the Deep) 3 16 () ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 2 (Tentacle of the Deep) 22 16 () ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 2 (Tentacle of the Deep) 10 16 () ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 2 (Tentacle of the Deep) 16 16 () ( _ "Tentacle")}
#endif
#ifdef NORMAL
{LOYAL_UNIT 2 (Tentacle of the Deep) 3 16 () ( _ "Tentacle")}
{LOYAL_UNIT 2 (Tentacle of the Deep) 22 16 () ( _ "Tentacle")}
{LOYAL_UNIT 2 (Tentacle of the Deep) 10 16 () ( _ "Tentacle")}
{LOYAL_UNIT 2 (Tentacle of the Deep) 16 16 () ( _ "Tentacle")}
{LOYAL_UNIT 2 (Tentacle of the Deep) 12 17 () ( _ "Tentacle")}
{LOYAL_UNIT 2 (Tentacle of the Deep) 14 17 () ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 2 (Tentacle of the Deep) 3 16 () ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 2 (Tentacle of the Deep) 22 16 () ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 2 (Tentacle of the Deep) 10 16 () ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 2 (Tentacle of the Deep) 16 16 () ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 2 (Tentacle of the Deep) 12 17 () ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 2 (Tentacle of the Deep) 14 17 () ( _ "Tentacle")}
#endif
#ifdef HARD
{LOYAL_UNIT 2 (Tentacle of the Deep) 3 16 () ( _ "Tentacle")}
{LOYAL_UNIT 2 (Tentacle of the Deep) 22 16 () ( _ "Tentacle")}
{LOYAL_UNIT 2 (Tentacle of the Deep) 10 16 () ( _ "Tentacle")}
{LOYAL_UNIT 2 (Tentacle of the Deep) 16 16 () ( _ "Tentacle")}
{LOYAL_UNIT 2 (Tentacle of the Deep) 12 17 () ( _ "Tentacle")}
{LOYAL_UNIT 2 (Tentacle of the Deep) 14 17 () ( _ "Tentacle")}
{LOYAL_UNIT 2 (Tentacle of the Deep) 10 15 () ( _ "Tentacle")}
{LOYAL_UNIT 2 (Tentacle of the Deep) 16 15 () ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 2 (Tentacle of the Deep) 3 16 () ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 2 (Tentacle of the Deep) 22 16 () ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 2 (Tentacle of the Deep) 10 16 () ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 2 (Tentacle of the Deep) 16 16 () ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 2 (Tentacle of the Deep) 12 17 () ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 2 (Tentacle of the Deep) 14 17 () ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 2 (Tentacle of the Deep) 10 15 () ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 2 (Tentacle of the Deep) 16 15 () ( _ "Tentacle")}
#endif
{PLACE_IMAGE (terrain/cave/floor.png) 6 18}
{PLACE_IMAGE (terrain/cave/floor.png) 20 18}

18
data/campaigns/The_Rise_Of_Wesnoth/scenarios/08_Clearwater_Port.cfg
View file

@ -213,9 +213,9 @@
id=Minister Edmond
[/recall]
{LOYAL_UNIT 2 (Peasant) 26 18 () ( _ "Angry Farmer")}
{LOYAL_UNIT 2 (Peasant) 28 19 () ( _ "Angry Farmer")}
{LOYAL_UNIT 2 (Peasant) 29 22 () ( _ "Angry Farmer")}
{NAMED_LOYAL_UNIT 2 (Peasant) 26 18 () ( _ "Angry Farmer")}
{NAMED_LOYAL_UNIT 2 (Peasant) 28 19 () ( _ "Angry Farmer")}
{NAMED_LOYAL_UNIT 2 (Peasant) 29 22 () ( _ "Angry Farmer")}
# wmllint: recognize Angry Farmer
[objectives]
@ -369,17 +369,17 @@
[/allow_recruit]
#ifdef EASY
{LOYAL_UNIT 3 (Naga Fighter) 31 30 (Rolassi) ( _ "Rolassi")}
{NAMED_LOYAL_UNIT 3 (Naga Fighter) 31 30 (Rolassi) ( _ "Rolassi")}
#endif
#ifdef NORMAL
{LOYAL_UNIT 3 (Naga Fighter) 31 30 (Rolassi) ( _ "Rolassi")}
{LOYAL_UNIT 3 (Naga Fighter) 30 31 (Porbag) ( _ "Porbag")}
{NAMED_LOYAL_UNIT 3 (Naga Fighter) 31 30 (Rolassi) ( _ "Rolassi")}
{NAMED_LOYAL_UNIT 3 (Naga Fighter) 30 31 (Porbag) ( _ "Porbag")}
#endif
#ifdef HARD
{LOYAL_UNIT 3 (Naga Fighter) 31 30 (Rolassi) ( _ "Rolassi")}
{LOYAL_UNIT 3 (Naga Fighter) 30 31 (Porbag) ( _ "Porbag")}
{LOYAL_UNIT 3 (Naga Fighter) 27 33 (Eriol) ( _ "Eriol")}
{NAMED_LOYAL_UNIT 3 (Naga Fighter) 31 30 (Rolassi) ( _ "Rolassi")}
{NAMED_LOYAL_UNIT 3 (Naga Fighter) 30 31 (Porbag) ( _ "Porbag")}
{NAMED_LOYAL_UNIT 3 (Naga Fighter) 27 33 (Eriol) ( _ "Eriol")}
#endif
[/event]

4
data/campaigns/The_Rise_Of_Wesnoth/scenarios/09_Fallen_Lich_Point.cfg
View file

@ -550,7 +550,7 @@
y=1,2,3,3,4,4,5,6,7,7,8,9,10,10,11
[/move_unit_fake]
{LOYAL_UNIT 4 (Yeti) 12 11 (Rarlg) ( _ "Rarlg")}
{NAMED_LOYAL_UNIT 4 (Yeti) 12 11 (Rarlg) ( _ "Rarlg")}
# wmllint: recognize Rarlg
[message]
@ -578,7 +578,7 @@
id=Rarlg
[/scroll_to_unit]
{LOYAL_UNIT 4 (Yeti) 15 11 (Raul-Rarlg) ( _ "Raul-Rarlg")}
{NAMED_LOYAL_UNIT 4 (Yeti) 15 11 (Raul-Rarlg) ( _ "Raul-Rarlg")}
# wmllint: recognize Raul-Rarg
[/event]

2
data/campaigns/The_Rise_Of_Wesnoth/scenarios/13_Peoples_in_Decline.cfg
View file

@ -233,7 +233,7 @@
{VARIABLE_OP xx1 random 14..19}
{VARIABLE_OP yy1 random 16..19}
{LOYAL_UNIT 4 (Sea Serpent) $xx1 $yy1 (Bitey the Serpent) ( _ "Bitey the Serpent")}
{NAMED_LOYAL_UNIT 4 (Sea Serpent) $xx1 $yy1 (Bitey the Serpent) ( _ "Bitey the Serpent")}
# wmllint: recognize Bitey The Sepent
[message]

6
data/campaigns/The_Rise_Of_Wesnoth/scenarios/14_Rough_Landing.cfg
View file

@ -209,7 +209,7 @@
{VARIABLE_OP xx1 random 16..19}
{VARIABLE_OP yy1 random 23..30}
{LOYAL_UNIT 2 (Sea Serpent) $xx1 $yy1 (Chompey the Serpent) ( _ "Chompey the Serpent")}
{NAMED_LOYAL_UNIT 2 (Sea Serpent) $xx1 $yy1 (Chompey the Serpent) ( _ "Chompey the Serpent")}
# wmllint: recognize Chompey the Serpent
[message]
@ -238,7 +238,7 @@
{VARIABLE_OP xx1 random 13..25}
{VARIABLE_OP yy1 random 7..8}
{LOYAL_UNIT 2 (Sea Serpent) $xx1 $yy1 (Scaly the Serpent) ( _ "Scaly the Serpent")}
{NAMED_LOYAL_UNIT 2 (Sea Serpent) $xx1 $yy1 (Scaly the Serpent) ( _ "Scaly the Serpent")}
# wmllint: recognize Scaly the Serpent
[message]
@ -267,7 +267,7 @@
{VARIABLE_OP xx1 random 1..14}
{VARIABLE_OP yy1 random 12..13}
{LOYAL_UNIT 2 (Sea Serpent) $xx1 $yy1 (Toothey the Serpent) ( _ "Toothey the Serpent")}
{NAMED_LOYAL_UNIT 2 (Sea Serpent) $xx1 $yy1 (Toothey the Serpent) ( _ "Toothey the Serpent")}
# wmllint: recognize Toothey the Serpent
[message]

8
data/campaigns/The_Rise_Of_Wesnoth/scenarios/17a_The_Dragon.cfg
View file

@ -289,8 +289,8 @@
type=Giant Mudcrawler
[/filter]
{LOYAL_UNIT 2 (Mudcrawler) ($x1) ($y1) () ("") }
{LOYAL_UNIT 3 (Mudcrawler) ($x1) ($y1) () ("") }
{LOYAL_UNIT 2 (Mudcrawler) ($x1) ($y1)}
{LOYAL_UNIT 3 (Mudcrawler) ($x1) ($y1)}
[/event]
[event]
@ -338,7 +338,7 @@
numerical_equals=0
[/variable]
[then]
{LOYAL_UNIT 5 (Fire Dragon) 20 27 ("Shek'kahan") ( _ "Shek'kahan")}
{NAMED_LOYAL_UNIT 5 (Fire Dragon) 20 27 ("Shek'kahan") ( _ "Shek'kahan")}
# wmllint: recognize Shek'kahan
[set_variable]
@ -366,7 +366,7 @@
numerical_equals=0
[/variable]
[then]
{LOYAL_UNIT 5 (Fire Dragon) 20 27 ("Shek'kahan") ( _ "Shek'kahan")}
{NAMED_LOYAL_UNIT 5 (Fire Dragon) 20 27 ("Shek'kahan") ( _ "Shek'kahan")}
[set_variable]
name=dragon_awake

22
data/campaigns/The_Rise_Of_Wesnoth/scenarios/17b_A_Beach.cfg
View file

@ -171,8 +171,8 @@
type=Giant Mudcrawler
[/filter]
{LOYAL_UNIT 2 (Mudcrawler) ($x1) ($y1) () ("") }
{LOYAL_UNIT 3 (Mudcrawler) ($x1) ($y1) () ("") }
{LOYAL_UNIT 2 (Mudcrawler) ($x1) ($y1)}
{LOYAL_UNIT 3 (Mudcrawler) ($x1) ($y1)}
[/event]
[event]
@ -235,7 +235,7 @@
y=15,14,15,15,16,15
[/move_unit_fake]
{LOYAL_UNIT 2 (Naga Warrior) 6 15 (Riaa) ( _ "Riaa")}
{NAMED_LOYAL_UNIT 2 (Naga Warrior) 6 15 (Riaa) ( _ "Riaa")}
# wmllint: recognize Riaa
[message]
@ -243,19 +243,19 @@
message= _ "We must protect the saurians. We need the metal!"
[/message]
{LOYAL_UNIT 3 (Naga Fighter) 5 15 (Liabra) ( _ "Liabra")}
{LOYAL_UNIT 2 (Naga Fighter) 5 16 (Brissal) ( _ "Brissal")}
{NAMED_LOYAL_UNIT 3 (Naga Fighter) 5 15 (Liabra) ( _ "Liabra")}
{NAMED_LOYAL_UNIT 2 (Naga Fighter) 5 16 (Brissal) ( _ "Brissal")}
#ifdef NORMAL
{LOYAL_UNIT 3 (Naga Fighter) 4 14 (Gaxmail) ( _ "Gaxmail")}
{LOYAL_UNIT 2 (Naga Fighter) 4 16 (Griama) ( _ "Gaxmail")}
{NAMED_LOYAL_UNIT 3 (Naga Fighter) 4 14 (Gaxmail) ( _ "Gaxmail")}
{NAMED_LOYAL_UNIT 2 (Naga Fighter) 4 16 (Griama) ( _ "Gaxmail")}
#endif
#ifdef HARD
{LOYAL_UNIT 3 (Naga Fighter) 4 14 (Gaxmail) ( _ "Gaxmail")}
{LOYAL_UNIT 2 (Naga Fighter) 4 16 (Griama) ( _ "Griama")}
{LOYAL_UNIT 3 (Naga Fighter) 3 14 (Saxiala) ( _ "Saxiala")}
{LOYAL_UNIT 2 (Naga Fighter) 3 17 (Malix) ( _ "Malix")}
{NAMED_LOYAL_UNIT 3 (Naga Fighter) 4 14 (Gaxmail) ( _ "Gaxmail")}
{NAMED_LOYAL_UNIT 2 (Naga Fighter) 4 16 (Griama) ( _ "Griama")}
{NAMED_LOYAL_UNIT 3 (Naga Fighter) 3 14 (Saxiala) ( _ "Saxiala")}
{NAMED_LOYAL_UNIT 2 (Naga Fighter) 3 17 (Malix) ( _ "Malix")}
#endif
[/event]

16
data/campaigns/The_Rise_Of_Wesnoth/scenarios/17c_Troll_Hole.cfg
View file

@ -144,19 +144,19 @@
{PLACE_IMAGE (scenery/rubble.png) 15 3}
{PLACE_IMAGE (scenery/rubble.png) 17 27}
{LOYAL_UNIT 2 (Tentacle of the Deep) 15 11 () ( _ "Tentacle")}
{LOYAL_UNIT 3 (Tentacle of the Deep) 15 20 () ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 2 (Tentacle of the Deep) 15 11 () ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 3 (Tentacle of the Deep) 15 20 () ( _ "Tentacle")}
#ifdef NORMAL
{LOYAL_UNIT 4 (Tentacle of the Deep) 11 15 () ( _ "Tentacle")}
{LOYAL_UNIT 5 (Tentacle of the Deep) 19 17 () ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 4 (Tentacle of the Deep) 11 15 () ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 5 (Tentacle of the Deep) 19 17 () ( _ "Tentacle")}
#endif
#ifdef HARD
{LOYAL_UNIT 4 (Tentacle of the Deep) 11 15 () ( _ "Tentacle")}
{LOYAL_UNIT 5 (Tentacle of the Deep) 19 17 () ( _ "Tentacle")}
{LOYAL_UNIT 2 (Tentacle of the Deep) 11 17 () ( _ "Tentacle")}
{LOYAL_UNIT 3 (Tentacle of the Deep) 19 15 () ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 4 (Tentacle of the Deep) 11 15 () ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 5 (Tentacle of the Deep) 19 17 () ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 2 (Tentacle of the Deep) 11 17 () ( _ "Tentacle")}
{NAMED_LOYAL_UNIT 3 (Tentacle of the Deep) 19 15 () ( _ "Tentacle")}
#endif
{RANDOM 1..4}

24
data/campaigns/The_Rise_Of_Wesnoth/scenarios/20_Return_of_the_Fleet.cfg
View file

@ -455,14 +455,14 @@
[/filter]
#No campaign is complete without a cuttlefish
{LOYAL_UNIT 3 (Cuttle Fish) 11 17 () ( _ "Cuttle Fish")}
{NAMED_LOYAL_UNIT 3 (Cuttle Fish) 11 17 () ( _ "Cuttle Fish")}
#ifdef NORMAL
{LOYAL_UNIT 3 (Cuttle Fish) 11 18 () ( _ "Cuttle Fish")}
{NAMED_LOYAL_UNIT 3 (Cuttle Fish) 11 18 () ( _ "Cuttle Fish")}
#endif
#ifdef HARD
{LOYAL_UNIT 3 (Cuttle Fish) 11 18 () ( _ "Cuttle Fish")}
{LOYAL_UNIT 3 (Cuttle Fish) 12 16 () ( _ "Cuttle Fish")}
{NAMED_LOYAL_UNIT 3 (Cuttle Fish) 11 18 () ( _ "Cuttle Fish")}
{NAMED_LOYAL_UNIT 3 (Cuttle Fish) 12 16 () ( _ "Cuttle Fish")}
#endif
[message]
type=Cuttle Fish
@ -482,18 +482,18 @@
y=13-18
[/filter]
# wmllint: recognize Flixta
{LOYAL_UNIT 4 (Saurian Flanker) 34 15 (Flixta) ( _ "Flixta")}
{LOYAL_UNIT 4 (Saurian Oracle) 34 16 ("Bzz'Kza") ( _ "Bzz'Kza")}
{LOYAL_UNIT 4 (Saurian Soothsayer) 33 16 (Tirasch) ( _ "Tirasch")}
{NAMED_LOYAL_UNIT 4 (Saurian Flanker) 34 15 (Flixta) ( _ "Flixta")}
{NAMED_LOYAL_UNIT 4 (Saurian Oracle) 34 16 ("Bzz'Kza") ( _ "Bzz'Kza")}
{NAMED_LOYAL_UNIT 4 (Saurian Soothsayer) 33 16 (Tirasch) ( _ "Tirasch")}
#ifdef NORMAL
{LOYAL_UNIT 4 (Saurian Skirmisher) 35 15 (Kersezz) ( _ "Kersezz")}
{LOYAL_UNIT 4 (Saurian Skirmisher) 33 15 (Tarex) ( _ "Tarex")}
{NAMED_LOYAL_UNIT 4 (Saurian Skirmisher) 35 15 (Kersezz) ( _ "Kersezz")}
{NAMED_LOYAL_UNIT 4 (Saurian Skirmisher) 33 15 (Tarex) ( _ "Tarex")}
#endif
#ifdef HARD
{LOYAL_UNIT 4 (Saurian Skirmisher) 35 15 (Zzalkz) ( _ "Zzalkz")}
{LOYAL_UNIT 4 (Saurian Skirmisher) 34 16 (Amprixta) ( _ "Amprixta")}
{LOYAL_UNIT 4 (Saurian Skirmisher) 33 15 (Anexir) ( _ "Anexir")}
{NAMED_LOYAL_UNIT 4 (Saurian Skirmisher) 35 15 (Zzalkz) ( _ "Zzalkz")}
{NAMED_LOYAL_UNIT 4 (Saurian Skirmisher) 34 16 (Amprixta) ( _ "Amprixta")}
{NAMED_LOYAL_UNIT 4 (Saurian Skirmisher) 33 15 (Anexir) ( _ "Anexir")}
#endif
[message]
speaker=Flixta

18
data/campaigns/The_Rise_Of_Wesnoth/scenarios/22_Rise_of_Wesnoth.cfg
View file

@ -1011,7 +1011,7 @@
y=32,31,32,32,33,32
[/move_unit_fake]
{LOYAL_UNIT 2 (Naga Warrior) 6 32 (Abraxas) ( _ "Abraxas")}
{NAMED_LOYAL_UNIT 2 (Naga Warrior) 6 32 (Abraxas) ( _ "Abraxas")}
# wmllint: recognize Abraxas
[scroll_to_unit]
@ -1023,19 +1023,19 @@
message= _ "It's the Haldric! Jevyan, you never said you came to destroy this monster. We will help you."
[/message]
{LOYAL_UNIT 3 (Naga Fighter) 5 32 (Xamalia) ( _ "Xamalia")}
{LOYAL_UNIT 2 (Naga Fighter) 5 33 (Brissal) ( _ "Brissal")}
{NAMED_LOYAL_UNIT 3 (Naga Fighter) 5 32 (Xamalia) ( _ "Xamalia")}
{NAMED_LOYAL_UNIT 2 (Naga Fighter) 5 33 (Brissal) ( _ "Brissal")}
#ifdef NORMAL
{LOYAL_UNIT 3 (Naga Fighter) 4 31 (Saxiala) ( _ "Saxiala")}
{LOYAL_UNIT 2 (Naga Fighter) 4 34 (Liabra) ( _ "Liabra")}
{NAMED_LOYAL_UNIT 3 (Naga Fighter) 4 31 (Saxiala) ( _ "Saxiala")}
{NAMED_LOYAL_UNIT 2 (Naga Fighter) 4 34 (Liabra) ( _ "Liabra")}
#endif
#ifdef HARD
{LOYAL_UNIT 3 (Naga Fighter) 4 31 (Saxiala) ( _ "Saxiala")}
{LOYAL_UNIT 2 (Naga Fighter) 4 34 (Liabra) ( _ "Liabra")}
{LOYAL_UNIT 3 (Naga Fighter) 3 31 (Riaa) ( _ "Riaa")}
{LOYAL_UNIT 2 (Naga Fighter) 3 35 (Griama) ( _ "Griama")}
{NAMED_LOYAL_UNIT 3 (Naga Fighter) 4 31 (Saxiala) ( _ "Saxiala")}
{NAMED_LOYAL_UNIT 2 (Naga Fighter) 4 34 (Liabra) ( _ "Liabra")}
{NAMED_LOYAL_UNIT 3 (Naga Fighter) 3 31 (Riaa) ( _ "Riaa")}
{NAMED_LOYAL_UNIT 2 (Naga Fighter) 3 35 (Griama) ( _ "Griama")}
#endif
[allow_recruit]

3
data/campaigns/Under_the_Burning_Suns/TODO
View file

@ -1,6 +1,3 @@
- The masked assassin (the brother of Kaleh) can appear in place of
the players characters and they die (even campaign critical ones).
- Choosing the trolls as allies is too hard.
- The whole campaign seems to be unbalanced by being too easy in general.

40
data/campaigns/Under_the_Burning_Suns/scenarios/01_The_Morning_After.cfg
View file

@ -275,15 +275,15 @@
# Place found elves, this schema will repeat over this module as I
# want to use core macros (which saves maintenance burden) and
# have them posses both random traits and loyal.
{LOYAL_UNIT 1 "Desert Fighter" 24 25 "Vecnu" ( _ "Vecnu")}
{NAMED_LOYAL_UNIT 1 "Desert Fighter" 24 25 "Vecnu" ( _ "Vecnu")}
[+unit]
random_traits=yes
[/unit]
{LOYAL_UNIT 1 "Desert Archer" 24 27 "Eranor" ( _ "Eranor")}
{NAMED_LOYAL_UNIT 1 "Desert Archer" 24 27 "Eranor" ( _ "Eranor")}
[+unit]
random_traits=yes
[/unit]
{LOYAL_UNIT 1 "Desert Archer" 21 25 "Seela" ( _ "Seela")}
{NAMED_LOYAL_UNIT 1 "Desert Archer" 21 25 "Seela" ( _ "Seela")}
[+unit]
random_traits=yes
gender=female
@ -359,16 +359,16 @@
[/filter]
{VARIABLE_OP rescued_elves add 1}
{LOYAL_UNIT 1 "Desert Hunter" 24 34 "Eloshi" ( _ "Eloshi")}
{NAMED_LOYAL_UNIT 1 "Desert Hunter" 24 34 "Eloshi" ( _ "Eloshi")}
[+unit]
random_traits=yes
[/unit]
{LOYAL_UNIT 1 "Desert Archer" 19 33 "Illuvia" ( _ "Illuvia")}
{NAMED_LOYAL_UNIT 1 "Desert Archer" 19 33 "Illuvia" ( _ "Illuvia")}
[+unit]
random_traits=yes
gender=female
[/unit]
{LOYAL_UNIT 1 "Desert Hunter" 21 35 "Raynor" ( _ "Raynor")}
{NAMED_LOYAL_UNIT 1 "Desert Hunter" 21 35 "Raynor" ( _ "Raynor")}
[+unit]
random_traits=yes
[/unit]
@ -471,11 +471,11 @@
{IS_HERO}
[/unit]
{LOYAL_UNIT 1 "Desert Fighter" 36 33 "Jorazan" ( _ "Jorazan")}
{NAMED_LOYAL_UNIT 1 "Desert Fighter" 36 33 "Jorazan" ( _ "Jorazan")}
[+unit]
random_traits=yes
[/unit]
{LOYAL_UNIT 1 "Desert Fighter" 35 34 "Zyara" ( _ "Zyara")}
{NAMED_LOYAL_UNIT 1 "Desert Fighter" 35 34 "Zyara" ( _ "Zyara")}
[+unit]
gender=female
random_traits=yes
@ -613,11 +613,11 @@
[/modifications]
{IS_HERO}
[/unit]
{LOYAL_UNIT 1 "Desert Shaman" 30 27 "Ryoko" ( _ "Ryoko")}
{NAMED_LOYAL_UNIT 1 "Desert Shaman" 30 27 "Ryoko" ( _ "Ryoko")}
[+unit]
random_traits=yes
[/unit]
{LOYAL_UNIT 1 "Desert Shaman" 32 27 "Yuni" ( _ "Yuni")}
{NAMED_LOYAL_UNIT 1 "Desert Shaman" 32 27 "Yuni" ( _ "Yuni")}
[+unit]
random_traits=yes
[/unit]
@ -753,7 +753,7 @@
speaker=Naru
message= _ "Hey Nisa, the rocks have stopped falling. You can come out now!"
[/message]
{LOYAL_UNIT 1 "Desert Scout" $x1 $y1 "Nisa" (_"Nisa")}
{NAMED_LOYAL_UNIT 1 "Desert Scout" $x1 $y1 "Nisa" (_"Nisa")}
[+unit]
gender=female
random_traits=yes
@ -765,7 +765,7 @@
[/then]
# If have naru spawn Nisa
[else]
{LOYAL_UNIT 1 "Desert Scout" $x1 $y1 "Naru" (_"Naru")}
{NAMED_LOYAL_UNIT 1 "Desert Scout" $x1 $y1 "Naru" (_"Naru")}
[+unit]
random_traits=yes
[/unit]
@ -810,7 +810,7 @@
speaker=Naru
message= _ "Hey Nisa, the rocks have stopped falling. You can come out now!"
[/message]
{LOYAL_UNIT 1 "Desert Scout" $x1 $y1 "Nisa" (_"Nisa")}
{NAMED_LOYAL_UNIT 1 "Desert Scout" $x1 $y1 "Nisa" (_"Nisa")}
[+unit]
gender=female
random_traits=yes
@ -821,7 +821,7 @@
[/message]
[/then]
[else]
{LOYAL_UNIT 1 "Desert Scout" $x1 $y1 "Naru" (_"Naru")}
{NAMED_LOYAL_UNIT 1 "Desert Scout" $x1 $y1 "Naru" (_"Naru")}
[+unit]
random_traits=yes
[/unit]
@ -984,7 +984,7 @@
[/then]
[else]
{VARIABLE flagset[$|fate].flag set}
{LOYAL_UNIT 1 $|elf_pool[$|fate].type $|x1 $|y1 $|elf_pool[$|fate].id $|elf_pool[$|fate].name}
{NAMED_LOYAL_UNIT 1 $|elf_pool[$|fate].type $|x1 $|y1 $|elf_pool[$|fate].id $|elf_pool[$|fate].name}
[/else]
[/if]
[/do]
@ -1293,23 +1293,23 @@
x=24-32
y=1-6
[/remove_shroud]
{LOYAL_UNIT 1 "Desert Hunter" 29 2 "Pythos" (_"Pythos")}
{NAMED_LOYAL_UNIT 1 "Desert Hunter" 29 2 "Pythos" (_"Pythos")}
[+unit]
random_traits=yes
[/unit]
{LOYAL_UNIT 1 "Desert Fighter" 28 2 "Shea" ( _ "Shea")}
{NAMED_LOYAL_UNIT 1 "Desert Fighter" 28 2 "Shea" ( _ "Shea")}
[+unit]
random_traits=yes
[/unit]
{LOYAL_UNIT 1 "Desert Fighter" 29 1 "Narn" ( _ "Narn")}
{NAMED_LOYAL_UNIT 1 "Desert Fighter" 29 1 "Narn" ( _ "Narn")}
[+unit]
random_traits=yes
[/unit]
{LOYAL_UNIT 1 "Desert Scout" 27 2 "Jokli" ( _ "Jokli")}
{NAMED_LOYAL_UNIT 1 "Desert Scout" 27 2 "Jokli" ( _ "Jokli")}
[+unit]
random_traits=yes
[/unit]
{LOYAL_UNIT 1 "Desert Archer" 28 1 "Lyia" ( _ "Lyia")}
{NAMED_LOYAL_UNIT 1 "Desert Archer" 28 1 "Lyia" ( _ "Lyia")}
[+unit]
gender=female
random_traits=yes

82
data/core/macros/unit-utils.cfg
View file

@ -14,6 +14,22 @@
[/not]
#enddef
# Rationale for the naming scheme of these generators:
# All generators take SIDE X Y for consistency.
# Those that begin with NAMED_ additionally take ID_STRING NAME_STRING
#define UNIT SIDE TYPE X Y WML
# Place a unit with embedded WML specified.
#
[unit]
side={SIDE}
type={TYPE}
x={X}
y={Y}
{WML}
[/unit]
#enddef
#define GENERIC_UNIT SIDE TYPE X Y
# Creates a generic unit of TYPE belonging to SIDE at X,Y, which has a
# random name, gender and traits (just like a recruited unit).
@ -46,7 +62,39 @@
[/unit]
#enddef
#define LOYAL_UNIT SIDE TYPE X Y ID_STRING NAME_STRING
#define LOYAL_UNIT SIDE TYPE X Y
# Creates a unit with the Loyal trait.
#
# Example:
#! {LOYAL_UNIT 1 (Elvish Fighter) 19 16}
#
[unit]
type={TYPE}
side={SIDE}
x={X}
y={Y}
generate_name=yes
[modifications]
{TRAIT_LOYAL}
[/modifications]
[/unit]
#enddef
#define LOYAL_UNDEAD_UNIT SIDE TYPE X Y
# Create a unit with the Undead and Loyal traits.
[unit]
type={TYPE}
side={SIDE}
x={X}
y={Y}
[modifications]
{TRAIT_UNDEAD}
{TRAIT_LOYAL}
[/modifications]
[/unit]
#enddef
#define NAMED_LOYAL_UNIT SIDE TYPE X Y ID_STRING NAME_STRING
# Creates a unit with the Loyal trait.
#
# Example:
@ -65,17 +113,35 @@
[/unit]
#enddef
#define LOYAL_UNDEAD_UNIT SIDE TYPE X Y
# Create a unit with the Undead and Loyal traits.
#define NAMED_GENERIC_UNIT SIDE TYPE X Y ID_STRING NAME_STRING
# Creates a generic unit of TYPE belonging to SIDE at X,Y, which has a
# generated gender and traits (just like a recruited unit).
[unit]
type={TYPE}
side={SIDE}
type={TYPE}
id={ID_STRING}
name={NAME_STRING}
x={X}
y={Y}
[modifications]
{TRAIT_UNDEAD}
{TRAIT_LOYAL}
[/modifications]
random_traits=yes
random_gender=yes
upkeep=full
[/unit]
#enddef
#define TYPE_NAMED_UNIT SIDE TYPE X Y NAME_STRING
# Creates a generic unit of TYPE belonging to SIDE at X,Y, which has
# random gender and traits and is named for its type. Appropriate
# for use on anonymous monsters.
[unit]
side={SIDE}
type={TYPE}
name={TYPE}
x={X}
y={Y}
random_traits=yes
random_gender=yes
upkeep=full
[/unit]
#enddef

2
data/scenario-test.cfg
View file

@ -932,7 +932,7 @@ Ww, Ww, Ww, Ww
[filter_location]
[/filter_location]
[command]
{LOYAL_UNIT $side_number (Troll) $x1 $y1 (MagicTroll) ("Magic Troll")}
{NAMED_LOYAL_UNIT $side_number (Troll) $x1 $y1 (MagicTroll) ("Magic Troll")}
{GIVE_TROLLSKIN}
#undef GIVE_TROLLSKIN
[sound]

2
data/tools/emacs_mode/wesnoth-wml-data.el
View file

File diff suppressed because one or more lines are too long