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

Legend_of_Wesmere: convert main characters and key loyals of LoW to 'wmllint: who' system

Browse source 
Also, get rid of now-unnecessary 'recognize' magic comments
This commit is contained in:
Groggy Dice 2013-08-15 00:31:14 -04:00
parent a8a65c25b2
commit 76134b5bfe
18 changed files with 8 additions and 79 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
data/campaigns/Legend_of_Wesmere/scenarios/chapter1/01_The_Uprooting.cfg
View file

@ -87,8 +87,8 @@ This is the story of Kalenz, Landar, and of the Elves in the first days of the h
side=1
fog=no
shroud=no
# wmllint: who {KALENZ} is Kalenz
{KALENZ}
# wmllint: recognize Kalenz
save_id=Kalenz
controller=human
team_name=player
@ -99,8 +99,8 @@ This is the story of Kalenz, Landar, and of the Elves in the first days of the h
y=15
#ifndef MULTIPLAYER
[unit]
# wmllint: who {LANDAR} is Landar
{LANDAR}
# wmllint: recognize Landar
extra_recruit=Elvish Fighter, Elvish Archer
x=18
y=15

6
data/campaigns/Legend_of_Wesmere/scenarios/chapter1/02_Hostile_Mountains.cfg
View file

@ -50,7 +50,6 @@
[side]
{KALENZ}
# wmllint: recognize Kalenz
controller=human
fog=no
extra_recruit=Elvish Fighter, Elvish Archer
@ -58,7 +57,6 @@
{PLAYER_GOLD}
[unit]
{LANDAR}
# wmllint: recognize Landar
extra_recruit=Elvish Fighter, Elvish Archer
x=20
y=4
@ -69,6 +67,7 @@
[/side]
[event]
name=prestart
# wmllint: who RECALL_LOYALS is Anduilas, Landulias
{RECALL_LOYALS}
[/event]
### /Kalenz's code ###
@ -80,7 +79,7 @@
#enddef
[side]
# wmllint: recognize Olurf
# wmllint: who {OLURF} is Olurf
{OLURF}
side=2
allow_player=no
@ -467,7 +466,6 @@
{LANDAR}
{MULTIPLAYER_GOLD}
fog=no
# wmllint: recognize Landar
extra_recruit=Elvish Fighter, Elvish Archer
[/side]
#endif

2
data/campaigns/Legend_of_Wesmere/scenarios/chapter1/03_Kalian_under_Attack.cfg
View file

@ -325,7 +325,6 @@
x=19
y=22
[/unit]
# wmllint: recognize Eradion
x=19
y=22
[/side]
@ -716,7 +715,6 @@
y=11
[/unit]
# wmllint: recognize Landar
[unit]
{LANDAR}
#ifndef MULTIPLAYER

8
data/campaigns/Legend_of_Wesmere/scenarios/chapter2/04_The_Elvish_Treasury.cfg
View file

@ -62,7 +62,6 @@ Chapter Two"
team_name=Player
user_team_name= _ "Player"
recruit=""
# wmllint: recognize Kalenz
#ifndef MULTIPLAYER
{PLAYER_GOLD_04}
[unit]
@ -70,7 +69,6 @@ Chapter Two"
extra_recruit=Elvish Fighter, Elvish Archer, Elvish Scout
x=16
y=29
# wmllint: recognize Landar
[/unit]
#else
{MULTIPLAYER_GOLD_04}
@ -143,7 +141,6 @@ Chapter Two"
{MULTIPLAYER_GOLD_04}
team_name=Player
user_team_name= _ "Player"
# wmllint: recognize Landar
extra_recruit=Elvish Fighter, Elvish Archer, Elvish Scout
[/side]
@ -160,7 +157,6 @@ Chapter Two"
{MULTIPLAYER_GOLD_04}
team_name=Player
user_team_name= _ "Player"
# wmllint: recognize Cleodil
extra_recruit=Elvish Shaman, Elvish Scout, Wose
[/side]
@ -264,8 +260,8 @@ Chapter Two"
[/then]
[/if]
# wmllint: who RECALL_LOYALS is Huraldur
{RECALL_LOYALS}
# wmllint: recognize Huraldur
#{CHECK_LANDAR}
#ifdef MULTIPLAYER
@ -348,7 +344,7 @@ Chapter Two"
{INCIDENTAL_MUSIC love_theme.ogg}
[unit]
# wmllint: recognize Cleodil
# wmllint: who {CLEODIL} is Cleodil
{CLEODIL}
#ifdef MULTIPLAYER
side=5

