Don't bother with stolen gold if there wasn't any

This commit is contained in:
ln-zookeeper 2014-04-13 14:31:32 +03:00
parent 6905294ccf
commit 62549bfccb
2 changed files with 42 additions and 6 deletions

View file

@ -8,6 +8,10 @@ Version 1.11.12+dev:
* Bug fix for requiring unnecessary keys for removal of several Micro AIs
* Some internal reorganization of Micro AI code to facilitate customizing
them for UMC and adding functionality from other versions of Wesnoth
* Campaigns:
* Eastern Invasion:
* In 'Captured', stolen gold won't be mentioned if the player had no
carryover gold.
* Language and i18n:
* Updated translations: Hungarian, Italian, Slovak
* Miscellaneous and bug fixes:

View file

@ -102,7 +102,6 @@
{PLACE_IMAGE scenery/gate-rusty-se.png 21 8}
{PLACE_IMAGE scenery/gate-rusty-se.png 17 10}
{PLACE_IMAGE scenery/gate-rusty-sw.png 29 9}
{PLACE_IMAGE items/chest-plain-closed.png 33 11}
{PLACE_IMAGE scenery/trash.png 22 2}
@ -188,6 +187,17 @@
variable=stored_player_gold
[/store_gold]
[if]
[variable]
name=stored_player_gold
greater_than_equal_to=1
[/variable]
[then]
{PLACE_IMAGE items/chest-plain-closed.png 33 11}
[/then]
[/if]
[modify_side]
side=1
gold=0
@ -985,12 +995,21 @@
message= _ "The eastern entrance is teeming with orcs. We have to find another way to exit to the west!"
[/message]
[message]
speaker=Gweddry
message= _ "We have to get our gold back first! It must have been taken to their treasury."
[/message]
[if]
[variable]
name=stored_player_gold
greater_than_equal_to=1
[/variable]
{HIGHLIGHT_IMAGE 33 11 items/chest-plain-closed.png ()}
[then]
[message]
speaker=Gweddry
message= _ "We have to get our gold back first! It must have been taken to their treasury."
[/message]
{HIGHLIGHT_IMAGE 33 11 items/chest-plain-closed.png ()}
[/then]
[/if]
[modify_turns]
value="$($turn_number + 15)"
@ -1005,6 +1024,12 @@
[objective]
description= _ "Retrieve the stolen gold"
condition=win
[show_if]
[variable]
name=stored_player_gold
greater_than_equal_to=1
[/variable]
[/show_if]
[/objective]
[objective]
description= _ "Release the remaining prisoners"
@ -1138,6 +1163,13 @@
x,y=33,11
[/filter]
[filter_condition]
[variable]
name=stored_player_gold
greater_than_equal_to=1
[/variable]
[/filter_condition]
[message]
speaker=unit
message= _ "All the gold the orcs took is in this chest!"