From 15b243ea5236050e7c633a3b078b3be4bcb52f4b Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Mon, 8 Nov 2021 02:50:29 +0200 Subject: [PATCH 13/13] 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/experimental/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 f0284cd1f2..7ead1b7e41 100644 --- a/common/actions.c +++ b/common/actions.c @@ -8952,11 +8952,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_POISON: case ACTION_SPY_POISON_ESC: case ACTION_SPY_SABOTAGE_UNIT: diff --git a/data/alien/game.ruleset b/data/alien/game.ruleset index 945145b5ec..9ea06e7e24 100644 --- a/data/alien/game.ruleset +++ b/data/alien/game.ruleset @@ -284,8 +284,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 555d590418..c8b0117d1a 100644 --- a/data/civ1/game.ruleset +++ b/data/civ1/game.ruleset @@ -271,7 +271,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 86bc6be159..808f490339 100644 --- a/data/civ2/game.ruleset +++ b/data/civ2/game.ruleset @@ -267,7 +267,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 8cec1566d8..550b66151b 100644 --- a/data/civ2civ3/game.ruleset +++ b/data/civ2civ3/game.ruleset @@ -306,9 +306,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 ee40ee7625..03e86d3a7c 100644 --- a/data/classic/game.ruleset +++ b/data/classic/game.ruleset @@ -288,10 +288,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/experimental/game.ruleset b/data/experimental/game.ruleset index 8c731ec554..6e70e0d1dd 100644 --- a/data/experimental/game.ruleset +++ b/data/experimental/game.ruleset @@ -293,10 +293,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 31f80b87e4..b99636f26a 100644 --- a/data/granularity/game.ruleset +++ b/data/granularity/game.ruleset @@ -264,7 +264,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 4f422ef9f1..17180701a8 100644 --- a/data/multiplayer/game.ruleset +++ b/data/multiplayer/game.ruleset @@ -288,10 +288,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 8546308fa5..78f9947a01 100644 --- a/data/sandbox/game.ruleset +++ b/data/sandbox/game.ruleset @@ -305,10 +305,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 f1bd288ac4..91a9c109b6 100644 --- a/data/stub/game.ruleset +++ b/data/stub/game.ruleset @@ -254,7 +254,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 1438728ee8..20f345ff46 100644 --- a/data/webperimental/game.ruleset +++ b/data/webperimental/game.ruleset @@ -288,8 +288,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 631870e54d..63e1e4e798 100644 --- a/doc/README.actions +++ b/doc/README.actions @@ -1264,7 +1264,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 (!) @@ -1284,13 +1284,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