From 4afc7fa16e91d325a41c5a8ba9173e0c4aa51312 Mon Sep 17 00:00:00 2001 From: Sveinung Kvilhaugsvik Date: Tue, 18 May 2021 11:01:12 +0200 Subject: [PATCH] "Is foreign" -> "Foreign" "Is foreign" was renamed to "Foreign" in 3.1. See osdn #42311 --- common/reqtext.c | 2 +- doc/README.actions | 6 +++--- doc/README.effects | 10 +++++----- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/common/reqtext.c b/common/reqtext.c index 38b4edd92f..3ca6237ac4 100644 --- a/common/reqtext.c +++ b/common/reqtext.c @@ -1186,7 +1186,7 @@ bool req_text_insert(char *buf, size_t bufsz, struct player *pplayer, cat_snprintf(buf, bufsz, /* TRANS: in this and following strings, '%s' can be one * of a wide range of relationships; e.g., 'Peace', - * 'Never met', 'Is foreign', 'Hosts embassy', + * 'Never met', 'Foreign', 'Hosts embassy', * 'Provided Casus Belli' */ _("Requires that you have the relationship '%s' with at " "least one other living player."), diff --git a/doc/README.actions b/doc/README.actions index 55f8ca726f..dc570d6c48 100644 --- a/doc/README.actions +++ b/doc/README.actions @@ -43,7 +43,7 @@ actor_reqs = { "type", "name", "range", "present" "DiplRel", "Has Casus Belli", "Local", TRUE "DiplRel", "Provided Casus Belli", "Local", FALSE - "DiplRel", "Is foreign", "Local", TRUE + "DiplRel", "Foreign", "Local", TRUE } [actionenabler_go_bind_your_sons_to_exile] @@ -51,7 +51,7 @@ action = "Incite City" actor_reqs = { "type", "name", "range", "present" "Tech", "Flight", "Player", TRUE - "DiplRel", "Is foreign", "Local", TRUE + "DiplRel", "Foreign", "Local", TRUE } target_reqs = { "type", "name", "range", "present" @@ -92,7 +92,7 @@ actor requirements. action enablers to be simpler and faster. * If player A having a diplomatic relationship to player B implies that player B has the same relationship to player A the relationship is - symmetric. Examples: "Is foreign" and "War" + symmetric. Examples: "Foreign" and "War" * Symmetric local DiplRel requirements can be moved directly from the target requirement vector to the actor requirement vector. * Asymmetric local DiplRel requirements must test for the same thing in diff --git a/doc/README.effects b/doc/README.effects index 8332ee860b..2a8364d70e 100644 --- a/doc/README.effects +++ b/doc/README.effects @@ -695,7 +695,7 @@ Look for the diplomatic relationship "Never met", "War", "Cease-fire", "Armistice", "Peace", "Alliance", "Team", "Gives shared vision", "Receives shared vision", "Hosts embassy", "Has embassy", "Hosts real embassy" (not from an effect), "Has real embassy", -"Has Casus Belli" (reason for war), "Provided Casus Belli" or "Is foreign". +"Has Casus Belli" (reason for war), "Provided Casus Belli" or "Foreign". A DiplRel is considered fulfilled for the range * world if some player in the world has the specified diplomatic @@ -719,10 +719,10 @@ needs the player the first player's relationship is to. Example: The requirements below are about the relationship to the owner of a tile. The table shows in what situations a requirement is fulfilled. -Requirement is fulfilled when the tile is - | domestic | unclaimed | foreign -"DiplRel", "Is foreign", "Local", TRUE | no | no | yes -"DiplRel", "Is foreign", "Local", FALSE | yes | no | no +Requirement is fulfilled when the tile is + | domestic | unclaimed | foreign +"DiplRel", "Foreign", "Local", TRUE | no | no | yes +"DiplRel", "Foreign", "Local", FALSE | yes | no | no The MaxUnitsOnTile requirement type ----------------------------------- -- 2.30.2