diff --git a/data/core/macros/utils.cfg b/data/core/macros/utils.cfg index f72364e35feb..42134d5c333e 100644 --- a/data/core/macros/utils.cfg +++ b/data/core/macros/utils.cfg @@ -576,73 +576,71 @@ {SECOND_FILTER} [/filter_second] - [if] + [filter_condition] [and] {EXTRA_CONDITIONS_WML} [/and] + [/filter_condition] - [then] - {FOREACH unit.attack i} - [if] - #This is to mute a warning message about retrieving a member of non-existant wml container. - [variable] - name=unit.attack[$i].specials.length - greater_than=0 - [/variable] - - [variable] - name=unit.attack[$i].specials.chance_to_hit.length - greater_than=0 - [/variable] - - [then] - [set_variables] - name=unit.attack[$i].specials.original_chance_to_hit - to_variable=unit.attack[$i].specials.chance_to_hit - [/set_variables] - - {CLEAR_VARIABLE unit.attack[$i].specials.chance_to_hit} - [/then] - [/if] + {FOREACH unit.attack i} + [if] + #This is to mute a warning message about retrieving a member of non-existant wml container. + [variable] + name=unit.attack[$i].specials.length + greater_than=0 + [/variable] - [set_variables] - name=unit.attack[$i].specials.chance_to_hit + [variable] + name=unit.attack[$i].specials.chance_to_hit.length + greater_than=0 + [/variable] - [value] - id=forced_cth - value={CTH_NUMBER} - cumulative=no - [/value] + [then] + [set_variables] + name=unit.attack[$i].specials.original_chance_to_hit + to_variable=unit.attack[$i].specials.chance_to_hit [/set_variables] - {NEXT i} - [unstore_unit] - variable=unit - find_vacant=no - [/unstore_unit] + {CLEAR_VARIABLE unit.attack[$i].specials.chance_to_hit} + [/then] + [/if] + + [set_variables] + name=unit.attack[$i].specials.chance_to_hit + + [value] + id=forced_cth + value={CTH_NUMBER} + cumulative=no + [/value] + [/set_variables] + {NEXT i} + + [unstore_unit] + variable=unit + find_vacant=no + [/unstore_unit] - [event] - name=attack end - delayed_variable_substitution=yes + [event] + name=attack end + delayed_variable_substitution=yes - {FOREACH unit.attack i} - {CLEAR_VARIABLE unit.attack[$i].specials.chance_to_hit} + {FOREACH unit.attack i} + {CLEAR_VARIABLE unit.attack[$i].specials.chance_to_hit} - [set_variables] - name=unit.attack[$i].specials.chance_to_hit - to_variable=unit.attack[$i].specials.original_chance_to_hit - [/set_variables] + [set_variables] + name=unit.attack[$i].specials.chance_to_hit + to_variable=unit.attack[$i].specials.original_chance_to_hit + [/set_variables] - {CLEAR_VARIABLE unit.attack[$i].specials.original_chance_to_hit} - {NEXT i} + {CLEAR_VARIABLE unit.attack[$i].specials.original_chance_to_hit} + {NEXT i} - [unstore_unit] - variable=unit - find_vacant=no - [/unstore_unit] - [/event] - [/then] - [/if] + [unstore_unit] + variable=unit + find_vacant=no + [/unstore_unit] + [/event] [/event] # The following event is a simple duplicates of the above ones, with the @@ -660,72 +658,70 @@ {FILTER} [/filter_second] - [if] + [filter_condition] [and] {EXTRA_CONDITIONS_WML} [/and] + [/filter_condition] - [then] - {FOREACH second_unit.attack i} - [if] - [variable] - name=second_unit.attack[$i].specials.length - greater_than=0 - [/variable] - - [variable] - name=second_unit.attack[$i].specials.chance_to_hit.length - greater_than=0 - [/variable] - - [then] - [set_variables] - name=second_unit.attack[$i].specials.original_chance_to_hit - to_variable=second_unit.attack[$i].specials.chance_to_hit - [/set_variables] - - {CLEAR_VARIABLE second_unit.attack[$i].specials.chance_to_hit} - [/then] - [/if] + {FOREACH second_unit.attack i} + [if] + [variable] + name=second_unit.attack[$i].specials.length + greater_than=0 + [/variable] - [set_variables] - name=second_unit.attack[$i].specials.chance_to_hit + [variable] + name=second_unit.attack[$i].specials.chance_to_hit.length + greater_than=0 + [/variable] - [value] - id=forced_cth - value={CTH_NUMBER} - cumulative=no - [/value] + [then] + [set_variables] + name=second_unit.attack[$i].specials.original_chance_to_hit + to_variable=second_unit.attack[$i].specials.chance_to_hit [/set_variables] - {NEXT i} - [unstore_unit] - variable=second_unit - find_vacant=no - [/unstore_unit] + {CLEAR_VARIABLE second_unit.attack[$i].specials.chance_to_hit} + [/then] + [/if] + + [set_variables] + name=second_unit.attack[$i].specials.chance_to_hit + + [value] + id=forced_cth + value={CTH_NUMBER} + cumulative=no + [/value] + [/set_variables] + {NEXT i} + + [unstore_unit] + variable=second_unit + find_vacant=no + [/unstore_unit] - [event] - name=attack end - delayed_variable_substitution=yes + [event] + name=attack end + delayed_variable_substitution=yes - {FOREACH second_unit.attack i} - {CLEAR_VARIABLE second_unit.attack[$i].specials.chance_to_hit} + {FOREACH second_unit.attack i} + {CLEAR_VARIABLE second_unit.attack[$i].specials.chance_to_hit} - [set_variables] - name=second_unit.attack[$i].specials.chance_to_hit - to_variable=second_unit.attack[$i].specials.original_chance_to_hit - [/set_variables] + [set_variables] + name=second_unit.attack[$i].specials.chance_to_hit + to_variable=second_unit.attack[$i].specials.original_chance_to_hit + [/set_variables] - {CLEAR_VARIABLE second_unit.attack[$i].specials.original_chance_to_hit} - {NEXT i} + {CLEAR_VARIABLE second_unit.attack[$i].specials.original_chance_to_hit} + {NEXT i} - [unstore_unit] - variable=second_unit - find_vacant=no - [/unstore_unit] - [/event] - [/then] - [/if] + [unstore_unit] + variable=second_unit + find_vacant=no + [/unstore_unit] + [/event] [/event] #enddef