Fix up WML variable references...
...to track the SingleUnitWML attribute name changes. These cannot be lifted mechanically, but wmllint warns about possible problems.
This commit is contained in:
Eric S. Raymond
parent
e4c1da3ec6
commit
4ec05d32b7
33 changed files with 139 additions and 133 deletions
|
|
@ -195,8 +195,8 @@
|
|||
name=side turn
|
||||
first_time_only=yes
|
||||
{MODIFY_ONE_UNIT type=Ghost side 4}
|
||||
{MODIFY_ONE_UNIT side=4 description (Tortured Soul)}
|
||||
{MODIFY_ONE_UNIT side=4 user_description (_ "Tortured Soul")}
|
||||
{MODIFY_ONE_UNIT side=4 id (Tortured Soul)}
|
||||
{MODIFY_ONE_UNIT side=4 name (_ "Tortured Soul")}
|
||||
{MODIFY_ONE_UNIT side=4 canrecruit yes}
|
||||
{VARIABLE ghost_was_freed yes}
|
||||
{DIALOGUE_AHIW_GHOSTFREE}
|
||||
|
|
|
|||
|
|
@ -241,7 +241,7 @@
|
|||
role=Outlaw_Advisor
|
||||
[/filter]
|
||||
[/store_unit]
|
||||
{VARIABLE outlaw_name $outlaw_advisor_store.user_description}
|
||||
{VARIABLE outlaw_name $outlaw_advisor_store.name}
|
||||
{CLEAR_VARIABLE outlaw_advisor_store}
|
||||
[/then]
|
||||
[/if]
|
||||
|
|
|
|||
|
|
@ -332,7 +332,7 @@
|
|||
[then]
|
||||
[message]
|
||||
speaker=Wolmas
|
||||
message= _ "What's happening here? Why are you running like mad, $unit.user_description|?"
|
||||
message= _ "What's happening here? Why are you running like mad, $unit.name|?"
|
||||
[/message]
|
||||
[message]
|
||||
speaker=unit
|
||||
|
|
|
|||
|
|
@ -416,12 +416,12 @@
|
|||
# Arch Mage,Great Mage
|
||||
[if]
|
||||
[variable]
|
||||
name=second_unit.description
|
||||
name=second_unit.id
|
||||
equals=Krash
|
||||
[/variable]
|
||||
[or]
|
||||
[variable]
|
||||
name=second_unit.description
|
||||
name=second_unit.id
|
||||
equals=Camerlin
|
||||
[/variable]
|
||||
[/or]
|
||||
|
|
@ -435,12 +435,12 @@
|
|||
# White Mage,Mage of Light
|
||||
[if]
|
||||
[variable]
|
||||
name=second_unit.description
|
||||
name=second_unit.id
|
||||
equals=Father Marcus
|
||||
[/variable]
|
||||
[or]
|
||||
[variable]
|
||||
name=second_unit.description
|
||||
name=second_unit.id
|
||||
equals=Sister Theta
|
||||
[/variable]
|
||||
[/or]
|
||||
|
|
|
|||
|
|
@ -134,7 +134,7 @@
|
|||
# Check who picked the rod
|
||||
[if]
|
||||
[variable]
|
||||
name=unit.description
|
||||
name=unit.id
|
||||
equals=Abhai
|
||||
[/variable]
|
||||
# If it's Abhai hand the rod to Tallin
|
||||
|
|
@ -159,7 +159,7 @@
|
|||
duration=forever
|
||||
description= _ "This is a magical staff of tremendous power and unknown origin. Although the full extent of its power has not been fathomed, there are a few features about it that will be obvious to any master of lore. The wielder of this staff gains a dramatic increase in strength, speed and intelligence, and is granted the ability to fire devastating lightning bolts at at his opponents. Only a person who is good at heart and who is willing to sacrifice his life on the path of justice can wield this staff."
|
||||
[filter]
|
||||
id=$unit.description
|
||||
id=$unit.id
|
||||
[/filter]
|
||||
# New 16-4 fire attack with cool lightning animation
|
||||
[effect]
|
||||
|
|
@ -229,7 +229,7 @@
|
|||
# And do all the talk
|
||||
[if]
|
||||
[variable]
|
||||
name=unit.description
|
||||
name=unit.id
|
||||
equals=Abhai
|
||||
[/variable]
|
||||
[then]
|
||||
|
|
|
|||
|
|
@ -121,7 +121,7 @@
|
|||
x=15
|
||||
y=3
|
||||
id=Betrayed Friend
|
||||
name=$betrayed_friend.user_description
|
||||
name=$betrayed_friend.name
|
||||
canrecruit=yes
|
||||
experience=$betrayed_friend.experience
|
||||
hitpoints=$betrayed_friend.hitpoints
|
||||
|
|
@ -282,7 +282,7 @@
|
|||
[message]
|
||||
speaker=Tallin
|
||||
image=portraits/Tallin-Evil.jpg
|
||||
message= _ " $betrayed_friend.user_description, I..."
|
||||
message= _ " $betrayed_friend.name, I..."
|
||||
[/message]
|
||||
|
||||
[message]
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@
|
|||
x=11
|
||||
y=10
|
||||
id=Betrayed Friend
|
||||
name=$betrayed_friend.user_description
|
||||
name=$betrayed_friend.name
|
||||
canrecruit=yes
|
||||
experience=$betrayed_friend.experience
|
||||
hitpoints=$betrayed_friend.hitpoints
|
||||
|
|
@ -129,12 +129,12 @@
|
|||
|
||||
[message]
|
||||
speaker=Tallin
|
||||
message= _ " $betrayed_friend.user_description, you?"
|
||||
message= _ " $betrayed_friend.name, you?"
|
||||
[/message]
|
||||
|
||||
[message]
|
||||
speaker=Betrayed Friend
|
||||
message= _ "Yes Tallin - it is I."
|
||||
message= _ "Yes, Tallin - it is I."
|
||||
[/message]
|
||||
|
||||
[message]
|
||||
|
|
|
|||
|
|
@ -381,7 +381,7 @@
|
|||
[/move_unit_fake]
|
||||
{RANDOM_TRAIT_UNIT (
|
||||
id=Kawn # wmllint: ignore
|
||||
user_description= _ "Kawn"
|
||||
name= _ "Kawn"
|
||||
type=Gryphon Rider
|
||||
x,y=5,28
|
||||
side=1)}
|
||||
|
|
|
|||
|
|
@ -208,7 +208,7 @@
|
|||
{RANDOM_TRAIT_UNIT (
|
||||
type=Spearman
|
||||
id=Rolin # wmllint: ignore
|
||||
user_description= _ "Rolin"
|
||||
name= _ "Rolin"
|
||||
x,y=$x1,$y1
|
||||
side=1
|
||||
upkeep=loyal)}
|
||||
|
|
@ -254,7 +254,7 @@
|
|||
{RANDOM_TRAIT_UNIT (
|
||||
type=Lieutenant
|
||||
id=Hadlin # wmllint: ignore
|
||||
user_description= _ "Hadlin"
|
||||
name= _ "Hadlin"
|
||||
x,y=10,63
|
||||
side=1
|
||||
upkeep=loyal)}
|
||||
|
|
|
|||
|
|
@ -260,7 +260,7 @@
|
|||
|
||||
[message]
|
||||
speaker="Kapou'e"
|
||||
message= _ "Don't be afraid, $name.user_description. The trolls have been our allies in the past--maybe they will help us. And what true orc has ever feared dwarvish stinky-midgets? Hurry up, we must leave as soon as possible."
|
||||
message= _ "Don't be afraid, $name.name. The trolls have been our allies in the past--maybe they will help us. And what true orc has ever feared dwarvish stinky-midgets? Hurry up, we must leave as soon as possible."
|
||||
[/message]
|
||||
|
||||
[endlevel]
|
||||
|
|
|
|||
|
|
@ -156,7 +156,7 @@
|
|||
|
||||
[message]
|
||||
speaker="Kapou'e"
|
||||
message= _ " $stored_helper.user_description|!"
|
||||
message= _ " $stored_helper.name|!"
|
||||
[/message]
|
||||
|
||||
[message]
|
||||
|
|
@ -208,7 +208,7 @@
|
|||
find_vacant=yes
|
||||
[/unstore_unit]
|
||||
|
||||
{MOVE_UNIT id=$stored_helper.description 26 2}
|
||||
{MOVE_UNIT id=$stored_helper.id 26 2}
|
||||
|
||||
[message]
|
||||
role=Helper
|
||||
|
|
|
|||
|
|
@ -316,7 +316,7 @@
|
|||
[filter]
|
||||
role=Scout
|
||||
[/filter]
|
||||
variable=name
|
||||
variable=scout
|
||||
[/store_unit]
|
||||
|
||||
[message]
|
||||
|
|
@ -335,7 +335,7 @@
|
|||
[/message]
|
||||
[message]
|
||||
speaker="Kapou'e"
|
||||
message= _ "Hmmm, $name.user_description go find out what they are up to."
|
||||
message= _ "Hmmm, $scout.name go find out what they are up to."
|
||||
[/message]
|
||||
|
||||
[message]
|
||||
|
|
@ -496,7 +496,7 @@
|
|||
|
||||
[message]
|
||||
speaker="Kapou'e"
|
||||
message= _ "So, what news do you bring $name.user_description?"
|
||||
message= _ "So, what news do you bring $scout.name?"
|
||||
[/message]
|
||||
|
||||
[message]
|
||||
|
|
|
|||
|
|
@ -166,7 +166,7 @@
|
|||
side=2
|
||||
[/filter]
|
||||
|
||||
{MODIFY_UNIT x,y=$x1,$y1 user_description _"Masked Dwarf"}
|
||||
{MODIFY_UNIT x,y=$x1,$y1 name _"Masked Dwarf"}
|
||||
[/event]
|
||||
|
||||
[event]
|
||||
|
|
|
|||
|
|
@ -312,8 +312,8 @@
|
|||
[/filter]
|
||||
[/store_unit]
|
||||
|
||||
{VARIABLE wesfolk_leader_store.description (Lady Outlaw)}
|
||||
{VARIABLE wesfolk_leader_store.user_description ( _ "Lady Outlaw")}
|
||||
{VARIABLE wesfolk_leader_store.id (Lady Outlaw)}
|
||||
{VARIABLE wesfolk_leader_store.name ( _ "Lady Outlaw")}
|
||||
{VARIABLE wesfolk_leader_store.canrecruit no}
|
||||
{VARIABLE wesfolk_leader_store.side 1}
|
||||
|
||||
|
|
@ -349,8 +349,8 @@
|
|||
[/filter]
|
||||
[/store_unit]
|
||||
|
||||
{VARIABLE wesfolk_leader_store.description (Lady Outlaw)}
|
||||
{VARIABLE wesfolk_leader_store.user_description ( _ "Lady Outlaw")}
|
||||
{VARIABLE wesfolk_leader_store.id (Lady Outlaw)}
|
||||
{VARIABLE wesfolk_leader_store.name ( _ "Lady Outlaw")}
|
||||
{VARIABLE wesfolk_leader_store.canrecruit no}
|
||||
{VARIABLE wesfolk_leader_store.side 1}
|
||||
|
||||
|
|
|
|||
|
|
@ -312,8 +312,8 @@
|
|||
[/then]
|
||||
[/if]
|
||||
|
||||
{VARIABLE lady_store.description (Lady Jessica)}
|
||||
{VARIABLE lady_store.user_description (_ "Lady Jessica")}
|
||||
{VARIABLE lady_store.id (Lady Jessica)}
|
||||
{VARIABLE lady_store.name (_ "Lady Jessica")}
|
||||
|
||||
[unstore_unit]
|
||||
variable=lady_store
|
||||
|
|
|
|||
|
|
@ -177,13 +177,13 @@
|
|||
|
||||
[unit]
|
||||
type=$haldric_store.type
|
||||
id=$haldric_store.description
|
||||
id=$haldric_store.id
|
||||
side=1
|
||||
x=$haldric_store.x
|
||||
y=$haldric_store.y
|
||||
canrecruit=yes
|
||||
experience=$haldric_store.experience
|
||||
name=$haldric_store.user_description
|
||||
name=$haldric_store.name
|
||||
unrenamable=yes
|
||||
[/unit]
|
||||
|
||||
|
|
|
|||
|
|
@ -196,7 +196,7 @@
|
|||
[/if]
|
||||
{NEXT i}
|
||||
[recall]
|
||||
id=$swordsman[$best_unit].description
|
||||
id=$swordsman[$best_unit].id
|
||||
[/recall]
|
||||
{CLEAR_VARIABLE swordsman}
|
||||
|
||||
|
|
@ -251,7 +251,7 @@
|
|||
[/if]
|
||||
{NEXT i}
|
||||
[recall]
|
||||
id=$archer[$best_unit].description
|
||||
id=$archer[$best_unit].id
|
||||
[/recall]
|
||||
{CLEAR_VARIABLE archer}
|
||||
|
||||
|
|
|
|||
|
|
@ -723,7 +723,7 @@
|
|||
[/message]
|
||||
[if]
|
||||
[variable]
|
||||
name=unit.description
|
||||
name=unit.id
|
||||
equals="Arne"
|
||||
[/variable]
|
||||
[then]
|
||||
|
|
|
|||
|
|
@ -379,7 +379,7 @@
|
|||
[unit]
|
||||
side={SIDE}
|
||||
type=$enemy[$i].type
|
||||
name=$enemy[$i].user_description
|
||||
name=$enemy[$i].name
|
||||
facing=$enemy[$i].facing
|
||||
gender=$enemy[$i].gender
|
||||
x=$enemy[$i].x
|
||||
|
|
@ -1476,7 +1476,7 @@
|
|||
[else]
|
||||
{CHECK_SPEAKER}
|
||||
[message]
|
||||
speaker=$speaking_unit.description
|
||||
speaker=$speaking_unit.id
|
||||
message= _ "The undead are defeated, but we lost her in the fight as well. Darn, if only we could have saved her."
|
||||
[/message]
|
||||
{CLEAR_VARIABLE speaking_unit}
|
||||
|
|
@ -1583,7 +1583,7 @@
|
|||
|
||||
{CHECK_SPEAKER}
|
||||
[message]
|
||||
speaker=$speaking_unit.description
|
||||
speaker=$speaking_unit.id
|
||||
message= _ "Searching his castle, we found a chest filled with gold."
|
||||
[/message]
|
||||
{CLEAR_VARIABLE speaking_unit}
|
||||
|
|
@ -1710,7 +1710,7 @@
|
|||
|
||||
{CHECK_EXPLORER}
|
||||
[message]
|
||||
speaker=$explorer.description
|
||||
speaker=$explorer.id
|
||||
message= _ "Bandits. If they get in our way, they're going to be sorry."
|
||||
[/message]
|
||||
|
||||
|
|
@ -1720,7 +1720,7 @@
|
|||
[/message]
|
||||
|
||||
[message]
|
||||
speaker=$explorer.description
|
||||
speaker=$explorer.id
|
||||
message= _ "Did you see that? I think I just saw someone disappear behind that dune over there. I think we're being watched. I suspect there are more of these bandits lurking in these dunes than we originally thought."
|
||||
[/message]
|
||||
{CLEAR_VARIABLE explorer}
|
||||
|
|
@ -1815,7 +1815,7 @@
|
|||
|
||||
{CHECK_EXPLORER}
|
||||
[message]
|
||||
speaker=$explorer.description
|
||||
speaker=$explorer.id
|
||||
message= _ "Dang. I was sure I saw an oasis here. Must have been a mirage. I've been out in the sand for too long."
|
||||
[/message]
|
||||
{CLEAR_VARIABLE explorer}
|
||||
|
|
@ -1839,7 +1839,7 @@
|
|||
|
||||
{CHECK_EXPLORER}
|
||||
[message]
|
||||
speaker=$explorer.description
|
||||
speaker=$explorer.id
|
||||
message= _ "So, the outlaws have made a base around Pinnacle Rock. It's a good location, but we will drive them from it all the same."
|
||||
[/message]
|
||||
{CLEAR_VARIABLE explorer}
|
||||
|
|
|
|||
|
|
@ -645,7 +645,7 @@
|
|||
[side]
|
||||
side=3
|
||||
id=Ystara
|
||||
user_description= _ "Ystara"
|
||||
name= _ "Ystara"
|
||||
type=Spectre
|
||||
canrecruit=yes
|
||||
controller=ai
|
||||
|
|
@ -1039,7 +1039,7 @@
|
|||
[unit]
|
||||
type=Orcish Leader
|
||||
id=Ganthos
|
||||
user_description= _ "Ganthos"
|
||||
name= _ "Ganthos"
|
||||
upkeep=free
|
||||
canrecruit=yes
|
||||
side=4
|
||||
|
|
@ -1050,7 +1050,7 @@
|
|||
[unit]
|
||||
type=Orcish Ruler
|
||||
id=Ganthos
|
||||
user_description= _ "Ganthos"
|
||||
name= _ "Ganthos"
|
||||
upkeep=free
|
||||
canrecruit=yes
|
||||
side=4
|
||||
|
|
|
|||
|
|
@ -1001,7 +1001,7 @@
|
|||
|
||||
{CHECK_SPEAKER}
|
||||
[message]
|
||||
speaker=$speaking_unit.description
|
||||
speaker=$speaking_unit.id
|
||||
message= _ "Wait a minute. He was wearing a silver ring on one of his fingers. I think the ring might be magical. Maybe that's why he was moving so fast."
|
||||
[/message]
|
||||
{CLEAR_VARIABLE speaking_unit}
|
||||
|
|
@ -1166,7 +1166,7 @@
|
|||
|
||||
{CHECK_EXPLORER}
|
||||
[message]
|
||||
speaker=$explorer.description
|
||||
speaker=$explorer.id
|
||||
message= _ "Ugh! These tunnels are pitch black! It's as bad as fighting in a moonless night, and it stinks of orc filth. I can hardly think of a place I would less like to go into."
|
||||
[/message]
|
||||
{CLEAR_VARIABLE explorer}
|
||||
|
|
@ -1271,7 +1271,7 @@
|
|||
|
||||
{CHECK_EXPLORER}
|
||||
[message]
|
||||
speaker=$explorer.description
|
||||
speaker=$explorer.id
|
||||
message= _ "Looks like he's been squirreling away his stolen loot in this cave. Not that he had much. Must be hard times."
|
||||
[/message]
|
||||
{CLEAR_VARIABLE explorer}
|
||||
|
|
@ -1409,7 +1409,7 @@
|
|||
|
||||
{CHECK_EXPLORER}
|
||||
[message]
|
||||
speaker=$explorer.description
|
||||
speaker=$explorer.id
|
||||
message= _ "This is the end of the line. The water is too deep for me to continue any further. I'm freezing cold, wet, and I can't see a thing. I'm not exactly sure what I'm doing up here. Some strange influence made me want to come up here, but I don't know what made me think it could be of any good."
|
||||
[/message]
|
||||
{CLEAR_VARIABLE explorer}
|
||||
|
|
@ -2093,7 +2093,7 @@
|
|||
[/redraw]
|
||||
|
||||
[message]
|
||||
speaker=$unit_var.description
|
||||
speaker=$unit_var.id
|
||||
message= _ "Huh? What happened? Must have been another stupid elf trick! Well it won't stop me from killing you!"
|
||||
[/message]
|
||||
[/then]
|
||||
|
|
@ -2118,7 +2118,7 @@
|
|||
[/redraw]
|
||||
|
||||
[message]
|
||||
speaker=$unit_var.description
|
||||
speaker=$unit_var.id
|
||||
message= _ "What happened? Where am I?"
|
||||
[/message]
|
||||
|
||||
|
|
@ -2128,7 +2128,7 @@
|
|||
[/message]
|
||||
|
||||
[message]
|
||||
speaker=$unit_var.description
|
||||
speaker=$unit_var.id
|
||||
message= _ "I don't know, someone just knocked me out. I didn't get a good look at them."
|
||||
[/message]
|
||||
[/then]
|
||||
|
|
@ -2142,7 +2142,7 @@
|
|||
|
||||
[set_variable]
|
||||
name=temp
|
||||
value=$unit_var.description
|
||||
value=$unit_var.id
|
||||
[/set_variable]
|
||||
|
||||
[if]
|
||||
|
|
|
|||
|
|
@ -1358,7 +1358,7 @@
|
|||
|
||||
{CHECK_EXPLORER}
|
||||
[message]
|
||||
speaker=$explorer.description
|
||||
speaker=$explorer.id
|
||||
message= _ "Woah."
|
||||
[/message]
|
||||
|
||||
|
|
@ -1492,7 +1492,7 @@
|
|||
#set ally variable (1=dwarf 2=troll) and change elvish allegiance
|
||||
|
||||
[message]
|
||||
speaker=$explorer.description
|
||||
speaker=$explorer.id
|
||||
message= _ "But they both look evenly matched. Who should we ally with?"
|
||||
|
||||
[option]
|
||||
|
|
@ -1587,7 +1587,7 @@
|
|||
[/music]
|
||||
|
||||
[message]
|
||||
speaker=$explorer.description
|
||||
speaker=$explorer.id
|
||||
message= _ "There seems to be an abandoned Dwarvish fortress right in front of us. If we can fight our way to the keep, we should be able to start rallying our warriors to help in the battle."
|
||||
[/message]
|
||||
{CLEAR_VARIABLE explorer}
|
||||
|
|
@ -1909,12 +1909,12 @@
|
|||
[/store_unit]
|
||||
|
||||
[set_variable]
|
||||
name=unitstats.description
|
||||
name=unitstats.id
|
||||
value=Dwarf Skirmisher
|
||||
[/set_variable]
|
||||
|
||||
[set_variable]
|
||||
name=unitstats.user_description
|
||||
name=unitstats.name
|
||||
value=Dwarf Skirmisher
|
||||
[/set_variable]
|
||||
|
||||
|
|
@ -1934,12 +1934,12 @@
|
|||
[/store_unit]
|
||||
|
||||
[set_variable]
|
||||
name=unitstats.description
|
||||
name=unitstats.id
|
||||
value=Troll Skirmisher
|
||||
[/set_variable]
|
||||
|
||||
[set_variable]
|
||||
name=unitstats.user_description
|
||||
name=unitstats.name
|
||||
value=Troll Skirmisher
|
||||
[/set_variable]
|
||||
|
||||
|
|
@ -4147,7 +4147,7 @@
|
|||
[/redraw]
|
||||
|
||||
[message]
|
||||
speaker=$unit_var.description
|
||||
speaker=$unit_var.id
|
||||
message= _ "Huh? What happened? No time to think, must keep fighting!"
|
||||
[/message]
|
||||
[/then]
|
||||
|
|
@ -4172,7 +4172,7 @@
|
|||
[/redraw]
|
||||
|
||||
[message]
|
||||
speaker=$unit_var.description
|
||||
speaker=$unit_var.id
|
||||
message= _ "Huh? What happened?"
|
||||
[/message]
|
||||
|
||||
|
|
@ -4182,7 +4182,7 @@
|
|||
[/message]
|
||||
|
||||
[message]
|
||||
speaker=$unit_var.description
|
||||
speaker=$unit_var.id
|
||||
message= _ "No, someone grabbed me and knocked me out. I have no idea who it was."
|
||||
[/message]
|
||||
[/then]
|
||||
|
|
|
|||
|
|
@ -916,7 +916,7 @@
|
|||
|
||||
{CHECK_EXPLORER}
|
||||
[message]
|
||||
speaker=$explorer.description
|
||||
speaker=$explorer.id
|
||||
message= _ "If we move fast we might be able to save the other prisoner before he gets killed too."
|
||||
[/message]
|
||||
{CLEAR_VARIABLE explorer}
|
||||
|
|
@ -1049,7 +1049,7 @@
|
|||
numerical_equals=1
|
||||
[/variable]
|
||||
[variable]
|
||||
name=unit_on_lava.description
|
||||
name=unit_on_lava.id
|
||||
equals=Kaleh
|
||||
[/variable]
|
||||
[then]
|
||||
|
|
@ -1084,7 +1084,7 @@
|
|||
[/variable]
|
||||
[then]
|
||||
[kill]
|
||||
id=$unit_on_lava.description
|
||||
id=$unit_on_lava.id
|
||||
fire_event=yes
|
||||
animate=yes
|
||||
[/kill]
|
||||
|
|
@ -1152,7 +1152,7 @@
|
|||
[/variable]
|
||||
|
||||
[variable]
|
||||
name=unitstats.description
|
||||
name=unitstats.id
|
||||
equals=Kaleh
|
||||
[/variable]
|
||||
|
||||
|
|
@ -1263,12 +1263,12 @@
|
|||
|
||||
{CHECK_EXPLORER}
|
||||
[message]
|
||||
speaker=$explorer.description
|
||||
speaker=$explorer.id
|
||||
message= _ "Woah. This place is hot."
|
||||
[/message]
|
||||
|
||||
[message]
|
||||
speaker=$explorer.description
|
||||
speaker=$explorer.id
|
||||
message= _ "This cavern is so hot it's stifling; I can already feel my armor heating up. If we tarry here too long we'll roast alive. I don't even want to think about what would happen if I tried to walk across the lava. On the other hand, the lava does light up the cavern nicely. I'm just thankful the trolls constructed a bridge across the lava."
|
||||
[/message]
|
||||
|
||||
|
|
@ -1325,7 +1325,7 @@
|
|||
[/kill]
|
||||
|
||||
[message]
|
||||
speaker=speaker=$explorer.description
|
||||
speaker=speaker=$explorer.id
|
||||
message= _ "Uh, I take that back. Still, the trolls don't seem to be advancing. I guess they think the lava can hold us back. Well, we'll show them. It will take more than a little heat to stop us!"
|
||||
[/message]
|
||||
{CLEAR_VARIABLE explorer}
|
||||
|
|
@ -1371,7 +1371,7 @@
|
|||
|
||||
{CHECK_EXPLORER}
|
||||
[message]
|
||||
speaker=$explorer.description
|
||||
speaker=$explorer.id
|
||||
message= _ "There is a small pool of water here. It must come from some spring deep underground. The water is cool and refreshing. Let me bathe in it a while and recover from the heat of that blasted cavern."
|
||||
[/message]
|
||||
{CLEAR_VARIABLE explorer}
|
||||
|
|
@ -1658,7 +1658,7 @@
|
|||
|
||||
{CHECK_EXPLORER}
|
||||
[message]
|
||||
speaker=$explorer.description
|
||||
speaker=$explorer.id
|
||||
message= _ "Look, more fire guardians!"
|
||||
[/message]
|
||||
{CLEAR_VARIABLE explorer}
|
||||
|
|
@ -1709,7 +1709,7 @@
|
|||
|
||||
{CHECK_EXPLORER}
|
||||
[message]
|
||||
speaker=$explorer.description
|
||||
speaker=$explorer.id
|
||||
message= _ "Oh great, even more fire guardians. When I get through this inferno I'm going to kill those trolls."
|
||||
[/message]
|
||||
{CLEAR_VARIABLE explorer}
|
||||
|
|
@ -1759,7 +1759,7 @@
|
|||
#endif
|
||||
{CHECK_EXPLORER}
|
||||
[message]
|
||||
speaker=$explorer.description
|
||||
speaker=$explorer.id
|
||||
message= _ "How surprising, more fire guardians. I'm going to be really glad to get out of this cavern."
|
||||
[/message]
|
||||
{CLEAR_VARIABLE explorer}
|
||||
|
|
|
|||
|
|
@ -1383,7 +1383,7 @@
|
|||
|
||||
{CHECK_EXPLORER}
|
||||
[message]
|
||||
speaker=$explorer.description
|
||||
speaker=$explorer.id
|
||||
message= _ "It's a huge underground lake. The water looks dark and deep and is cold to the touch. There also seems to be some glowing moss on the walls which illuminates the cavern, making it easier to see."
|
||||
[/message]
|
||||
{CLEAR_VARIABLE explorer}
|
||||
|
|
@ -1503,7 +1503,7 @@
|
|||
|
||||
{CHECK_SPEAKER}
|
||||
[message]
|
||||
speaker=$speaking_unit.description
|
||||
speaker=$speaking_unit.id
|
||||
message= _ "Good riddance."
|
||||
[/message]
|
||||
{CLEAR_VARIABLE speaking_unit}
|
||||
|
|
@ -2136,7 +2136,7 @@
|
|||
|
||||
{CHECK_EXPLORER}
|
||||
[message]
|
||||
speaker=$explorer.description
|
||||
speaker=$explorer.id
|
||||
message= _ "More tentacles?!? What, did that thing have a baby?"
|
||||
[/message]
|
||||
{CLEAR_VARIABLE explorer}
|
||||
|
|
|
|||
|
|
@ -1717,7 +1717,7 @@
|
|||
[else]
|
||||
{CHECK_SPEAKER}
|
||||
[message]
|
||||
speaker=$speaking_unit.description
|
||||
speaker=$speaking_unit.id
|
||||
message= _ "Fish bait? Hermit Crabs? Who are these humans and what were they talking about?"
|
||||
[/message]
|
||||
{CLEAR_VARIABLE speaking_unit}
|
||||
|
|
@ -1751,7 +1751,7 @@
|
|||
[else]
|
||||
{CHECK_SPEAKER}
|
||||
[message]
|
||||
speaker=$speaking_unit.description
|
||||
speaker=$speaking_unit.id
|
||||
message= _ "Fish bait? Barnacles? Who are these humans and what were they talking about?"
|
||||
[/message]
|
||||
{CLEAR_VARIABLE speaking_unit}
|
||||
|
|
@ -1854,7 +1854,7 @@
|
|||
[then]
|
||||
{CHECK_EXPLORER}
|
||||
[message]
|
||||
speaker=$explorer.description
|
||||
speaker=$explorer.id
|
||||
message= _ "Woah, what is this place? It sure seems well protected."
|
||||
[/message]
|
||||
{CLEAR_VARIABLE explorer}
|
||||
|
|
@ -2442,12 +2442,12 @@
|
|||
|
||||
{CHECK_EXPLORER}
|
||||
[message]
|
||||
speaker=$explorer.description
|
||||
speaker=$explorer.id
|
||||
message= _ "There isn't much left of the furnishings of this room. I think it was some sort of storeroom, but it looks like scavengers have taken anything useful."
|
||||
[/message]
|
||||
|
||||
[message]
|
||||
speaker=$explorer.description
|
||||
speaker=$explorer.id
|
||||
message= _ "Curse Uria! The water is rising over here as well. Already the western end of this chamber is flooded. And I think I see shapes rising out of the water. Whatever they are, it can't be good."
|
||||
[/message]
|
||||
|
||||
|
|
@ -3464,7 +3464,7 @@
|
|||
|
||||
{CHECK_EXPLORER}
|
||||
[message]
|
||||
speaker=$explorer.description
|
||||
speaker=$explorer.id
|
||||
message= _ "This looks like some kind of burial chamber."
|
||||
[/message]
|
||||
{CLEAR_VARIABLE explorer}
|
||||
|
|
@ -3833,12 +3833,12 @@
|
|||
|
||||
{CHECK_EXPLORER}
|
||||
[message]
|
||||
speaker=$explorer.description
|
||||
speaker=$explorer.id
|
||||
message= _ "Look, daylight! I think we finally made it out of the caves!"
|
||||
[/message]
|
||||
|
||||
[message]
|
||||
speaker=$explorer.description
|
||||
speaker=$explorer.id
|
||||
message= _ "What's this? Someone has built an outpost at the end of the cave. Where are its occupants?"
|
||||
[/message]
|
||||
|
||||
|
|
@ -3858,7 +3858,7 @@
|
|||
|
||||
[then]
|
||||
[message]
|
||||
speaker=$explorer.description
|
||||
speaker=$explorer.id
|
||||
message= _ "Kaleh, I think you should come up and see this."
|
||||
[/message]
|
||||
|
||||
|
|
@ -4417,7 +4417,7 @@
|
|||
|
||||
{CHECK_EXPLORER}
|
||||
[message]
|
||||
speaker=$explorer.description
|
||||
speaker=$explorer.id
|
||||
message= _ "We've come out on the side of a mountain, overlooking a large valley. The land seems to be much the same as the foothills south of the mountains. The valley is filled with sand dunes, though the center is flat. There seems to be some sort of settlement in the center of the valley. And far to the north I can see something sparkling on the horizon, but I don't know what it is."
|
||||
[/message]
|
||||
|
||||
|
|
@ -4590,7 +4590,7 @@
|
|||
|
||||
[then]
|
||||
[message]
|
||||
speaker=$explorer.description
|
||||
speaker=$explorer.id
|
||||
message= _ "Kaleh, who are you talking to?"
|
||||
[/message]
|
||||
|
||||
|
|
@ -4602,7 +4602,7 @@
|
|||
|
||||
[message]
|
||||
speaker=Kaleh
|
||||
message= _ " $speaker.user_description|, be quiet, I'll explain it all later."
|
||||
message= _ " $speaker.name|, be quiet, I'll explain it all later."
|
||||
[/message]
|
||||
[/then]
|
||||
|
||||
|
|
|
|||
|
|
@ -1852,7 +1852,7 @@
|
|||
[/message]
|
||||
|
||||
[message]
|
||||
speaker=$unit.description
|
||||
speaker=$unit.id
|
||||
race=elf
|
||||
message= _ "As I envy your kind's prowess when fighting in the water."
|
||||
[/message]
|
||||
|
|
@ -2181,7 +2181,7 @@
|
|||
|
||||
{CHECK_EXPLORER}
|
||||
[message]
|
||||
speaker=$explorer.description
|
||||
speaker=$explorer.id
|
||||
message= _ "Esanoo found the elves that we were searching for. He brought them back and they helped free us. I can't believe the humans imprisoned you in such a horrible place. To be stuck in the darkness with those undead. We will make them pay for what they have done!"
|
||||
[/message]
|
||||
|
||||
|
|
@ -2191,7 +2191,7 @@
|
|||
[/message]
|
||||
|
||||
[message]
|
||||
speaker=$explorer.description
|
||||
speaker=$explorer.id
|
||||
message= _ "Yes, you are right, of course. Pardon me."
|
||||
[/message]
|
||||
{CLEAR_VARIABLE explorer}
|
||||
|
|
@ -3056,7 +3056,7 @@
|
|||
# wmllint: recognize Zhul_statue
|
||||
[/store_unit]
|
||||
|
||||
{VARIABLE Zhul_statue.description "Zhul_statue"}
|
||||
{VARIABLE Zhul_statue.id "Zhul_statue"}
|
||||
{VARIABLE Zhul_statue.status.stone "on"}
|
||||
|
||||
[unstore_unit]
|
||||
|
|
@ -3914,8 +3914,8 @@
|
|||
[/filter]
|
||||
[/store_unit]
|
||||
{VARIABLE zhul_statue.status.stoned "off"}
|
||||
{VARIABLE zhul_statue.description "Zhul"}
|
||||
{VARIABLE zhul_statue.user_description _"Zhul"}
|
||||
{VARIABLE zhul_statue.id "Zhul"}
|
||||
{VARIABLE zhul_statue.name _"Zhul"}
|
||||
[unstore_unit]
|
||||
variable=zhul_statue
|
||||
[/unstore_unit]
|
||||
|
|
|
|||
|
|
@ -133,24 +133,24 @@ This unit always strikes first with this attack, even if they are defending."
|
|||
[if]
|
||||
[and]
|
||||
[variable]
|
||||
name=second_unit.description
|
||||
name=second_unit.id
|
||||
equals=Grak
|
||||
[/variable]
|
||||
[or]
|
||||
[variable]
|
||||
name=second_unit.description
|
||||
name=second_unit.id
|
||||
equals=Zur
|
||||
[/variable]
|
||||
[/or]
|
||||
[/and]
|
||||
[and]
|
||||
[variable]
|
||||
name=unit.description
|
||||
name=unit.id
|
||||
equals=Garak
|
||||
[/variable]
|
||||
[/and]
|
||||
[then]
|
||||
{VARIABLE challenged $second_unit.description}
|
||||
{VARIABLE challenged $second_unit.id}
|
||||
[if]
|
||||
[variable]
|
||||
name=challenged
|
||||
|
|
@ -228,7 +228,7 @@ This unit always strikes first with this attack, even if they are defending."
|
|||
[/filter]
|
||||
[if]
|
||||
[variable]
|
||||
name=second_unit.description
|
||||
name=second_unit.id
|
||||
equals=Grak
|
||||
[/variable]
|
||||
[then]
|
||||
|
|
@ -245,24 +245,24 @@ This unit always strikes first with this attack, even if they are defending."
|
|||
[if]
|
||||
[and]
|
||||
[variable]
|
||||
name=unit.description
|
||||
name=unit.id
|
||||
equals=Grak
|
||||
[/variable]
|
||||
[or]
|
||||
[variable]
|
||||
name=unit.description
|
||||
name=unit.id
|
||||
equals=Zur
|
||||
[/variable]
|
||||
[/or]
|
||||
[/and]
|
||||
[and]
|
||||
[variable]
|
||||
name=second_unit.description
|
||||
name=second_unit.id
|
||||
equals=Garak
|
||||
[/variable]
|
||||
[/and]
|
||||
[then]
|
||||
{VARIABLE challenged $unit.description}
|
||||
{VARIABLE challenged $unit.id}
|
||||
[if]
|
||||
[variable]
|
||||
name=challenged
|
||||
|
|
@ -340,7 +340,7 @@ This unit always strikes first with this attack, even if they are defending."
|
|||
[/filter]
|
||||
[if]
|
||||
[variable]
|
||||
name=second_unit.description
|
||||
name=second_unit.id
|
||||
equals=Grak
|
||||
[/variable]
|
||||
[then]
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
[/filter]
|
||||
[if]
|
||||
[variable]
|
||||
name=unit.description
|
||||
name=unit.id
|
||||
equals=Azkotep
|
||||
[/variable]
|
||||
[then]
|
||||
|
|
@ -29,7 +29,7 @@
|
|||
[/have_unit]
|
||||
[then]
|
||||
[message]
|
||||
speaker=$unit.description
|
||||
speaker=$unit.id
|
||||
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]
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@
|
|||
{VARIABLE_OP ystara_casaulties.length add 1}
|
||||
[store_unit]
|
||||
[filter]
|
||||
id=$unit.description
|
||||
id=$unit.id
|
||||
[/filter]
|
||||
variable=ystara_casaulties[$killed_by_ystara].unit
|
||||
kill=no
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@
|
|||
# ugly trait hack...
|
||||
[unit]
|
||||
side=$recruit.side
|
||||
name=$recruit.user_description
|
||||
name=$recruit.name
|
||||
type=$recruit.type
|
||||
experience=$recruit.experience
|
||||
gender=$recruit.gender
|
||||
|
|
@ -151,8 +151,8 @@
|
|||
{FOREACH galdrad_comments i}
|
||||
[if]
|
||||
[variable]
|
||||
name=galdrad_comments[$i].description
|
||||
equals=${NAME}.description
|
||||
name=galdrad_comments[$i].id
|
||||
equals=${NAME}.id
|
||||
[/variable]
|
||||
[then]
|
||||
{VARIABLE commented 1}
|
||||
|
|
@ -166,7 +166,7 @@
|
|||
[then]
|
||||
[store_unit]
|
||||
[filter]
|
||||
id=${NAME}.description
|
||||
id=${NAME}.id
|
||||
[/filter]
|
||||
variable=galdrad_comments
|
||||
mode=append
|
||||
|
|
@ -199,8 +199,8 @@
|
|||
{FOREACH unit_complained i}
|
||||
[if]
|
||||
[variable]
|
||||
name=unit_complained[$i].description
|
||||
equals=${NAME}.description
|
||||
name=unit_complained[$i].id
|
||||
equals=${NAME}.id
|
||||
[/variable]
|
||||
[then]
|
||||
{VARIABLE complained 1}
|
||||
|
|
@ -213,7 +213,7 @@
|
|||
[then]
|
||||
[store_unit]
|
||||
[filter]
|
||||
id=${NAME}.description
|
||||
id=${NAME}.id
|
||||
[/filter]
|
||||
variable=unit_complained
|
||||
mode=append
|
||||
|
|
@ -512,14 +512,14 @@ One Elvish Shaman")}
|
|||
greater_than=0
|
||||
[/variable]
|
||||
[then]
|
||||
{VARIABLE_OP recall_name1 format $recall[$recall_i1].user_description}
|
||||
{VARIABLE_OP recall_name1 format $recall[$recall_i1].name}
|
||||
[if]
|
||||
[variable]
|
||||
name=recall_xp2
|
||||
greater_than=0
|
||||
[/variable]
|
||||
[then]
|
||||
{VARIABLE_OP recall_name2 format $recall[$recall_i2].user_description}
|
||||
{VARIABLE_OP recall_name2 format $recall[$recall_i2].name}
|
||||
# We have two worth recalling.
|
||||
{TEACHER (_"During your tutorial, $recall_name1 gained $recall_xp1 experience points, and $recall_name2 gained $recall_xp2. You should recall them now so they can gain more experience, rather than recruiting new ones.")}
|
||||
[/then]
|
||||
|
|
@ -691,7 +691,7 @@ One Elvish Shaman")}
|
|||
# You were supposed to recall $recall_name2.
|
||||
[if]
|
||||
[variable]
|
||||
name=recruit.user_description
|
||||
name=recruit.name
|
||||
not_equals=$recall_name2
|
||||
[/variable]
|
||||
[then]
|
||||
|
|
@ -765,13 +765,13 @@ One Elvish Shaman")}
|
|||
# You were supposed to recall $recall_name1.
|
||||
[if]
|
||||
[variable]
|
||||
name=recruit.user_description
|
||||
name=recruit.name
|
||||
not_equals=$recall_name1
|
||||
[/variable]
|
||||
[then]
|
||||
[if]
|
||||
[variable]
|
||||
name=recruit.user_description
|
||||
name=recruit.name
|
||||
equals=$recall_name2
|
||||
[/variable]
|
||||
[then]
|
||||
|
|
@ -1264,7 +1264,7 @@ When 'n' no longer selects a new unit, you can end your turn.")}
|
|||
|
||||
[if]
|
||||
[variable]
|
||||
name=attacker.description
|
||||
name=attacker.id
|
||||
equals=Thrag
|
||||
[/variable]
|
||||
[variable]
|
||||
|
|
@ -1280,7 +1280,7 @@ When 'n' no longer selects a new unit, you can end your turn.")}
|
|||
|
||||
[if]
|
||||
[variable]
|
||||
name=defender.description
|
||||
name=defender.id
|
||||
equals=Thrag
|
||||
[/variable]
|
||||
[variable]
|
||||
|
|
@ -1329,7 +1329,7 @@ When 'n' no longer selects a new unit, you can end your turn.")}
|
|||
greater_than=20
|
||||
[/variable]
|
||||
[then]
|
||||
{TEACHER (_"We will miss $deadguy.user_description|, and he had $deadguy.experience experience points, meaning he would have advanced to level 2 soon.")}
|
||||
{TEACHER (_"We will miss $deadguy.name|, and he had $deadguy.experience experience points, meaning he would have advanced to level 2 soon.")}
|
||||
[/then]
|
||||
[else]
|
||||
[if]
|
||||
|
|
@ -1338,7 +1338,7 @@ When 'n' no longer selects a new unit, you can end your turn.")}
|
|||
less_than=8
|
||||
[/variable]
|
||||
[then]
|
||||
{TEACHER (_"We will miss $deadguy.user_description|, but better than one of our experienced troops dying!")}
|
||||
{TEACHER (_"We will miss $deadguy.name|, but better than one of our experienced troops dying!")}
|
||||
[/then]
|
||||
[/if]
|
||||
[/else]
|
||||
|
|
@ -1356,7 +1356,7 @@ When 'n' no longer selects a new unit, you can end your turn.")}
|
|||
[/then]
|
||||
[else]
|
||||
# Must be level 2 unit.
|
||||
{TEACHER (_"Level 2 units are powerful, but not invulnerable! Goodbye, $deadguy.user_description|.")}
|
||||
{TEACHER (_"Level 2 units are powerful, but not invulnerable! Goodbye, $deadguy.name|.")}
|
||||
[/else]
|
||||
[/if]
|
||||
[/else]
|
||||
|
|
|
|||
|
|
@ -462,7 +462,7 @@
|
|||
#! name=start
|
||||
#!
|
||||
#! {TIME_ACTIONS (
|
||||
#! {MODIFY_UNIT race=orc user_description ( _ "Azir")}
|
||||
#! {MODIFY_UNIT race=orc name ( _ "Azir")}
|
||||
#! )}
|
||||
#!
|
||||
#! {DEBUG_MSG "Renaming all orcs to Azir took $timed_actions_ms|ms."}
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@
|
|||
{VARIABLE movement $spawns[$id].max_moves}
|
||||
{VARIABLE_OP movement multiply 0.33}
|
||||
{VARIABLE_OP movement add 1}
|
||||
{VARIABLE unit_name $spawns[$id].user_description}
|
||||
{VARIABLE unit_name $spawns[$id].name}
|
||||
[unit]
|
||||
side=$timid_ai_side
|
||||
type=$spawns[$id].type
|
||||
|
|
@ -130,7 +130,7 @@
|
|||
equals="none"
|
||||
[/variable]
|
||||
[else]
|
||||
{VARIABLE spawns[$id].user_description $unit_name}
|
||||
{VARIABLE spawns[$id].name $unit_name}
|
||||
[/else]
|
||||
[/if]
|
||||
[unstore_unit]
|
||||
|
|
@ -166,7 +166,7 @@
|
|||
[/filter]
|
||||
[/store_unit]
|
||||
{FOREACH ai_unit id}
|
||||
{VARIABLE name $ai_unit[$id].user_description}
|
||||
{VARIABLE name $ai_unit[$id].name}
|
||||
{VARIABLE type $ai_unit[$id].type}
|
||||
{VARIABLE hitpoints $ai_unit[$id].hitpoints}
|
||||
{VARIABLE max_hp $ai_unit[$i].max_hitpoints}
|
||||
|
|
|
|||
|
|
@ -2131,8 +2131,14 @@ if __name__ == '__main__':
|
|||
transformed = re.sub(r"\bdescription\s*=", "id=", line)
|
||||
if "name" not in tagstack[-1][1]:
|
||||
transformed = re.sub(r"user_description\s*=", "name=", line)
|
||||
# One-time conversion
|
||||
#transformed = re.sub(r"\bdescription\s*=", "name=", line)
|
||||
# Alas, WML variable references cannod be converted so
|
||||
# automatically.
|
||||
if ".description" in line:
|
||||
print '"%s", line %d: .description may need hand fixup' % \
|
||||
(filename, lineno)
|
||||
if ".user_description" in line:
|
||||
print '"%s", line %d: .user_description may need hand fixup' % \
|
||||
(filename, lineno)
|
||||
# Report the changes
|
||||
if verbose > 0 and transformed != line:
|
||||
msg = "%s, line %d: %s -> %s" % \
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue