Skip to content

Commit

Permalink
Minor simplification of FORCE_CHANCE_TO_HIT
Browse files Browse the repository at this point in the history
  • Loading branch information
@Vultraz
Vultraz committed Oct 4, 2015
1 parent 33385f9 commit 2775d3d
Showing 1 changed file with 103 additions and 107 deletions.
210 changes: 103 additions & 107 deletions data/core/macros/utils.cfg
View file
Expand Up @@ -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
Expand All @@ -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

Expand Down

0 comments on commit 2775d3d

Please sign in to comment.