From dfb8a61ee7aa5a6310ba9818a15209b0f07922e8 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sat, 3 Apr 2021 04:43:14 +0300 Subject: [PATCH 37/37] Rulesets: Improve Nuke related action enablers coding style See osdn #41904 Signed-off-by: Marko Lindqvist --- data/civ1/game.ruleset | 16 ++++++++-------- data/civ2/game.ruleset | 16 ++++++++-------- data/civ2civ3/game.ruleset | 16 ++++++++-------- data/classic/game.ruleset | 16 ++++++++-------- data/goldkeep/game.ruleset | 16 ++++++++-------- data/multiplayer/game.ruleset | 16 ++++++++-------- data/webperimental/game.ruleset | 16 ++++++++-------- 7 files changed, 56 insertions(+), 56 deletions(-) diff --git a/data/civ1/game.ruleset b/data/civ1/game.ruleset index 554200f0f8..3318912dee 100644 --- a/data/civ1/game.ruleset +++ b/data/civ1/game.ruleset @@ -712,15 +712,15 @@ actor_reqs = } [actionenabler_nuke] -action = "Explode Nuclear" -actor_reqs = - { "type", "name", "range", "present" +action = "Explode Nuclear" +actor_reqs = + { "type", "name", "range", "present" "UnitFlag", "Nuclear", "Local", TRUE } [actionenabler_nuke_city] -action="Nuke City" -actor_reqs= +action = "Nuke City" +actor_reqs = { "type", "name", "range" "UnitFlag", "Nuclear", "Local" "MinMoveFrags", "1", "Local" @@ -728,14 +728,14 @@ actor_reqs= } [actionenabler_nuke_units] -action="Nuke Units" -actor_reqs= +action = "Nuke Units" +actor_reqs = { "type", "name", "range" "UnitFlag", "Nuclear", "Local" "MinMoveFrags", "1", "Local" "DiplRel", "War", "Local" } -target_reqs= +target_reqs = { "type", "name", "range", "present" "CityTile", "Center", "Local", FALSE } diff --git a/data/civ2/game.ruleset b/data/civ2/game.ruleset index 794537a571..dd95a2616b 100644 --- a/data/civ2/game.ruleset +++ b/data/civ2/game.ruleset @@ -887,15 +887,15 @@ actor_reqs = } [actionenabler_nuke] -action = "Explode Nuclear" -actor_reqs = - { "type", "name", "range", "present" +action = "Explode Nuclear" +actor_reqs = + { "type", "name", "range", "present" "UnitFlag", "Nuclear", "Local", TRUE } [actionenabler_nuke_city] -action="Nuke City" -actor_reqs= +action = "Nuke City" +actor_reqs = { "type", "name", "range" "UnitFlag", "Nuclear", "Local" "MinMoveFrags", "1", "Local" @@ -903,14 +903,14 @@ actor_reqs= } [actionenabler_nuke_units] -action="Nuke Units" -actor_reqs= +action = "Nuke Units" +actor_reqs = { "type", "name", "range" "UnitFlag", "Nuclear", "Local" "MinMoveFrags", "1", "Local" "DiplRel", "War", "Local" } -target_reqs= +target_reqs = { "type", "name", "range", "present" "CityTile", "Center", "Local", FALSE } diff --git a/data/civ2civ3/game.ruleset b/data/civ2civ3/game.ruleset index 42cb59cc1e..80c6b8ac2e 100644 --- a/data/civ2civ3/game.ruleset +++ b/data/civ2civ3/game.ruleset @@ -1028,15 +1028,15 @@ actor_reqs = } [actionenabler_nuke] -action = "Explode Nuclear" -actor_reqs = - { "type", "name", "range", "present" +action = "Explode Nuclear" +actor_reqs = + { "type", "name", "range", "present" "UnitFlag", "Nuclear", "Local", TRUE } [actionenabler_nuke_city] -action="Nuke City" -actor_reqs= +action = "Nuke City" +actor_reqs = { "type", "name", "range" "UnitFlag", "Nuclear", "Local" "MinMoveFrags", "1", "Local" @@ -1044,14 +1044,14 @@ actor_reqs= } [actionenabler_nuke_units] -action="Nuke Units" -actor_reqs= +action = "Nuke Units" +actor_reqs = { "type", "name", "range" "UnitFlag", "Nuclear", "Local" "MinMoveFrags", "1", "Local" "DiplRel", "War", "Local" } -target_reqs= +target_reqs = { "type", "name", "range", "present" "CityTile", "Center", "Local", FALSE } diff --git a/data/classic/game.ruleset b/data/classic/game.ruleset index da6c1cef36..60479f4767 100644 --- a/data/classic/game.ruleset +++ b/data/classic/game.ruleset @@ -960,15 +960,15 @@ actor_reqs = } [actionenabler_nuke] -action = "Explode Nuclear" -actor_reqs = - { "type", "name", "range", "present" +action = "Explode Nuclear" +actor_reqs = + { "type", "name", "range", "present" "UnitFlag", "Nuclear", "Local", TRUE } [actionenabler_nuke_city] -action="Nuke City" -actor_reqs= +action = "Nuke City" +actor_reqs = { "type", "name", "range" "UnitFlag", "Nuclear", "Local" "MinMoveFrags", "1", "Local" @@ -976,14 +976,14 @@ actor_reqs= } [actionenabler_nuke_units] -action="Nuke Units" -actor_reqs= +action = "Nuke Units" +actor_reqs = { "type", "name", "range" "UnitFlag", "Nuclear", "Local" "MinMoveFrags", "1", "Local" "DiplRel", "War", "Local" } -target_reqs= +target_reqs = { "type", "name", "range", "present" "CityTile", "Center", "Local", FALSE } diff --git a/data/goldkeep/game.ruleset b/data/goldkeep/game.ruleset index 6b505aa0e8..f9edae9b51 100644 --- a/data/goldkeep/game.ruleset +++ b/data/goldkeep/game.ruleset @@ -974,15 +974,15 @@ actor_reqs = } [actionenabler_nuke] -action = "Explode Nuclear" -actor_reqs = - { "type", "name", "range", "present" +action = "Explode Nuclear" +actor_reqs = + { "type", "name", "range", "present" "UnitFlag", "Nuclear", "Local", TRUE } [actionenabler_nuke_city] -action="Nuke City" -actor_reqs= +action = "Nuke City" +actor_reqs = { "type", "name", "range" "UnitFlag", "Nuclear", "Local" "MinMoveFrags", "1", "Local" @@ -990,14 +990,14 @@ actor_reqs= } [actionenabler_nuke_units] -action="Nuke Units" -actor_reqs= +action = "Nuke Units" +actor_reqs = { "type", "name", "range" "UnitFlag", "Nuclear", "Local" "MinMoveFrags", "1", "Local" "DiplRel", "War", "Local" } -target_reqs= +target_reqs = { "type", "name", "range", "present" "CityTile", "Center", "Local", FALSE } diff --git a/data/multiplayer/game.ruleset b/data/multiplayer/game.ruleset index 9fa510f1da..783a70a8d4 100644 --- a/data/multiplayer/game.ruleset +++ b/data/multiplayer/game.ruleset @@ -951,15 +951,15 @@ actor_reqs = } [actionenabler_nuke] -action = "Explode Nuclear" -actor_reqs = - { "type", "name", "range", "present" +action = "Explode Nuclear" +actor_reqs = + { "type", "name", "range", "present" "UnitFlag", "Nuclear", "Local", TRUE } [actionenabler_nuke_city] -action="Nuke City" -actor_reqs= +action = "Nuke City" +actor_reqs = { "type", "name", "range" "UnitFlag", "Nuclear", "Local" "MinMoveFrags", "1", "Local" @@ -967,14 +967,14 @@ actor_reqs= } [actionenabler_nuke_units] -action="Nuke Units" -actor_reqs= +action = "Nuke Units" +actor_reqs = { "type", "name", "range" "UnitFlag", "Nuclear", "Local" "MinMoveFrags", "1", "Local" "DiplRel", "War", "Local" } -target_reqs= +target_reqs = { "type", "name", "range", "present" "CityTile", "Center", "Local", FALSE } diff --git a/data/webperimental/game.ruleset b/data/webperimental/game.ruleset index 2f15cd72d3..26a11310e7 100644 --- a/data/webperimental/game.ruleset +++ b/data/webperimental/game.ruleset @@ -1207,15 +1207,15 @@ actor_reqs = } [actionenabler_nuke] -action = "Explode Nuclear" -actor_reqs = - { "type", "name", "range", "present" +action = "Explode Nuclear" +actor_reqs = + { "type", "name", "range", "present" "UnitFlag", "Nuclear", "Local", TRUE } [actionenabler_nuke_city] -action="Nuke City" -actor_reqs= +action = "Nuke City" +actor_reqs = { "type", "name", "range" "UnitFlag", "Nuclear", "Local" "MinMoveFrags", "1", "Local" @@ -1223,14 +1223,14 @@ actor_reqs= } [actionenabler_nuke_units] -action="Nuke Units" -actor_reqs= +action ="Nuke Units" +actor_reqs = { "type", "name", "range" "UnitFlag", "Nuclear", "Local" "MinMoveFrags", "1", "Local" "DiplRel", "War", "Local" } -target_reqs= +target_reqs = { "type", "name", "range", "present" "CityTile", "Center", "Local", FALSE } -- 2.30.2