Skip to content

Commit

Permalink
.
Browse files Browse the repository at this point in the history
  • Loading branch information
@Pentarctagon
Pentarctagon committed Jul 27, 2024
1 parent 374069b commit 4fba26f
Show file tree
Hide file tree
Showing 35 changed files with 61 additions and 62 deletions.
47 changes: 23 additions & 24 deletions data/test/macros/wml_unit_test_macros.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,9 +99,9 @@ bob#endarg
1#endarg

#arg DAMAGE_VALUE
[damage]
value=100
[/damage]
[damage]
value=100
[/damage]
#endarg

[modify_unit]
Expand All @@ -121,22 +121,28 @@ bob#endarg
[/chance_to_hit]
[/set_specials]
[/effect]
hitpoints = 1000
max_hitpoints = 1000
[/modify_unit]

{VARIABLE weapons {WEAPON_COUNT}}
[for]
start=0
end="$($weapons-1)"
step=1
[do]
[test_do_attack_by_id]
attacker={ID1}
defender={ID2}
weapon=$i
{VARIABLE weapons {WEAPON_COUNT}}
[for]
start=0
end="$($weapons-1)"
step=1
[do]
[modify_unit]
[filter]
id={ID1},{ID2}
[/filter]
hitpoints = 1000
[/modify_unit]

[test_do_attack_by_id]
attacker={ID1}
defender={ID2}
weapon=$i
resupply_attacks_left=1
[/test_do_attack_by_id]
[/test_do_attack_by_id]

[store_unit]
[filter]
Expand All @@ -154,17 +160,10 @@ bob#endarg
{ASSERT {VARIABLE_CONDITIONAL {ID1}.hitpoints numerical_equals "$(${ID1}.max_hitpoints-{DAMAGE1})"}}
{ASSERT {VARIABLE_CONDITIONAL {ID2}.hitpoints numerical_equals "$(${ID2}.max_hitpoints-{DAMAGE2})"}}

[modify_unit]
[filter]
id={ID1},{ID2}
[/filter]
hitpoints = 1000
[/modify_unit]

{CLEAR_VARIABLE {ID1}}
{CLEAR_VARIABLE {ID2}}
[/do]
[/for]
[/do]
[/for]
#enddef

# Takes a unit id, and checks that its hitpoints and experience are the expected values.
Expand Down
2 changes: 1 addition & 1 deletion data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/damage/damage_add.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
[/effect]
[/modify_unit]

{ATTACK_AND_VALIDATE 6 (DAMAGE_VALUE=) WEAPON_COUNT=2}
{ATTACK_AND_VALIDATE 6 (DAMAGE_VALUE=) WEAPON_COUNT=2}
{SUCCEED}
[/event]
) SIDE2_LEADER="Elvish Archer"}
2 changes: 1 addition & 1 deletion data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/damage/damage_add_divide.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
[/effect]
[/modify_unit]

{ATTACK_AND_VALIDATE 3 (DAMAGE_VALUE=) WEAPON_COUNT=2}
{ATTACK_AND_VALIDATE 3 (DAMAGE_VALUE=) WEAPON_COUNT=2}
{SUCCEED}
[/event]
) SIDE2_LEADER="Elvish Archer"}
2 changes: 1 addition & 1 deletion data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/damage/damage_add_multiply.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
[/effect]
[/modify_unit]

{ATTACK_AND_VALIDATE 12 (DAMAGE_VALUE=) WEAPON_COUNT=2}
{ATTACK_AND_VALIDATE 12 (DAMAGE_VALUE=) WEAPON_COUNT=2}
{SUCCEED}
[/event]
) SIDE2_LEADER="Elvish Archer"}
2 changes: 1 addition & 1 deletion data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/damage/damage_add_sub.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
[/effect]
[/modify_unit]

{ATTACK_AND_VALIDATE 3 (DAMAGE_VALUE=) WEAPON_COUNT=2}
{ATTACK_AND_VALIDATE 3 (DAMAGE_VALUE=) WEAPON_COUNT=2}
{SUCCEED}
[/event]
) SIDE2_LEADER="Elvish Archer"}
4 changes: 2 additions & 2 deletions data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/damage/damage_affect_allies.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
[/effect]
[/modify_unit]

