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

Give LOYAL_UNIT the canonical order of arguments for unit-creation macros.

Browse source 
It was introduced recently and is not used by UMC, so this is a safe change.
This commit is contained in:
Eric S. Raymond 2008-02-27 02:51:07 +00:00
parent b20adef3e9
commit 5c42bd2fc7
36 changed files with 230 additions and 230 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
data/campaigns/Descent_Into_Darkness/Descent_story.cfg
View file

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

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

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

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

@ -120,7 +120,7 @@
{SET_VILLAGE 3 10 10}
# Set dwarf watchman
{LOYAL_UNIT (Dwarvish Guardsman) Watchman (_ "Watchman") 2 14 12}
{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

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

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

@ -257,7 +257,7 @@
description=Bugg
[/kill]
{LOYAL_UNIT (Sea Orc) (Bugg) ( _ "Bugg") 2 16 18}
{LOYAL_UNIT 2 (Sea Orc) 16 18 (Bugg) ( _ "Bugg")}
[message]
description=Bugg

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 (Merman Fighter) (Kalba) ( _ "Kalba") 1 27 12}
{LOYAL_UNIT (Merman Fighter) (Gnaba) ( _ "Gnaba") 1 31 14}
{LOYAL_UNIT 1 (Merman Fighter) 27 12 (Kalba) ( _ "Kalba")}
{LOYAL_UNIT 1 (Merman Fighter) 31 14 (Gnaba) ( _ "Gnaba")}
# wmllint: recognize Kalba
# wmllint: recognize Gnaba
@ -199,7 +199,7 @@
y=10,11,12
[/move_unit_fake]
{LOYAL_UNIT (Outlaw) (Delurin) ( _ "Delurin") 1 21 12}
{LOYAL_UNIT 1 (Outlaw) 21 12 (Delurin) ( _ "Delurin")}
# wmllint: recognize Delurin
[redraw]

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

