Another checkpoint.

This commit is contained in:
Eric S. Raymond 2008-01-24 02:12:40 +00:00
parent d94dc12305
commit c8873e8408

View file

@ -637,200 +637,200 @@ One Elvish Shaman")}
[/then]
[/if]
[if]
{NUMEQ recruit_num 2}
[then]
# wmlindent: start ignoring
[if]
{NUMEQ recruit_num 2}
[then]
[if]
[variable]
name=recall_xp2
greater_than=0
[/variable]
[then]
# You were supposed to recall $recall_name2.
[if]
[variable]
name=recruit.user_description
not_equals=$recall_name2
[/variable]
[then]
# FIXME: Did they recruit, or recall?
{REFUND recruit.type}
[kill]
x,y=$x1,$y1
[/kill]
{TEACHER (_"No! I said RECALL $recall_name2|! Now try again...")}
[/then]
[else]
{VARIABLE_OP recruit_num add 1}
{UNLABEL 11,4}
{LABEL (_"Archer #1") 9,4}
{LABEL (_"Archer #2") 9,3}
{PRINT (_"Recruit two Elvish Archers in tiles to your west")}
[/else]
[/if]
[/then]
[else]
# You were supposed to recruit a Fighter.
[if]
[variable]
name=recruit.type
not_equals=Elvish Fighter
[/variable]
[then]
{REFUND recruit.type}
[kill]
x,y=$x1,$y1
[/kill]
{TEACHER (_"No! I said recruit an Elvish FIGHTER! Now try again...")}
[/then]
[else]
{VARIABLE_OP recruit_num add 1}
[if]
[variable]
name=recall_xp2
greater_than=0
[/variable]
[then]
# You were supposed to recall $recall_name2.
[if]
[variable]
name=recruit.user_description
not_equals=$recall_name2
[/variable]
[then]
# FIXME: Did they recruit, or recall?
{REFUND recruit.type}
[kill]
x,y=$x1,$y1
[/kill]
{TEACHER (_"No! I said RECALL $recall_name2|! Now try again...")}
[/then]
[else]
{VARIABLE_OP recruit_num add 1}
{UNLABEL 11,4}
{LABEL (_"Archer #1") 9,4}
{LABEL (_"Archer #2") 9,3}
{PRINT (_"Recruit two Elvish Archers in tiles to your west")}
[/else]
[/if]
[/then]
[else]
# You were supposed to recruit a Fighter.
[if]
[variable]
name=recruit.type
not_equals=Elvish Fighter
[/variable]
[then]
{REFUND recruit.type}
[kill]
x,y=$x1,$y1
[/kill]
{TEACHER (_"No! I said recruit an Elvish FIGHTER! Now try again...")}
[/then]
[else]
{VARIABLE_OP recruit_num add 1}
[kill]
x,y=$x1,$y1
[/kill]
[unit]
description=Golir
user_description=_"Golir"
type=Elvish Fighter
x,y=$x1,$y1
side=1
upkeep=full
moves=0
[modifications]
{TRAIT_QUICK}
{TRAIT_RESILIENT}
[/modifications]
[/unit]
{EXPLAIN_QUICK_RESILIENT (_"Golir")}
[kill]
x,y=$x1,$y1
[/kill]
[unit]
description=Golir
user_description=_"Golir"
type=Elvish Fighter
x,y=$x1,$y1
side=1
upkeep=full
moves=0
[modifications]
{TRAIT_QUICK}
{TRAIT_RESILIENT}
[/modifications]
[/unit]
{EXPLAIN_QUICK_RESILIENT (_"Golir")}
{UNLABEL 11,4}
{LABEL (_"Archer #1") 9,4}
{LABEL (_"Archer #2") 9,3}
{PRINT (_"Recruit two Elvish Archers in tiles to your west")}
[/else]
[/if]
[/else]
[/if]
[/then]
[/if]
[if]
{NUMEQ recruit_num 1}
[then]
[if]
[variable]
name=recall_xp1
greater_than=0
[/variable]
[then]
# You were supposed to recall $recall_name1.
[if]
[variable]
name=recruit.user_description
not_equals=$recall_name1
[/variable]
[then]
[if]
[variable]
name=recruit.user_description
equals=$recall_name2
[/variable]
[then]
[gold]
amount=20
[/gold]
[store_unit]
variable=unrecall
[filter]
x,y=$x1,$y1
[/filter]
kill=yes
[/store_unit]
{VARIABLE unrecall.x 0}
{VARIABLE unrecall.y 0}
[unstore_unit]
variable=unrecall
[/unstore_unit]
{CLEAR_VARIABLE unrecall}
{TEACHER (_"No! I said recall $recall_name1, not $recall_name2|! Now try again...")}
[/then]
[else]
{REFUND recruit.type}
{TEACHER (_"No! I said RECALL $recall_name1 from the last battle, not recruit a new $recruit.language_name|! Now try again...")}
[kill]
x,y=$x1,$y1
[/kill]
[/else]
[/if]
[/then]
[else]
{VARIABLE_OP recruit_num add 1}
{UNLABEL 10,4}
[if]
[variable]
name=recall_xp2
greater_than=0
[/variable]
[then]
{PRINT (_"Right click on the tile south-east of you and recall $recall_name2")}
{LABEL (_"RECALL $recall_name2") 11,4}
[/then]
[else]
{LABEL (_"Elvish Fighter") 11,4}
{PRINT (_"Right click on the tile south-east of you and recruit an Elvish Fighter")}
[/else]
[/if]
[/else]
[/if]
[/then]
[else]
# You were supposed to recruit a new fighter.
# FIXME: How do we tell if they recalled instead?
[if]
[variable]
name=recruit.type
not_equals=Elvish Fighter
[/variable]
[then]
{REFUND recruit.type}
{TEACHER (_"$recruit.language_name|? I said RECRUIT a new ELVISH FIGHTER. Now try again...")}
[kill]
x,y=$x1,$y1
[/kill]
[/then]
[else]
{UNLABEL 10,4}
{VARIABLE_OP recruit_num add 1}
[kill]
x,y=$x1,$y1
[/kill]
[unit]
description=Elindel
user_description=_"Elindel"
type=Elvish Fighter
x,y=$x1,$y1
side=1
upkeep=full
moves=0
[modifications]
{TRAIT_STRONG}
{TRAIT_INTELLIGENT}
[/modifications]
[/unit]
{EXPLAIN_STRONG_INTELLIGENT (_"Elindel")}
{LABEL (_"Elvish Fighter") 11,4}
{PRINT (_"Right click on the tile south-east of you and recruit an Elvish Fighter")}
[/else]
[/if]
[/else]
[/if]
[/then]
[/if]
{UNLABEL 11,4}
{LABEL (_"Archer #1") 9,4}
{LABEL (_"Archer #2") 9,3}
{PRINT (_"Recruit two Elvish Archers in tiles to your west")}
[/else]
[/if]
[/else]
[/if]
# wmlindent: stop ignoring
[/then]
[/if]
[if]
{NUMEQ recruit_num 1}
[then]
[if]
[variable]
name=recall_xp1
greater_than=0
[/variable]
[then]
# You were supposed to recall $recall_name1.
[if]
[variable]
name=recruit.user_description
not_equals=$recall_name1
[/variable]
[then]
[if]
[variable]
name=recruit.user_description
equals=$recall_name2
[/variable]
[then]
[gold]
amount=20
[/gold]
[store_unit]
variable=unrecall
[filter]
x,y=$x1,$y1
[/filter]
kill=yes
[/store_unit]
{VARIABLE unrecall.x 0}
{VARIABLE unrecall.y 0}
[unstore_unit]
variable=unrecall
[/unstore_unit]
{CLEAR_VARIABLE unrecall}
{TEACHER (_"No! I said recall $recall_name1, not $recall_name2|! Now try again...")}
[/then]
[else]
{REFUND recruit.type}
{TEACHER (_"No! I said RECALL $recall_name1 from the last battle, not recruit a new $recruit.language_name|! Now try again...")}
[kill]
x,y=$x1,$y1
[/kill]
[/else]
[/if]
[/then]
[else]
{VARIABLE_OP recruit_num add 1}
{UNLABEL 10,4}
[if]
[variable]
name=recall_xp2
greater_than=0
[/variable]
[then]
{PRINT (_"Right click on the tile south-east of you and recall $recall_name2")}
{LABEL (_"RECALL $recall_name2") 11,4}
[/then]
[else]
{LABEL (_"Elvish Fighter") 11,4}
{PRINT (_"Right click on the tile south-east of you and recruit an Elvish Fighter")}
[/else]
[/if]
[/else]
[/if]
[/then]
[else]
# You were supposed to recruit a new fighter.
# FIXME: How do we tell if they recalled instead?
[if]
[variable]
name=recruit.type
not_equals=Elvish Fighter
[/variable]
[then]
{REFUND recruit.type}
{TEACHER (_"$recruit.language_name|? I said RECRUIT a new ELVISH FIGHTER. Now try again...")}
[kill]
x,y=$x1,$y1
[/kill]
[/then]
[else]
{UNLABEL 10,4}
{VARIABLE_OP recruit_num add 1}
[kill]
x,y=$x1,$y1
[/kill]
[unit]
description=Elindel
user_description=_"Elindel"
type=Elvish Fighter
x,y=$x1,$y1
side=1
upkeep=full
moves=0
[modifications]
{TRAIT_STRONG}
{TRAIT_INTELLIGENT}
[/modifications]
[/unit]
{EXPLAIN_STRONG_INTELLIGENT (_"Elindel")}
{LABEL (_"Elvish Fighter") 11,4}
{PRINT (_"Right click on the tile south-east of you and recruit an Elvish Fighter")}
[/else]
[/if]
[/else]
[/if]
[/then]
[/if]
{CLEAR_VARIABLE recruit}
[/event]
@ -851,10 +851,10 @@ One Elvish Shaman")}
[then]
# wmlindent: start ignoring
# FIXME: Level 2 units change costs.
{GENDER ({TEACHER (_"You've learned well, Konrad! " +
_ "The village supports one unit, and pays one gold per turn: you're only losing 1 gold per turn now.")})
({TEACHER (_"You've learned well, Li'sar! " +
_ "The village supports one unit, and pays one gold per turn: you're only losing 1 gold per turn now.")})}
{GENDER ({TEACHER (_"You've learned well, Konrad! " +
_ "The village supports one unit, and pays one gold per turn: you're only losing 1 gold per turn now.")})
({TEACHER (_"You've learned well, Li'sar! " +
_ "The village supports one unit, and pays one gold per turn: you're only losing 1 gold per turn now.")})}
# wmlindent: stop ignoring
{PRINT (_"End your turn")}
[/then]