{ATTACK_AND_VALIDATE 5 DAMAGE2=2 (DAMAGE_VALUE=) ID1=bob ID2=charlie WEAPON_COUNT=2}
{ATTACK_AND_VALIDATE 5 (DAMAGE_VALUE=) ID1=alice ID2=dave WEAPON_COUNT=2}
{ATTACK_AND_VALIDATE 5 DAMAGE2=2 (DAMAGE_VALUE=) ID1=bob ID2=charlie WEAPON_COUNT=2}
{ATTACK_AND_VALIDATE 5 (DAMAGE_VALUE=) ID1=alice ID2=dave WEAPON_COUNT=2}
{SUCCEED}
[/event]
) SIDE_LEADER="Elvish Archer"}
2 changes: 1 addition & 1 deletion data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/damage/damage_affect_enemies.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
[/effect]
[/modify_unit]

{ATTACK_AND_VALIDATE 2 DAMAGE2=5 (DAMAGE_VALUE=) WEAPON_COUNT=2}
{ATTACK_AND_VALIDATE 2 DAMAGE2=5 (DAMAGE_VALUE=) WEAPON_COUNT=2}
{SUCCEED}
[/event]
) SIDE2_LEADER="Elvish Archer"}
6 changes: 3 additions & 3 deletions data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/damage/damage_affect_everybody.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@
[/effect]
[/modify_unit]

{ATTACK_AND_VALIDATE 2 (DAMAGE_VALUE=) ID1=alice ID2=charlie WEAPON_COUNT=2}
{ATTACK_AND_VALIDATE 2 (DAMAGE_VALUE=) ID1=bob ID2=dave WEAPON_COUNT=2}
{ATTACK_AND_VALIDATE 2 (DAMAGE_VALUE=) ID1=dave ID2=alice WEAPON_COUNT=2}
{ATTACK_AND_VALIDATE 2 (DAMAGE_VALUE=) ID1=alice ID2=charlie WEAPON_COUNT=2}
{ATTACK_AND_VALIDATE 2 (DAMAGE_VALUE=) ID1=bob ID2=dave WEAPON_COUNT=2}
{ATTACK_AND_VALIDATE 2 (DAMAGE_VALUE=) ID1=dave ID2=alice WEAPON_COUNT=2}
{SUCCEED}
[/event]
) SIDE_LEADER="Elvish Archer"}
2 changes: 1 addition & 1 deletion data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/damage/damage_affect_self_no.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
[/effect]
[/modify_unit]

{ATTACK_AND_VALIDATE 5 (DAMAGE_VALUE=) WEAPON_COUNT=2}
{ATTACK_AND_VALIDATE 5 (DAMAGE_VALUE=) WEAPON_COUNT=2}
{SUCCEED}
[/event]
) SIDE2_LEADER="Elvish Archer"}
2 changes: 1 addition & 1 deletion data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/damage/damage_divide.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
[/effect]
[/modify_unit]

{ATTACK_AND_VALIDATE 3 (DAMAGE_VALUE=) WEAPON_COUNT=2}
{ATTACK_AND_VALIDATE 3 (DAMAGE_VALUE=) WEAPON_COUNT=2}
{SUCCEED}
[/event]
) SIDE2_LEADER="Elvish Archer"}
2 changes: 1 addition & 1 deletion data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/damage/damage_high_fraction.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
[/effect]
[/modify_unit]

{ATTACK_AND_VALIDATE 3 (DAMAGE_VALUE=) WEAPON_COUNT=2}
{ATTACK_AND_VALIDATE 3 (DAMAGE_VALUE=) WEAPON_COUNT=2}
{SUCCEED}
[/event]
) SIDE2_LEADER="Elvish Archer"}
Expand Down
2 changes: 1 addition & 1 deletion data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/damage/damage_low_fraction.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
[/effect]
[/modify_unit]

