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

Added a lint-low option for wmllint...

Browse source 
...and made more scenarios being available in multiplayer.
This commit is contained in:
Fabian Müller 2010-02-17 06:27:48 +00:00
parent 59ce4ebe51
commit 5a73121a0c
13 changed files with 184 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/campaigns/Legend_of_Wesmere/maps/09_Bounty_Hunters.map
View file

@ -32,6 +32,6 @@ Hh , Ce , Ce , Ce , Mm , Mm
Mm , Hh , Hh , Mm , Mm^Vhh , Mm , Mm , Mm , Mm , Mm , Gg^Vc , Mm , Mm , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gg^Vc , Gg , Gs^Fp , Gs^Fp , Gs^Fp , Gg^Fet , Gs^Fp , Gs^Fp , Mm , Mm , Mm
Mm , Mm , Mm , Mm , Mm , Mm , Mm , Hh^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gg^Vc , Gs^Fp , Gs^Fp , Gs^Fp , Gg^Vc , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Mm , Hh , Hh , Hh , Hh , Hh , Mm , Mm , Mm
Hh , Hh , Mm , Mm , Mm , Mm , Gg^Vc , Gs^Fp , Gs^Fp , Hh^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Ce , Ce , Ce , Ce , Ce , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gg^Vc , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm
Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Hh^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Ce , 1 Ke , Ce , Ce , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Hh^Fp , Hh^Fp , Mm , Mm , Mm , Mm , Mm , Mm
Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Hh^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Ce , 1 Ke , Ce , Ce , 5 Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Hh^Fp , Hh^Fp , Mm , Mm , Mm , Mm , Mm , Mm
Mm , Mm , Mm , Mm , Mm , Mm , Mm , Hh , Hh , Hh^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Ce , Ce , Ce , Ce , Ce , Ce , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Hh^Fp , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm
Mm , Mm , Mm , Mm , Mm , Mm , Mm , Hh , Hh , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Gs^Fp , Hh^Fp , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm

2
data/campaigns/Legend_of_Wesmere/maps/10_Cliffs_of_Thoria.map
View file

@ -32,6 +32,6 @@ Mm , Mm , Mm , Mm , Mm , Mm
Mm , Mm , Hh , Mm , Mm^Vhh , Mm , Mm , Mm , Mm , Mm , Gg^Ve , Mm , Mm , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Gg^Ve , Gg , Hh^Fp , Hh^Fp , Hh^Fp , Hh^Fp , Hh^Fp , Hh^Fp , Mm , Mm , Mm
Mm , Mm , Mm , Mm , Mm , Mm , Mm , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Gg^Ve , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Mm , Hh , Hh , Hh , Hh , Hh , Mm , Mm , Mm
Hh , Hh , Mm , Mm , Mm , Mm , Gg^Ve , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Ce , Ce , Ce , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Gg^Ve , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm
Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Hh , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Ce , 1 Ke , Ce , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm
Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Hh , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Ce , 1 Ke , Ce , 5 Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm
Mm , Mm , Mm , Mm , Mm , Mm , Mm , Hh , Hh , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Ce , Ce , Ce , Ce , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm
Mm , Mm , Mm , Mm , Mm , Mm , Mm , Hh , Hh , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Gs^Fds , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm

2
data/campaigns/Legend_of_Wesmere/maps/11_Battle_of_the_book.map
View file