6
data/campaigns/Legend_of_Wesmere/scenarios/chapter2/05_The_Saurian_Treasury.cfg
View file

@ -77,7 +77,6 @@
[side]
{KALENZ}
# wmllint: recognize Kalenz
extra_recruit=Elvish Fighter, Elvish Archer, Elvish Scout
x=3
y=19
@ -89,14 +88,12 @@
extra_recruit=Elvish Fighter, Elvish Archer, Elvish Scout
x=4
y=11
# wmllint: recognize Landar
[/unit]
[unit]
{CLEODIL}
extra_recruit=Elvish Shaman, Elvish Scout, Wose
x=1
y=15
# wmllint: recognize Cleodil
[/unit]
#else
{MULTIPLAYER_GOLD}
@ -194,7 +191,6 @@
{MULTIPLAYER_GOLD}
recruit=Elvish Fighter, Elvish Archer, Elvish Scout
{LANDAR}
# wmllint: recognize Landar
x=4
y=11
[/side]
@ -241,6 +237,7 @@
[/gold_carryover]
[/objectives]
# wmllint: who RECALL_LOYALS is Arkildur, Tameril-Isimeril, Laril
{RECALL_LOYALS}
[/event]
@ -431,7 +428,6 @@
[then]
[if]
[have_unit]
#wmllint: recognize Huraldur
id=Huraldur
[/have_unit]
[then]

6
data/campaigns/Legend_of_Wesmere/scenarios/chapter2/06_Acquaintance_in_Need.cfg
View file

@ -60,7 +60,6 @@
{KALENZ}
extra_recruit=Elvish Fighter, Elvish Archer, Elvish Scout
fog=no
# wmllint: recognize Kalenz
#ifndef MULTIPLAYER
{PLAYER_GOLD}
[unit]
@ -69,7 +68,6 @@
#placement=leader
x=22
y=39
# wmllint: recognize Landar
[/unit]
[unit]
{CLEODIL}
@ -77,7 +75,6 @@
x=14
y=39
#placement=leader
# wmllint: recognize Cleodil
[/unit]
#else
{MULTIPLAYER_GOLD}
@ -92,7 +89,6 @@
#### Olurf's code ####
[side]
{OLURF}
# wmllint: recognize Olurf
side=2
allow_player=no
controller=ai
@ -214,7 +210,6 @@
{MULTIPLAYER_GOLD}
recruit=Elvish Fighter, Elvish Archer, Elvish Scout
{LANDAR}
# wmllint: recognize Landar
[/side]
[side]
side=7
@ -223,7 +218,6 @@
{MULTIPLAYER_GOLD}
recruit=Elvish Shaman, Wose, Elvish Scout
{CLEODIL}
# wmllint: recognize Landar
[/side]
#endif

4
data/campaigns/Legend_of_Wesmere/scenarios/chapter2/07_Elves_Last_Stand.cfg
View file

@ -64,7 +64,6 @@
#### Kalenz ###
[side]
# wmllint: recognize Kalenz
{KALENZ}
type=Elvish Captain
extra_recruit=Elvish Fighter, Elvish Archer, Elvish Scout
@ -75,14 +74,12 @@
#ifndef MULTIPLAYER
{PLAYER_GOLD}
[unit]
# wmllint: recognize Landar
{LANDAR}
extra_recruit=Elvish Fighter, Elvish Archer, Elvish Scout
x=42
y=10
[/unit]
[unit]
# wmllint: recognize Cleodil
{CLEODIL}
extra_recruit=Elvish Shaman, Elvish Scout, Wose
x=41
@ -603,7 +600,6 @@
[unit]
side=8
{OLURF}
#wmllint: recognize Olurf
x=$olurf_entry.x
y=$olurf_entry.y
[/unit]

