From 6ac024ae7738683363100631ce1cb5e7bcf099b5 Mon Sep 17 00:00:00 2001 From: Simon Forsyth Date: Sat, 3 Mar 2012 14:55:04 +0000 Subject: [PATCH] use simpler helper finding code from Eftboren in FInal Confrontation --- .../scenarios/12_The_Final_Confrontation.cfg | 71 ++++--------------- 1 file changed, 14 insertions(+), 57 deletions(-) diff --git a/data/campaigns/Under_the_Burning_Suns/scenarios/12_The_Final_Confrontation.cfg b/data/campaigns/Under_the_Burning_Suns/scenarios/12_The_Final_Confrontation.cfg index a0525228961..78ee0818394 100644 --- a/data/campaigns/Under_the_Burning_Suns/scenarios/12_The_Final_Confrontation.cfg +++ b/data/campaigns/Under_the_Burning_Suns/scenarios/12_The_Final_Confrontation.cfg @@ -940,20 +940,16 @@ [/filter] kill=no - variable=lvl4_recalls + variable=possible_helpers [/store_unit] [if] [variable] - name=lvl4_recalls.length - greater_than=0 + name=possible_helpers.length + equals=0 [/variable] [then] - {VARIABLE helper_level 4} - [/then] - - [else] [store_unit] [filter] side=1 @@ -962,20 +958,16 @@ [/filter] kill=no - variable=lvl3_recalls + variable=possible_helpers [/store_unit] [if] [variable] - name=lvl3_recalls.length - greater_than=0 + name=possible_helpers.length + equals=0 [/variable] [then] - {VARIABLE helper_level 3} - [/then] - - [else] [store_unit] [filter] side=1 @@ -984,20 +976,16 @@ [/filter] kill=no - variable=lvl2_recalls + variable=possible_helpers [/store_unit] [if] [variable] - name=lvl2_recalls.length - greater_than=0 + name=possible_helpers.length + equals=0 [/variable] [then] - {VARIABLE helper_level 2} - [/then] - - [else] [store_unit] [filter] side=1 @@ -1008,54 +996,23 @@ kill=no variable=lvl1_recalls [/store_unit] - - [if] - [variable] - name=lvl1_recalls.length - greater_than=0 - [/variable] - - [then] - {VARIABLE helper_level 1} - [/then] - - [else] - {VARIABLE no_possible_helpers_left yes} - [/else] - [/if] - [/else] + [/then] [/if] - [/else] + [/then] [/if] - [/else] + [/then] [/if] - {CLEAR_VARIABLE lvl1_recalls,lvl2_recalls,lvl3_recalls,lvl4_recalls} - [if] [variable] - name=no_possible_helpers_left - not_equals=yes + name=possible_helpers.length + greater_than=0 [/variable] [then] - [store_unit] - [filter] - side=1 - level=$helper_level - x,y=recall,recall - [/filter] - - kill=no - variable=possible_helpers - [/store_unit] - {VARIABLE_OP random_helper_i rand "1..$possible_helpers.length"} {VARIABLE_OP random_helper_i sub 1} - {VARIABLE possible_helpers[$random_helper_i].x 10} - {VARIABLE possible_helpers[$random_helper_i].y 18} - [move_unit_fake] type=$possible_helpers[$random_helper_i].type side=1