{ATTACK_AND_VALIDATE 3 (DAMAGE_VALUE=) WEAPON_COUNT=2}
{ATTACK_AND_VALIDATE 3 (DAMAGE_VALUE=) WEAPON_COUNT=2}
{SUCCEED}
[/event]
) SIDE2_LEADER="Elvish Archer"}
Expand Down
2 changes: 1 addition & 1 deletion data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/damage/damage_max_value.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
[/effect]
[/modify_unit]

{ATTACK_AND_VALIDATE 1 (DAMAGE_VALUE=) WEAPON_COUNT=2}
{ATTACK_AND_VALIDATE 1 (DAMAGE_VALUE=) WEAPON_COUNT=2}
{SUCCEED}
[/event]
) SIDE2_LEADER="Elvish Archer"}
2 changes: 1 addition & 1 deletion data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/damage/damage_multiply.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
[/effect]
[/modify_unit]

{ATTACK_AND_VALIDATE 8 (DAMAGE_VALUE=) WEAPON_COUNT=2}
{ATTACK_AND_VALIDATE 8 (DAMAGE_VALUE=) WEAPON_COUNT=2}
{SUCCEED}
[/event]
) SIDE2_LEADER="Elvish Archer"}
2 changes: 1 addition & 1 deletion data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/damage/damage_multiply_divide.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
[/effect]
[/modify_unit]

{ATTACK_AND_VALIDATE 6 (DAMAGE_VALUE=) WEAPON_COUNT=2}
{ATTACK_AND_VALIDATE 6 (DAMAGE_VALUE=) WEAPON_COUNT=2}
{SUCCEED}
[/event]
) SIDE2_LEADER="Elvish Archer"}
2 changes: 1 addition & 1 deletion data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/damage/damage_multiply_fraction.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
[/effect]
[/modify_unit]

{ATTACK_AND_VALIDATE 6 (DAMAGE_VALUE=) WEAPON_COUNT=2}
{ATTACK_AND_VALIDATE 6 (DAMAGE_VALUE=) WEAPON_COUNT=2}
{SUCCEED}
[/event]
) SIDE2_LEADER="Elvish Archer"}
Expand Down
2 changes: 1 addition & 1 deletion data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/damage/damage_negative_value.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
[/effect]
[/modify_unit]

{ATTACK_AND_VALIDATE 1 (DAMAGE_VALUE=) WEAPON_COUNT=2}
{ATTACK_AND_VALIDATE 1 (DAMAGE_VALUE=) WEAPON_COUNT=2}
{SUCCEED}
[/event]
) SIDE2_LEADER="Elvish Archer"}
2 changes: 1 addition & 1 deletion data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/damage/damage_no_value.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
[/effect]
[/modify_unit]

{ATTACK_AND_VALIDATE 5 (DAMAGE_VALUE=) WEAPON_COUNT=2}
{ATTACK_AND_VALIDATE 5 (DAMAGE_VALUE=) WEAPON_COUNT=2}
{SUCCEED}
[/event]
) SIDE2_LEADER="Elvish Archer"}
2 changes: 1 addition & 1 deletion ...scenarios/wml_tests/UnitsWML/AbilitiesWML/damage/damage_overwrite_specials_both_sides.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
[/effect]
[/modify_unit]

{ATTACK_AND_VALIDATE 5 DAMAGE2=2 (DAMAGE_VALUE=) WEAPON_COUNT=2}
{ATTACK_AND_VALIDATE 5 DAMAGE2=2 (DAMAGE_VALUE=) WEAPON_COUNT=2}
{SUCCEED}
[/event]
) SIDE2_LEADER="Elvish Archer"}
2 changes: 1 addition & 1 deletion ...test/scenarios/wml_tests/UnitsWML/AbilitiesWML/damage/damage_overwrite_specials_mixed.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
[/effect]
[/modify_unit]

{ATTACK_AND_VALIDATE 5 DAMAGE2=7 (DAMAGE_VALUE=) WEAPON_COUNT=2}
{ATTACK_AND_VALIDATE 5 DAMAGE2=7 (DAMAGE_VALUE=) WEAPON_COUNT=2}
{SUCCEED}
[/event]
) SIDE2_LEADER="Elvish Archer"}
2 changes: 1 addition & 1 deletion ...t/scenarios/wml_tests/UnitsWML/AbilitiesWML/damage/damage_overwrite_specials_one_side.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
[/effect]
[/modify_unit]

