From d49af8bf0e97550a2c2466733be9d8ec8d04a860 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sun, 23 Apr 2023 04:14:28 +0300 Subject: [PATCH 34/34] civ/2: Stop Great Wall from preventing Fortify bonus outside cities Great Wall affects cities only. Reported by ihnatus See osdn #47907 Signed-off-by: Marko Lindqvist --- data/civ1/effects.ruleset | 3 +-- data/civ2/effects.ruleset | 17 ++++++++--------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/data/civ1/effects.ruleset b/data/civ1/effects.ruleset index 2421c792de..3602bf2c45 100644 --- a/data/civ1/effects.ruleset +++ b/data/civ1/effects.ruleset @@ -988,7 +988,7 @@ value = 200 reqs = { "type", "name", "range", "present" "Building", "Great Wall", "Player", TRUE - "CityTile", "Center", "Tile", TRUE + "CityTile", "Center", "Tile", TRUE "UnitType", "Artillery", "Local", FALSE "UnitType", "Bomber", "Local", FALSE } @@ -1351,7 +1351,6 @@ reqs = { "type", "name", "range", "present" "Activity", "Fortified", "Local", TRUE "CityTile", "Center", "Tile", FALSE - "Building", "Great Wall", "Player", FALSE "Extra", "Fortress", "Tile", FALSE } diff --git a/data/civ2/effects.ruleset b/data/civ2/effects.ruleset index b09bed0202..d76ff94498 100644 --- a/data/civ2/effects.ruleset +++ b/data/civ2/effects.ruleset @@ -1166,7 +1166,6 @@ reqs = { "type", "name", "range", "present" "Activity", "Fortified", "Local", TRUE "CityTile", "Center", "Tile", FALSE - "Building", "Great Wall", "Player", FALSE "Extra", "Fortress", "Tile", FALSE } @@ -1828,21 +1827,21 @@ reqs = type = "Defend_Bonus" value = 200 reqs = - { "type", "name", "range", "present" - "Building", "Great Wall", "Player", TRUE - "UnitClass", "Land", "Local", TRUE - "CityTile", "Center", "Tile", TRUE - "UnitType", "Howitzer", "Local", FALSE + { "type", "name", "range", "present" + "Building", "Great Wall", "Player", TRUE + "UnitClass", "Land", "Local", TRUE + "CityTile", "Center", "Tile", TRUE + "UnitType", "Howitzer", "Local", FALSE } [effect_great_wall_0] type = "Defend_Bonus" value = 200 reqs = - { "type", "name", "range" - "Building", "Great Wall", "Player" + { "type", "name", "range" + "Building", "Great Wall", "Player" "UnitClass", "Helicopter", "Local" - "CityTile", "Center", "Tile" + "CityTile", "Center", "Tile" } [effect_great_wall_1] -- 2.39.2