7
data/campaigns/Legend_of_Wesmere/scenarios/chapter3/09_Bounty_Hunters.cfg
View file

@ -72,7 +72,6 @@ Chapter Three"
shroud=no
team_name=player
user_team_name= _ "Player"
# wmllint: recognize Kalenz
extra_recruit=Elvish Fighter, Elvish Archer, Elvish Scout
#ifndef MULTIPLAYER
{PLAYER_GOLD}
@ -80,7 +79,6 @@ Chapter Three"
[unit]
{LANDAR}
extra_recruit=Elvish Fighter, Elvish Archer, Elvish Scout
# wmllint: recognize Landar
x=14
y=31
[/unit]
@ -89,14 +87,12 @@ Chapter Three"
extra_recruit=Dwarvish Fighter, Dwarvish Thunderer, Dwarvish Scout, Dwarvish Stalwart
x=18
y=29
# wmllint: recognize Olurf
[/unit]
[unit]
{CLEODIL}
extra_recruit=Elvish Shaman, Wose, Elvish Scout
x=18
y=31
# wmllint: recognize Cleodil
[/unit]
#else
{MULTIPLAYER_GOLD}
@ -332,7 +328,6 @@ Chapter Three"
type=Elvish Ranger
x=14
y=31
# wmllint: recognize Landar
[/unit]
[/then]
[/if]
@ -348,7 +343,6 @@ Chapter Three"
side=6
x=18
y=29
# wmllint: recognize Olurf
[/unit]
[/then]
[/if]
@ -364,7 +358,6 @@ Chapter Three"
side=7
x=18
y=31
# wmllint: recognize Cleodil
[/unit]
[/then]
[/if]

4
data/campaigns/Legend_of_Wesmere/scenarios/chapter3/10_Cliffs_of_Thoria.cfg
View file

@ -62,13 +62,11 @@
[side]
{KALENZ}
# wmllint: recognize Kalenz
extra_recruit=Elvish Fighter, Elvish Archer, Elvish Scout
fog=yes
#ifndef MULTIPLAYER
[unit]
{LANDAR}
# wmllint: recognize Landar
extra_recruit=Elvish Fighter, Elvish Archer, Elvish Scout
x=23
y=32
@ -78,14 +76,12 @@
x=13
y=31
#extra_recruit=Dwarvish Fighter, Dwarvish Thunderer, Dwarvish Guardsmen, Dwarvish Scout
# wmllint: recognize Olurf
[/unit]
[unit]
{CLEODIL}
extra_recruit=Elvish Shaman, Wose, Elvish Scout
x=18
y=32
# wmllint: recognize Cleodil
[/unit]
#endif
[/side]

4
data/campaigns/Legend_of_Wesmere/scenarios/chapter3/11_Battle_of_the_Book.cfg
View file

@ -57,28 +57,24 @@
[side]
{KALENZ}
# wmllint: recognize Kalenz
extra_recruit=Elvish Fighter, Elvish Archer, Elvish Scout
fog=yes
#ifndef MULTIPLAYER
{PLAYER_GOLD}
[unit]
{LANDAR}
# wmllint: recognize Landar
extra_recruit=Elvish Fighter, Elvish Archer, Elvish Scout
x=25
y=27
[/unit]
[unit]
{OLURF}
# wmllint: recognize Olurf
extra_recruit=Dwarvish Fighter, Dwarvish Scout, Dwarvish Thunderer, Dwarvish Guardsman
x=29
y=28
[/unit]
[unit]
{CLEODIL}
# wmllint: recognize Cleodil
extra_recruit=Elvish Shaman, Elvish Scout, Wose
x=15
y=27

4
data/campaigns/Legend_of_Wesmere/scenarios/chapter4/13_News_from_the_Front.cfg
View file