{ATTACK_AND_VALIDATE 5 DAMAGE2=2 (DAMAGE_VALUE=) WEAPON_COUNT=2}
{ATTACK_AND_VALIDATE 5 DAMAGE2=2 (DAMAGE_VALUE=) WEAPON_COUNT=2}
{SUCCEED}
[/event]
) SIDE2_LEADER="Elvish Archer"}
2 changes: 1 addition & 1 deletion ...arios/wml_tests/UnitsWML/AbilitiesWML/damage/damage_overwrite_specials_two_both_sides.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
[/effect]
[/modify_unit]

{ATTACK_AND_VALIDATE 5 DAMAGE2=7 (DAMAGE_VALUE=) WEAPON_COUNT=2}
{ATTACK_AND_VALIDATE 5 DAMAGE2=7 (DAMAGE_VALUE=) WEAPON_COUNT=2}
{SUCCEED}
[/event]
) SIDE2_LEADER="Elvish Archer"}
2 changes: 1 addition & 1 deletion ...enarios/wml_tests/UnitsWML/AbilitiesWML/damage/damage_overwrite_specials_two_one_side.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
[/effect]
[/modify_unit]

{ATTACK_AND_VALIDATE 5 DAMAGE2=7 (DAMAGE_VALUE=) WEAPON_COUNT=2}
{ATTACK_AND_VALIDATE 5 DAMAGE2=7 (DAMAGE_VALUE=) WEAPON_COUNT=2}
{SUCCEED}
[/event]
) SIDE2_LEADER="Elvish Archer"}
2 changes: 1 addition & 1 deletion data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/damage/damage_sub.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
[/effect]
[/modify_unit]

{ATTACK_AND_VALIDATE 1 (DAMAGE_VALUE=) WEAPON_COUNT=2}
{ATTACK_AND_VALIDATE 1 (DAMAGE_VALUE=) WEAPON_COUNT=2}
{SUCCEED}
[/event]
) SIDE2_LEADER="Elvish Archer"}
2 changes: 1 addition & 1 deletion data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/damage/damage_sub_divide.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
[/effect]
[/modify_unit]

{ATTACK_AND_VALIDATE 1 (DAMAGE_VALUE=) WEAPON_COUNT=2}
{ATTACK_AND_VALIDATE 1 (DAMAGE_VALUE=) WEAPON_COUNT=2}
{SUCCEED}
[/event]
) SIDE2_LEADER="Elvish Archer"}
2 changes: 1 addition & 1 deletion data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/damage/damage_sub_multiply.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
[/effect]
[/modify_unit]

{ATTACK_AND_VALIDATE 4 (DAMAGE_VALUE=) WEAPON_COUNT=2}
{ATTACK_AND_VALIDATE 4 (DAMAGE_VALUE=) WEAPON_COUNT=2}
{SUCCEED}
[/event]
) SIDE2_LEADER="Elvish Archer"}
2 changes: 1 addition & 1 deletion .../scenarios/wml_tests/UnitsWML/AbilitiesWML/damage/damage_two_cumulative_mixed_same_id.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
[/effect]
[/modify_unit]

{ATTACK_AND_VALIDATE 6 (DAMAGE_VALUE=) WEAPON_COUNT=2}
{ATTACK_AND_VALIDATE 6 (DAMAGE_VALUE=) WEAPON_COUNT=2}
{SUCCEED}
[/event]
) SIDE2_LEADER="Elvish Archer"}
2 changes: 1 addition & 1 deletion ...cenarios/wml_tests/UnitsWML/AbilitiesWML/damage/damage_two_cumulative_mixed_unique_id.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
[/effect]
[/modify_unit]

{ATTACK_AND_VALIDATE 6 (DAMAGE_VALUE=) WEAPON_COUNT=2}
{ATTACK_AND_VALIDATE 6 (DAMAGE_VALUE=) WEAPON_COUNT=2}
{SUCCEED}
[/event]
) SIDE2_LEADER="Elvish Archer"}
2 changes: 1 addition & 1 deletion ...est/scenarios/wml_tests/UnitsWML/AbilitiesWML/damage/damage_two_cumulative_no_same_id.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
[/effect]
[/modify_unit]

