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

Various cleanups related to description= -> id=, mostly comment fixes.

Browse source
This commit is contained in:
Eric S. Raymond 2008-03-13 09:14:15 +00:00
parent 5b8286d4d9
commit c66aa1eb74
12 changed files with 69 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
data/campaigns/Heir_To_The_Throne/scenarios/17_Scepter_of_Fire.cfg
View file

@ -202,11 +202,12 @@
[/terrain]
#
# Future capability, once I figure out how to access the scepter's random
# location and if this still sounds like a good idea.
# Future capability, once I figure out how to access
# the scepter's random location and if this still
# sounds like a good idea.
#
# [message]
# description=Delfador
# id=Delfador
# message= _ "I think... I think if I were to concentrate a bit I could tell you where it is."
# [/message]
# [message]

16
data/campaigns/Northern_Rebirth/scenarios/04_Clearing_the_Mines.cfg
View file

@ -428,14 +428,14 @@
# message= _ "Tallin! No!"
# [/message]
# [message]
# description=Hamel
# id=Hamel
# message= _ "Tallin, what are you doing?"
# [/message]
# [message]
# description=Tallin
# id=Tallin
# message= _ ".....Death!..... Blood!...."
# [/message]
# {MODIFY_UNIT description=Tallin profile portraits/Tallin-Evil.jpg}
# {MODIFY_UNIT id=Tallin profile portraits/Tallin-Evil.jpg}
# [sound]
# name=dagger-swish.wav
# [/sound]
@ -446,11 +446,11 @@
# name=dwarf-hit-3.ogg
# [/sound]
# [message]
# description=Hamel
# id=Hamel
# message= _ "Ahhh! Treacherous human! Kill him, men!"
# [/message]
# [message]
# description=Malifor
# id=Malifor
# message= _ "HAHAHAHAHAHAHA!"
# [/message]
# [sound]
@ -474,17 +474,17 @@
# [/colour_adjust]
# [teleport]
# [filter]
# description=Tallin
# id=Tallin
# [/filter]
# x=34
# y=6
# [/teleport]
# [message]
# description=Hamel
# id=Hamel
# message= _ "What the! Where did he go?"
# [/message]
# [message]
# description=Malifor
# id=Malifor
# message= _ "Right here with me, fools! He is mine now."
# [/message]
# [disallow_recruit]

12
data/campaigns/Northern_Rebirth/utils/herodeaths.cfg
View file

@ -312,12 +312,12 @@
[/if]
{FLASH}
# [store_locations]
# variable=father_marcus_whereabouts
# [filter]
# description=Father Marcus
# [/filter]
# radius=1
# [/store_locations]
# variable=father_marcus_whereabouts
# [filter]
# id=Father Marcus
# [/filter]
# radius=1
# [/store_locations]
[store_starting_location]
side=1
variable=respawn_point

4
data/campaigns/Sceptre_of_Fire/scenarios/7_Outriding_of_Outriders.cfg
View file

