From 6a17fc49b7cd556bedd32deb88e118eaa15bf2a1 Mon Sep 17 00:00:00 2001 From: Sveinung Kvilhaugsvik Date: Mon, 15 Mar 2021 12:35:11 +0100 Subject: [PATCH] Deduplicate "Establish Embassy" move costs. Doing post "Establish Embassy" escape to a nearby city spends all remaining MP. There is no point in also subtracting 1 move fragment for doing the action. Reported by Marko Lindqvist See osdn #41765 --- data/civ2/effects.ruleset | 10 +--------- data/civ2civ3/effects.ruleset | 10 +--------- data/classic/effects.ruleset | 10 +--------- data/experimental/effects.ruleset | 12 ++---------- data/multiplayer/effects.ruleset | 10 +--------- data/sandbox/effects.ruleset | 10 +--------- data/webperimental/effects.ruleset | 10 +--------- 7 files changed, 8 insertions(+), 64 deletions(-) diff --git a/data/civ2/effects.ruleset b/data/civ2/effects.ruleset index 781229309c..e0f1b26f29 100644 --- a/data/civ2/effects.ruleset +++ b/data/civ2/effects.ruleset @@ -2469,15 +2469,7 @@ reqs = "Action", "Transport Embark", "Local", TRUE } -[effect_action_success_move_cost_embassy] -type = "Action_Success_Actor_Move_Cost" -value = 1 -reqs = - { "type", "name", "range", "present" - "Action", "Establish Embassy", "Local", TRUE - } - -[effect_action_success_establish_embassy] +[effect_action_establish_embassy_success_move_cost] type = "Action_Success_Actor_Move_Cost" value = 65535 reqs = diff --git a/data/civ2civ3/effects.ruleset b/data/civ2civ3/effects.ruleset index afbd9fa028..df94b0994d 100644 --- a/data/civ2civ3/effects.ruleset +++ b/data/civ2civ3/effects.ruleset @@ -4227,7 +4227,7 @@ reqs = "BuildingGenus", "GreatWonder", "Local" } -[effect_action_success_establish_embassy] +[effect_action_establish_embassy_success_move_cost] type = "Action_Success_Actor_Move_Cost" value = 65535 reqs = @@ -4307,14 +4307,6 @@ reqs = "Action", "Sabotage Unit Escape", "Local", TRUE } -[effect_action_success_move_cost_embassy] -type = "Action_Success_Actor_Move_Cost" -value = 1 -reqs = - { "type", "name", "range", "present" - "Action", "Establish Embassy", "Local", TRUE - } - [effect_action_success_move_cost_investigate] type = "Action_Success_Actor_Move_Cost" value = 1 diff --git a/data/classic/effects.ruleset b/data/classic/effects.ruleset index aea1f163c2..fbd3c1cce8 100644 --- a/data/classic/effects.ruleset +++ b/data/classic/effects.ruleset @@ -2500,7 +2500,7 @@ reqs = "BuildingGenus", "GreatWonder", "Local" } -[effect_action_success_establish_embassy] +[effect_action_establish_embassy_success_move_cost] type = "Action_Success_Actor_Move_Cost" value = 65535 reqs = @@ -2580,14 +2580,6 @@ reqs = "Action", "Sabotage Unit Escape", "Local", TRUE } -[effect_action_success_move_cost_embassy] -type = "Action_Success_Actor_Move_Cost" -value = 1 -reqs = - { "type", "name", "range", "present" - "Action", "Establish Embassy", "Local", TRUE - } - [effect_action_success_move_cost_investigate] type = "Action_Success_Actor_Move_Cost" value = 1 diff --git a/data/experimental/effects.ruleset b/data/experimental/effects.ruleset index 4f8dabd5b6..2c5e8af826 100644 --- a/data/experimental/effects.ruleset +++ b/data/experimental/effects.ruleset @@ -2883,14 +2883,6 @@ reqs = "BuildingGenus", "GreatWonder", "Local" } -[effect_action_success_move_cost_embassy] -type = "Action_Success_Actor_Move_Cost" -value = 1 -reqs = - { "type", "name", "range", "present" - "Action", "Establish Embassy", "Local", TRUE - } - [effect_action_success_move_cost_investigate] type = "Action_Success_Actor_Move_Cost" value = 1 @@ -2962,11 +2954,11 @@ reqs = "UnitFlag", "OneAttack", "Local", FALSE } -[effect_action_success_establish_embassy] +[effect_action_establish_embassy_success_move_cost] type = "Action_Success_Actor_Move_Cost" value = 65535 reqs = - { "type", "name", "range", "quiet" + { "type", "name", "range", "present" "Action", "Establish Embassy", "Local", TRUE } diff --git a/data/multiplayer/effects.ruleset b/data/multiplayer/effects.ruleset index 08d7fb212a..f3216ab8ea 100644 --- a/data/multiplayer/effects.ruleset +++ b/data/multiplayer/effects.ruleset @@ -2545,14 +2545,6 @@ reqs = "Building", "Palace", "Local", FALSE } -[effect_action_success_move_cost_embassy] -type = "Action_Success_Actor_Move_Cost" -value = 1 -reqs = - { "type", "name", "range", "present" - "Action", "Establish Embassy", "Local", TRUE - } - [effect_action_success_move_cost_investigate] type = "Action_Success_Actor_Move_Cost" value = 1 @@ -2606,7 +2598,7 @@ reqs = "UnitFlag", "OneAttack", "Local", FALSE } -[effect_action_success_establish_embassy] +[effect_action_establish_embassy_success_move_cost] type = "Action_Success_Actor_Move_Cost" value = 65535 reqs = diff --git a/data/sandbox/effects.ruleset b/data/sandbox/effects.ruleset index 87ea0d4fcc..38ba2928ec 100644 --- a/data/sandbox/effects.ruleset +++ b/data/sandbox/effects.ruleset @@ -4373,7 +4373,7 @@ reqs = "BuildingGenus", "GreatWonder", "Local" } -[effect_success_move_cost_establish_embassy] +[effect_action_establish_embassy_success_move_cost] type = "Action_Success_Actor_Move_Cost" value = 65535 reqs = @@ -4469,14 +4469,6 @@ reqs = "Action", "Steal Gold Escape", "Local", TRUE } -[effect_action_success_move_cost_embassy] -type = "Action_Success_Actor_Move_Cost" -value = 1 -reqs = - { "type", "name", "range", "present" - "Action", "Establish Embassy", "Local", TRUE - } - [effect_action_success_move_cost_investigate] type = "Action_Success_Actor_Move_Cost" value = 1 diff --git a/data/webperimental/effects.ruleset b/data/webperimental/effects.ruleset index c8f8bc1390..06dc7945ae 100644 --- a/data/webperimental/effects.ruleset +++ b/data/webperimental/effects.ruleset @@ -2717,7 +2717,7 @@ reqs = "BuildingGenus", "GreatWonder", "Local" } -[effect_action_success_move_cost_establish_embassy] +[effect_action_establish_embassy_success_move_cost] type = "Action_Success_Actor_Move_Cost" value = 65535 reqs = @@ -2821,14 +2821,6 @@ reqs = "Action", "Suitcase Nuke Escape", "Local", TRUE } -[effect_action_success_move_cost_embassy] -type = "Action_Success_Actor_Move_Cost" -value = 1 -reqs = - { "type", "name", "range", "present" - "Action", "Establish Embassy", "Local", TRUE - } - [effect_action_success_move_cost_investigate] type = "Action_Success_Actor_Move_Cost" value = 1 -- 2.20.1