From bba1fdd2fb1f84717bc0dccb2e0bce7799ba55ba Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sat, 13 Mar 2021 13:38:45 +0200 Subject: [PATCH 27/27] Improve grouping of movement related action enablers See osdn #41763 Signed-off-by: Marko Lindqvist --- data/alien/game.ruleset | 40 +++++++++++++++--------------- data/civ1/game.ruleset | 16 ++++++------ data/civ2/game.ruleset | 16 ++++++------ data/civ2civ3/game.ruleset | 40 +++++++++++++++--------------- data/classic/game.ruleset | 40 +++++++++++++++--------------- data/goldkeep/game.ruleset | 40 +++++++++++++++--------------- data/granularity/game.ruleset | 28 ++++++++++----------- data/multiplayer/game.ruleset | 16 ++++++------ data/sandbox/game.ruleset | 40 +++++++++++++++--------------- data/webperimental/game.ruleset | 44 ++++++++++++++++----------------- 10 files changed, 160 insertions(+), 160 deletions(-) diff --git a/data/alien/game.ruleset b/data/alien/game.ruleset index 71447c5191..9e281db320 100644 --- a/data/alien/game.ruleset +++ b/data/alien/game.ruleset @@ -1110,6 +1110,26 @@ actor_reqs = "CityTile", "Center", "Local", FALSE } +[actionenabler_embark] +action = "Transport Embark" +actor_reqs = + { "type", "name", "range", "present" + "MinMoveFrags", "1", "Local", TRUE + "DiplRel", "Armistice", "Local", FALSE + "DiplRel", "War", "Local", FALSE + "DiplRel", "Cease-fire", "Local", FALSE + "DiplRel", "Peace", "Local", FALSE + "DiplRel", "Never met", "Local", FALSE + } + +[actionenabler_regular_move] +action = "Unit Move" +actor_reqs = + { "type", "name", "range", "present" + "MinMoveFrags", "1", "Local", TRUE + "UnitState", "Transported", "Local", FALSE + } + [actionenabler_hut_enter_from_native_tile] action = "Enter Hut" actor_reqs = @@ -1135,26 +1155,6 @@ actor_reqs = "CityTile", "Center", "Local", FALSE } -[actionenabler_embark] -action = "Transport Embark" -actor_reqs = - { "type", "name", "range", "present" - "MinMoveFrags", "1", "Local", TRUE - "DiplRel", "Armistice", "Local", FALSE - "DiplRel", "War", "Local", FALSE - "DiplRel", "Cease-fire", "Local", FALSE - "DiplRel", "Peace", "Local", FALSE - "DiplRel", "Never met", "Local", FALSE - } - -[actionenabler_regular_move] -action = "Unit Move" -actor_reqs = - { "type", "name", "range", "present" - "MinMoveFrags", "1", "Local", TRUE - "UnitState", "Transported", "Local", FALSE - } - [borders] ; Base border radius from city. radius_sq_city = 4 diff --git a/data/civ1/game.ruleset b/data/civ1/game.ruleset index 7bdba1832f..e458c0836b 100644 --- a/data/civ1/game.ruleset +++ b/data/civ1/game.ruleset @@ -960,6 +960,14 @@ target_reqs = "CityTile", "Center", "Local", FALSE } +[actionenabler_regular_move] +action = "Unit Move" +actor_reqs = + { "type", "name", "range", "present" + "MinMoveFrags", "1", "Local", TRUE + "UnitState", "Transported", "Local", FALSE + } + [actionenabler_hut_enter_from_native] action = "Enter Hut" actor_reqs = @@ -976,14 +984,6 @@ actor_reqs = "UnitState", "Transported", "Local", TRUE } -[actionenabler_regular_move] -action = "Unit Move" -actor_reqs = - { "type", "name", "range", "present" - "MinMoveFrags", "1", "Local", TRUE - "UnitState", "Transported", "Local", FALSE - } - [borders] ; Base border radius from city. radius_sq_city = 17 diff --git a/data/civ2/game.ruleset b/data/civ2/game.ruleset index c2467e0b35..e80e692264 100644 --- a/data/civ2/game.ruleset +++ b/data/civ2/game.ruleset @@ -1235,6 +1235,14 @@ target_reqs = "CityTile", "Center", "Local", FALSE } +[actionenabler_regular_move] +action = "Unit Move" +actor_reqs = + { "type", "name", "range", "present" + "MinMoveFrags", "1", "Local", TRUE + "UnitState", "Transported", "Local", FALSE + } + [actionenabler_hut_enter] action = "Enter Hut" actor_reqs = @@ -1249,14 +1257,6 @@ actor_reqs = "MinMoveFrags", "1", "Local" } -[actionenabler_regular_move] -action = "Unit Move" -actor_reqs = - { "type", "name", "range", "present" - "MinMoveFrags", "1", "Local", TRUE - "UnitState", "Transported", "Local", FALSE - } - [borders] ; Base border radius from city. radius_sq_city = 17 diff --git a/data/civ2civ3/game.ruleset b/data/civ2civ3/game.ruleset index 1c9808fb45..1d9d7834a9 100644 --- a/data/civ2civ3/game.ruleset +++ b/data/civ2civ3/game.ruleset @@ -1502,6 +1502,26 @@ actor_reqs = "CityTile", "Center", "Local", FALSE } +[actionenabler_embark] +action = "Transport Embark" +actor_reqs = + { "type", "name", "range", "present" + "MinMoveFrags", "1", "Local", TRUE + "DiplRel", "Armistice", "Local", FALSE + "DiplRel", "War", "Local", FALSE + "DiplRel", "Cease-fire", "Local", FALSE + "DiplRel", "Peace", "Local", FALSE + "DiplRel", "Never met", "Local", FALSE + } + +[actionenabler_regular_move] +action = "Unit Move" +actor_reqs = + { "type", "name", "range", "present" + "MinMoveFrags", "1", "Local", TRUE + "UnitState", "Transported", "Local", FALSE + } + [actionenabler_hut_enter_from_native_tile] action = "Enter Hut" actor_reqs = @@ -1552,26 +1572,6 @@ actor_reqs = "CityTile", "Center", "Local", FALSE } -[actionenabler_embark] -action = "Transport Embark" -actor_reqs = - { "type", "name", "range", "present" - "MinMoveFrags", "1", "Local", TRUE - "DiplRel", "Armistice", "Local", FALSE - "DiplRel", "War", "Local", FALSE - "DiplRel", "Cease-fire", "Local", FALSE - "DiplRel", "Peace", "Local", FALSE - "DiplRel", "Never met", "Local", FALSE - } - -[actionenabler_regular_move] -action = "Unit Move" -actor_reqs = - { "type", "name", "range", "present" - "MinMoveFrags", "1", "Local", TRUE - "UnitState", "Transported", "Local", FALSE - } - [borders] ; Base border radius from city. radius_sq_city = 5 diff --git a/data/classic/game.ruleset b/data/classic/game.ruleset index d2673ee280..1289084610 100644 --- a/data/classic/game.ruleset +++ b/data/classic/game.ruleset @@ -1191,14 +1191,6 @@ actor_reqs = "Activity", "Fortified", "Local", FALSE } -[actionenabler_regular_move] -action = "Unit Move" -actor_reqs = - { "type", "name", "range", "present" - "MinMoveFrags", "1", "Local", TRUE - "UnitState", "Transported", "Local", FALSE - } - [actionenabler_fortify_city] action = "Fortify" actor_reqs = @@ -1344,6 +1336,26 @@ actor_reqs = "UnitState", "OnNativeTile", "Local", FALSE } +[actionenabler_embark] +action = "Transport Embark" +actor_reqs = + { "type", "name", "range", "present" + "MinMoveFrags", "1", "Local", TRUE + "DiplRel", "Armistice", "Local", FALSE + "DiplRel", "War", "Local", FALSE + "DiplRel", "Cease-fire", "Local", FALSE + "DiplRel", "Peace", "Local", FALSE + "DiplRel", "Never met", "Local", FALSE + } + +[actionenabler_regular_move] +action = "Unit Move" +actor_reqs = + { "type", "name", "range", "present" + "MinMoveFrags", "1", "Local", TRUE + "UnitState", "Transported", "Local", FALSE + } + [actionenabler_hut_enter_from_native_tile] action = "Enter Hut" actor_reqs = @@ -1376,18 +1388,6 @@ actor_reqs = "UnitState", "OnNativeTile", "Local", FALSE } -[actionenabler_embark] -action = "Transport Embark" -actor_reqs = - { "type", "name", "range", "present" - "MinMoveFrags", "1", "Local", TRUE - "DiplRel", "Armistice", "Local", FALSE - "DiplRel", "War", "Local", FALSE - "DiplRel", "Cease-fire", "Local", FALSE - "DiplRel", "Peace", "Local", FALSE - "DiplRel", "Never met", "Local", FALSE - } - [actionenabler_claim_extra_war_from_native_tile] action = "Conquer Extras" actor_reqs = diff --git a/data/goldkeep/game.ruleset b/data/goldkeep/game.ruleset index 2ff6556b39..04cc75f02b 100644 --- a/data/goldkeep/game.ruleset +++ b/data/goldkeep/game.ruleset @@ -1360,6 +1360,26 @@ actor_reqs = "CityTile", "Center", "Local", FALSE } +[actionenabler_embark] +action = "Transport Embark" +actor_reqs = + { "type", "name", "range", "present" + "MinMoveFrags", "1", "Local", TRUE + "DiplRel", "Armistice", "Local", FALSE + "DiplRel", "War", "Local", FALSE + "DiplRel", "Cease-fire", "Local", FALSE + "DiplRel", "Peace", "Local", FALSE + "DiplRel", "Never met", "Local", FALSE + } + +[actionenabler_regular_move] +action = "Unit Move" +actor_reqs = + { "type", "name", "range", "present" + "MinMoveFrags", "1", "Local", TRUE + "UnitState", "Transported", "Local", FALSE + } + [actionenabler_hut_enter_from_native_tile] action = "Enter Hut" actor_reqs = @@ -1410,18 +1430,6 @@ actor_reqs = "CityTile", "Center", "Local", FALSE } -[actionenabler_embark] -action = "Transport Embark" -actor_reqs = - { "type", "name", "range", "present" - "MinMoveFrags", "1", "Local", TRUE - "DiplRel", "Armistice", "Local", FALSE - "DiplRel", "War", "Local", FALSE - "DiplRel", "Cease-fire", "Local", FALSE - "DiplRel", "Peace", "Local", FALSE - "DiplRel", "Never met", "Local", FALSE - } - [actionenabler_claim_extra_war_from_native_tile] action = "Conquer Extras" actor_reqs = @@ -1487,14 +1495,6 @@ target_reqs = "CityTile", "Extras Owned", "Local", FALSE } -[actionenabler_regular_move] -action = "Unit Move" -actor_reqs = - { "type", "name", "range", "present" - "MinMoveFrags", "1", "Local", TRUE - "UnitState", "Transported", "Local", FALSE - } - [borders] ; Base border radius from city. radius_sq_city = 17 diff --git a/data/granularity/game.ruleset b/data/granularity/game.ruleset index bc40a1411f..ce36effa5a 100644 --- a/data/granularity/game.ruleset +++ b/data/granularity/game.ruleset @@ -439,6 +439,20 @@ target_reqs = "TerrainFlag","NoCities","Local",FALSE } +[actionenabler_cultivate] +action = "Cultivate" +actor_reqs = + { "type", "name", "range", "present" + "UnitFlag", "Settlers", "Local", TRUE + } + +[actionenabler_plant] +action = "Plant" +actor_reqs = + { "type", "name", "range", "present" + "UnitFlag", "Settlers", "Local", TRUE + } + [actionenabler_alight] action = "Transport Alight" actor_reqs = @@ -514,20 +528,6 @@ actor_reqs = "DiplRel", "Never met", "Local", FALSE } -[actionenabler_cultivate] -action = "Cultivate" -actor_reqs = - { "type", "name", "range", "present" - "UnitFlag", "Settlers", "Local", TRUE - } - -[actionenabler_plant] -action = "Plant" -actor_reqs = - { "type", "name", "range", "present" - "UnitFlag", "Settlers", "Local", TRUE - } - [actionenabler_regular_move] action = "Unit Move" actor_reqs = diff --git a/data/multiplayer/game.ruleset b/data/multiplayer/game.ruleset index 54b8cb2461..90c1c95456 100644 --- a/data/multiplayer/game.ruleset +++ b/data/multiplayer/game.ruleset @@ -1324,6 +1324,14 @@ actor_reqs = "DiplRel", "Never met", "Local", FALSE } +[actionenabler_regular_move] +action = "Unit Move" +actor_reqs = + { "type", "name", "range", "present" + "MinMoveFrags", "1", "Local", TRUE + "UnitState", "Transported", "Local", FALSE + } + [actionenabler_claim_extra_war_from_native_tile] action = "Conquer Extras" actor_reqs = @@ -1366,14 +1374,6 @@ target_reqs = "CityTile", "Extras Owned", "Local", FALSE } -[actionenabler_regular_move] -action = "Unit Move" -actor_reqs = - { "type", "name", "range", "present" - "MinMoveFrags", "1", "Local", TRUE - "UnitState", "Transported", "Local", FALSE - } - [borders] ; Base border radius from city. radius_sq_city = 17 diff --git a/data/sandbox/game.ruleset b/data/sandbox/game.ruleset index edf1c3bbfd..c71b9c8392 100644 --- a/data/sandbox/game.ruleset +++ b/data/sandbox/game.ruleset @@ -1925,6 +1925,26 @@ actor_reqs = "CityTile", "Center", "Local", FALSE } +[actionenabler_embark] +action = "Transport Embark" +actor_reqs = + { "type", "name", "range", "present" + "MinMoveFrags", "1", "Local", TRUE + "DiplRel", "Armistice", "Local", FALSE + "DiplRel", "War", "Local", FALSE + "DiplRel", "Cease-fire", "Local", FALSE + "DiplRel", "Peace", "Local", FALSE + "DiplRel", "Never met", "Local", FALSE + } + +[actionenabler_regular_move] +action = "Unit Move" +actor_reqs = + { "type", "name", "range", "present" + "MinMoveFrags", "1", "Local", TRUE + "UnitState", "Transported", "Local", FALSE + } + [actionenabler_hut_enter_from_native_tile] action = "Enter Hut" actor_reqs = @@ -1975,26 +1995,6 @@ actor_reqs = "CityTile", "Center", "Local", FALSE } -[actionenabler_embark] -action = "Transport Embark" -actor_reqs = - { "type", "name", "range", "present" - "MinMoveFrags", "1", "Local", TRUE - "DiplRel", "Armistice", "Local", FALSE - "DiplRel", "War", "Local", FALSE - "DiplRel", "Cease-fire", "Local", FALSE - "DiplRel", "Peace", "Local", FALSE - "DiplRel", "Never met", "Local", FALSE - } - -[actionenabler_regular_move] -action = "Unit Move" -actor_reqs = - { "type", "name", "range", "present" - "MinMoveFrags", "1", "Local", TRUE - "UnitState", "Transported", "Local", FALSE - } - [borders] ; Base border radius from city. radius_sq_city = 5 diff --git a/data/webperimental/game.ruleset b/data/webperimental/game.ruleset index c1f095ba4b..1e7c3e8c17 100644 --- a/data/webperimental/game.ruleset +++ b/data/webperimental/game.ruleset @@ -1624,6 +1624,28 @@ actor_reqs = "DiplRel", "Never met", "Local", FALSE } +[actionenabler_regular_move] +action = "Unit Move" +actor_reqs = + { "type", "name", "range", "present" + "MinMoveFrags", "1", "Local", TRUE + "UnitState", "Transported", "Local", FALSE + } + +[actionenabler_hut_enter] +action = "Enter Hut" +actor_reqs = + { "type", "name", "range" + "MinMoveFrags", "1", "Local" + } + +[actionenabler_hut_frighten] +action = "Frighten Hut" +actor_reqs = + { "type", "name", "range" + "MinMoveFrags", "1", "Local" + } + [actionenabler_claim_extra_war] action = "Conquer Extras" actor_reqs = @@ -1645,28 +1667,6 @@ target_reqs = "CityTile", "Extras Owned", "Local", FALSE } -[actionenabler_hut_enter] -action = "Enter Hut" -actor_reqs = - { "type", "name", "range" - "MinMoveFrags", "1", "Local" - } - -[actionenabler_hut_frighten] -action = "Frighten Hut" -actor_reqs = - { "type", "name", "range" - "MinMoveFrags", "1", "Local" - } - -[actionenabler_regular_move] -action = "Unit Move" -actor_reqs = - { "type", "name", "range", "present" - "MinMoveFrags", "1", "Local", TRUE - "UnitState", "Transported", "Local", FALSE - } - [borders] ; Base border radius from city. radius_sq_city = 17 -- 2.30.1