{ATTACK_AND_VALIDATE 6 (DAMAGE_VALUE=) WEAPON_COUNT=2}
{ATTACK_AND_VALIDATE 6 (DAMAGE_VALUE=) WEAPON_COUNT=2}
{SUCCEED}
[/event]
) SIDE2_LEADER="Elvish Archer"}
2 changes: 1 addition & 1 deletion ...t/scenarios/wml_tests/UnitsWML/AbilitiesWML/damage/damage_two_cumulative_no_unique_id.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
[/effect]
[/modify_unit]

{ATTACK_AND_VALIDATE 6 (DAMAGE_VALUE=) WEAPON_COUNT=2}
{ATTACK_AND_VALIDATE 6 (DAMAGE_VALUE=) WEAPON_COUNT=2}
{SUCCEED}
[/event]
) SIDE2_LEADER="Elvish Archer"}
2 changes: 1 addition & 1 deletion ...st/scenarios/wml_tests/UnitsWML/AbilitiesWML/damage/damage_two_cumulative_yes_same_id.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
[/effect]
[/modify_unit]

{ATTACK_AND_VALIDATE 6 (DAMAGE_VALUE=) WEAPON_COUNT=2}
{ATTACK_AND_VALIDATE 6 (DAMAGE_VALUE=) WEAPON_COUNT=2}
{SUCCEED}
[/event]
) SIDE2_LEADER="Elvish Archer"}
2 changes: 1 addition & 1 deletion .../scenarios/wml_tests/UnitsWML/AbilitiesWML/damage/damage_two_cumulative_yes_unique_id.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
[/effect]
[/modify_unit]

{ATTACK_AND_VALIDATE 6 (DAMAGE_VALUE=) WEAPON_COUNT=2}
{ATTACK_AND_VALIDATE 6 (DAMAGE_VALUE=) WEAPON_COUNT=2}
{SUCCEED}
[/event]
) SIDE2_LEADER="Elvish Archer"}
2 changes: 1 addition & 1 deletion data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/damage/damage_wfl_other.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
[/effect]
[/modify_unit]

{ATTACK_AND_VALIDATE 250 (DAMAGE_VALUE=) WEAPON_COUNT=2}
{ATTACK_AND_VALIDATE 250 (DAMAGE_VALUE=) WEAPON_COUNT=2}
{SUCCEED}
[/event]
) SIDE2_LEADER="Elvish Archer"}
4 changes: 2 additions & 2 deletions data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/damage/damage_wfl_self.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
# Have the side 1 leader attack the side 2 leader with both its weapons
##
# Expected end state:
# The side 1 leader has 2 weapons both of which have 250 strikes (1000/4), self is the attacker
# The side 1 leader has 2 weapons both of which have 250 damage (1000/4), self is the attacker
#####
{COMMON_KEEP_A_B_UNIT_TEST "damage_wfl_self" (
[event]
Expand All @@ -25,7 +25,7 @@
[/effect]
[/modify_unit]

{ATTACK_AND_VALIDATE 250 (DAMAGE_VALUE=) WEAPON_COUNT=2}
{ATTACK_AND_VALIDATE 250 (DAMAGE_VALUE=) WEAPON_COUNT=2}
{SUCCEED}
[/event]
) SIDE2_LEADER="Elvish Archer"}
2 changes: 1 addition & 1 deletion data/test/scenarios/wml_tests/UnitsWML/AbilitiesWML/damage/damage_zero.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
[/effect]
[/modify_unit]

{ATTACK_AND_VALIDATE 0 (DAMAGE_VALUE=) WEAPON_COUNT=2}
{ATTACK_AND_VALIDATE 0 (DAMAGE_VALUE=) WEAPON_COUNT=2}
{SUCCEED}
[/event]
) SIDE2_LEADER="Elvish Archer"}

0 comments on commit 4fba26f

Please sign in to comment.