From 77f4989ce90010ad174aa81e7b8b1a8312871cf7 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Tue, 6 Apr 2021 15:25:10 +0300 Subject: [PATCH 25/28] 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 4f2b89dcf6..65e60f16fd 100644 --- a/data/civ2civ3/game.ruleset +++ b/data/civ2civ3/game.ruleset @@ -411,7 +411,7 @@ actor_reqs = } [actionenabler_establish_embassy] -action = "Establish Embassy" +action = "Establish Embassy Stay" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "Diplomat", "Local", TRUE @@ -438,7 +438,7 @@ target_reqs = } [actionenabler_establish_embassy_explorer] -action = "Establish Embassy" +action = "Establish Embassy Stay" actor_reqs = { "type", "name", "range" "UnitType", "Explorer", "Local" diff --git a/data/civ2civ3/units.ruleset b/data/civ2civ3/units.ruleset index 30dd3b39ff..ca170b5b9f 100644 --- a/data/civ2civ3/units.ruleset +++ b/data/civ2civ3/units.ruleset @@ -2259,6 +2259,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\ @@ -2472,9 +2473,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\ @@ -2485,6 +2484,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 fa7ac5ccca..1a3e18ac95 100644 --- a/data/sandbox/game.ruleset +++ b/data/sandbox/game.ruleset @@ -418,7 +418,7 @@ actor_reqs = } [actionenabler_establish_embassy] -action = "Establish Embassy" +action = "Establish Embassy Stay" actor_reqs = { "type", "name", "range", "present" "UnitFlag", "Diplomat", "Local", TRUE @@ -445,7 +445,7 @@ target_reqs = } [actionenabler_establish_embassy_explorer] -action = "Establish Embassy" +action = "Establish Embassy Stay" actor_reqs = { "type", "name", "range" "UnitType", "Explorer", "Local" diff --git a/data/sandbox/units.ruleset b/data/sandbox/units.ruleset index 0d6988a5e3..a672c63ec7 100644 --- a/data/sandbox/units.ruleset +++ b/data/sandbox/units.ruleset @@ -2321,6 +2321,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\ @@ -2536,9 +2537,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\ @@ -2549,6 +2548,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