From 83f7f48b418ada8877b8344e995621a73de144dc Mon Sep 17 00:00:00 2001 From: Steven Panek Date: Sat, 6 Nov 2010 05:56:22 +0000 Subject: [PATCH] 'add -' -> sub '. --- .../An_Orcish_Incursion/scenarios/03_Wasteland.cfg | 2 +- .../scenarios/07_A_Small_Favor.cfg | 2 +- .../scenarios/08_A_Small_Favor2.cfg | 8 ++++---- .../scenarios/04c_Mal-Ravanals_Capital.cfg | 4 ++-- .../scenarios/05_Northern_Outpost.cfg | 6 +++--- .../scenarios/13_The_Drowned_Plains.cfg | 2 +- .../Heir_To_The_Throne/scenarios/07_Crossroads.cfg | 2 +- .../scenarios/10_Gryphon_Mountain.cfg | 6 +++--- .../scenarios/12_Northern_Winter.cfg | 4 ++-- .../scenarios/23_Test_of_the_Clans.cfg | 2 +- .../Heir_To_The_Throne/utils/httt_utils.cfg | 6 +++--- .../Legend_of_Wesmere/scenarios/03_Kalian.cfg | 2 +- .../scenarios/09_Bounty_hunters.cfg | 2 +- .../Liberty/scenarios/05_Hide_and_Seek.cfg | 4 ++-- .../scenarios/4_Gathering_Materials.cfg | 6 +++--- .../scenarios/06_Black_Flag.cfg | 2 +- .../campaigns/Son_Of_The_Black_Eye/utils/utils.cfg | 6 +++--- .../scenarios/06b_The_Long_March.cfg | 10 +++++----- .../scenarios/08b_The_Tides_of_War.cfg | 6 +++--- .../scenarios/01_The_Morning_After.cfg | 2 +- .../scenarios/02_Across_the_Harsh_Sands.cfg | 2 +- .../scenarios/03_Stirring_in_the_Night.cfg | 8 ++++---- .../scenarios/12_The_Final_Confrontation.cfg | 14 +++++++------- .../utils/dehydration-utils.cfg | 4 ++-- .../Under_the_Burning_Suns/utils/macros.cfg | 2 +- data/campaigns/tutorial/scenarios/1_Tutorial.cfg | 8 ++++---- 26 files changed, 61 insertions(+), 61 deletions(-) diff --git a/data/campaigns/An_Orcish_Incursion/scenarios/03_Wasteland.cfg b/data/campaigns/An_Orcish_Incursion/scenarios/03_Wasteland.cfg index 051ed3291ba..603c74768d4 100644 --- a/data/campaigns/An_Orcish_Incursion/scenarios/03_Wasteland.cfg +++ b/data/campaigns/An_Orcish_Incursion/scenarios/03_Wasteland.cfg @@ -145,7 +145,7 @@ There are no villages in this scenario — you must use healers instead. Use hit [/else] [/if] - {VARIABLE_OP camp_gold add -$unit.cost} + {VARIABLE_OP camp_gold sub $unit.cost} {VARIABLE_OP orcs_recruited add 1} {CLEAR_VARIABLE temporary} [/event] diff --git a/data/campaigns/Descent_Into_Darkness/scenarios/07_A_Small_Favor.cfg b/data/campaigns/Descent_Into_Darkness/scenarios/07_A_Small_Favor.cfg index 498a4077c8b..16ed4998565 100644 --- a/data/campaigns/Descent_Into_Darkness/scenarios/07_A_Small_Favor.cfg +++ b/data/campaigns/Descent_Into_Darkness/scenarios/07_A_Small_Favor.cfg @@ -274,7 +274,7 @@ race=undead [/filter] - {VARIABLE_OP unit.hitpoints add -1} + {VARIABLE_OP unit.hitpoints sub 1} [if] [variable] diff --git a/data/campaigns/Descent_Into_Darkness/scenarios/08_A_Small_Favor2.cfg b/data/campaigns/Descent_Into_Darkness/scenarios/08_A_Small_Favor2.cfg index 73fad490ff1..056cf07fc2c 100644 --- a/data/campaigns/Descent_Into_Darkness/scenarios/08_A_Small_Favor2.cfg +++ b/data/campaigns/Descent_Into_Darkness/scenarios/08_A_Small_Favor2.cfg @@ -183,7 +183,7 @@ [do] {RANDOM 1..$possible_guard_locations.length} - {VARIABLE_OP random add -1} + {VARIABLE_OP random sub 1} {NAMED_NOTRAIT_UNIT 2 $guardtypetable[$guardtypetable_i].type $possible_guard_locations[$random].x $possible_guard_locations[$random].y () (_ "Guard")} {GUARDIAN} @@ -209,7 +209,7 @@ [/then] [/if] - {VARIABLE_OP guards_to_place add -1} + {VARIABLE_OP guards_to_place sub 1} [/do] [/while] @@ -281,7 +281,7 @@ [do] {RANDOM 1..$possible_mage_locations.length} - {VARIABLE_OP random add -1} + {VARIABLE_OP random sub 1} {GENERIC_UNIT 2 $magetypetable[$magetypetable_i].type $possible_mage_locations[$random].x $possible_mage_locations[$random].y} @@ -307,7 +307,7 @@ [/then] [/if] - {VARIABLE_OP mages_to_place add -1} + {VARIABLE_OP mages_to_place sub 1} [/do] [/while] diff --git a/data/campaigns/Eastern_Invasion/scenarios/04c_Mal-Ravanals_Capital.cfg b/data/campaigns/Eastern_Invasion/scenarios/04c_Mal-Ravanals_Capital.cfg index 71b64dd9e4f..b921e1f0705 100644 --- a/data/campaigns/Eastern_Invasion/scenarios/04c_Mal-Ravanals_Capital.cfg +++ b/data/campaigns/Eastern_Invasion/scenarios/04c_Mal-Ravanals_Capital.cfg @@ -170,7 +170,7 @@ [/store_locations] {VARIABLE paladin_i "1..$prison_locations.length"} - {VARIABLE_OP paladin_i add -1} + {VARIABLE_OP paladin_i sub 1} {FOREACH prison_locations i} [item] @@ -465,7 +465,7 @@ [/if] {VARIABLE_OP random_prisoner_i rand "1..$killable_prisoners.length"} - {VARIABLE_OP random_prisoner_i add -1} + {VARIABLE_OP random_prisoner_i sub 1} [store_unit] [filter] diff --git a/data/campaigns/Eastern_Invasion/scenarios/05_Northern_Outpost.cfg b/data/campaigns/Eastern_Invasion/scenarios/05_Northern_Outpost.cfg index b8214957878..9d0dc006f43 100644 --- a/data/campaigns/Eastern_Invasion/scenarios/05_Northern_Outpost.cfg +++ b/data/campaigns/Eastern_Invasion/scenarios/05_Northern_Outpost.cfg @@ -339,7 +339,7 @@ {REPEAT $num_of_bandit_villages ( {VARIABLE_OP bandit_village_i rand "1..$all_villages.length"} - {VARIABLE_OP bandit_village_i add -1} + {VARIABLE_OP bandit_village_i sub 1} [store_locations] x,y=$all_villages[$bandit_village_i].x,$all_villages[$bandit_village_i].y @@ -473,7 +473,7 @@ [/if] {VARIABLE_OP loc_i rand "1..$new_bandit_locations.length"} - {VARIABLE_OP loc_i add -1} + {VARIABLE_OP loc_i sub 1} [move_unit_fake] x=$x1|,$new_bandit_locations[$loc_i].x @@ -547,7 +547,7 @@ [/store_locations] {VARIABLE_OP loc_i rand "1..$new_bandit_locations.length"} - {VARIABLE_OP loc_i add -1} + {VARIABLE_OP loc_i sub 1} [move_unit_fake] x=$x1|,$new_bandit_locations[$loc_i].x diff --git a/data/campaigns/Eastern_Invasion/scenarios/13_The_Drowned_Plains.cfg b/data/campaigns/Eastern_Invasion/scenarios/13_The_Drowned_Plains.cfg index e22eae1607a..0083b33fb6f 100644 --- a/data/campaigns/Eastern_Invasion/scenarios/13_The_Drowned_Plains.cfg +++ b/data/campaigns/Eastern_Invasion/scenarios/13_The_Drowned_Plains.cfg @@ -225,7 +225,7 @@ [do] {RANDOM 1..$possible_ambush_locations.length} - {VARIABLE_OP random add -1} + {VARIABLE_OP random sub 1} # Check if the random location picked already contains an ambusher # and if it does, we loop again to pick another one until an empty diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/07_Crossroads.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/07_Crossroads.cfg index 62ccb521421..6ee394361d7 100644 --- a/data/campaigns/Heir_To_The_Throne/scenarios/07_Crossroads.cfg +++ b/data/campaigns/Heir_To_The_Throne/scenarios/07_Crossroads.cfg @@ -284,7 +284,7 @@ [do] {RANDOM 1..$possible_ambush_locations.length} - {VARIABLE_OP random add -1} + {VARIABLE_OP random sub 1} # Check if the random location picked already contains an ambusher # and if it does, we loop again to pick another one until an empty diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/10_Gryphon_Mountain.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/10_Gryphon_Mountain.cfg index 9d4e006b602..2bf4aedaf3f 100644 --- a/data/campaigns/Heir_To_The_Throne/scenarios/10_Gryphon_Mountain.cfg +++ b/data/campaigns/Heir_To_The_Throne/scenarios/10_Gryphon_Mountain.cfg @@ -193,7 +193,7 @@ speaker=second_unit message= _ "Ha ha! We have killed this foul beast of the air, and can deny the rebels its eggs!" [/message] - {VARIABLE_OP gryphon_disposition add -1} + {VARIABLE_OP gryphon_disposition sub 1} [/event] [event] name=attack @@ -214,7 +214,7 @@ [filter_second] side=3 [/filter_second] - {VARIABLE_OP gryphon_disposition add -1} + {VARIABLE_OP gryphon_disposition sub 1} [/event] [event] name=die @@ -224,7 +224,7 @@ [filter_second] side=1 [/filter_second] - {VARIABLE_OP gryphon_disposition add -10} + {VARIABLE_OP gryphon_disposition sub 10} [/event] [event] diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/12_Northern_Winter.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/12_Northern_Winter.cfg index 48e62c70df0..dd1fccda9bb 100644 --- a/data/campaigns/Heir_To_The_Throne/scenarios/12_Northern_Winter.cfg +++ b/data/campaigns/Heir_To_The_Throne/scenarios/12_Northern_Winter.cfg @@ -204,7 +204,7 @@ [/store_locations] {VARIABLE turns_left $turn_limit} - {VARIABLE_OP turns_left add -$turn_number} + {VARIABLE_OP turns_left sub $turn_number} {VARIABLE num_of_falling_snow $non_snowy_locs.length} {VARIABLE_OP num_of_falling_snow divide $turns_left} @@ -221,7 +221,7 @@ [do] {RANDOM "1..$non_snowy_locs.length"} - {VARIABLE_OP random add -1} + {VARIABLE_OP random sub 1} [switch] variable=non_snowy_locs[$random].terrain diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/23_Test_of_the_Clans.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/23_Test_of_the_Clans.cfg index f66f90f27b3..67266fe61b0 100644 --- a/data/campaigns/Heir_To_The_Throne/scenarios/23_Test_of_the_Clans.cfg +++ b/data/campaigns/Heir_To_The_Throne/scenarios/23_Test_of_the_Clans.cfg @@ -482,7 +482,7 @@ side=2,3,4,5 [/filter] - {VARIABLE_OP units_to_slay add -1} + {VARIABLE_OP units_to_slay sub 1} [if] [variable] diff --git a/data/campaigns/Heir_To_The_Throne/utils/httt_utils.cfg b/data/campaigns/Heir_To_The_Throne/utils/httt_utils.cfg index 141949fed06..a4f94940449 100644 --- a/data/campaigns/Heir_To_The_Throne/utils/httt_utils.cfg +++ b/data/campaigns/Heir_To_The_Throne/utils/httt_utils.cfg @@ -496,9 +496,9 @@ _f, _f, _f, _f, _f, _f, Re, _f, _f, _f, _f, _f, [/filter] [/store_unit] {VARIABLE min_x $side_store.x} - {VARIABLE_OP min_x add -1} + {VARIABLE_OP min_x sub 1} {VARIABLE min_y $side_store.y} - {VARIABLE_OP min_y add -1} + {VARIABLE_OP min_y sub 1} {VARIABLE max_x $side_store.x} {VARIABLE_OP max_x add 1} {VARIABLE max_y $side_store.y} @@ -561,7 +561,7 @@ _f, _f, _f, _f, _f, _f, Re, _f, _f, _f, _f, _f, [then] {VARIABLE lava_count 0} {VARIABLE randrange $potential_locs.length} - {VARIABLE_OP randrange add -1} + {VARIABLE_OP randrange sub 1} {VARIABLE randrange "0..$randrange"} {RANDOM $randrange} {CLEAR_VARIABLE lava_body} diff --git a/data/campaigns/Legend_of_Wesmere/scenarios/03_Kalian.cfg b/data/campaigns/Legend_of_Wesmere/scenarios/03_Kalian.cfg index 459fec9cbc6..634a3eadc75 100644 --- a/data/campaigns/Legend_of_Wesmere/scenarios/03_Kalian.cfg +++ b/data/campaigns/Legend_of_Wesmere/scenarios/03_Kalian.cfg @@ -304,7 +304,7 @@ [/have_unit] [/not] [then] - {VARIABLE_OP orc_battlefield_evaluation add -1000} + {VARIABLE_OP orc_battlefield_evaluation sub 1000} [/then] [/if] diff --git a/data/campaigns/Legend_of_Wesmere/scenarios/09_Bounty_hunters.cfg b/data/campaigns/Legend_of_Wesmere/scenarios/09_Bounty_hunters.cfg index d70d9d9e465..3f6616c2d56 100644 --- a/data/campaigns/Legend_of_Wesmere/scenarios/09_Bounty_hunters.cfg +++ b/data/campaigns/Legend_of_Wesmere/scenarios/09_Bounty_hunters.cfg @@ -246,7 +246,7 @@ [/case] [else] {VARIABLE l3_length $l3_store_{NAME}.length} - {VARIABLE_OP l3_length add -1} + {VARIABLE_OP l3_length sub 1} {FOREACH l3_store_{NAME} i} # for-case, what a great anti-pattern [switch] diff --git a/data/campaigns/Liberty/scenarios/05_Hide_and_Seek.cfg b/data/campaigns/Liberty/scenarios/05_Hide_and_Seek.cfg index df7c32a9ca8..edd8d6fbdbe 100644 --- a/data/campaigns/Liberty/scenarios/05_Hide_and_Seek.cfg +++ b/data/campaigns/Liberty/scenarios/05_Hide_and_Seek.cfg @@ -302,7 +302,7 @@ {IF_VAR new_guard_locations.length greater_than 0 ( [then] {VARIABLE_OP random_i rand "1..$new_guard_locations.length"} - {VARIABLE_OP random_i add -1} + {VARIABLE_OP random_i sub 1} {VARIABLE stored_guard.x $new_guard_locations[$random_i].x} {VARIABLE stored_guard.y $new_guard_locations[$random_i].y} @@ -336,7 +336,7 @@ {IF_VAR new_assistant_guard_locations.length greater_than 0 ( [then] {VARIABLE_OP random_i rand "1..$new_assistant_guard_locations.length"} - {VARIABLE_OP random_i add -1} + {VARIABLE_OP random_i sub 1} {VARIABLE_OP assistant_guard_type rand "Shock Trooper,Shock Trooper,Iron Mauler,Javelineer,Swordsman,Pikeman"} diff --git a/data/campaigns/Sceptre_of_Fire/scenarios/4_Gathering_Materials.cfg b/data/campaigns/Sceptre_of_Fire/scenarios/4_Gathering_Materials.cfg index f2e57954bb7..1f3be342656 100644 --- a/data/campaigns/Sceptre_of_Fire/scenarios/4_Gathering_Materials.cfg +++ b/data/campaigns/Sceptre_of_Fire/scenarios/4_Gathering_Materials.cfg @@ -141,7 +141,7 @@ [/store_locations] {RANDOM 1..$possible_coal_1_locations.length} - {VARIABLE_OP random add -1} + {VARIABLE_OP random sub 1} {VARIABLE coal_1.x $possible_coal_1_locations[$random].x} {VARIABLE coal_1.y $possible_coal_1_locations[$random].y} @@ -164,7 +164,7 @@ [/store_locations] {RANDOM 1..$possible_coal_2_locations.length} - {VARIABLE_OP random add -1} + {VARIABLE_OP random sub 1} {VARIABLE coal_2.x $possible_coal_2_locations[$random].x} {VARIABLE coal_2.y $possible_coal_2_locations[$random].y} @@ -202,7 +202,7 @@ [/store_locations] {RANDOM 1..$possible_gold_locations.length} - {VARIABLE_OP random add -1} + {VARIABLE_OP random sub 1} {VARIABLE gold_1.x $possible_gold_locations[$random].x} {VARIABLE gold_1.y $possible_gold_locations[$random].y} diff --git a/data/campaigns/Son_Of_The_Black_Eye/scenarios/06_Black_Flag.cfg b/data/campaigns/Son_Of_The_Black_Eye/scenarios/06_Black_Flag.cfg index 3a560cb9101..103234a3e88 100644 --- a/data/campaigns/Son_Of_The_Black_Eye/scenarios/06_Black_Flag.cfg +++ b/data/campaigns/Son_Of_The_Black_Eye/scenarios/06_Black_Flag.cfg @@ -369,7 +369,7 @@ [/store_locations] {VARIABLE_OP transport_destination_index rand "1..$possible_transport_destinations.length"} - {VARIABLE_OP transport_destination_index add -1} + {VARIABLE_OP transport_destination_index sub 1} {VARIABLE stored_transports[$i].variables.destination_x $possible_transport_destinations[$transport_destination_index].x} {VARIABLE stored_transports[$i].variables.destination_y $possible_transport_destinations[$transport_destination_index].y} diff --git a/data/campaigns/Son_Of_The_Black_Eye/utils/utils.cfg b/data/campaigns/Son_Of_The_Black_Eye/utils/utils.cfg index d285408fd0b..c19b5421703 100644 --- a/data/campaigns/Son_Of_The_Black_Eye/utils/utils.cfg +++ b/data/campaigns/Son_Of_The_Black_Eye/utils/utils.cfg @@ -112,7 +112,7 @@ [/filter] {VARIABLE unit.upkeep $unit.level} - {VARIABLE_OP unit.upkeep add -1} + {VARIABLE_OP unit.upkeep sub 1} {VARIABLE unit.variables.great_horde_upkeep_mod_applied yes} [unstore_unit] @@ -148,7 +148,7 @@ [/filter] {VARIABLE unit.upkeep $unit.level} - {VARIABLE_OP unit.upkeep add -1} + {VARIABLE_OP unit.upkeep sub 1} {VARIABLE unit.variables.great_horde_upkeep_mod_applied yes} [unstore_unit] @@ -176,7 +176,7 @@ [/filter] {VARIABLE unit.upkeep $unit.level} - {VARIABLE_OP unit.upkeep add -1} + {VARIABLE_OP unit.upkeep sub 1} {VARIABLE unit.variables.great_horde_upkeep_mod_applied yes} [unstore_unit] diff --git a/data/campaigns/The_South_Guard/scenarios/06b_The_Long_March.cfg b/data/campaigns/The_South_Guard/scenarios/06b_The_Long_March.cfg index 4b6715eff8b..e15a01d61bd 100644 --- a/data/campaigns/The_South_Guard/scenarios/06b_The_Long_March.cfg +++ b/data/campaigns/The_South_Guard/scenarios/06b_The_Long_March.cfg @@ -202,7 +202,7 @@ [then] {RANDOM 1..$new_road_branches.length} - {VARIABLE_OP random add -1} + {VARIABLE_OP random sub 1} {VARIABLE new_path_hex.x $new_road_branches[$random].x} {VARIABLE new_path_hex.y $new_road_branches[$random].y} @@ -254,7 +254,7 @@ [/store_locations] {RANDOM "1..$adjacent_forests.length"} - {VARIABLE_OP random add -1} + {VARIABLE_OP random sub 1} [terrain] x,y=$secret_path_to_hide[$i].x,$secret_path_to_hide[$i].y @@ -263,7 +263,7 @@ {NEXT i} {VARIABLE ford_mask_x $new_path_hex.x} - {VARIABLE_OP ford_mask_x add -1} + {VARIABLE_OP ford_mask_x sub 1} # This mask creates the ford at the end of the road [terrain_mask] @@ -634,7 +634,7 @@ _f, _f, Re, _f {CLEAR_VARIABLE previous_2_mp_hexes} - {VARIABLE_OP urza_moves add -1} + {VARIABLE_OP urza_moves sub 1} [/do] [/while] @@ -1025,7 +1025,7 @@ _f, _f, Re, _f [then] {VARIABLE max_undead_spawns $turn_number} - {VARIABLE_OP max_undead_spawns add -2} + {VARIABLE_OP max_undead_spawns sub 2} [if] [variable] diff --git a/data/campaigns/The_South_Guard/scenarios/08b_The_Tides_of_War.cfg b/data/campaigns/The_South_Guard/scenarios/08b_The_Tides_of_War.cfg index 90b5ccc633e..d865093d7ee 100644 --- a/data/campaigns/The_South_Guard/scenarios/08b_The_Tides_of_War.cfg +++ b/data/campaigns/The_South_Guard/scenarios/08b_The_Tides_of_War.cfg @@ -223,7 +223,7 @@ [then] {VARIABLE turns_past_22 $pebbles_defense_length} - {VARIABLE_OP turns_past_22 add -22} + {VARIABLE_OP turns_past_22 sub 22} {VARIABLE extra_starting_gold 20} {VARIABLE_OP extra_starting_gold multiply $turns_past_22} @@ -242,7 +242,7 @@ name=prestart {VARIABLE village_radius $pebbles_defense_length} - {VARIABLE_OP village_radius add -5} + {VARIABLE_OP village_radius sub 5} [if] [variable] @@ -370,7 +370,7 @@ message= _ "Hylas, I have made all possible haste, but my Council brethren are not as swift as I. It will take more time for them to arrive." [/message] {VARIABLE council_arrive_turn 25} - {VARIABLE_OP council_arrive_turn add -$pebbles_defense_length} + {VARIABLE_OP council_arrive_turn sub $pebbles_defense_length} [/then] [else] diff --git a/data/campaigns/Under_the_Burning_Suns/scenarios/01_The_Morning_After.cfg b/data/campaigns/Under_the_Burning_Suns/scenarios/01_The_Morning_After.cfg index 4772a645ee3..8df57a66528 100644 --- a/data/campaigns/Under_the_Burning_Suns/scenarios/01_The_Morning_After.cfg +++ b/data/campaigns/Under_the_Burning_Suns/scenarios/01_The_Morning_After.cfg @@ -990,7 +990,7 @@ # random elf from pool we defined in prestart {VARIABLE_OP random_elf_pool_index rand "1..$elf_pool.length"} - {VARIABLE_OP random_elf_pool_index add -1} + {VARIABLE_OP random_elf_pool_index sub 1} [unit] side=1 diff --git a/data/campaigns/Under_the_Burning_Suns/scenarios/02_Across_the_Harsh_Sands.cfg b/data/campaigns/Under_the_Burning_Suns/scenarios/02_Across_the_Harsh_Sands.cfg index faf9e9f39f0..a7fc2889663 100644 --- a/data/campaigns/Under_the_Burning_Suns/scenarios/02_Across_the_Harsh_Sands.cfg +++ b/data/campaigns/Under_the_Burning_Suns/scenarios/02_Across_the_Harsh_Sands.cfg @@ -2014,7 +2014,7 @@ {CLEAR_VARIABLE ghosts_per_turn} # deduct already spawned ghosts - whether still alive or not {VARIABLE ghost_limit $max_ghosts} - {VARIABLE_OP ghost_limit add -$ghosts_already_spawned} + {VARIABLE_OP ghost_limit sub $ghosts_already_spawned} [if] [variable] name=ghost_limit diff --git a/data/campaigns/Under_the_Burning_Suns/scenarios/03_Stirring_in_the_Night.cfg b/data/campaigns/Under_the_Burning_Suns/scenarios/03_Stirring_in_the_Night.cfg index c56c0271f33..13cacce2b70 100644 --- a/data/campaigns/Under_the_Burning_Suns/scenarios/03_Stirring_in_the_Night.cfg +++ b/data/campaigns/Under_the_Burning_Suns/scenarios/03_Stirring_in_the_Night.cfg @@ -504,7 +504,7 @@ {FOREACH tents i} {RANDOM 0..100} - {VARIABLE_OP random add -tents[i].y} + {VARIABLE_OP random sub tents[i].y} [if] [variable] name=random @@ -517,7 +517,7 @@ x=$tents[$i].x y=$tents[$i].y [/recall] - {VARIABLE_OP rally_chance add -3} + {VARIABLE_OP rally_chance sub 3} [/then] [/if] {NEXT i} @@ -694,7 +694,7 @@ side=$|unit.side [/gold] - {VARIABLE_OP elven_camps add -1} + {VARIABLE_OP elven_camps sub 1} [if] [variable] @@ -2218,7 +2218,7 @@ This unit always strikes first with this attack, even if they are defending." name=new turn first_time_only="no" {VARIABLE orc_warning $ambush_turn} - {VARIABLE_OP orc_warning add -2} + {VARIABLE_OP orc_warning sub 2} [if] [variable] 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 fdb486b8e98..225a71c300e 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 @@ -375,7 +375,7 @@ x,y=10,13 [/remove_item] - {VARIABLE_OP stored_kaleh.hitpoints add -10} + {VARIABLE_OP stored_kaleh.hitpoints sub 10} {VARIABLE stored_kaleh.facing n} [unstore_unit] @@ -555,7 +555,7 @@ variable=stored_eloh [/store_unit] - {VARIABLE_OP stored_eloh add -6} + {VARIABLE_OP stored_eloh sub 6} [unstore_unit] variable=stored_eloh @@ -647,7 +647,7 @@ [then] {VARIABLE_OP new_minion_loc_i rand "1..$possible_spawn_locations.length"} - {VARIABLE_OP new_minion_loc_i add -1} + {VARIABLE_OP new_minion_loc_i sub 1} {UNIT 2 (Crawling Horror) $possible_spawn_locations[$new_minion_loc_i].x $possible_spawn_locations[$new_minion_loc_i].y (upkeep=free)} @@ -1052,7 +1052,7 @@ [/store_unit] {VARIABLE random_helper_i "1..$possible_helpers.length"} - {VARIABLE_OP random_helper_i add -1} + {VARIABLE_OP random_helper_i sub 1} {VARIABLE possible_helpers[$random_helper_i].x 10} {VARIABLE possible_helpers[$random_helper_i].y 18} @@ -1227,7 +1227,7 @@ [/store_unit] {VARIABLE_OP victim_i rand "1..$elf_list.length"} - {VARIABLE_OP victim_i add -1} + {VARIABLE_OP victim_i sub 1} #used to be 140,255,247 @@ -1301,11 +1301,11 @@ [then] {VARIABLE special_attack_damage $elf_list[$victim_i].hitpoints} - {VARIABLE_OP special_attack_damage add -1} + {VARIABLE_OP special_attack_damage sub 1} [/then] [/if] - {VARIABLE_OP elf_list[$victim_i].hitpoints add -$special_attack_damage} + {VARIABLE_OP elf_list[$victim_i].hitpoints sub $special_attack_damage} [unstore_unit] variable=elf_list[$victim_i] diff --git a/data/campaigns/Under_the_Burning_Suns/utils/dehydration-utils.cfg b/data/campaigns/Under_the_Burning_Suns/utils/dehydration-utils.cfg index 574d3b3d0a9..c4243b336b5 100644 --- a/data/campaigns/Under_the_Burning_Suns/utils/dehydration-utils.cfg +++ b/data/campaigns/Under_the_Burning_Suns/utils/dehydration-utils.cfg @@ -94,7 +94,7 @@ Hd, Dd*, Rd #enddef [/variable] [then] - {VARIABLE_OP dehydrating_units[$i].attack[$j].damage add -1} + {VARIABLE_OP dehydrating_units[$i].attack[$j].damage sub 1} [/then] [/if] {NEXT j} @@ -107,7 +107,7 @@ Hd, Dd*, Rd #enddef [/variable] [then] - {VARIABLE_OP dehydrating_units[$i].hitpoints add -$dehydration_loss} + {VARIABLE_OP dehydrating_units[$i].hitpoints sub $dehydration_loss} [/then] [else] diff --git a/data/campaigns/Under_the_Burning_Suns/utils/macros.cfg b/data/campaigns/Under_the_Burning_Suns/utils/macros.cfg index 1e96de5aadf..083ab36bd69 100644 --- a/data/campaigns/Under_the_Burning_Suns/utils/macros.cfg +++ b/data/campaigns/Under_the_Burning_Suns/utils/macros.cfg @@ -183,7 +183,7 @@ multiply=-1 [/store_locations] {VARIABLE_OP assassin_location_i rand "1..$possible_assassin_locations.length"} - {VARIABLE_OP assassin_location_i add -1} + {VARIABLE_OP assassin_location_i sub 1} {VARIABLE dark_assassin_location.x $possible_assassin_locations[$assassin_location_i].x} {VARIABLE dark_assassin_location.y $possible_assassin_locations[$assassin_location_i].y} diff --git a/data/campaigns/tutorial/scenarios/1_Tutorial.cfg b/data/campaigns/tutorial/scenarios/1_Tutorial.cfg index 0d3c043ee83..fa2a1bae960 100644 --- a/data/campaigns/tutorial/scenarios/1_Tutorial.cfg +++ b/data/campaigns/tutorial/scenarios/1_Tutorial.cfg @@ -413,7 +413,7 @@ The places she can move to are highlighted." + [filter_second] id=student [/filter_second] - {VARIABLE_OP student_hp add -3} + {VARIABLE_OP student_hp sub 3} [/event] [event] @@ -422,7 +422,7 @@ The places she can move to are highlighted." + [filter] id=student [/filter] - {VARIABLE_OP student_hp add -3} + {VARIABLE_OP student_hp sub 3} [/event] [event] @@ -462,7 +462,7 @@ The places she can move to are highlighted." + {MOVE Delfador 13 6 14 8} {VARIABLE future_hp $student_hp} - {VARIABLE_OP future_hp add -15} + {VARIABLE_OP future_hp sub 15} #wmlindent: start ignoring {GENDER ( [message] @@ -580,7 +580,7 @@ Now, this quintain gets 5 chances to hit you for 3 damage each. If it hits every variable=student_hp_check [/store_unit] {VARIABLE hp_difference $student_hp_check.max_hitpoints} - {VARIABLE_OP hp_difference add -$student_hp_check.hitpoints} + {VARIABLE_OP hp_difference sub $student_hp_check.hitpoints} [if] [variable] name=hp_difference