Another checkpoint on the road to understanding wmlindent's problem.

This commit is contained in:
Eric S. Raymond 2008-01-24 02:42:18 +00:00
parent c8873e8408
commit 9bab11d2e4

View file

@ -640,50 +640,52 @@ One Elvish Shaman")}
[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}
# wmlindent: start ignoring
{LABEL (_"Archer #1") 9,4}
{LABEL (_"Archer #2") 9,3}
# wmlindent: stop ignoring
{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]
# wmlindent: start ignoring
[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}
@ -710,10 +712,10 @@ One Elvish Shaman")}
{LABEL (_"Archer #2") 9,3}
{PRINT (_"Recruit two Elvish Archers in tiles to your west")}
[/else]
[/if]
[/else]
[/if]
# wmlindent: stop ignoring
[/if]
[/else]
[/if]
[/then]
[/if]