@ -449,7 +449,7 @@
y=14,13,13
[/move_unit_fake]
{LOYAL_UNIT (Elvish Archer) (Niodien) ( _ "Niodien") 1 11 13}
{LOYAL_UNIT 1 (Elvish Archer) 11 13 (Niodien) ( _ "Niodien")}
# wmllint: recognize Niodien
[message]
@ -471,7 +471,7 @@
y=16,16,15
[/move_unit_fake]
{LOYAL_UNIT (Elvish Fighter) (Loflar) ( _ "Loflar") 1 5 15}
{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

@ -183,9 +183,9 @@
[event]
name=turn 5
{LOYAL_UNIT (Lieutenant) (Jibb) ( _ "Jibb") 2 27 12}
{LOYAL_UNIT (Swordsman) (Monry) ( _ "Monry") 2 27 12}
{LOYAL_UNIT (Swordsman) (Gleran) ( _ "Gleran") 2 27 12}
{LOYAL_UNIT 2 (Lieutenant) 27 12 (Jibb) ( _ "Jibb")}
{LOYAL_UNIT 2 (Swordsman) 27 12 (Monry) ( _ "Monry")}
{LOYAL_UNIT 2 (Swordsman) 27 12 (Gleran) ( _ "Gleran")}
[message]
description="Li'sar"
@ -194,9 +194,9 @@
[/event]
[event]
name=turn 10
{LOYAL_UNIT (Lieutenant) (Rogerus) ( _ "Rogerus") 2 27 12}
{LOYAL_UNIT (Swordsman) (Rurcyn) ( _ "Rurcyn") 2 27 12}
{LOYAL_UNIT (Swordsman) (Blyr) ( _ "Blyr") 2 27 12}
{LOYAL_UNIT 2 (Lieutenant) 27 12 (Rogerus) ( _ "Rogerus")}
{LOYAL_UNIT 2 (Swordsman) 27 12 (Rurcyn) ( _ "Rurcyn")}
{LOYAL_UNIT 2 (Swordsman) 27 12 (Blyr) ( _ "Blyr")}
[message]
description="Li'sar"
@ -314,7 +314,7 @@
y=41,42,42,41,40
[/move_unit_fake]
{LOYAL_UNIT (Duelist) (Ronry) ( _ "Ronry") 2 6 40}
{LOYAL_UNIT 2 (Duelist) 6 40 (Ronry) ( _ "Ronry")}
# wmllint: recognize Ronry
[scroll_to_unit]
@ -322,11 +322,11 @@
y=40
[/scroll_to_unit]
#ifdef NORMAL
{LOYAL_UNIT (Fencer) (Ligwyn) ( _ "Ligwyn") 2 6 41}
{LOYAL_UNIT 2 (Fencer) 6 41 (Ligwyn) ( _ "Ligwyn")}
#endif
#ifdef HARD
{LOYAL_UNIT (Fencer) (Ligwyn) ( _ "Ligwyn") 2 6 41}
{LOYAL_UNIT (Fencer) (Owaryn) ( _ "Owaryn") 2 5 42}
{LOYAL_UNIT 2 (Fencer) 6 41 (Ligwyn) ( _ "Ligwyn")}
{LOYAL_UNIT 2 (Fencer) 5 42 (Owaryn) ( _ "Owaryn")}
#endif
[message]
@ -370,7 +370,7 @@
name=dagger-swish.wav
[/sound]
{LOYAL_UNIT (Duelist) (Ronry) ( _ "Ronry") 2 4 41}
{LOYAL_UNIT 2 (Duelist) 4 41 (Ronry) ( _ "Ronry")}
[scroll_to_unit]
x=4
@ -384,11 +384,11 @@
[/message]
#ifdef NORMAL
{LOYAL_UNIT (Fencer) (Ligwyn) ( _ "Ligwyn") 2 4 41}
{LOYAL_UNIT 2 (Fencer) 4 41 (Ligwyn) ( _ "Ligwyn")}
#endif
#ifdef HARD
{LOYAL_UNIT (Fencer) (Ligwyn) ( _ "Ligwyn") 2 4 41}
{LOYAL_UNIT (Fencer) (Owaryn) ( _ "Owaryn") 2 4 41}
{LOYAL_UNIT 2 (Fencer) 4 41 (Ligwyn) ( _ "Ligwyn")}
{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

@ -280,9 +280,9 @@
[/modifications]
[/unit]
{LOYAL_UNIT (White Mage) (Heldra) ( _ "Heldra") 1 20 48}
{LOYAL_UNIT (White Mage) (Marcus) ( _ "Marcus") 1 20 48}
{LOYAL_UNIT (White Mage) (Haldar) ( _ "Haldar") 1 20 48}
{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")}
[message]
description=Moremirmu

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

@ -101,9 +101,9 @@
description=Kalenz
[/recall]
{LOYAL_UNIT (Sleeping Gryphon) (Graak) ( _ "Graak") 3 12 18}
{LOYAL_UNIT (Sleeping Gryphon) (Grook) ( _ "Grook") 3 16 16}
{LOYAL_UNIT (Sleeping Gryphon) (Gruak) ( _ "Gruak") 3 10 14}
{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")}
# wmllint: recognize Graak
# wmllint: recognize Grook
# wmllint: recognize Gruak
@ -311,8 +311,8 @@
#
# Put some more gryphons up there and view the mountain
#
{LOYAL_UNIT (Gryphon) (Graik) ( _ "Graik") 3 13 14}
{LOYAL_UNIT (Gryphon) (Griak) ( _ "Griak") 3 13 18}
{LOYAL_UNIT 3 (Gryphon) 13 14 (Graik) ( _ "Graik")}
{LOYAL_UNIT 3 (Gryphon) 13 18 (Griak) ( _ "Griak")}
[scroll_to]
x,y=13,16
[/scroll_to]
@ -401,7 +401,7 @@
[kill]
description=Graak
[/kill]
{LOYAL_UNIT (Gryphon) (Rampant Graak) ( _ "Rampant Graak") 3 12 18}
{LOYAL_UNIT 3 (Gryphon) 12 18 (Rampant Graak) ( _ "Rampant Graak")}
[/event]
[event]
@ -412,7 +412,7 @@
[kill]
description=Grook
[/kill]
{LOYAL_UNIT (Gryphon) (Rampant Grook) ( _ "Rampant Grook") 3 16 16}
{LOYAL_UNIT 3 (Gryphon) 16 16 (Rampant Grook) ( _ "Rampant Grook")}
[/event]
[event]
@ -423,7 +423,7 @@
[kill]
description=Gruak
[/kill]
{LOYAL_UNIT (Gryphon) (Rampant Gruak) ( _ "Rampant Gruak") 3 10 14}
{LOYAL_UNIT 3 (Gryphon) 10 14 (Rampant Gruak) ( _ "Rampant Gruak")}
[/event]
#
@ -438,7 +438,7 @@
[kill]
description=Graak
[/kill]
{LOYAL_UNIT (Gryphon) (Rampant Graak) ( _ "Rampant Graak") 3 12 18}
{LOYAL_UNIT 3 (Gryphon) 12 18 (Rampant Graak) ( _ "Rampant Graak")}
[/event]
[event]
@ -449,7 +449,7 @@
[kill]
description=Grook
[/kill]
{LOYAL_UNIT (Gryphon) (Rampant Grook) ( _ "Rampant Grook") 3 16 16}
{LOYAL_UNIT 3 (Gryphon) 16 16 (Rampant Grook) ( _ "Rampant Grook")}
[/event]
[event]
@ -460,7 +460,7 @@
[kill]
description=Gruak
[/kill]
{LOYAL_UNIT (Gryphon) (Rampant Gruak) ( _ "Rampant Gruak") 3 10 14}
{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

@ -352,10 +352,10 @@
[event]
name=turn 5
{LOYAL_UNIT (Sea Serpent) (Sea Serpent) ( _ "Sea Serpent") 4 1 15}
{LOYAL_UNIT 4 (Sea Serpent) 1 15 (Sea Serpent) ( _ "Sea Serpent")}
#define SEA_CREATURE
{LOYAL_UNIT (Cuttle Fish) (Cuttle Fish) ( _ "Cuttle Fish") 4 1 15}
{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

@ -135,7 +135,7 @@
[/set_variable]
#enddef
#define LISAR_GUARD_DOORS
{LOYAL_UNIT (Royal Guard) (Royal Guard) ( _ "Royal Guard") 2 8 44}
{LOYAL_UNIT 2 (Royal Guard) 8 44 (Royal Guard) ( _ "Royal Guard")}
#enddef
[event]
@ -393,7 +393,7 @@
numerical_equals=1
[/variable]
[then]
{LOYAL_UNIT (Bandit) (Uncle Somf) ( _ "Uncle Somf") 1 18 24}
{LOYAL_UNIT 1 (Bandit) 18 24 (Uncle Somf) ( _ "Uncle Somf")}
[redraw]
[/redraw]
#
@ -671,7 +671,7 @@
y=10-15
[/filter]
{LOYAL_UNIT (Cuttle Fish) (Cuttle Fish) ( _ "Cuttle Fish") 5 13 13}
{LOYAL_UNIT 5 (Cuttle Fish) 13 13 (Cuttle Fish) ( _ "Cuttle Fish")}
# wmllint: recognize Cuttle Fish
[message]
@ -701,7 +701,7 @@
message= _ "But Konrad's party was not alone in entering the caves..."
[/message]
{LOYAL_UNIT (Princess) (Li'sar) ( _ "Li'sar") 2 8 44}
{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

@ -103,7 +103,7 @@
[/modifications]
[/unit]
{LOYAL_UNIT (Giant Spider) (Hywyn) ( _ "Hywyn") 2 16 40}
{LOYAL_UNIT 2 (Giant Spider) 16 40 (Hywyn) ( _ "Hywyn")}
[/side]
[side]

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

@ -134,7 +134,7 @@
side=1
[/filter]
{LOYAL_UNIT (Dwarvish Fighter) (Burlin) ( _ "Burlin") 2 17 24}
{LOYAL_UNIT 2 (Dwarvish Fighter) 17 24 (Burlin) ( _ "Burlin")}
# wmllint: recognize Burlin
[message]
@ -158,7 +158,7 @@
[/message]
{PLACE_IMAGE units/trolls/whelp-die-6.png 2 22}
{PLACE_IMAGE units/trolls/whelp-die-5.png 4 21}
{LOYAL_UNIT (Dwarvish Ulfserker) (Ulfdain) ( _ "Ulfdain") 2 2 21}
{LOYAL_UNIT 2 (Dwarvish Ulfserker) 2 21 (Ulfdain) ( _ "Ulfdain")}
# wmllint: recognize Ulfdain
[teleport]
[filter]

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

@ -218,12 +218,12 @@
[/music]
#define HASTY_TROLL X Y
{LOYAL_UNIT (Troll) (Troll) ( _ "Troll") 3 ({X}) ({Y})}
{LOYAL_UNIT 3 (Troll) {X} {Y} (Troll) ( _ "Troll")}
[redraw]
[/redraw]
#enddef
#define HASTY_GOBLIN_KNIGHT X Y
{LOYAL_UNIT (Goblin Knight) (Goblin Knight) ( _ "Goblin Knight") 3 ({X}) ({Y})}
{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

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

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

@ -179,9 +179,9 @@
message= _ "These intruders are stronger than we expected. Call in the reinforcements!"
[/message]
{LOYAL_UNIT (Halberdier) (Dacayan) ( _ "Dacayan") 4 33 37}
{LOYAL_UNIT (Halberdier) (Ceomyr) ( _ "Ceomyr") 4 32 37}
{LOYAL_UNIT (Halberdier) (Gwellyn) ( _ "Gwellyn") 4 34 37}
{LOYAL_UNIT 4 (Halberdier) 33 37 (Dacayan) ( _ "Dacayan")}
{LOYAL_UNIT 4 (Halberdier) 32 37 (Ceomyr) ( _ "Ceomyr")}
{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

@ -471,7 +471,7 @@
# Re-create Lord Bayar so he can talk. He's not dead;
# he's just out of commission.
#
{LOYAL_UNIT (Grand Knight) (Lord Bayar) (_ "Lord Bayar") 5 8 54}
{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

@ -171,7 +171,7 @@
numerical_equals=1
[/variable]
[then]
{LOYAL_UNIT (Grand Knight) (Lord Bayar) (_ "Lord Bayar") 1 39 4}
{LOYAL_UNIT 1 (Grand Knight) 39 4 (Lord Bayar) (_ "Lord Bayar")}
[/then]
[/if]
[if]
@ -180,7 +180,7 @@
numerical_equals=1
[/variable]
[then]
{LOYAL_UNIT (Grand Knight) (Sir Daryn) (_ "Sir Daryn") 1 39 3}
{LOYAL_UNIT 1 (Grand Knight) 39 3 (Sir Daryn) (_ "Sir Daryn")}
[/then]
[/if]
[if]
@ -189,7 +189,7 @@
numerical_equals=1
[/variable]
[then]
{LOYAL_UNIT (Grand Knight) (Sir Ruga) (_ "Sir Ruga") 1 39 9}
{LOYAL_UNIT 1 (Grand Knight) 39 9 (Sir Ruga) (_ "Sir Ruga")}
[/then]
[/if]
[if]
@ -198,7 +198,7 @@
numerical_equals=1
[/variable]
[then]
{LOYAL_UNIT (Grand Knight) (Sir Alric) (_ "Sir Alric") 1 39 8}
{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]
description=Harper
[/recall]
{LOYAL_UNIT Outlaw Jingo ( _ "Jingo") 1 30 17}
{LOYAL_UNIT Outlaw Majel ( _ "Majel") 1 32 17}
{LOYAL_UNIT 1 Outlaw Jingo ( _ "Jingo") 30 17
{LOYAL_UNIT 1 Outlaw Majel ( _ "Majel") 32 17
# 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 Dragoon Pitcher ( _ "Pitcher") 1 11 1}
{LOYAL_UNIT 1 Dragoon Pitcher ( _ "Pitcher") 11 1
# wmllint: recognize Pitcher
{MOVE_UNIT description=Pitcher 20 14}

38
data/campaigns/Northern_Rebirth/scenarios/05a_The_Pursuit.cfg
View file

@ -788,34 +788,34 @@
[/message]
#ifdef NEWBIE
{LOYAL_UNIT (Tentacle of the Deep) (Tentacle) ( _ "Tentacle") 2 35 23}
{LOYAL_UNIT (Tentacle of the Deep) (Tentacle) ( _ "Tentacle") 2 33 25}
{LOYAL_UNIT (Tentacle of the Deep) (Tentacle) ( _ "Tentacle") 2 33 23}
{LOYAL_UNIT 2 (Tentacle of the Deep) 35 23 (Tentacle) ( _ "Tentacle")}
{LOYAL_UNIT 2 (Tentacle of the Deep) 33 25 (Tentacle) ( _ "Tentacle")}
{LOYAL_UNIT 2 (Tentacle of the Deep) 33 23 (Tentacle) ( _ "Tentacle")}
#endif
#ifdef EASY
{LOYAL_UNIT (Tentacle of the Deep) (Tentacle) ( _ "Tentacle") 2 35 23}
{LOYAL_UNIT (Tentacle of the Deep) (Tentacle) ( _ "Tentacle") 2 33 25}
{LOYAL_UNIT (Tentacle of the Deep) (Tentacle) ( _ "Tentacle") 2 33 23}
{LOYAL_UNIT (Tentacle of the Deep) (Tentacle) ( _ "Tentacle") 2 34 21}
{LOYAL_UNIT 2 (Tentacle of the Deep) 35 23 (Tentacle) ( _ "Tentacle")}
{LOYAL_UNIT 2 (Tentacle of the Deep) 33 25 (Tentacle) ( _ "Tentacle")}
{LOYAL_UNIT 2 (Tentacle of the Deep) 33 23 (Tentacle) ( _ "Tentacle")}
{LOYAL_UNIT 2 (Tentacle of the Deep) 34 21 (Tentacle) ( _ "Tentacle")}
#endif
#ifdef NORMAL
{LOYAL_UNIT (Tentacle of the Deep) (Tentacle) ( _ "Tentacle") 2 35 23}
{LOYAL_UNIT (Tentacle of the Deep) (Tentacle) ( _ "Tentacle") 2 33 25}
{LOYAL_UNIT (Tentacle of the Deep) (Tentacle) ( _ "Tentacle") 2 33 23}
{LOYAL_UNIT (Tentacle of the Deep) (Tentacle) ( _ "Tentacle") 2 34 21}
{LOYAL_UNIT (Tentacle of the Deep) (Tentacle) ( _ "Tentacle") 2 31 23}
{LOYAL_UNIT 2 (Tentacle of the Deep) 35 23 (Tentacle) ( _ "Tentacle")}
{LOYAL_UNIT 2 (Tentacle of the Deep) 33 25 (Tentacle) ( _ "Tentacle")}
{LOYAL_UNIT 2 (Tentacle of the Deep) 33 23 (Tentacle) ( _ "Tentacle")}
{LOYAL_UNIT 2 (Tentacle of the Deep) 34 21 (Tentacle) ( _ "Tentacle")}
{LOYAL_UNIT 2 (Tentacle of the Deep) 31 23 (Tentacle) ( _ "Tentacle")}
#endif
#ifdef HARD
{LOYAL_UNIT (Tentacle of the Deep) (Tentacle) ( _ "Tentacle") 2 35 23}
{LOYAL_UNIT (Tentacle of the Deep) (Tentacle) ( _ "Tentacle") 2 33 25}
{LOYAL_UNIT (Tentacle of the Deep) (Tentacle) ( _ "Tentacle") 2 33 23}
{LOYAL_UNIT (Tentacle of the Deep) (Tentacle) ( _ "Tentacle") 2 34 21}
{LOYAL_UNIT (Tentacle of the Deep) (Tentacle) ( _ "Tentacle") 2 31 23}
{LOYAL_UNIT (Tentacle of the Deep) (Tentacle) ( _ "Tentacle") 2 32 22}
{LOYAL_UNIT 2 (Tentacle of the Deep) 35 23 (Tentacle) ( _ "Tentacle")}
{LOYAL_UNIT 2 (Tentacle of the Deep) 33 25 (Tentacle) ( _ "Tentacle")}
{LOYAL_UNIT 2 (Tentacle of the Deep) 33 23 (Tentacle) ( _ "Tentacle")}
{LOYAL_UNIT 2 (Tentacle of the Deep) 34 21 (Tentacle) ( _ "Tentacle")}
{LOYAL_UNIT 2 (Tentacle of the Deep) 31 23 (Tentacle) ( _ "Tentacle")}
{LOYAL_UNIT 2 (Tentacle of the Deep) 32 22 (Tentacle) ( _ "Tentacle")}
#endif
[message]
@ -1056,7 +1056,7 @@
message= _ "Ssssh! I hear something."
[/message]
{LOYAL_UNIT (Sea Serpent) (Sea Serpent) ( _ "Sea Serpent") 2 31 5}
{LOYAL_UNIT 2 (Sea Serpent) 31 5 (Sea Serpent) ( _ "Sea Serpent")}
# wmllint: recognize Sea Serpent
[message]

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

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

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

@ -335,16 +335,16 @@ SW - The Midlands."
side=3
amount=60
[/gold]
{LOYAL_UNIT (Orcish Slayer) (Hashnak) ( _ "Hashnak") 3 25 40}
{LOYAL_UNIT 3 (Orcish Slayer) 25 40 (Hashnak) ( _ "Hashnak")}
#else
[gold]
side=3
amount=90
[/gold]
{LOYAL_UNIT (Orcish Slayer) (Hashnak) ( _ "Hashnak") 3 25 40}
{LOYAL_UNIT (Orcish Assassin) (Grork) ( _ "Grork") 3 24 40}
{LOYAL_UNIT (Orcish Assassin) (Vigdish) ( _ "Vigdish") 3 26 40}
{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")}
#endif
# wmllint: recognize Hashnak
@ -397,16 +397,16 @@ SW - The Midlands."
amount=60
[/gold]
{LOYAL_UNIT (Orcish Slayer) (Hashnak) ( _ "Hashnak") 2 25 40}
{LOYAL_UNIT 2 (Orcish Slayer) 25 40 (Hashnak) ( _ "Hashnak")}
#else
[gold]
side=2
amount=90
[/gold]
{LOYAL_UNIT (Orcish Slayer) (Hashnak) ( _ "Hashnak") 2 25 40}
{LOYAL_UNIT (Orcish Assassin) (Grork) ( _ "Grork") 2 24 40}
{LOYAL_UNIT (Orcish Assassin) (Vigdish) ( _ "Vigdish") 2 26 40}
{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")}
#endif
[message]
description=Tan-Schmog

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

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

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

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

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

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

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

@ -208,9 +208,9 @@
description=Minister Edmond
[/recall]
{LOYAL_UNIT (Peasant) (Angry Farmer) ( _ "Angry Farmer") 2 26 18}
{LOYAL_UNIT (Peasant) (Angry Farmer) ( _ "Angry Farmer") 2 28 19}
{LOYAL_UNIT (Peasant) (Angry Farmer) ( _ "Angry Farmer") 2 29 22}
{LOYAL_UNIT 2 (Peasant) 26 18 (Angry Farmer) ( _ "Angry Farmer")}
{LOYAL_UNIT 2 (Peasant) 28 19 (Angry Farmer) ( _ "Angry Farmer")}
{LOYAL_UNIT 2 (Peasant) 29 22 (Angry Farmer) ( _ "Angry Farmer")}
# wmllint: recognize Angry Farmer
[objectives]
@ -364,17 +364,17 @@
[/allow_recruit]
#ifdef EASY
{LOYAL_UNIT (Naga Fighter) (Rolassi) ( _ "Rolassi") 3 31 30}
{LOYAL_UNIT 3 (Naga Fighter) 31 30 (Rolassi) ( _ "Rolassi")}
#endif
#ifdef NORMAL
{LOYAL_UNIT (Naga Fighter) (Rolassi) ( _ "Rolassi") 3 31 30}
{LOYAL_UNIT (Naga Fighter) (Porbag) ( _ "Porbag") 3 30 31}
{LOYAL_UNIT 3 (Naga Fighter) 31 30 (Rolassi) ( _ "Rolassi")}
{LOYAL_UNIT 3 (Naga Fighter) 30 31 (Porbag) ( _ "Porbag")}
#endif
#ifdef HARD
{LOYAL_UNIT (Naga Fighter) (Rolassi) ( _ "Rolassi") 3 31 30}
{LOYAL_UNIT (Naga Fighter) (Porbag) ( _ "Porbag") 3 30 31}
{LOYAL_UNIT (Naga Fighter) (Eriol) ( _ "Eriol") 3 27 33}
{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")}
#endif
[/event]

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

@ -543,7 +543,7 @@
y=1,2,3,3,4,4,5,6,7,7,8,9,10,10,11
[/move_unit_fake]
{LOYAL_UNIT (Yeti) (Rarlg) ( _ "Rarlg") 4 12 11}
{LOYAL_UNIT 4 (Yeti) 12 11 (Rarlg) ( _ "Rarlg")}
# wmllint: recognize Rarlg
[message]
@ -571,7 +571,7 @@
description=Rarlg
[/scroll_to_unit]
{LOYAL_UNIT (Yeti) (Raul-Rarlg) ( _ "Raul-Rarlg") 4 15 11}
{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

@ -229,7 +229,7 @@
{VARIABLE_OP xx1 random 14..19}
{VARIABLE_OP yy1 random 16..19}
{LOYAL_UNIT (Sea Serpent) (Bitey the Serpent) ( _ "Bitey the Serpent") 4 $xx1 $yy1}
{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

@ -206,7 +206,7 @@
{VARIABLE_OP xx1 random 16..19}
{VARIABLE_OP yy1 random 23..30}
{LOYAL_UNIT (Sea Serpent) (Chompey the Serpent) ( _ "Chompey the Serpent") 2 $xx1 $yy1}
{LOYAL_UNIT 2 (Sea Serpent) $xx1 $yy1 (Chompey the Serpent) ( _ "Chompey the Serpent")}
# wmllint: recognize Chompey the Serpent
[message]
@ -235,7 +235,7 @@
{VARIABLE_OP xx1 random 13..25}
{VARIABLE_OP yy1 random 7..8}
{LOYAL_UNIT (Sea Serpent) (Scaly the Serpent) ( _ "Scaly the Serpent") 2 $xx1 $yy1}
{LOYAL_UNIT 2 (Sea Serpent) $xx1 $yy1 (Scaly the Serpent) ( _ "Scaly the Serpent")}
# wmllint: recognize Scaly the Serpent
[message]
@ -264,7 +264,7 @@
{VARIABLE_OP xx1 random 1..14}
{VARIABLE_OP yy1 random 12..13}
{LOYAL_UNIT (Sea Serpent) (Toothey the Serpent) ( _ "Toothey the Serpent") 2 $xx1 $yy1}
{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

@ -294,8 +294,8 @@
type=Giant Mudcrawler
[/filter]
{LOYAL_UNIT (Mudcrawler) () ("") 2 ($x1) ($y1)}
{LOYAL_UNIT (Mudcrawler) () ("") 3 ($x1) ($y1)}
{LOYAL_UNIT 2 (Mudcrawler) ($x1) ($y1) () ("") }
{LOYAL_UNIT 3 (Mudcrawler) ($x1) ($y1) () ("") }
[/event]
[event]
@ -343,7 +343,7 @@
numerical_equals=0
[/variable]
[then]
{LOYAL_UNIT (Fire Dragon) ("Shek'kahan") ( _ "Shek'kahan") 5 20 27}
{LOYAL_UNIT 5 (Fire Dragon) 20 27 ("Shek'kahan") ( _ "Shek'kahan")}
# wmllint: recognize Shek'kahan
[set_variable]
@ -371,7 +371,7 @@
numerical_equals=0
[/variable]
[then]
{LOYAL_UNIT (Fire Dragon) ("Shek'kahan") ( _ "Shek'kahan") 5 20 27}
{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

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

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

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

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

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

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

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

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

@ -35,11 +35,11 @@
[/unit]
#enddef
#define LOYAL_UNIT TYPE DESCRIPTION USER_DESCRIPTION SIDE X Y
#define LOYAL_UNIT SIDE TYPE X Y DESCRIPTION USER_DESCRIPTION
# Creates a unit with the Loyal trait.
#
# Example:
#! {LOYAL_UNIT (Elvish Fighter) (Myname) ( _ "Myname") 1 19 16}
#! {LOYAL_UNIT 1 (Elvish Fighter) 19 16 DESCRIPTION USER_DESCRIPTION (Myname) ( _ "Myname")}
#
[unit]
type={TYPE}