@ -207,7 +207,7 @@
[/message]
{RANDOM_TRAIT_UNIT (
type=Spearman
description=Rolin # wmllint: ignore
id=Rolin # wmllint: ignore
user_description= _ "Rolin"
x,y=$x1,$y1
side=1
@ -253,7 +253,7 @@
[/filter]
{RANDOM_TRAIT_UNIT (
type=Lieutenant
description=Hadlin # wmllint: ignore
id=Hadlin # wmllint: ignore
user_description= _ "Hadlin"
x,y=10,63
side=1

4
data/campaigns/Sceptre_of_Fire/scenarios/9_Caverns_of_Flame.cfg
View file

@ -427,11 +427,11 @@
# [/variable]
# [then]
# [message]
# description=Rugnur
# id=Rugnur
# message= _ "Look, those orcs can't get to us! There's cave wall in the way!"
# [/message]
# [message]
# description=Thursagan
# id=Thursagan
# message= _ "True; but, perhaps later they will find a way out."
# [/message]
# [/then]

2
data/campaigns/Son_Of_The_Black_Eye/scenarios/10_Saving_Inarix.cfg
View file

@ -86,7 +86,7 @@
[/filter]
{VARIABLE leaders_not_safe T}
# [message]
# description=Grüü
# id=Grüü
# message= _ "Don't do it now!"
# [/message]
[/event]

2
data/campaigns/The_Rise_Of_Wesnoth/scenarios/15_New_Land.cfg
View file

@ -194,7 +194,7 @@
# [teleport]
# [filter]
# description=Lord Typhon
# id=Lord Typhon
# [/filter]
# x=3
# y=3

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

@ -254,7 +254,7 @@
#If I can scrounge up a decent scroll \/
#[unit_overlay]
# description=Commander Aethyr
# id=Commander Aethyr
# image=items/book3.png
#[/unit_overlay]

82
data/campaigns/Under_the_Burning_Suns/scenarios/03_Stirring_in_the_Night.cf_
View file

@ -699,7 +699,7 @@
[/target]
[target]
description=Zur
id=Zur
value=20
[/target]
[/ai]
@ -818,16 +818,16 @@
#recall heroes
[recall]
description=Nym
id=Nym
[/recall]
[recall]
description=Elyssa
id=Elyssa
[/recall]
[recall]
description=Zhul
id=Zhul
[/recall]
[recall]
description=Garak
id=Garak
[/recall]
[item]
@ -965,7 +965,7 @@
name=die
[filter]
description=Zur
id=Zur
[/filter]
[if]
@ -981,7 +981,7 @@
[/set_variable]
[message]
description=Azkotep
id=Azkotep
message= _ "Curse you! I will not forget this. You will rue this night."
[/message]
[/then]
@ -993,7 +993,7 @@
name=die
[filter]
description=Grak
id=Grak
[/filter]
[if]
@ -1004,7 +1004,7 @@
[then]
[message]
description=Ystara
id=Ystara
message= _ "Noooooo! I shall have my revenge!"
[/message]
@ -1038,7 +1038,7 @@
#ifdef EASY
[unit]
type=Orcish Leader
description=Ganthos
id=Ganthos
user_description= _ "Ganthos"
upkeep=free
canrecruit=yes
@ -1049,7 +1049,7 @@
#else
[unit]
type=Orcish Ruler
description=Ganthos
id=Ganthos
user_description= _ "Ganthos"
upkeep=free
canrecruit=yes
@ -1119,12 +1119,12 @@
#endif
[message]
description=Ganthos
id=Ganthos
message= _ "What's this on our borders? Stinkin' elves and more undead? We'll teach them a lesson they won't soon forget. Attack!"
[/message]
[message]
description=Kaleh
id=Kaleh
message= _ "If those raiders capture any of our encampments, I fear our people's fate will be just as bad as if it was captured by the undead."
[/message]
[/then]
@ -1185,14 +1185,14 @@
#store Garak's x,y location
[store_locations]
[filter]
description=Garak
id=Garak
[/filter]
variable=locs
[/store_locations]
[store_unit]
[filter]
description=Garak
id=Garak
[/filter]
variable=ElvishGarak
kill=no
@ -1201,7 +1201,7 @@
# play some adequate sound
[kill]
description=Garak
id=Garak
animate=yes
fire_event=no
[/kill]
@ -1279,12 +1279,12 @@
[then]
[message]
description=Nym
id=Nym
message= _ "I can just barely see the sun poking over the dunes. It is almost dawn!"
[/message]
[message]
description=Ystara
id=Ystara
message= _ "No! This contest is not over yet, Azkotep. I shall show you a taste of my true power."
[/message]
@ -1303,12 +1303,12 @@
[then]
[message]
description=Nym
id=Nym
message= _ "I can just barely see the sun poking over the dunes. It is almost dawn!"
[/message]
[message]
description=Azkotep
id=Azkotep
message= _ "No, I shall have my revenge. I shall show you that darkness is strongest just before dawn. I call upon the lord of death and decay, grant me my vengeance!"
[/message]
@ -1335,12 +1335,12 @@
#death events, and Possessed Garak is created
[message]
description=Nym
id=Nym
message= _ "I can just barely see the sun poking over the dunes. It is almost dawn!"
[/message]
[message]
description=Ystara
id=Ystara
message= _ "No, I shall have my revenge. I shall show you that darkness is strongest just before dawn. I call upon the powers of disease and despair, grant me my vengeance!"
[/message]
@ -1355,11 +1355,11 @@
name=die
[filter]
description=Possessed Garak
id=Possessed Garak
[/filter]
[kill]
description=Possessed Garak
id=Possessed Garak
animate=no
fire_event=no
[/kill]
@ -1372,7 +1372,7 @@
[then]
[message]
description=Azkotep
id=Azkotep
message= _ "Hah, now you have learned the flesh is always weaker than the powers of the undead."
[/message]
@ -1390,7 +1390,7 @@
[then]
[message]
description=Ystara
id=Ystara
message= _ "My undead zombies shall always defeat the living."
[/message]
@ -1408,7 +1408,7 @@
[then]
[message]
description=Azkotep
id=Azkotep
message= _ "Hah, now you have learned the flesh is always weaker than the powers of the undead."
[/message]
@ -1425,7 +1425,7 @@
name=die
[filter]
description=Ystara
id=Ystara
[/filter]
[set_variable]
@ -1456,12 +1456,12 @@
[else]
[message]
description=Ystara
id=Ystara
message= _ "You think you have defeated me, don't you? Foolish boy, I shall assume a new form more powerful and horrible than you could ever imagine!"
[/message]
[message]
description=Azkotep
id=Azkotep
message= _ "How dare you interfere in our contest! I did not need your help. I shall teach you not to cross a lord of darkness."
[/message]
@ -1477,13 +1477,13 @@
[else]
[message]
description=Possessed Garak
id=Possessed Garak
message= _ "See, I told you I was more powerful. This game is over, now I can leave this shell of a body."
[/message]
#kill possessed Garak
[kill]
description=Possessed Garak
id=Possessed Garak
animate=yes
fire_event=no
[/kill]
@ -1501,7 +1501,7 @@
name=die
[filter]
description=Azkotep
id=Azkotep
[/filter]
[set_variable]
@ -1539,12 +1539,12 @@
[else]
[message]
description=Azkotep
id=Azkotep
message= _ "You think you have defeated me, don't you? Foolish boy, I shall assume a new form more powerful and horrible than you could ever imagine!"
[/message]
[message]
description=Ystara
id=Ystara
message= _ "How dare you interfere in our contest! I did not need your help. I shall teach you not to cross a lord of darkness."
[/message]
@ -1560,13 +1560,13 @@
[else]
[message]
description=Possessed Garak
id=Possessed Garak
message= _ "See, I told you I was more powerful. This game is over, now I can leave this shell of a body."
[/message]
#kill possessed Garak
[kill]
description=Possessed Garak
id=Possessed Garak
animate=yes
fire_event=no
[/kill]
@ -1648,12 +1648,12 @@
[then]
[message]
description=Nym
id=Nym
message= _ "They're raising the corpses of our slain people! What a horrible fate!"
[/message]
[message]
description=Elyssa
id=Elyssa
message= _ "Then we shall have to give them a proper cremation."
[/message]
[/then]
@ -1696,7 +1696,7 @@
[then]
[message]
description=Kaleh
id=Kaleh
message= _ "Too many of our people have been killed. We will surely be overwhelmed by the undead now. All is lost!"
[/message]
@ -1712,7 +1712,7 @@
name=time over
[message]
description=Kaleh
id=Kaleh
message= _ "This darkness will never end, and the undead will soon overwhelm us. I'm sorry Garak, we couldn't save you."
[/message]

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

@ -101,7 +101,7 @@
# Stores an attribute of a unit to the given variable.
#
# Example where this is used to flip all orcs to whatever side James is on:
#! {STORE_UNIT_VAR description=James side side_of_James}
#! {STORE_UNIT_VAR id=James side side_of_James}
#! {MODIFY_UNIT race=orc side $side_of_James}
[store_unit]
[filter]

2
data/multiplayer/scenarios/Wesbench_AI.cfg
View file

@ -126,7 +126,7 @@ Aa^Fpa ,Aa^Fpa , Aa^Fpa , Ha , Mm , Mm
# this unit is defined twice, one will end in the wall at 19,11
# commenting the 2nd exact copy out
#[unit]
# description="TG1"
# id="TG1"
# type=Dwarvish Thunderguard
# side=1
# x,y=19,12

3
data/tools/wmllint
View file

@ -564,13 +564,12 @@ def standard_unit_filter():
"unit_filter", "secondary_unit_filter",
"special_filter", "special_filter_second",
"neighbor_unit_filter",
"recall", "teleport", "kill", "unstone", "store",
"recall", "teleport", "kill", "unstone", "store_unit",
"have_unit", "scroll_to_unit", "role",
"hide_unit", "unhide_unit",
"protect_unit", "target", "avoid")) \
or under("message")
# Sanity checking
# Associations for the ability sanity checks.