@ -28,6 +28,6 @@ Mm , Mm , Mm , Mm , Mm , Mm
Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Hd , Hh , Hh , Gg , Gg , Gg , Hh , Hh , Mm , Mm , Hh^Fp , Hh^Fp , Re , Re , Hh , Mm , Hh , Hh^Fp , Hh^Fp , Hh^Fp , Hh^Fp , Hh^Fp , Hh^Fp , Hh^Fp , Hh^Fp , Hh^Fp , Hh^Fp , Hh , Hh , Hh , Mm , Hd , Hd , Mm , Mm , Mm , Hd , Hd , Mm , Mm , Mm , Mm , Mm , Hd , Hd , Mm , Mm , Mm , Mm , Hd , Hd , Mm , Mm , Mm , Mm , Mm
Mm , Mm , Mm , Mm , Hd , Hd , Hd , Hd , Mm , Hh , Hh , Hh , Hh , Gg^Vh , Hh , Hh , Hh , Hh , Hh , Hh^Fp , Hh^Fp , Re , Re , Hh , Hh , Hh , Hh^Fp , Hh^Fp , Hh^Fp , Hh^Fp , Hh^Fp , Hh^Fp , Hh^Fp , Hh^Fp , Hh^Fp , Hh^Fp , Hh^Fp , Hh^Fp , Mm , Mm , Mm , Hd , Hd , Hd , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Hd , Mm , Mm , Mm , Mm , Mm , Mm , Hd , Hd , Hd , Mm , Mm
Mm , Mm , Mm , Mm , Hd , Mm , Mm^Vhh , Mm , Mm , Mm , Mm , Hh , Hh , Hh , Hh , Hh , Hh , Hh , Ce , Ce , Ce , Ce , Re , Re , Mm , Mm , Hh , Hh^Fp , Hh , Hh , Hh^Fp , Hh^Fp , Hh^Fp , Hh^Fp , Hh^Fp , Hh^Fp , Mm , Mm , Mm , Mm , Mm , Mm , Hd , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Hd , Hd , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Hd , Hd , Mm
Mm , Mm , Hd , Hd , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Hh , Hh , Hh , Hh , Hh , Hh , Ce , Ce , 1 Ke , Ce , Re , Re , Mm , Mm , Hh , Hh , Hh , Mm , Mm , Mm , Gg^Ve , Hh^Fp , Hh^Fp , Hh^Fp , Mm , Mm , Mm , Mm , Mm , Mm , Hd , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm^Vhh , Mm , Hd , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm^Vhh , Hd
Mm , Mm , Hd , Hd , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Hh , Hh , Hh , Hh , Hh , Hh , Ce , Ce , 1 Ke , Ce , Re , 5 Re , Mm , Mm , Hh , Hh , Hh , Mm , Mm , Mm , Gg^Ve , Hh^Fp , Hh^Fp , Hh^Fp , Mm , Mm , Mm , Mm , Mm , Mm , Hd , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm^Vhh , Mm , Hd , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm^Vhh , Hd
Hd , Hd , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Ce , Ce , Ce , Ce , Re , Re , Mm , Mm , Mm , Hh , Hh , Hh , Hh , Hh , Hh , Hh , Hh , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Hd , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Hd , Hd , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm
Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Hh , Hh , Hh , Hh , Re , Re , Mm , Mm , Mm , Hh , Hh , Hh , Hh , Hh , Hh , Hh , Hh , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Hd , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Hd , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm , Mm

9
data/campaigns/Legend_of_Wesmere/scenarios/01_The_Uprooting.cfg
View file

@ -446,8 +446,15 @@ This is the story of Kalenz, and of the Elves in the days of the humans in Wesno
#TODO remove debug thing
x=14
y=14
[and]
id=Kalenz
#ifdef MULTIPLAYER
[or]
id=Landar
[/or]
#endif
[/and]
id=Kalenz
[/filter]
[message]
id=Velon

8
data/campaigns/Legend_of_Wesmere/scenarios/07_Elves_last_stand.cfg
View file

@ -21,11 +21,11 @@
id=07_Elves_last_stand
name= _ "Elves' Last Stand"
#ifdef MULTIPLAYER
next_scenario=null
#else
#ifblahdef MULTIPLAYER
# next_scenario=null
#elblahse
next_scenario=08_Council_of_hard_choices
#endif
#enblahdif
### Story ###
[story]

14
data/campaigns/Legend_of_Wesmere/scenarios/08_Council_of_hard_choices.cfg
View file

@ -1,5 +1,12 @@
#textdomain wesnoth-low
[scenario]
#ifdef MULTIPLAYER
[multiplayer]
#ifndef DEBUG_MODE
allow_new_game=no
#endif
#else
[scenario]
#endif
id="08_Council_of_hard_choices"
name= _ "Council of hard choices"
@ -104,4 +111,9 @@
carryover_report=no
[/endlevel]
[/event]
#ifndef MULTIPLAYER
[/scenario]
#else
[/multiplayer]
#endif

