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

Fix various small problems detected by wmllint

Browse source 
(macro name collisions, 1.3 terrain that wmllint can't tell from 1.2,
and so forth).
This commit is contained in:
Eric S. Raymond 2008-01-03 14:54:20 +00:00
parent abaa21302d
commit a680346d71
7 changed files with 41 additions and 23 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

@ -269,7 +269,7 @@
[/message]
#enddef
#define DIALOGUE_AHIW_GHOST
#define DIALOGUE_AHIW_GHOSTWARN
[message]
speaker=Darken Volk
message=_ "Be careful when imprisoning a soul and use all your might to retain control over it or it might attempt to break free and destroy you!"
@ -302,7 +302,7 @@
[/message]
#enddef
#define DIALOGUE_AHIW_GHOST
#define DIALOGUE_AHIW_GHOSTFREE
[message]
side=4
message=_ "Free! Your foul spells cannot enslave me any longer, Malin the Damned. You shall pay for keeping me from my final rest!"

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

@ -147,7 +147,7 @@
[filter]
type=Ghost
[/filter]
{DIALOGUE_AHIW_GHOST}
{DIALOGUE_AHIW_GHOSTWARN}
[/event]
[event]
@ -197,7 +197,7 @@
{MODIFY_ONE_UNIT side=4 user_description (_ "Tortured Soul")}
{MODIFY_ONE_UNIT side=4 canrecruit 1}
{VARIABLE ghost_was_freed yes}
{DIALOGUE_AHIW_GHOST}
{DIALOGUE_AHIW_GHOSTFREE}
[/event]
[/then]
[/if]

15
data/campaigns/Liberty/scenarios/08_Glory.cfg
View file

@ -68,7 +68,7 @@
recruit=Swordsman,Pikeman,Dragoon,Shock Trooper,Longbowman,Red Mage,White Mage,Spearman,Heavy Infantryman,Bowman
{GOLD 200 380 460}
controller=ai
colour=2
colour=green
[ai]
caution=0.8
village_value=0.0
@ -100,7 +100,7 @@
side=3
no_leader=yes
controller=ai
colour=2
colour=green
[ai]
caution=0.8
village_value=0.0
@ -123,7 +123,7 @@
recruit=Wolf Rider,Orcish Grunt,Orcish Archer,Orcish Assassin,Troll,Troll Whelp
gold=300
controller=ai
colour=3
colour=blue
[ai]
[target]
side=2
@ -165,7 +165,7 @@
recruit=Shadow Mage,Fugitive,Rogue Mage,Rogue,Huntsman
{GOLD 700 600 500}
controller=ai
colour=4
colour=purple
[ai]
recruitment_pattern=mixed fighter,mixed fighter,fighter,mixed fighter,archer
[target]
@ -181,7 +181,7 @@
no_leader=yes
{GOLD 380 260 160}
controller=ai
colour=5
colour=black
team_name=good_guys
[ai]
aggression=0.7
@ -690,7 +690,10 @@
#
[terrain_mask]
x,y=15,11
mask="Re , Mm^Xm , Re , Ww , Rr , Ww^Bw| , Rr , Rr , Gs^Fp , Mm^Xm , Gs^Fp
mask="
usage=mask
Re , Mm^Xm , Re , Ww , Rr , Ww^Bw| , Rr , Rr , Gs^Fp , Mm^Xm , Gs^Fp
Mm , Chr , Mm^Xm , Re , Uh , Uu , Uh , Uh , Mm^Xm , Uu , Mm^Xm
Uu , Uu , Qxu , Uu , Re , Qxu , Re , Qxu , Chr , Rr , Chr
Uu , Chr , Qxu , Qxu , Qxu , Qxu , Qxu , Qxu , Uu , Qxu , Re

22
data/campaigns/The_Hammer_of_Thursagan/scenarios/12_The_Underlevels.cfg
View file

@ -408,7 +408,7 @@
[terrain]
x=38,39,40
y=42,42,42
letter=Uu
letter=Uu # wmllint: ignore
[/terrain]
[message]
@ -451,7 +451,7 @@
[terrain]
x=26
y=5
letter=Uu
letter=Uu # wmllint: ignore
[/terrain]
[/event]
@ -507,7 +507,7 @@
[terrain]
x=15
y=24
letter=Uu
letter=Uu # wmllint: ignore
[/terrain]
[/event]
@ -528,7 +528,7 @@
[terrain]
x=15
y=36
letter=Uu
letter=Uu # wmllint: ignore
[/terrain]
[/event]
@ -591,7 +591,7 @@
[terrain]
x=39,39
y=13,14
letter=Uu
letter=Uu # wmllint: ignore
[/terrain]
[/event]
@ -612,7 +612,7 @@
[terrain]
x=55,55
y=34,35
letter=Uu
letter=Uu # wmllint: ignore
[/terrain]
[/event]
@ -628,7 +628,7 @@
[terrain]
x=10
y=2
letter=Uu
letter=Uu # wmllint: ignore
[/terrain]
[remove_shroud]
@ -679,7 +679,7 @@
[terrain]
x=18
y=1
letter=Uu
letter=Uu # wmllint: ignore
[/terrain]
[remove_shroud]
@ -730,7 +730,7 @@
[terrain]
x=23
y=4
letter=Uu
letter=Uu # wmllint: ignore
[/terrain]
[remove_shroud]
@ -781,7 +781,7 @@
[terrain]
x=25
y=8
letter=Uu
letter=Uu # wmllint: ignore
[/terrain]
[remove_shroud]
@ -963,7 +963,7 @@
[terrain]
x=21,21
y=54,55
letter=Uu
letter=Uu # wmllint: ignore
[/terrain]
[/event]

2
data/campaigns/The_Hammer_of_Thursagan/scenarios/13_Epilogue.cfg
View file

@ -80,7 +80,7 @@
[unit]
type={TYPE}
description={NAME}
user_description= _ {NAME}
user_description= _ {NAME} # wmllint: ignore
side=3
x,y={X},{Y}
[/unit]

4
data/core/macros/abilities.cfg
View file

@ -465,7 +465,9 @@ Enemy units cannot see this unit while it is in deep water, except if they have
#define ABILITY_FEEDING FEEDER_TYPE
# Canned definition of the Feeding ability to be included in an
# [abilities] clause.
# [abilities] clause. Note: this is deliberately unbalanced WML,
# in order to close the abilities clause then insert the event
# then reopen the abilities clause.
[resistance]
id=feeding
name= _ "feeding"

13
data/tools/mapsize Executable file
View file

@ -0,0 +1,13 @@
#!/usr/bin/env python
#
import sys
for filename in sys.argv[1:]:
contents = open(filename).read().split("\n")
while "," not in contents[0]:
contents.pop(0)
width = contents[0].count(",")
if not contents[0].strip().endswith(","):
width += 1
height = len(filter(lambda x: "," in x, contents))
print "***", filename, width, height, width/5, height/5