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

wmlscope/wmllint cleanup.

Browse source
This commit is contained in:
Eric S. Raymond 2009-07-07 09:00:51 +00:00
parent 9cb4ac3386
commit 871dab2d25
4 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/campaigns/The_Rise_Of_Wesnoth/scenarios/21_The_Plan.cfg
View file

@ -143,7 +143,7 @@
[/message]
[message]
speaker=Lady Jessene
message= _ "Haldric! I won't do it... I won't help. What is it with your kind, always rushing to a fool's death? Who'll lead these people? I...<i>we</i> need you alive"
message= _ "Haldric! I won't do it... I won't help. What is it with your kind, always rushing to a fool's death? Who'll lead these people? I...<i>we</i> need you alive"
[/message]
[message]
speaker=Prince Haldric

7
data/campaigns/The_Rise_Of_Wesnoth/scenarios/23_Epilogue.cfg
View file

@ -288,7 +288,8 @@
message= _ "So, what is to become of me?"
[/message]
[message]
speaker=Prince Haldric
speaker=Prince Haldric
# wmllint: local spelling I..I
message= _ "There are many Wesfolk amongst the remains of my people. We must stay united under one banner. I will need you by my side if there is any hope of building a true 'Kingdom of Wesnoth'. I..I think a Queen's crown would sit well upon that flame-colored hair of yours, Jessene."
[/message]
[message]
@ -297,15 +298,17 @@
[/message]
[message]
speaker=Prince Haldric
message= _ "Then take my hand, Jessene, if you won't accept crown or kingdom. You have earned both. We can't make this work without your people...and I don't think I can make it work without <i>you</i>."
message= _ "Then take my hand, Jessene, if you won't accept crown or kingdom. You have earned both. We can't make this work without your people...and I don't think I can make it work without <i>you</i>."
[/message]
[message]
# wmllint: local spelling Dragonbane
speaker=Lady Jessene
message= _ "Probably not. And, if nothing else, the hero-king of Wesnoth. Haldric Dragonbane, will need someone to remind him that he does not eat lighting and fart thunder. I...accept."
[/message]
[message]
speaker=narrator
message= _ "It was never said afterwards that the marriage of Haldric and Jessene was exactly tranquil. But it was also said that neither could stand be long separated from the other, and she bore him strong children that mingled the blood of their diverse ancestries. Many followed their example, and the two refugee peoples from the Green Isles became fused into one in the new kingdom."
image=wesnoth-icon.png
[/message]
[message]
speaker=narrator

6
data/multiplayer/scenarios/ANL_utils/ANL_special_macros.cfg
View file

@ -98,16 +98,16 @@
[/set_variables]
#enddef
#define PICK_RECRUIT_OPTION UNIT_IMAGE UNIT_TYPE UNIT_TYPE_NAME VAR
#define PICK_RECRUIT_OPTION UNIT_IMAGE UNIT_TYPE_STRING UNIT_TYPE_NAME_STRING VAR
[option]
message={MENU_IMG_TXT {UNIT_IMAGE} {UNIT_TYPE_NAME}}
message={MENU_IMG_TXT {UNIT_IMAGE} {UNIT_TYPE_NAME_STRING}}
[show_if]
{CONDITION player_$side_number|.{VAR} equals no}
[/show_if]
[command]
{VARIABLE player_$side_number|.{VAR} yes}
[allow_recruit]
type={UNIT_TYPE}
type={UNIT_TYPE_STRING}
side=$side_number
[/allow_recruit]
[/command]

4
data/tools/wesnoth/wmltools.py
View file

@ -152,10 +152,10 @@ def formaltype(f):
ftype = "terrain_code"
elif f in ("NAME", "VAR", "IMAGESTEM", "ID") or f.endswith("_NAME"):
ftype = "name"
elif f in ("STRING", "TYPE", "TEXT") or f.endswith("_TEXT"):
ftype = "string"
elif f in ("ID_STRING", "NAME_STRING", "DESCRIPTION"):
ftype = "optional_string"
elif f in ("STRING", "TYPE", "TEXT") or f.endswith("_STRING") or f.endswith("_TYPE") or f.endswith("_TEXT"):
ftype = "string"
elif f.endswith("IMAGE") or f == "PROFILE":
ftype = "image"
elif f in ("MUSIC",) or f.endswith("SOUND"):