53
data/campaigns/Legend_of_Wesmere/scenarios/09_Bounty_hunters.cfg
View file

@ -1,6 +1,13 @@
#textdomain wesnoth-low
#ifdef MULTIPLAYER
[multiplayer]
#ifndef DEBUG_MODE
allow_new_game=no
#endif
#else
[scenario]
#endif
[scenario]
id="09_Bounty_hunters"
name= _ "Bounty Hunters"
{LOW_MAP 09_Bounty_Hunters.map}
@ -64,9 +71,10 @@
# these have been left behind to guard the Ka'lian
[store_unit]
variable=l3_store
variable=l3_store_kalenz
kill=yes
[filter]
side=1
[not]
id=Kalenz
[/not]
@ -88,6 +96,28 @@
[/filter]
[/store_unit]
#ifdef MULTIPLAYER
[store_unit]
variable=l3_store_landar
kill=yes
[filter]
side=5
[not]
id=Landar
[/not]
[not]
id=Landulias
[/not]
[and]
type=Elvish Marshal,Elvish Champion,Elvish Avenger,Elvish Sharpshooter
[or]
{FILTER_LOYALS}
[/or]
[/and]
[/filter]
[/store_unit]
#endif
[recall]
id=Anduilas
[/recall]
@ -95,7 +125,7 @@
# {RECALL_LOYALS}
[switch]
variable=l3_store.length
variable=l3_store_kalenz.length
[case]
value=0
[set_variable]
@ -233,6 +263,14 @@
[/ai]
[/side]
#ifdef MULTIPLAYER
[side]
side=5
{LANDAR}
recruit={ELVES}
[/side]
#endif
[event]
name=prestart
[objectives]
@ -316,7 +354,11 @@
[filter]
x=1-37,1-17,21-37, 1-5,23-37,1-3,28-37,35-37
y= 1-2, 3, 3, 4, 4, 5, 5, 6
id=Kalenz
#ifdef MULTIPLAYER
#endif
[/filter]
[message]
speaker=unit
@ -451,4 +493,9 @@
[/event]
{campaigns/Legend_of_Wesmere/utils/deaths.cfg}
#ifndef MULTIPLAYER
[/scenario]
#else
[/multiplayer]
#endif

21
data/campaigns/Legend_of_Wesmere/scenarios/10_Cliffs_of_Thoria.cfg
View file

@ -1,5 +1,12 @@
#textdomain wesnoth-low
[scenario]
#ifdef MULTIPLAYER
[multiplayer]
#ifndef DEBUG_MODE
allow_new_game=no
#endif
#else
[scenario]
#endif
id=10_Cliffs_of_Thoria
name= _ "Cliffs of Thoria"
{LOW_MAP 10_Cliffs_of_Thoria.map}
@ -124,6 +131,14 @@
[/ai]
[/side]
#ifdef MULTIPLAYER
[side]
side=5
{LANDAR}
recruit={ELVES}
[/side]
#endif
[event]
name=prestart
[objectives]
@ -289,4 +304,8 @@
[/event]
{campaigns/Legend_of_Wesmere/utils/deaths.cfg}
#ifndef MULTIPLAYER
[/scenario]
#else
[/multiplayer]
#endif

29
data/campaigns/Legend_of_Wesmere/scenarios/11_Battle_of_the_book.cfg
View file

