Merge victory events

This commit is contained in:
Alarantalara 2013-11-09 21:55:36 -05:00
parent 0316f68d7d
commit c4a532ea5f

View file

@ -998,41 +998,6 @@
{VARIABLE village_at_$x1|_$y1|.captured_by undead}
[/event]
[event]
name=victory
# This unstores all unspawned units from the pool into the recall list.
# Provides extra loyal units on easy, and eventually discounted units on all difficulties.
# Reduces luck issues based on which units were found.
{FOREACH elf_pool i}
[unit]
side=1
type=$elf_pool[$i].type
name=$elf_pool[$i].name
gender=$elf_pool[$i].gender
x=recall
y=recall
random_traits=yes
#ifdef EASY
[modifications]
{TRAIT_LOYAL}
[/modifications]
{IS_LOYAL}
#endif
[/unit]
{NEXT i}
# This clears all those village-specific containers that were holding
# information about who had visited the village
{FOREACH outer_villages i}
{CLEAR_VARIABLE village_at_$outer_villages[$i].x|_$outer_villages[$i].y|}
{NEXT i}
{CLEAR_VARIABLE elf_pool}
{CLEAR_VARIABLE outer_villages}
[/event]
# Necromancer - spawning the bad guy both on time and prematurely
# and victory event.
@ -1273,7 +1238,6 @@
[/message]
[/event]
# On victory dialogue
[event]
name=victory
@ -1352,11 +1316,40 @@
image=wesnoth-icon.png
[/message]
# Unstore all unspawned units from the pool into the recall list.
# Provides extra loyal units on easy, and eventually discounted units on all difficulties.
# Reduces luck issues based on which units were found.
{FOREACH elf_pool i}
[unit]
side=1
type=$elf_pool[$i].type
name=$elf_pool[$i].name
gender=$elf_pool[$i].gender
x=recall
y=recall
random_traits=yes
#ifdef EASY
[modifications]
{TRAIT_LOYAL}
[/modifications]
{IS_LOYAL}
#endif
[/unit]
{NEXT i}
# Clear variables
{CLEAR_VARIABLE seen_mudcrawler}
{CLEAR_VARIABLE rescued_elves}
{CLEAR_VARIABLE found_garak}
{CLEAR_VARIABLE found_zhul}
# This clears all those village-specific containers that were holding
# information about who had visited the village
{FOREACH outer_villages i}
{CLEAR_VARIABLE village_at_$outer_villages[$i].x|_$outer_villages[$i].y|}
{NEXT i}
{CLEAR_VARIABLE elf_pool}
{CLEAR_VARIABLE outer_villages}
[/event]
[event]