LoW::3: Fix bug #17234 , bug #17224 and bug #17144

This commit is contained in:
Fabian Müller 2011-01-14 02:54:19 +00:00
parent dcd024d213
commit e2e183ab9c

View file

@ -526,9 +526,7 @@
equals='wait'
[/variable]
[then]
[message]
message=_ "$orc_battlefield_strategy changed to attack"
[/message]
{DEBUG_MSG ("$orc_battlefield_strategy changed to attack")}
{VARIABLE orc_battlefield_strategy 'attack'}
[/then]
[/if]
@ -733,6 +731,8 @@
terrain = Rp^Dr
x,y=19,13
[/terrain]
[redraw]
[/redraw]
{REPLACE_SCENARIO_MUSIC the_city_falls.ogg}
{APPEND_MUSIC wanderer.ogg}
@ -790,7 +790,11 @@
[unit]
{LANDAR}
#ifndef MULTIPLAER
side=1
#else
side=6
#endif
x=33
y=7
[/unit]
@ -836,9 +840,8 @@
[objectives]
side=0
[objective]
description= _ "Hold on until turns run out."
description= _ "Defeat all enemy leaders."
condition=win
show_turn_counter=yes
[/objective]
[objective]
description= _ "Death of Kalenz"
@ -852,13 +855,18 @@
description= _ "Death of Galtrid"
condition=lose
[/objective]
#todo display number of turns left
#ifdef MULTIPLAYER
[objective]
description= _ "Death of El'Isimithir"
condition=lose
[/objective]
#endif
[gold_carryover]
bonus=yes
carryover_percentage=80
[/gold_carryover]
{TURNS_RUN_OUT}
[/objectives]
[message]
@ -882,6 +890,12 @@
id=Galtrid
message= _ "Then you have not heard the ill tidings. King Haldric has broken the treaty. The humans will not come to our help!"
[/message]
[message]
id=Landar
#TODO ESR
message= _ "How can they dare to brake the treaty!"
[/message]
{AI_CONTROLLER_ALLOW_LEADER_CONTROL 1 2}
@ -913,17 +927,28 @@
[event]
name=prestart
[objectives]
[objective]
description= _ "Hold on until turns run out."
condition=win
show_turn_counter=yes
[/objective]
[objective]
description= _ "Death of Galtrid"
condition=lose
[/objective]
#ifdef MULTIPLAYER
[objective]
{BONUS_OBJECTIVE_CAPTION}
description= _ "Defeat Urudin"
condition=win
description= _ "Death of El'Isomithir"
condition=lose
[/objective]
#endif
# [objective]
# {BONUS_OBJECTIVE_CAPTION}
# description= _ "Defeat Urudin"
# #condition=win
# [/objective]
{TURNS_RUN_OUT}
# {TURNS_RUN_OUT}
[/objectives]
[/event]
@ -1116,7 +1141,7 @@
facing=se
[/unit]
#TODO give a second Huraldur to Landar
#TODO Multiplayer: give a second Huraldur to Landar
[message]
id=Huraldur