From 80ef5d7c56b3dce715cc88f7ddd45bc9b854c7a4 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Tue, 6 Apr 2021 15:25:10 +0300 Subject: [PATCH 46/46] civ2civ3/sandbox: Consume Diplomat or Explorer establishing embassy Establishing Embassy without unit cost was overpowerful action considering that embassies give tech leakage, units capable of establishing embassy are given as startunits, and by default all players start at the same continent, i.e., are easily reachable. It also made Marco Polo wonder obsolete. Reported by chippo See osdn #41929 Signed-off-by: Marko Lindqvist --- data/civ2civ3/game.ruleset | 4 ++-- data/civ2civ3/units.ruleset | 6 +++--- data/sandbox/game.ruleset | 4 ++-- data/sandbox/units.ruleset | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/data/civ2civ3/game.ruleset b/data/civ2civ3/game.ruleset index 9a9eafa277..bd4cef03fa 100644 --- a/data/civ2civ3/game.ruleset +++ b/data/civ2civ3/game.ruleset @@ -718,7 +718,7 @@ actor_reqs = } [actionenabler_establish_embassy] -action = "Establish Embassy" +action = "Establish Embassy Stay" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "Diplomat", "Local", TRUE @@ -747,7 +747,7 @@ target_reqs = } [actionenabler_establish_embassy_explorer] -action = "Establish Embassy" +action = "Establish Embassy Stay" actor_reqs = { "type", "name", "range", "present" "UnitType", "Explorer", "Local", TRUE diff --git a/data/civ2civ3/units.ruleset b/data/civ2civ3/units.ruleset index 510fecdeae..26d86ead3f 100644 --- a/data/civ2civ3/units.ruleset +++ b/data/civ2civ3/units.ruleset @@ -2273,6 +2273,7 @@ The actions available to Diplomats in a city are:\ - \"Investigate City\": Your unit attempts to report detailed\ information about the city: its status, what buildings and units are\ within, and what it is currently producing.\ + The unit is not consumed by this action.\ "), _("\ - \"Sabotage City\": Your unit attempts either to disrupt all the\ city's work so far towards its current project, or to destroy an\ @@ -2487,9 +2488,7 @@ helptext = _("\ Explorers are brave individuals that are very useful for\ mapping unknown territory.\ "), _("\ -Explorers can also perform some actions in another player's city,\ - and like Diplomats and Spies, the unit is not consumed by these\ - harmless actions:\ +Explorers can also perform some actions in another player's city:\ "), _("\ - \"Establish Embassy\": This action always succeeds, and gives\ permanent contact with the city's owner, as well as intelligence\ @@ -2500,6 +2499,7 @@ Explorers can also perform some actions in another player's city,\ - \"Investigate City\": Your unit attempts to report detailed\ information about the city: its status, what buildings and units are\ within, and what it is currently producing.\ + The unit is not consumed by this action.\ ") [unit_leader] diff --git a/data/sandbox/game.ruleset b/data/sandbox/game.ruleset index 8615b7cec0..deebf2eb1d 100644 --- a/data/sandbox/game.ruleset +++ b/data/sandbox/game.ruleset @@ -841,7 +841,7 @@ actor_reqs = } [actionenabler_establish_embassy] -action = "Establish Embassy" +action = "Establish Embassy Stay" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "Diplomat", "Local", TRUE @@ -870,7 +870,7 @@ target_reqs = } [actionenabler_establish_embassy_explorer] -action = "Establish Embassy" +action = "Establish Embassy Stay" actor_reqs = { "type", "name", "range", "present" "UnitType", "Explorer", "Local", TRUE diff --git a/data/sandbox/units.ruleset b/data/sandbox/units.ruleset index 327be7d198..08534bb7e0 100644 --- a/data/sandbox/units.ruleset +++ b/data/sandbox/units.ruleset @@ -2437,6 +2437,7 @@ The actions available to Diplomats in a city are:\ - \"Investigate City\": Your unit attempts to report detailed\ information about the city: its status, what buildings and units are\ within, and what it is currently producing.\ + The unit is not consumed by this action.\ "), _("\ - \"Sabotage City\": Your unit attempts either to disrupt all the\ city's work so far towards its current project, or to destroy an\ @@ -2657,9 +2658,7 @@ helptext = _("\ Explorers are brave individuals that are very useful for\ mapping unknown territory.\ "), _("\ -Explorers can also perform some actions in another player's city,\ - and like Diplomats and Spies, the unit is not consumed by these\ - harmless actions:\ +Explorers can also perform some actions in another player's city:\ "), _("\ - \"Establish Embassy\": This action always succeeds, and gives\ permanent contact with the city's owner, as well as intelligence\ @@ -2670,6 +2669,7 @@ Explorers can also perform some actions in another player's city,\ - \"Investigate City\": Your unit attempts to report detailed\ information about the city: its status, what buildings and units are\ within, and what it is currently producing.\ + The unit is not consumed by this action.\ ") [unit_leader] -- 2.30.2