Merge pull request #734 from GregoryLundberg/GL_HttT_S07_ambushers_reduced

HttT S07 Ambushers Reduced
This commit is contained in:
Lari Nieminen 2016-09-19 19:24:19 +03:00 committed by GitHub
commit 2970360d49
3 changed files with 46 additions and 23 deletions

View file

@ -25,6 +25,7 @@
[event]
name=prestart
{VARIABLE besieged_enemies_killed 0}
{NEED_DELFADOR (x,y=19,23)}
[objectives]
side=1
@ -569,6 +570,21 @@
message= _ "There can be no looking back. We must go quickly!"
[/message]
[/event]
[event]
name=die
first_time_only=no
[filter]
side=2,3,4
canrecruit=yes
[/filter]
[set_variable]
name=besieged_enemies_killed
add=1
[/set_variable]
[/event]
[/scenario]
#undef AVOID_CHANTAL

View file

@ -375,30 +375,37 @@
# Only the number of ambushers differs by difficulty here.
#ifdef EASY
{ORC_AMBUSH_AREA 2 5-35 1-7 5}
{ORC_AMBUSH_AREA 2 9-24 8-15 5}
{ORC_AMBUSH_AREA 3 1-17 17-24 9}
{ORC_AMBUSH_AREA 3 18-25 16-23 5}
{ORC_AMBUSH_AREA 3 26-40 16-23 5}
#endif
#ifdef NORMAL
{ORC_AMBUSH_AREA 2 5-35 1-7 6}
{ORC_AMBUSH_AREA 2 9-24 8-15 6}
{ORC_AMBUSH_AREA 3 1-17 17-24 10}
{ORC_AMBUSH_AREA 3 18-25 16-23 6}
{ORC_AMBUSH_AREA 3 26-40 16-23 6}
#endif
#ifdef HARD
{ORC_AMBUSH_AREA 2 5-35 1-7 7}
{ORC_AMBUSH_AREA 2 9-24 8-15 7}
{ORC_AMBUSH_AREA 3 1-17 17-24 11}
{ORC_AMBUSH_AREA 3 18-25 16-23 7}
{ORC_AMBUSH_AREA 3 26-40 16-23 7}
#endif
# Adjust for leaders killed in S01 ('The Elves Besieged')
# Reduce 25% for each. Note: implicit floor() due to loop
# GL-2016Aug
#
# 3 2 1 0 # killed
#
# 5 --> 1 2 3 5
# 6 --> 1 3 4 6
# 7 --> 1 3 5 7
#
# 9 --> 2 4 6 9
# 10 --> 2 5 7 10
# 11 --> 2 5 8 11
#
# Net result
#
# Easy --> 6 12 18 29
# Normal --> 6 17 23 34
# Hard --> 6 17 28 39
{VARIABLE small_number "$(((4 - $besieged_enemies_killed?0|) * {ON_DIFFICULTY 5 6 7}) / 4)"}
{VARIABLE large_number "$(((4 - $besieged_enemies_killed?0|) * {ON_DIFFICULTY 9 10 11}) / 4)"}
{ORC_AMBUSH_AREA 2 5-35 1-7 $small_number}
{ORC_AMBUSH_AREA 2 9-24 8-15 $small_number}
{ORC_AMBUSH_AREA 3 1-17 17-24 $large_number}
{ORC_AMBUSH_AREA 3 18-25 16-23 $small_number}
{ORC_AMBUSH_AREA 3 26-40 16-23 $small_number}
{CLEAR_VARIABLE random_ambusher_type_table}
{CLEAR_VARIABLE random_ambusher_type_i}
{CLEAR_VARIABLE random_ambusher_type_i,small_number,large_number}
[/event]
[event]

View file

@ -62,7 +62,7 @@
# Some are old, some are new, some are secret, and some are well-known
# Something counts as a hidden goodie if the effect is not advertised or must be discovered somehow
# The list doesn't include any of the "pop-up" monsters, which are at best annoying
# - if you defeat two or more leaders in Elves Besieged, the orcish army is weakened enough such that there are far fewer ambushes in Crossroads
# - if you defeat any leaders in Elves Besieged, the orcish army is weakened enough such that there are far fewer ambushes in Crossroads
# - if you completely liberate Blackwater Port on HARD, you are given a free knight
# - if you completely eliminate the undead presence on the Isle of the Damned, Moremirmu joins your party
# - if you do not completely eliminate the undead presence on the Isle of the Damned, Moremirmu returns to help you in the Valley of Death