@ -38,7 +38,6 @@
[side]
{KALENZ}
# wmllint: recognize Kalenz
fog=yes
share_view=yes
x=12
@ -47,17 +46,14 @@
#ifndef MULTIPLAYER
[unit]
{LANDAR}
# wmllint: recognize Landar
placement=leader
[/unit]
[unit]
{CLEODIL}
# wmllint: recognize Cleodil
placement=leader
[/unit]
[unit]
{OLURF}
# wmllint: recognize Olurf
placement=leader
[/unit]
#endif

11
data/campaigns/Legend_of_Wesmere/scenarios/chapter4/14_Human_Alliance.cfg
View file

@ -171,21 +171,18 @@ Chapter Four"
[unit]
{LANDAR}
extra_recruit=Elvish Fighter, Elvish Archer, Elvish Scout
# wmllint: recognize Landar
x=25
y=13
[/unit]
[unit]
{CLEODIL}
extra_recruit=Elvish Shaman, Elvish Scout, Wose
# wmllint: recognize Cleodil
x=27
y=12
[/unit]
[unit]
{OLURF}
extra_recruit=Dwarvish Fighter, Dwarvish Thunderer, Dwarvish Scout, Dwarvish Guardsman
# wmllint: recognize Olurf
x=36
y=10
[/unit]
@ -371,10 +368,6 @@ Chapter Four"
[event]
name=side 1 turn 1
# wmllint: recognize Arkildur
# wmllint: recognize Tameril-Isimeril
# wmllint: recognize Laril
# wmllint: recognize Anduilas
#ifdef MULTIPLAYER
{GET_PERSISTENT_RECALLS_FROM4 1 5 6 7 LoW_Chapter_Three kalenz}
@ -704,7 +697,6 @@ Chapter Four"
{MULTIPLAYER_GOLD}
x=28
y=11
# wmllint: recognize Landar
recruit=Elvish Fighter, Elvish Archer, Elvish Scout
[/side]
[side]
@ -717,7 +709,6 @@ Chapter Four"
{MULTIPLAYER_GOLD}
x=36
y=10
# wmllint: recognize Olurf
team_name=player
user_team_name= _ "Player"
extra_recruit=Dwarvish Fighter, Dwarvish Scout, Dwarvish Guardsman, Dwarvish Thunderer
@ -732,7 +723,6 @@ Chapter Four"
{MULTIPLAYER_GOLD}
x=36
y=10
# wmllint: recognize Olurf
team_name=player
user_team_name= _ "Player"
extra_recruit=Elvish Shaman, Wose, Elvish Scout
@ -955,7 +945,6 @@ Chapter Four"
#[/modify_ai]
[/event]
#wmllint: recognize Cleodil
[event]
name=victory
[message]

2
data/campaigns/Legend_of_Wesmere/scenarios/chapter4/16_The_Chief_Must_Die.cfg
View file

@ -68,7 +68,6 @@
#wmllint: validate-off
[side]
{KALENZ}
# wmllint: recognize Kalenz
village_gold=0
#This sets the income to 0
{INCOME -2 -2 -2}
@ -76,7 +75,6 @@
{LANDAR}
canrecruit=yes
placement=leader
# wmllint: recognize Landar
[/unit]
[/side]
#wmllint: validate-on

8
data/campaigns/Legend_of_Wesmere/scenarios/chapter4/17_Breaking_the_Siege.cfg
View file

