0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Minor simplification of FORCE_CHANCE_TO_HIT

Browse source
This commit is contained in:
Charles Dang 2015-10-04 13:52:23 +11:00
parent 33385f97b8
commit 2775d3df4d
1 changed files with 101 additions and 105 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

206
data/core/macros/utils.cfg
View file

@ -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]
{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]
[variable]
name=unit.attack[$i].specials.chance_to_hit.length
greater_than=0
[/variable]
[then]
[set_variables]
name=unit.attack[$i].specials.chance_to_hit
[value]
id=forced_cth
value={CTH_NUMBER}
cumulative=no
[/value]
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]
[event]
name=attack end
delayed_variable_substitution=yes
[set_variables]
name=unit.attack[$i].specials.chance_to_hit
{FOREACH unit.attack i}
{CLEAR_VARIABLE unit.attack[$i].specials.chance_to_hit}
[value]
id=forced_cth
value={CTH_NUMBER}
cumulative=no
[/value]
[/set_variables]
{NEXT i}
[set_variables]
name=unit.attack[$i].specials.chance_to_hit
to_variable=unit.attack[$i].specials.original_chance_to_hit
[/set_variables]
[unstore_unit]
variable=unit
find_vacant=no
[/unstore_unit]
{CLEAR_VARIABLE unit.attack[$i].specials.original_chance_to_hit}
{NEXT i}
[event]
name=attack end
delayed_variable_substitution=yes
[unstore_unit]
variable=unit
find_vacant=no
[/unstore_unit]
[/event]
[/then]
[/if]
{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]
{CLEAR_VARIABLE unit.attack[$i].specials.original_chance_to_hit}
{NEXT i}
[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]
{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]
[variable]
name=second_unit.attack[$i].specials.chance_to_hit.length
greater_than=0
[/variable]
[then]
[set_variables]
name=second_unit.attack[$i].specials.chance_to_hit
[value]
id=forced_cth
value={CTH_NUMBER}
cumulative=no
[/value]
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]
[event]
name=attack end
delayed_variable_substitution=yes
[set_variables]
name=second_unit.attack[$i].specials.chance_to_hit
{FOREACH second_unit.attack i}
{CLEAR_VARIABLE second_unit.attack[$i].specials.chance_to_hit}
[value]
id=forced_cth
value={CTH_NUMBER}
cumulative=no
[/value]
[/set_variables]
{NEXT i}
[set_variables]
name=second_unit.attack[$i].specials.chance_to_hit
to_variable=second_unit.attack[$i].specials.original_chance_to_hit
[/set_variables]
[unstore_unit]
variable=second_unit
find_vacant=no
[/unstore_unit]
{CLEAR_VARIABLE second_unit.attack[$i].specials.original_chance_to_hit}
{NEXT i}
[event]
name=attack end
delayed_variable_substitution=yes
[unstore_unit]
variable=second_unit
find_vacant=no
[/unstore_unit]
[/event]
[/then]
[/if]
{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]
{CLEAR_VARIABLE second_unit.attack[$i].specials.original_chance_to_hit}
{NEXT i}
[unstore_unit]
variable=second_unit
find_vacant=no
[/unstore_unit]
[/event]
[/event]
#enddef