@ -1,5 +1,12 @@
#textdomain wesnoth-low
[scenario]
#ifdef MULTIPLAYER
[multiplayer]
#ifndef DEBUG_MODE
allow_new_game=no
#endif
#else
[scenario]
#endif
id=11_Battle_of_the_book
name= _ "Battle of the book"
next_scenario=12_Revelations
@ -76,6 +83,9 @@
canrecruit=yes
controller=ai
{GOLD 100 90 80}
[ai]
passive_leader=yes
[/ai]
recruit=Mage, Gryphon
team_name=player
user_team_name= _ "Player"
@ -102,13 +112,24 @@
user_team_name= _ "Enemies"
[/side]
#ifdef MULTIPLAYER
[side]
side=5
{LANDAR}
recruit={ELVES}
fog=yes
share_view=yes
[/side]
#endif
#TODO what if Crelanu moves into sight?
[event]
name=sighted
[filter]
id=Crelanu
[/filter]
[filter_second]
side=1
side=1,5
[/filter_second]
[message]
id=Crelanu
@ -235,4 +256,8 @@
[/event]
{campaigns/Legend_of_Wesmere/utils/deaths.cfg}
#ifndef MULTIPLAYER
[/scenario]
#else
[/multiplayer]
#endif

14
data/campaigns/Legend_of_Wesmere/scenarios/12_Revelations.cfg
View file

@ -1,5 +1,12 @@
#textdomain wesnoth-low
[scenario]
#ifdef MULTIPLAYER
[multiplayer]
#ifndef DEBUG_MODE
allow_new_game=no
#endif
#else
[scenario]
#endif
name= _ "Revelations"
id=12_Revelations
next_scenario=13_News_from_the_front
@ -255,4 +262,9 @@
carryover_percentage=100
[/endlevel]
[/event]
#ifndef MULTIPLAYER
[/scenario]
#else
[/multiplayer]
#endif

32
data/campaigns/Legend_of_Wesmere/scenarios/13_News_from_the_front.cfg
View file

@ -4,14 +4,22 @@
# potion with magical effects. Do *not* change it to 'filter'!
### to do: make Landar dissapear
#ifdef MULTIPLAYER
[multiplayer]
#ifndef DEBUG_MODE
allow_new_game=no
#endif
#else
[scenario]
#endif
[scenario]
name= _ "News from the front"
id=13_News_from_the_front
{LOW_MAP 10_Cliffs_of_Thoria.map}
turns=1
snapshot=no
next_scenario=14_Human_Alliance
#TODO enable if that is supported again
#theme=FullScreen
{SCENARIO_MUSIC the_deep_path.ogg}
@ -32,13 +40,17 @@
{KALENZ}
# wmllint: recognize Kalenz
fog=yes
share_view=yes
x=12
y=1
team_name=player
#ifndef MULTIPLAYER
[unit]
{LANDAR}
# wmllint: recognize Landar
placement=leader
[/unit]
#endif
[unit]
{CLEODIL}
# wmllint: recognize Cleodil
@ -51,9 +63,20 @@
[/unit]
[/side]
#wmllint: validate-on
#ifdef MULTIPLAYER
[side]
{LANDAR}
x=11
y=1
fog=yes
share_view=yes
team_name=player
[/side]
#endif
[event]
name=prestart
{RECALL_LOYALS}
[/event]
@ -171,4 +194,9 @@
carryover_percentage=100
[/endlevel]
[/event]
#ifndef MULTIPLAYER
[/scenario]
#else
[/multiplayer]
#endif

13
data/campaigns/Legend_of_Wesmere/scenarios/14_Human_Alliance.cfg
View file

@ -1,5 +1,12 @@
#textdomain wesnoth-low
[scenario]
#ifdef MULTIPLAYER
[multiplayer]
#ifndef DEBUG_MODE
allow_new_game=no
#endif
#else
[scenario]
#endif
id=14_Human_Alliance
name= _ "Human Alliance"
@ -728,4 +735,8 @@
[/event]
{campaigns/Legend_of_Wesmere/utils/deaths.cfg}
#ifndef MULTIPLAYER
[/scenario]
#else
[/multiplayer]
#endif

4
data/tools/Makefile
View file

@ -19,6 +19,10 @@ lint:
# Check for obsolete WML, broken references, consistency.
./wmllint --dryrun $(MAINLINE) $(UMC)
lint-low:
# Check for obsolete WML, broken references, consistency.
./wmllint --dryrun $(DATA)/core $(DATA)/campaigns/Legend_of_Wesmere
unresolved:
@echo "# Report on unresolved macro calls and resource references"
@./wmlscope --unresolved $(MAINLINE) $(UMC)