@ -54,7 +54,6 @@
[side]
{KALENZ}
#wmllint: recognize Kalenz
team_name=player
user_team_name= _ "Player"
extra_recruit=Elvish Fighter, Elvish Archer, Elvish Scout
@ -68,21 +67,18 @@
extra_recruit=Elvish Fighter, Elvish Archer, Elvish Scout
#TODO place on his keep
placement=leader
# wmllint: recognize Landar
[/unit]
[unit]
{OLURF}
extra_recruit=Dwarvish Fighter, Dwarvish Thunderer, Dwarvish Guardsman, Dwarvish Scout
#TODO place on his keep
placement=leader
# wmllint: recognize Olurf
[/unit]
[unit]
{CLEODIL}
extra_recruit=Elvish Shaman, Elvish Scout, Wose
#TODO place on her keep
placement=leader
# wmllint: recognize Cleodil
[/unit]
#else
{MULTIPLAYER_GOLD}
@ -220,7 +216,6 @@
{LANDAR}
{MULTIPLAYER_GOLD}
fog=yes
# wmllint: recognize Landar
extra_recruit=Elvish Fighter, Elvish Archer, Elvish Scout
[/side]
[side]
@ -231,13 +226,11 @@
{OLURF}
{MULTIPLAYER_GOLD}
fog=yes
# wmllint: recognize Olurf
extra_recruit=Dwarvish Fighter, Dwarvish Thunderer, Dwarvish Guardsman, Dwarvish Scout
[/side]
[side]
side=8
{CLEODIL}
# wmllint: recognize Cleodil
save_id=Cleodil
x=20
y=4
@ -410,6 +403,7 @@
[/message]
[/event]
# wmllint: unwho "{OLURF}"
{campaigns/Legend_of_Wesmere/utils/deaths.cfg}
#ifndef MULTIPLAYER

4
data/campaigns/Legend_of_Wesmere/scenarios/chapter5/19_Costly_Revenge.cfg
View file

@ -83,7 +83,6 @@ Chapter Five"
[side]
{KALENZ}
# wmllint: recognize Kalenz
team_name=player
user_team_name= _ "Player"
extra_recruit=Elvish Fighter, Elvish Archer, Elvish Scout
@ -94,7 +93,6 @@ Chapter Five"
[unit]
{LANDAR}
extra_recruit=Elvish Fighter, Elvish Archer, Elvish Scout
# wmllint: recognize Landar
#TODO place on his keep
placement=leader
[/unit]
@ -113,7 +111,6 @@ Chapter Five"
#TODO see if this recalls units wich are not recallable
{RECALL_LOYALS}
# wmllint: recognize Anduilas
[/event]
[side]
@ -324,7 +321,6 @@ Chapter Five"
[then]
[role]
role=Anduilas
# wmllint: recognize Anduilas
id=Anduilas
[/role]
[/then]

1
data/campaigns/Legend_of_Wesmere/scenarios/chapter5/21_Elvish_Assassins.cfg
View file

@ -68,7 +68,6 @@
[unit]
{CLEODIL}
extra_recruit=Elvish Shaman, Elvish Scout, Wose
#wmllint: recognize Cleodil
placement=leader
[/unit]
[/side]

3
data/campaigns/Legend_of_Wesmere/scenarios/chapter5/22_Northern_Battle.cfg
View file

@ -46,7 +46,6 @@
[side]
{KALENZ}
{PLAYABLE}
# wmllint: recognize Kalenz
team_name=player
user_team_name= _ "Player"
controller=human
@ -60,7 +59,6 @@
extra_recruit=Elvish Shaman, Elvish Scout, Wose
#TODO place on her keep
placement=leader
#wmllint: recognize Cleodil
[/unit]
#endif
[/side]
@ -150,7 +148,6 @@
[side]
{URADREDIA}
#wmllint: recognize Uradredia
persistent=yes
save_id=Uradredia
side=2

3
data/campaigns/Legend_of_Wesmere/scenarios/chapter5/23_End_of_War.cfg
View file

@ -39,7 +39,6 @@
[side]
{KALENZ}
{PLAYABLE}
# wmllint: recognize Kalenz
extra_recruit=Elvish Fighter, Elvish Archer, Elvish Scout
{GOLD 200 180 160}
#ifndef MULTIPLAYER
@ -47,7 +46,6 @@
[unit]
{CLEODIL}
extra_recruit=Elvish Shaman, Elvish Scout, Wose
#wmllint: recognize Cleodil
placement=leader
[/unit]
#endif
@ -67,7 +65,6 @@
#ifdef MULTIPLAYER
{PLAYABLE}
#endif
# wmllint: recognize Landar
canrecruit=yes
#ifdef EASY
recruit=Elvish Archer, Elvish Fighter, Elvish Hero