Teach wmllint to fix up macros containing description=...
...filters, and do that on mainline.
This commit is contained in:
Eric S. Raymond
parent
c66aa1eb74
commit
dff0a94c41
42 changed files with 105 additions and 101 deletions
|
|
@ -113,7 +113,7 @@
|
|||
id=Darken Volk
|
||||
[/recall]
|
||||
|
||||
{MODIFY_UNIT (description=Malin Keshar) profile (portraits/malold.png)}
|
||||
{MODIFY_UNIT (id=Malin Keshar) profile (portraits/malold.png)}
|
||||
[/event]
|
||||
|
||||
[event]
|
||||
|
|
|
|||
|
|
@ -162,10 +162,10 @@
|
|||
{GEN_UNIT (Banebow) 3 5 18}
|
||||
{GEN_UNIT (Nightgaunt) 3 5 18}
|
||||
|
||||
{MODIFY_UNIT (description=Darken Volk) canrecruit yes}
|
||||
{MODIFY_UNIT (id=Darken Volk) canrecruit yes}
|
||||
#Go for the book
|
||||
{MODIFY_UNIT (description=Darken Volk) goto_x 5}
|
||||
{MODIFY_UNIT (description=Darken Volk) goto_y 5}
|
||||
{MODIFY_UNIT (id=Darken Volk) goto_x 5}
|
||||
{MODIFY_UNIT (id=Darken Volk) goto_y 5}
|
||||
|
||||
{DIALOGUE_ASF3_START}
|
||||
[/event]
|
||||
|
|
@ -189,8 +189,8 @@
|
|||
x,y=5,5
|
||||
[/removeitem]
|
||||
# new goal for DV
|
||||
{MODIFY_UNIT (description=Darken Volk) goto_x 25}
|
||||
{MODIFY_UNIT (description=Darken Volk) goto_y 1}
|
||||
{MODIFY_UNIT (id=Darken Volk) goto_x 25}
|
||||
{MODIFY_UNIT (id=Darken Volk) goto_y 1}
|
||||
[objectives]
|
||||
side=1
|
||||
[objective]
|
||||
|
|
@ -245,8 +245,8 @@
|
|||
x,y=5,5
|
||||
[/removeitem]
|
||||
# new goal for DV
|
||||
{MODIFY_UNIT (description=Darken Volk) goto_x 25}
|
||||
{MODIFY_UNIT (description=Darken Volk) goto_y 1}
|
||||
{MODIFY_UNIT (id=Darken Volk) goto_x 25}
|
||||
{MODIFY_UNIT (id=Darken Volk) goto_y 1}
|
||||
[objectives]
|
||||
side=1
|
||||
[objective]
|
||||
|
|
|
|||
|
|
@ -135,9 +135,9 @@
|
|||
|
||||
[event]
|
||||
name=start
|
||||
{MOVE_UNIT (description=Malin Keshar) 7 22}
|
||||
{MOVE_UNIT (id=Malin Keshar) 7 22}
|
||||
{DIALOGUE_AAL_START}
|
||||
{MOVE_UNIT (description=Darken Volk) 8 21}
|
||||
{MOVE_UNIT (id=Darken Volk) 8 21}
|
||||
[if]
|
||||
[variable]
|
||||
name=hasBook
|
||||
|
|
@ -153,25 +153,25 @@
|
|||
[/else]
|
||||
[/if]
|
||||
{CLEAR_VARIABLE hasBook}
|
||||
{MODIFY_UNIT (description=Darken Volk) role book_carrier}
|
||||
{MODIFY_UNIT (id=Darken Volk) role book_carrier}
|
||||
[unit_overlay]
|
||||
x,y=8,21
|
||||
image="misc/book-icon.png"
|
||||
[/unit_overlay]
|
||||
{MOVE_UNIT (description=Darken Volk) 19 19}
|
||||
{MODIFY_UNIT (description=Darken Volk) side 2}
|
||||
{MODIFY_UNIT (description=Darken Volk) canrecruit yes}
|
||||
{MOVE_UNIT (id=Darken Volk) 19 19}
|
||||
{MODIFY_UNIT (id=Darken Volk) side 2}
|
||||
{MODIFY_UNIT (id=Darken Volk) canrecruit yes}
|
||||
{DELAY 500}
|
||||
{MOVE_UNIT (description=Malin Keshar) 7 21}
|
||||
{MOVE_UNIT (id=Malin Keshar) 7 21}
|
||||
{DELAY 500}
|
||||
{MOVE_UNIT (description=Malin Keshar) 8 20}
|
||||
{MOVE_UNIT (id=Malin Keshar) 8 20}
|
||||
{DELAY 500}
|
||||
{MOVE_UNIT (description=Malin Keshar) 9 20}
|
||||
{MOVE_UNIT (id=Malin Keshar) 9 20}
|
||||
{DELAY 500}
|
||||
{CREATE_ADVISOR}
|
||||
{DIALOGUE_AAL_START3}
|
||||
{MOVE_UNIT (description=Malin Keshar) 5 17}
|
||||
{MOVE_UNIT (description=Darken Volk) 26 10}
|
||||
{MOVE_UNIT (id=Malin Keshar) 5 17}
|
||||
{MOVE_UNIT (id=Darken Volk) 26 10}
|
||||
|
||||
# Make camp
|
||||
[terrain]
|
||||
|
|
@ -381,7 +381,7 @@
|
|||
x=4-6,5-7
|
||||
y=16-17,18
|
||||
[/filter]
|
||||
{MOVE_UNIT (description=Malin Keshar) 1 12}
|
||||
{MOVE_UNIT (id=Malin Keshar) 1 12}
|
||||
{DIALOGUE_AAL_END}
|
||||
[endlevel]
|
||||
bonus=no
|
||||
|
|
|
|||
|
|
@ -143,8 +143,8 @@
|
|||
[/unit]
|
||||
|
||||
# Malin starts injured and poisoned
|
||||
{MODIFY_UNIT (description=Malin Keshar) hitpoints 12}
|
||||
{MODIFY_UNIT (description=Malin Keshar) status.poisoned on}
|
||||
{MODIFY_UNIT (id=Malin Keshar) hitpoints 12}
|
||||
{MODIFY_UNIT (id=Malin Keshar) status.poisoned on}
|
||||
|
||||
# Castle trolls - all difficulties
|
||||
{GEN_GUARD (Troll) 2 14 7}
|
||||
|
|
@ -195,7 +195,7 @@
|
|||
|
||||
[event]
|
||||
name=start
|
||||
{MOVE_UNIT (description=Malin Keshar) 4 33}
|
||||
{MOVE_UNIT (id=Malin Keshar) 4 33}
|
||||
{CREATE_ADVISOR}
|
||||
{DIALOGUE_DID_START}
|
||||
{PUT_TO_RECALL_LIST (role=advisor)}
|
||||
|
|
|
|||
|
|
@ -321,7 +321,7 @@
|
|||
message= _ "Good job! Now, we should move onward, north. Tell the villagers to pack their belongings and follow us."
|
||||
[/message]
|
||||
|
||||
{MODIFY_UNIT description=Owaec canrecruit no}
|
||||
{MODIFY_UNIT id=Owaec canrecruit no}
|
||||
{MODIFY_UNIT side=2 side 1}
|
||||
[store_unit]
|
||||
[filter]
|
||||
|
|
@ -380,7 +380,7 @@
|
|||
message= _ "Good work! Now, we should move onward, north. Tell the villagers to pack their belongings and follow us."
|
||||
[/message]
|
||||
|
||||
{MODIFY_UNIT description=Owaec canrecruit no}
|
||||
{MODIFY_UNIT id=Owaec canrecruit no}
|
||||
{MODIFY_UNIT side=2 side 1}
|
||||
[store_unit]
|
||||
[filter]
|
||||
|
|
|
|||
|
|
@ -262,7 +262,7 @@
|
|||
speaker=Gweddry
|
||||
message= _ "I think Dacyn and Owaec have escaped already. Now I have to, also... these guards are not being very alert, I may be able to get past them..."
|
||||
[/message]
|
||||
{MOVE_UNIT description=Gweddry 30 18}
|
||||
{MOVE_UNIT id=Gweddry 30 18}
|
||||
|
||||
[redraw]
|
||||
side=1
|
||||
|
|
@ -273,13 +273,13 @@
|
|||
message= _ "Aha! There is a small crack in the cave wall here."
|
||||
[/message]
|
||||
|
||||
{MOVE_UNIT description=Gweddry 29 16}
|
||||
{MOVE_UNIT id=Gweddry 29 16}
|
||||
|
||||
[redraw]
|
||||
side=1
|
||||
[/redraw]
|
||||
|
||||
{MOVE_UNIT description=Gweddry 29 12}
|
||||
{MOVE_UNIT id=Gweddry 29 12}
|
||||
|
||||
[redraw]
|
||||
side=1
|
||||
|
|
|
|||
|
|
@ -231,7 +231,7 @@
|
|||
x=43
|
||||
y=1
|
||||
[/unit]
|
||||
{MOVE_UNIT (description=Messenger of Doom) 39 4}
|
||||
{MOVE_UNIT (id=Messenger of Doom) 39 4}
|
||||
[message]
|
||||
speaker=Messenger of Doom
|
||||
message= _ "I come bearing a message from my leader."
|
||||
|
|
|
|||
|
|
@ -72,7 +72,7 @@ Men let weapons fall from nerveless fingers and horses reared in terror as that
|
|||
y=9
|
||||
[/recall]
|
||||
|
||||
{MOVE_UNIT description=Gweddry 10 9}
|
||||
{MOVE_UNIT id=Gweddry 10 9}
|
||||
[/event]
|
||||
|
||||
[event]
|
||||
|
|
@ -112,7 +112,7 @@ Men let weapons fall from nerveless fingers and horses reared in terror as that
|
|||
message= _ "Dacyn. You will remain by Our side, here; as you counseled these two in war, you shall counsel Us in peace and the rebuilding of the Kingdom."
|
||||
[/message]
|
||||
|
||||
{MOVE_UNIT description=Dacyn 8 8} # Move Dacyn to vacant throne
|
||||
{MOVE_UNIT id=Dacyn 8 8} # Move Dacyn to vacant throne
|
||||
|
||||
[message]
|
||||
speaker=Gweddry
|
||||
|
|
@ -124,7 +124,7 @@ Men let weapons fall from nerveless fingers and horses reared in terror as that
|
|||
message= _ "Quite. Now do not interrupt while I am doing mine...kneel, Owaec."
|
||||
[/message]
|
||||
|
||||
{MOVE_UNIT description=Owaec 10 8}
|
||||
{MOVE_UNIT id=Owaec 10 8}
|
||||
|
||||
[message]
|
||||
speaker=Konrad II
|
||||
|
|
@ -173,7 +173,7 @@ Men let weapons fall from nerveless fingers and horses reared in terror as that
|
|||
message= _ "Kneel, Gweddry."
|
||||
[/message]
|
||||
|
||||
{MOVE_UNIT description=Gweddry 10 8}
|
||||
{MOVE_UNIT id=Gweddry 10 8}
|
||||
|
||||
[message]
|
||||
speaker=Konrad II
|
||||
|
|
|
|||
|
|
@ -1240,8 +1240,8 @@ Soooo... It is you who sent your subordinates to attack us. Now when we've destr
|
|||
y=15,16,15,17,15,16
|
||||
[/filter]
|
||||
|
||||
{MODIFY_UNIT description=Warven side 1}
|
||||
{MODIFY_UNIT description=Warven type Sergeant}
|
||||
{MODIFY_UNIT id=Warven side 1}
|
||||
{MODIFY_UNIT id=Warven type Sergeant}
|
||||
|
||||
{VARIABLE have_warven yes}
|
||||
|
||||
|
|
|
|||
|
|
@ -127,7 +127,7 @@
|
|||
message= _ "Stand fast, nephew."
|
||||
[/message]
|
||||
|
||||
{MOVE_UNIT description=Tarwen 7 9}
|
||||
{MOVE_UNIT id=Tarwen 7 9}
|
||||
|
||||
[capture_village]
|
||||
x=6-10
|
||||
|
|
@ -276,8 +276,8 @@
|
|||
|
||||
# Changing the unit type clobbers its portrait pointer if the new
|
||||
# type has a unit portrait. Make sure Baldras and Harper keep theirs.
|
||||
{MODIFY_UNIT description=Baldras profile portraits/p_baldras.png}
|
||||
{MODIFY_UNIT description=Harper profile portraits/p_harper.png}
|
||||
{MODIFY_UNIT id=Baldras profile portraits/p_baldras.png}
|
||||
{MODIFY_UNIT id=Harper profile portraits/p_harper.png}
|
||||
|
||||
#clean up duplicates out of the recall list
|
||||
[store_unit]
|
||||
|
|
|
|||
|
|
@ -144,7 +144,7 @@
|
|||
[event]
|
||||
name=start
|
||||
|
||||
{MOVE_UNIT description=Baldras 28 19}
|
||||
{MOVE_UNIT id=Baldras 28 19}
|
||||
|
||||
[recall]
|
||||
id=Harper
|
||||
|
|
@ -208,12 +208,12 @@
|
|||
append=yes
|
||||
[/music]
|
||||
|
||||
{MOVE_UNIT (description=Urk Delek) 42 29}
|
||||
{MOVE_UNIT (id=Urk Delek) 42 29}
|
||||
[message]
|
||||
speaker="Urk Delek"
|
||||
message= _ "By the sound of the wolves, the scent trail of Fal Khag's killers ends here."
|
||||
[/message]
|
||||
{MOVE_UNIT description=Thhsthss 7 5}
|
||||
{MOVE_UNIT id=Thhsthss 7 5}
|
||||
[message]
|
||||
speaker="Thhsthss"
|
||||
message= _ "Fal Khag is nothing to usss, orc. You promissed uss gold. Bright gold."
|
||||
|
|
|
|||
|
|
@ -534,7 +534,7 @@
|
|||
id=Baldras
|
||||
[/scroll_to_unit]
|
||||
|
||||
{MOVE_UNIT description=Link 5 8}
|
||||
{MOVE_UNIT id=Link 5 8}
|
||||
|
||||
[kill]
|
||||
id=Link
|
||||
|
|
|
|||
|
|
@ -214,7 +214,7 @@
|
|||
#
|
||||
[event]
|
||||
name=start
|
||||
{MOVE_UNIT description=Baldras 7 4}
|
||||
{MOVE_UNIT id=Baldras 7 4}
|
||||
[recall]
|
||||
id=Harper
|
||||
[/recall]
|
||||
|
|
|
|||
|
|
@ -156,7 +156,7 @@
|
|||
{LOYAL_UNIT 1 Dragoon 11 1 (Pitcher) ( _ "Pitcher")}
|
||||
# wmllint: recognize Pitcher
|
||||
|
||||
{MOVE_UNIT description=Pitcher 20 14}
|
||||
{MOVE_UNIT id=Pitcher 20 14}
|
||||
|
||||
[message]
|
||||
speaker=Pitcher
|
||||
|
|
@ -171,7 +171,7 @@
|
|||
message= _ "Rider, quiet down before we are discovered! Quickly, approach."
|
||||
[/message]
|
||||
|
||||
{MOVE_UNIT description=Pitcher 28 18}
|
||||
{MOVE_UNIT id=Pitcher 28 18}
|
||||
|
||||
[message]
|
||||
speaker=Pitcher
|
||||
|
|
@ -202,7 +202,7 @@
|
|||
message= _ "May you prevail in peace and war. I must depart before I am seen so far from my Lord's borders."
|
||||
[/message]
|
||||
|
||||
{MOVE_UNIT description=Pitcher 20 14}
|
||||
{MOVE_UNIT id=Pitcher 20 14}
|
||||
|
||||
[kill]
|
||||
id=Pitcher
|
||||
|
|
|
|||
|
|
@ -528,7 +528,7 @@
|
|||
canrecruit=yes
|
||||
[/unit]
|
||||
|
||||
{MOVE_UNIT (description=Sir Gwydion) 5 3}
|
||||
{MOVE_UNIT (id=Sir Gwydion) 5 3}
|
||||
|
||||
{GENERIC_UNIT 6 (Lancer) 4 3}
|
||||
{GENERIC_UNIT 6 (Lancer) 6 2}
|
||||
|
|
@ -784,9 +784,9 @@ border=0
|
|||
|
||||
usage=mask
|
||||
|
||||
mask="
|
||||
usage=mask
|
||||
|
||||
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
|
||||
|
|
|
|||
|
|
@ -142,7 +142,7 @@
|
|||
{PLACE_IMAGE scenery/dwarven-doors-closed.png 32 4}
|
||||
|
||||
# Override Tallin's team color so he has a distinctive purple shirt.
|
||||
{TEAM_COLOR_OVERRIDE description=Tallin purple}
|
||||
{TEAM_COLOR_OVERRIDE id=Tallin purple}
|
||||
[unit]
|
||||
type=Peasant
|
||||
id=Zlex
|
||||
|
|
|
|||
|
|
@ -210,7 +210,7 @@
|
|||
[event]
|
||||
name=start
|
||||
|
||||
{MODIFY_UNIT description=Tallin alignment chaotic}
|
||||
{MODIFY_UNIT id=Tallin alignment chaotic}
|
||||
|
||||
[unit]
|
||||
type=Giant Spider
|
||||
|
|
|
|||
|
|
@ -323,7 +323,7 @@
|
|||
variable=respawn_point
|
||||
[/store_starting_location]
|
||||
[store_unit]
|
||||
description=Sister Theta
|
||||
id=Sister Theta
|
||||
variable=type_check
|
||||
kill=no
|
||||
[/store_unit]
|
||||
|
|
@ -598,7 +598,7 @@
|
|||
variable=respawns_at
|
||||
[/store_starting_location]
|
||||
[store_unit]
|
||||
description=Father Marcus
|
||||
id=Father Marcus
|
||||
variable=type_check
|
||||
kill=no
|
||||
[/store_unit]
|
||||
|
|
|
|||
|
|
@ -151,7 +151,7 @@
|
|||
|
||||
[event]
|
||||
name=start
|
||||
{MOVE_UNIT description=Rugnur 22 12}
|
||||
{MOVE_UNIT id=Rugnur 22 12}
|
||||
[recall]
|
||||
id=Alanin
|
||||
[/recall]
|
||||
|
|
@ -170,7 +170,7 @@
|
|||
speaker=Rugnur
|
||||
message= _ "Yes, that sounds good. I'll stay here and try to defend the gates..."
|
||||
[/message]
|
||||
{MOVE_UNIT description=Alanin 32 12}
|
||||
{MOVE_UNIT id=Alanin 32 12}
|
||||
[store_unit]
|
||||
[filter]
|
||||
id=Alanin
|
||||
|
|
|
|||
|
|
@ -143,7 +143,7 @@
|
|||
speaker=Durstorn
|
||||
message= _ "Good one, let them try to take it! Ha!"
|
||||
[/message]
|
||||
{MOVE_UNIT description=Rugnur 8 10}
|
||||
{MOVE_UNIT id=Rugnur 8 10}
|
||||
[recall]
|
||||
id=Baglur
|
||||
x,y=9,9
|
||||
|
|
@ -226,7 +226,7 @@
|
|||
variable=changealanin
|
||||
# wmllint: recognize Alanin
|
||||
[/unstore_unit]
|
||||
{MOVE_UNIT description=Alanin 6 9}
|
||||
{MOVE_UNIT id=Alanin 6 9}
|
||||
[clear_variable]
|
||||
name=changealanin
|
||||
[/clear_variable]
|
||||
|
|
|
|||
|
|
@ -380,7 +380,7 @@
|
|||
y=16,28
|
||||
[/move_unit_fake]
|
||||
{RANDOM_TRAIT_UNIT (
|
||||
description=Kawn # wmllint: ignore
|
||||
id=Kawn # wmllint: ignore
|
||||
user_description= _ "Kawn"
|
||||
type=Gryphon Rider
|
||||
x,y=5,28
|
||||
|
|
|
|||
|
|
@ -120,7 +120,7 @@
|
|||
[event]
|
||||
name=start
|
||||
#thursagan, baglur and alanin
|
||||
{MOVE_UNIT description=Rugnur 13 10}
|
||||
{MOVE_UNIT id=Rugnur 13 10}
|
||||
[recall]
|
||||
id=Thursagan
|
||||
x,y=12,8
|
||||
|
|
@ -186,8 +186,8 @@
|
|||
speaker=Durstorn
|
||||
message= _ "Fine. *grumble grumble*"
|
||||
[/message]
|
||||
{MOVE_UNIT description=Thursagan 11 4}
|
||||
{MOVE_UNIT description=Thursagan 12 8}
|
||||
{MOVE_UNIT id=Thursagan 11 4}
|
||||
{MOVE_UNIT id=Thursagan 12 8}
|
||||
[message]
|
||||
speaker=Thursagan
|
||||
message= _ "Hm... a most interesting jewel. I can feel its magical power. I will start drawing up plans for the sceptre immediately."
|
||||
|
|
|
|||
|
|
@ -119,7 +119,7 @@
|
|||
[event]
|
||||
name=start
|
||||
#alanin, baglur, krawg and thursagan
|
||||
{MOVE_UNIT description=Rugnur 15 14}
|
||||
{MOVE_UNIT id=Rugnur 15 14}
|
||||
[recall]
|
||||
id=Alanin
|
||||
x,y=17,14
|
||||
|
|
@ -173,7 +173,7 @@
|
|||
speaker=Durstorn
|
||||
message= _ "Whatever. Kuhnar, go, summon him here."
|
||||
[/message]
|
||||
{MOVE_UNIT description=Kuhnar 12 19}
|
||||
{MOVE_UNIT id=Kuhnar 12 19}
|
||||
[message]
|
||||
speaker=Kuhnar
|
||||
message= _ "Theganli! Come out of there, Durstorn orders you to come to the citadel."
|
||||
|
|
@ -193,7 +193,7 @@
|
|||
speaker=Thursagan
|
||||
message= _ "He doesn't need to come here, I'll take the jewel to his shop. He'll need his tools anyway."
|
||||
[/message]
|
||||
{MOVE_UNIT description=Thursagan 11 19}
|
||||
{MOVE_UNIT id=Thursagan 11 19}
|
||||
[message]
|
||||
speaker=Thursagan
|
||||
message= _ "Well, Theganli, what do you think of this jewel?"
|
||||
|
|
|
|||
|
|
@ -327,7 +327,7 @@
|
|||
canrecruit=yes
|
||||
type=Elvish Marshal
|
||||
[/unit]
|
||||
{MOVE_UNIT description=Lyndar 3 33}
|
||||
{MOVE_UNIT id=Lyndar 3 33}
|
||||
[message]
|
||||
speaker=Lyndar
|
||||
message= _ "Aha! I've spent years looking for you Dwarves, but now I've found you! Prepare to die!"
|
||||
|
|
|
|||
|
|
@ -439,7 +439,7 @@
|
|||
speaker=Thursagan
|
||||
message= _ "Tell him to send forces north to aid us and fight the elves, but that we are probably going to die. We are going into the caves."
|
||||
[/message]
|
||||
{MODIFY_UNIT description=Alanin canrecruit yes}
|
||||
{MODIFY_UNIT id=Alanin canrecruit yes}
|
||||
[store_unit]
|
||||
[filter]
|
||||
side=1
|
||||
|
|
|
|||
|
|
@ -138,7 +138,7 @@
|
|||
[event]
|
||||
name=start
|
||||
|
||||
{MOVE_UNIT description=Rugnur 12 7}
|
||||
{MOVE_UNIT id=Rugnur 12 7}
|
||||
|
||||
[redraw]
|
||||
side=1
|
||||
|
|
|
|||
|
|
@ -208,7 +208,7 @@
|
|||
find_vacant=yes
|
||||
[/unstore_unit]
|
||||
|
||||
{MOVE_UNIT description=$stored_helper.description 26 2}
|
||||
{MOVE_UNIT id=$stored_helper.description 26 2}
|
||||
|
||||
[message]
|
||||
role=Helper
|
||||
|
|
|
|||
|
|
@ -68,7 +68,7 @@
|
|||
[/unit]
|
||||
|
||||
# Flip the Aiglondur dummy around so he's facing the others.
|
||||
{MODIFY_UNIT description=Aiglondur facing sw}
|
||||
{MODIFY_UNIT id=Aiglondur facing sw}
|
||||
[redraw]
|
||||
side=1
|
||||
[/redraw]
|
||||
|
|
|
|||
|
|
@ -116,7 +116,7 @@
|
|||
|
||||
# Karrag's throne guards
|
||||
|
||||
{MODIFY_UNIT description="Karrag" facing sw}
|
||||
{MODIFY_UNIT id="Karrag" facing sw}
|
||||
|
||||
[unit]
|
||||
type=Dwarvish Masked Steelclad
|
||||
|
|
@ -269,7 +269,7 @@
|
|||
message=_"And you have sealed your doom. Hundreds of dirtgrubbers have already died to weave a web of blood around the Hammer and the soul of the dwarves. You and your new friends will be the the last sacrifices I require to bind the entire dwarvish race to my purpose. TAKE THEM!"
|
||||
[/message]
|
||||
|
||||
{MODIFY_UNIT description=Dulcatulos side 1}
|
||||
{MODIFY_UNIT id=Dulcatulos side 1}
|
||||
|
||||
[objectives]
|
||||
side="1"
|
||||
|
|
|
|||
|
|
@ -176,7 +176,7 @@
|
|||
variable=wesfolk_leader_store
|
||||
[/unstore_unit]
|
||||
|
||||
{FULL_HEAL (description=Wesfolk Leader)}
|
||||
{FULL_HEAL (id=Wesfolk Leader)}
|
||||
|
||||
# wmllint: recognize Wesfolk Leader
|
||||
|
||||
|
|
@ -325,7 +325,7 @@
|
|||
{MAKE_HERO (Lady Outlaw)}
|
||||
# wmliint: recognize Lady Outlaw
|
||||
|
||||
{FULL_HEAL (description=Lady Outlaw)}
|
||||
{FULL_HEAL (id=Lady Outlaw)}
|
||||
|
||||
[set_variable]
|
||||
name=have_lady
|
||||
|
|
@ -362,7 +362,7 @@
|
|||
{MAKE_HERO (Lady Outlaw)}
|
||||
# wmllint: recognize Lady Outlaw
|
||||
|
||||
{FULL_HEAL (description=Lady Outlaw)}
|
||||
{FULL_HEAL (id=Lady Outlaw)}
|
||||
|
||||
[store_unit]
|
||||
variable=lady_store
|
||||
|
|
|
|||
|
|
@ -174,7 +174,7 @@
|
|||
variable=lady_store
|
||||
[/unstore_unit]
|
||||
|
||||
{FULL_HEAL description="Lady Outlaw"}
|
||||
{FULL_HEAL id="Lady Outlaw"}
|
||||
# wmllint: recognize Lady Outlaw
|
||||
|
||||
[if]
|
||||
|
|
@ -321,7 +321,7 @@
|
|||
variable=lady_store
|
||||
[/unstore_unit]
|
||||
|
||||
{FULL_HEAL description="Lady Jessica"}
|
||||
{FULL_HEAL id="Lady Jessica"}
|
||||
# wmllint: recognize Lady Jessica
|
||||
|
||||
{CLEAR_VARIABLE lady_store}
|
||||
|
|
|
|||
|
|
@ -321,7 +321,7 @@
|
|||
[/variable]
|
||||
|
||||
[then]
|
||||
{MODIFY_UNIT (description=Urza Afalas) moves 0}
|
||||
{MODIFY_UNIT (id=Urza Afalas) moves 0}
|
||||
[/then]
|
||||
[/if]
|
||||
[/event]
|
||||
|
|
|
|||
|
|
@ -159,7 +159,7 @@
|
|||
x,y=16,23
|
||||
[/recall]
|
||||
|
||||
{MODIFY_UNIT (description=Sir Gerrick) canrecruit yes}
|
||||
{MODIFY_UNIT (id=Sir Gerrick) canrecruit yes}
|
||||
|
||||
[set_recruit]
|
||||
side=1
|
||||
|
|
|
|||
|
|
@ -720,7 +720,7 @@
|
|||
message= _ "Do we have any choice? Our food is running out, and it will be winter soon..."
|
||||
[/message]
|
||||
|
||||
{MOVE_UNIT (description=Urza Afalas) 24 46}
|
||||
{MOVE_UNIT (id=Urza Afalas) 24 46}
|
||||
|
||||
# reveal the first bit of path
|
||||
|
||||
|
|
@ -853,7 +853,7 @@
|
|||
id=Urza Afalas
|
||||
[/filter]
|
||||
|
||||
{MOVE_UNIT (description=Urza Afalas) 9 25}
|
||||
{MOVE_UNIT (id=Urza Afalas) 9 25}
|
||||
[message]
|
||||
speaker=Urza Afalas
|
||||
message= _ "Hurry! There are bandits in these woods!"
|
||||
|
|
@ -875,7 +875,7 @@
|
|||
id=Deoran
|
||||
[/filter]
|
||||
|
||||
{MOVE_UNIT (description=Urza Afalas) 10 18}
|
||||
{MOVE_UNIT (id=Urza Afalas) 10 18}
|
||||
[message]
|
||||
speaker=Urza Afalas
|
||||
message= _ "The river is just ahead!"
|
||||
|
|
|
|||
|
|
@ -328,7 +328,7 @@
|
|||
|
||||
{CLEAR_VARIABLE deoran_store}
|
||||
|
||||
{FULL_HEAL description=Deoran}
|
||||
{FULL_HEAL id=Deoran}
|
||||
|
||||
[message]
|
||||
speaker=Ethiliel
|
||||
|
|
|
|||
|
|
@ -182,14 +182,14 @@
|
|||
message= _ "Make no promises you know you cannot keep. Organize the defense of Westin, and if you survive, remember those who fell here."
|
||||
[/message]
|
||||
|
||||
{MOVE_UNIT description=Deoran 18 5}
|
||||
{MOVE_UNIT id=Deoran 18 5}
|
||||
|
||||
[message]
|
||||
speaker=Deoran
|
||||
message= _ "Your name will be sounded in the roll of heroes, and you will be avenged. Thank you, my friend."
|
||||
[/message]
|
||||
|
||||
{MOVE_UNIT description=Deoran 17 1}
|
||||
{MOVE_UNIT id=Deoran 17 1}
|
||||
|
||||
[store_unit]
|
||||
[filter]
|
||||
|
|
@ -200,7 +200,7 @@
|
|||
variable=stored_Deoran
|
||||
[/store_unit]
|
||||
|
||||
{MODIFY_UNIT (description=Sir Gerrick) canrecruit yes}
|
||||
{MODIFY_UNIT (id=Sir Gerrick) canrecruit yes}
|
||||
|
||||
[message]
|
||||
speaker=Lt. Illan
|
||||
|
|
|
|||
|
|
@ -207,7 +207,7 @@
|
|||
|
||||
{CLEAR_VARIABLE deoran_store}
|
||||
|
||||
{FULL_HEAL description=Deoran}
|
||||
{FULL_HEAL id=Deoran}
|
||||
|
||||
{GENERIC_UNIT 2 Trapper 6 43}
|
||||
[/event]
|
||||
|
|
|
|||
|
|
@ -2021,33 +2021,33 @@
|
|||
[/message]
|
||||
|
||||
{UNIT_ (Walking Corpse) (troll_wc_1) ("") 4 39 22}
|
||||
{INVOKE_TROLL_VARIATION description=troll_wc_1}
|
||||
{INVOKE_TROLL_VARIATION id=troll_wc_1}
|
||||
|
||||
{UNIT_ (Walking Corpse) (troll_wc_2) ("") 4 40 28}
|
||||
{INVOKE_TROLL_VARIATION description=troll_wc_2}
|
||||
{INVOKE_TROLL_VARIATION id=troll_wc_2}
|
||||
|
||||
{UNIT_ (Walking Corpse) (troll_wc_3) ("") 4 36 23}
|
||||
{INVOKE_TROLL_VARIATION description=troll_wc_3}
|
||||
{INVOKE_TROLL_VARIATION id=troll_wc_3}
|
||||
|
||||
{UNIT_ (Walking Corpse) (troll_wc_4) ("") 4 37 29}
|
||||
{INVOKE_TROLL_VARIATION description=troll_wc_4}
|
||||
{INVOKE_TROLL_VARIATION id=troll_wc_4}
|
||||
|
||||
#ifdef NORMAL
|
||||
|
||||
{UNIT_ (Walking Corpse) (troll_wc_5) ("") 4 33 25}
|
||||
{INVOKE_TROLL_VARIATION description=troll_wc_5}
|
||||
{INVOKE_TROLL_VARIATION id=troll_wc_5}
|
||||
|
||||
{UNIT_ (Walking Corpse) (troll_wc_6) ("") 4 34 28}
|
||||
{INVOKE_TROLL_VARIATION description=troll_wc_6}
|
||||
{INVOKE_TROLL_VARIATION id=troll_wc_6}
|
||||
|
||||
#endif
|
||||
|
||||
#ifdef HARD
|
||||
{UNIT_ (Walking Corpse) (troll_wc_5) ("") 4 42 21}
|
||||
{INVOKE_TROLL_VARIATION description=troll_wc_5}
|
||||
{INVOKE_TROLL_VARIATION id=troll_wc_5}
|
||||
|
||||
{UNIT_ (Walking Corpse) (troll_wc_6) ("") 4 43 26}
|
||||
{INVOKE_TROLL_VARIATION description=troll_wc_6}
|
||||
{INVOKE_TROLL_VARIATION id=troll_wc_6}
|
||||
|
||||
#endif
|
||||
|
||||
|
|
@ -2340,7 +2340,7 @@
|
|||
[/filter]
|
||||
|
||||
{UNIT_ Soulless cryptguard ( _ "Crypt Guardian") 4 7 25}
|
||||
{INVOKE_TROLL_VARIATION description=cryptguard}
|
||||
{INVOKE_TROLL_VARIATION id=cryptguard}
|
||||
|
||||
[message]
|
||||
speaker=unit
|
||||
|
|
|
|||
|
|
@ -666,7 +666,7 @@
|
|||
|
||||
# put hero icon on troll/dwarf ally
|
||||
|
||||
{UNIT_OVERLAY description=$ally_name misc/hero-icon.png}
|
||||
{UNIT_OVERLAY id=$ally_name misc/hero-icon.png}
|
||||
|
||||
# initialize starting variables
|
||||
|
||||
|
|
@ -4222,7 +4222,7 @@
|
|||
|
||||
# remove hero icon from troll/dwarf ally
|
||||
|
||||
{REMOVE_UNIT_OVERLAY description=$ally_name misc/hero-icon.png}
|
||||
{REMOVE_UNIT_OVERLAY id=$ally_name misc/hero-icon.png}
|
||||
[/event]
|
||||
|
||||
# Event 14.5 Player discovers human's chest of gold at cave mouth
|
||||
|
|
|
|||
|
|
@ -218,6 +218,6 @@ multiply=-1
|
|||
type={TYPE}
|
||||
[/filter]
|
||||
|
||||
{MODIFY_UNIT description={NAME} profile {PROFILE}}
|
||||
{MODIFY_UNIT id={NAME} profile {PROFILE}}
|
||||
[/event]
|
||||
#enddef
|
||||
|
|
|
|||
|
|
@ -101,8 +101,8 @@
|
|||
# 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 id=James side side_of_James}
|
||||
#! {MODIFY_UNIT race=orc side $side_of_James}
|
||||
#! {STORE_UNIT_VAR (id=James) side side_of_James}
|
||||
#! {MODIFY_UNIT (race=orc) side $side_of_James}
|
||||
[store_unit]
|
||||
[filter]
|
||||
{FILTER}
|
||||
|
|
|
|||
|
|
@ -2141,11 +2141,15 @@ if __name__ == '__main__':
|
|||
elif verbose > 1 and "unit]" in line and not within(("scenario","multiplayer","test","tutorial")):
|
||||
print "%s, line %d: [unit] may need conversion to [unit_type]" % \
|
||||
(filename, lineno)
|
||||
# SingleUnitWML or Standard Unit Filter or SideWML
|
||||
# Handle SingleUnitWML or Standard Unit Filter or SideWML
|
||||
# Also, hen macro calls have description= in them, the arg is
|
||||
# a SUF being passed in.
|
||||
if (under("unit") and not "units" in filename) or \
|
||||
standard_unit_filter() or \
|
||||
under("side"):
|
||||
under("side") or \
|
||||
re.search("{[A-Z]+.*description=.*}", line):
|
||||
transformed = re.sub(r"\bdescription\s*=", "id=", line)
|
||||
#
|
||||
# Report the changes
|
||||
if verbose > 0 and transformed != line:
|
||||
msg = "%s, line %d: %s -> %s" % \
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue