From 6aa5d8c6ba99741958ca903bf46a32079521246a Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Mon, 8 Nov 2021 02:46:36 +0200 Subject: [PATCH 18/18] Rename 'move_is_blocked_by' as 'move_blocked_by' Same for move_2_is_blocked_by and move_3_is_blocked_by. This is consistent naming with other _blocked_by variables See osdn #41857 Signed-off-by: Marko Lindqvist --- common/actions.c | 6 +++--- data/alien/game.ruleset | 4 ++-- data/civ1/game.ruleset | 2 +- data/civ2/game.ruleset | 2 +- data/civ2civ3/game.ruleset | 6 +++--- data/classic/game.ruleset | 8 ++++---- data/goldkeep/game.ruleset | 8 ++++---- data/granularity/game.ruleset | 2 +- data/multiplayer/game.ruleset | 8 ++++---- data/sandbox/game.ruleset | 8 ++++---- data/stub/game.ruleset | 2 +- data/webperimental/game.ruleset | 4 ++-- doc/README.actions | 6 +++--- 13 files changed, 33 insertions(+), 33 deletions(-) diff --git a/common/actions.c b/common/actions.c index cb85de725b..b83d801ef8 100644 --- a/common/actions.c +++ b/common/actions.c @@ -9176,11 +9176,11 @@ const char *action_blocked_by_ruleset_var_name(const struct action *act) case ACTION_CONQUER_CITY4: return "conquer_city_4_blocked_by"; case ACTION_UNIT_MOVE: - return "move_is_blocked_by"; + return "move_blocked_by"; case ACTION_UNIT_MOVE2: - return "move_2_is_blocked_by"; + return "move_2_blocked_by"; case ACTION_UNIT_MOVE3: - return "move_3_is_blocked_by"; + return "move_3_blocked_by"; case ACTION_SPY_ESCAPE: case ACTION_SPY_POISON: case ACTION_SPY_POISON_ESC: diff --git a/data/alien/game.ruleset b/data/alien/game.ruleset index 5589e60210..a88d469955 100644 --- a/data/alien/game.ruleset +++ b/data/alien/game.ruleset @@ -285,8 +285,8 @@ conquer_city_blocked_by = "Capture Units", "Bombard", "Attack", "Suicide Attack" ; Forbid regular unit move if one of the actions below is legal. -move_is_blocked_by = "Transport Disembark", "Transport Disembark 2", - "Enter Hut", "Enter Hut 2" +move_blocked_by = "Transport Disembark", "Transport Disembark 2", + "Enter Hut", "Enter Hut 2" ; Actor units will - under certain circumstances - be forced to try ; performing the following actions in the specified order after successfully diff --git a/data/civ1/game.ruleset b/data/civ1/game.ruleset index 0f3604874a..99ffcdd2f5 100644 --- a/data/civ1/game.ruleset +++ b/data/civ1/game.ruleset @@ -272,7 +272,7 @@ conquer_city_blocked_by = "Explode Nuclear", "Nuke City", "Nuke Units", "Attack", "Suicide Attack" ; Forbid regular unit move if one of the actions below is legal. -move_is_blocked_by = "Transport Disembark", "Enter Hut", "Enter Hut 2" +move_blocked_by = "Transport Disembark", "Enter Hut", "Enter Hut 2" ; Actor units will - under certain circumstances - be forced to try ; performing the following actions in the specified order after successfully diff --git a/data/civ2/game.ruleset b/data/civ2/game.ruleset index 73909d3c7b..570f851a30 100644 --- a/data/civ2/game.ruleset +++ b/data/civ2/game.ruleset @@ -268,7 +268,7 @@ conquer_city_blocked_by = "Explode Nuclear", "Nuke City", "Nuke Units", "Attack", "Suicide Attack" ; Forbid regular unit move if one of the actions below is legal. -move_is_blocked_by = "Transport Disembark", "Enter Hut", "Frighten Hut" +move_blocked_by = "Transport Disembark", "Enter Hut", "Frighten Hut" ; Actor units will - under certain circumstances - be forced to try ; performing the following actions in the specified order after successfully diff --git a/data/civ2civ3/game.ruleset b/data/civ2civ3/game.ruleset index 50292d1b16..35eed45013 100644 --- a/data/civ2civ3/game.ruleset +++ b/data/civ2civ3/game.ruleset @@ -307,9 +307,9 @@ conquer_city_2_blocked_by = "Capture Units", "Bombard", "Explode Nuclear", "Attack", "Suicide Attack" ; Forbid regular unit move if one of the actions below is legal. -move_is_blocked_by = "Transport Disembark", "Transport Disembark 2", - "Enter Hut", "Enter Hut 2", - "Frighten Hut", "Frighten Hut 2" +move_blocked_by = "Transport Disembark", "Transport Disembark 2", + "Enter Hut", "Enter Hut 2", + "Frighten Hut", "Frighten Hut 2" ; Actor units will - under certain circumstances - be forced to try ; performing the following actions in the specified order after successfully diff --git a/data/classic/game.ruleset b/data/classic/game.ruleset index bdd6dc054c..79afcf4c5f 100644 --- a/data/classic/game.ruleset +++ b/data/classic/game.ruleset @@ -289,10 +289,10 @@ conquer_city_2_blocked_by = "Explode Nuclear", "Nuke City", "Nuke Units", "Attack", "Suicide Attack" ; Forbid regular unit move if one of the actions below is legal. -move_is_blocked_by = "Transport Disembark", "Transport Disembark 2", - "Conquer Extras", "Conquer Extras 2", - "Enter Hut", "Enter Hut 2", - "Frighten Hut", "Frighten Hut 2" +move_blocked_by = "Transport Disembark", "Transport Disembark 2", + "Conquer Extras", "Conquer Extras 2", + "Enter Hut", "Enter Hut 2", + "Frighten Hut", "Frighten Hut 2" ; Actor units will - under certain circumstances - be forced to try ; performing the following actions in the specified order after successfully diff --git a/data/goldkeep/game.ruleset b/data/goldkeep/game.ruleset index 59c8f2f080..502b82e8de 100644 --- a/data/goldkeep/game.ruleset +++ b/data/goldkeep/game.ruleset @@ -289,10 +289,10 @@ conquer_city_2_blocked_by = "Explode Nuclear", "Nuke City", "Nuke Units", "Attack", "Suicide Attack" ; Forbid regular unit move if one of the actions below is legal. -move_is_blocked_by = "Transport Disembark", "Transport Disembark 2", - "Conquer Extras", "Conquer Extras 2", - "Enter Hut", "Enter Hut 2", - "Frighten Hut", "Frighten Hut 2" +move_blocked_by = "Transport Disembark", "Transport Disembark 2", + "Conquer Extras", "Conquer Extras 2", + "Enter Hut", "Enter Hut 2", + "Frighten Hut", "Frighten Hut 2" ; Actor units will - under certain circumstances - be forced to try ; performing the following actions in the specified order after successfully diff --git a/data/granularity/game.ruleset b/data/granularity/game.ruleset index 6c4aeb211e..e622e48e00 100644 --- a/data/granularity/game.ruleset +++ b/data/granularity/game.ruleset @@ -265,7 +265,7 @@ nuke_defender_survival_chance_pct = 0 [actions] ; Forbid regular unit move if one of the actions below is legal. -move_is_blocked_by = "Transport Disembark", "Transport Disembark 2" +move_blocked_by = "Transport Disembark", "Transport Disembark 2" ; Actor units will - under certain circumstances - be forced to try ; performing the following actions in the specified order after successfully diff --git a/data/multiplayer/game.ruleset b/data/multiplayer/game.ruleset index 140500afd8..687ec11a0b 100644 --- a/data/multiplayer/game.ruleset +++ b/data/multiplayer/game.ruleset @@ -289,10 +289,10 @@ conquer_city_2_blocked_by = "Explode Nuclear", "Nuke City", "Nuke Units", "Attack", "Suicide Attack" ; Forbid regular unit move if one of the actions below is legal. -move_is_blocked_by = "Transport Disembark", "Transport Disembark 2", - "Conquer Extras", "Conquer Extras 2", - "Enter Hut", "Enter Hut 2", - "Frighten Hut", "Frighten Hut 2" +move_blocked_by = "Transport Disembark", "Transport Disembark 2", + "Conquer Extras", "Conquer Extras 2", + "Enter Hut", "Enter Hut 2", + "Frighten Hut", "Frighten Hut 2" ; Actor units will - under certain circumstances - be forced to try ; performing the following actions in the specified order after successfully diff --git a/data/sandbox/game.ruleset b/data/sandbox/game.ruleset index 3a44053baf..679f8d19bf 100644 --- a/data/sandbox/game.ruleset +++ b/data/sandbox/game.ruleset @@ -307,10 +307,10 @@ conquer_city_2_blocked_by = "Capture Units", "Bombard", "Attack", "Suicide Attack" ; Forbid regular unit move if one of the actions below is legal. -move_is_blocked_by = "Transport Disembark", "Transport Disembark 2", - "Conquer Extras", "Conquer Extras 2", - "Enter Hut", "Enter Hut 2", - "Frighten Hut", "Frighten Hut 2" +move_blocked_by = "Transport Disembark", "Transport Disembark 2", + "Conquer Extras", "Conquer Extras 2", + "Enter Hut", "Enter Hut 2", + "Frighten Hut", "Frighten Hut 2" ; Actor units will - under certain circumstances - be forced to try ; performing the following actions in the specified order after successfully diff --git a/data/stub/game.ruleset b/data/stub/game.ruleset index d2540e4521..b43f23cf67 100644 --- a/data/stub/game.ruleset +++ b/data/stub/game.ruleset @@ -255,7 +255,7 @@ nuke_defender_survival_chance_pct = 0 [actions] ; Forbid regular unit move if one of the actions below is legal. -;move_is_blocked_by = "Conquer Extras" +;move_blocked_by = "Conquer Extras" ; Actor units will - under certain circumstances - be forced to try ; performing the following actions in the specified order after successfully diff --git a/data/webperimental/game.ruleset b/data/webperimental/game.ruleset index e658ea748a..b1f5085574 100644 --- a/data/webperimental/game.ruleset +++ b/data/webperimental/game.ruleset @@ -289,8 +289,8 @@ conquer_city_blocked_by = "Explode Nuclear", "Nuke City", "Nuke Units", "Attack", "Suicide Attack" ; Forbid regular unit move if one of the actions below is legal. -move_is_blocked_by = "Transport Disembark", "Conquer Extras", "Enter Hut", - "Frighten Hut" +move_blocked_by = "Transport Disembark", "Conquer Extras", "Enter Hut", + "Frighten Hut" ; Actor units will - under certain circumstances - be forced to try ; performing the following actions in the specified order after successfully diff --git a/doc/README.actions b/doc/README.actions index 7d8fb642fb..1d4fad4280 100644 --- a/doc/README.actions +++ b/doc/README.actions @@ -1359,7 +1359,7 @@ Actions done by a unit against a tile "Unit Move" - a regular move to the target tile. * UI name can be set using ui_name_unit_move -* any action listed in move_is_blocked_by must be impossible +* any action listed in move_blocked_by must be impossible * the actor unit must be on a tile next to the target. * the actor unit has at least one move fragment left (!) * the actor unit may not be transported (!) @@ -1379,13 +1379,13 @@ Actions done by a unit against a tile "Unit Move 2" - a regular move to the target tile. * UI name can be set using ui_name_unit_move_2 -* any action listed in move_2_is_blocked_by must be impossible +* any action listed in move_2_blocked_by must be impossible * A copy of "Unit Move" * See "Unit Move" for everything else. "Unit Move 3" - a regular move to the target tile. * UI name can be set using ui_name_unit_move_3 -* any action listed in move_3_is_blocked_by must be impossible +* any action listed in move_3_blocked_by must be impossible * A copy of "Unit Move" * See "Unit Move" for everything else. -- 2.30.2