From 7c9bdfec14a10d0528895d7313b0daed74a9e5c8 Mon Sep 17 00:00:00 2001 From: Sveinung Kvilhaugsvik Date: Mon, 3 May 2021 09:12:47 +0200 Subject: [PATCH] The "Trireme" flag has been renamed CoastStrict. See osdn #42158 --- common/aicore/path_finding.c | 2 +- data/alien/terrain.ruleset | 2 +- data/civ1/terrain.ruleset | 2 +- data/civ2/terrain.ruleset | 2 +- data/civ2civ3/terrain.ruleset | 2 +- data/classic/terrain.ruleset | 2 +- data/experimental/terrain.ruleset | 2 +- data/multiplayer/terrain.ruleset | 2 +- data/ruledit/comments.txt | 2 +- data/sandbox/terrain.ruleset | 2 +- data/stub/terrain.ruleset | 2 +- data/webperimental/terrain.ruleset | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/common/aicore/path_finding.c b/common/aicore/path_finding.c index 3278823bab..93387a4542 100644 --- a/common/aicore/path_finding.c +++ b/common/aicore/path_finding.c @@ -932,7 +932,7 @@ static struct pf_map *pf_normal_map_new(const struct pf_parameter *parameter) /* Danger path-finding maps are used for units which can cross some areas * but not ending their turn there. It used to be used for triremes notably. - * But since Freeciv 2.2, units with the "Trireme" flag just have + * But since Freeciv 2.2, units with the "CoastStrict" flag just have * restricted moves, then it is not use anymore. */ /* Node definition. Note we try to have the smallest data as possible. */ diff --git a/data/alien/terrain.ruleset b/data/alien/terrain.ruleset index e1f23eda3d..3b641114d6 100644 --- a/data/alien/terrain.ruleset +++ b/data/alien/terrain.ruleset @@ -168,7 +168,7 @@ ocean_resources = TRUE ; actual chance of river generation is controlled ; separately). ; - UnsafeCoast = This terrain does not provide a safe coast for -; units with flag "Trireme" +; units with flag "CoastStrict" ; - FreshWater = This terrain is used for small bodies of water. ; If this becomes adjacent to non-FreshWater terrain, ; the whole contiguous FreshWater area will be flooded diff --git a/data/civ1/terrain.ruleset b/data/civ1/terrain.ruleset index c6ec515395..2cc8996e81 100644 --- a/data/civ1/terrain.ruleset +++ b/data/civ1/terrain.ruleset @@ -162,7 +162,7 @@ igter_cost = 1 ; actual chance of river generation is controlled ; separately). ; - UnsafeCoast = This terrain does not provide a safe voyage for -; units with flag "Trireme" +; units with flag "CoastStrict" ; - FreshWater = This terrain is used for small bodies of water. ; If this becomes adjacent to non-FreshWater terrain, ; the whole contiguous FreshWater area will be flooded diff --git a/data/civ2/terrain.ruleset b/data/civ2/terrain.ruleset index f7235dc02c..e88224c6bd 100644 --- a/data/civ2/terrain.ruleset +++ b/data/civ2/terrain.ruleset @@ -162,7 +162,7 @@ pythagorean_diagonal = FALSE ; actual chance of river generation is controlled ; separately). ; - UnsafeCoast = This terrain does not provide a safe voyage for -; units with flag "Trireme" +; units with flag "CoastStrict" ; - FreshWater = This terrain is used for small bodies of water. ; If this becomes adjacent to non-FreshWater terrain, ; the whole contiguous FreshWater area will be flooded diff --git a/data/civ2civ3/terrain.ruleset b/data/civ2civ3/terrain.ruleset index 87b79df83c..9918ba143b 100644 --- a/data/civ2civ3/terrain.ruleset +++ b/data/civ2civ3/terrain.ruleset @@ -174,7 +174,7 @@ ocean_resources = FALSE ; actual chance of river generation is controlled ; separately). ; - UnsafeCoast = This terrain does not provide a safe voyage for -; units with flag "Trireme" +; units with flag "CoastStrict" ; - FreshWater = This terrain is used for small bodies of water. ; If this becomes adjacent to non-FreshWater terrain, ; the whole contiguous FreshWater area will be flooded diff --git a/data/classic/terrain.ruleset b/data/classic/terrain.ruleset index 2ca677f222..33cdf338f7 100644 --- a/data/classic/terrain.ruleset +++ b/data/classic/terrain.ruleset @@ -167,7 +167,7 @@ ocean_resources = FALSE ; actual chance of river generation is controlled ; separately). ; - UnsafeCoast = This terrain does not provide a safe voyage for -; units with flag "Trireme" +; units with flag "CoastStrict" ; - FreshWater = This terrain is used for small bodies of water. ; If this becomes adjacent to non-FreshWater terrain, ; the whole contiguous FreshWater area will be flooded diff --git a/data/experimental/terrain.ruleset b/data/experimental/terrain.ruleset index 33b1958b77..6f8d8bdad3 100644 --- a/data/experimental/terrain.ruleset +++ b/data/experimental/terrain.ruleset @@ -169,7 +169,7 @@ ocean_resources = FALSE ; actual chance of river generation is controlled ; separately). ; - UnsafeCoast = This terrain does not provide a safe voyage for -; units with flag "Trireme" +; units with flag "CoastStrict" ; - FreshWater = This terrain is used for small bodies of water. ; If this becomes adjacent to non-FreshWater terrain, ; the whole contiguous FreshWater area will be flooded diff --git a/data/multiplayer/terrain.ruleset b/data/multiplayer/terrain.ruleset index f83339ba1f..c90c5812a2 100644 --- a/data/multiplayer/terrain.ruleset +++ b/data/multiplayer/terrain.ruleset @@ -167,7 +167,7 @@ ocean_resources = FALSE ; actual chance of river generation is controlled ; separately). ; - UnsafeCoast = This terrain does not provide a safe voyage for -; units with flag "Trireme" +; units with flag "CoastStrict" ; - FreshWater = This terrain is used for small bodies of water. ; If this becomes adjacent to non-FreshWater terrain, ; the whole contiguous FreshWater area will be flooded diff --git a/data/ruledit/comments.txt b/data/ruledit/comments.txt index d0009be736..fed4996ea7 100644 --- a/data/ruledit/comments.txt +++ b/data/ruledit/comments.txt @@ -631,7 +631,7 @@ terrains = "\ ; actual chance of river generation is controlled\n\ ; separately).\n\ ; - UnsafeCoast = This terrain does not provide a safe voyage for\n\ -; units with flag \"Trireme\"\n\ +; units with flag \"CoastStrict\"\n\ ; - FreshWater = This terrain is used for small bodies of water.\n\ ; If this becomes adjacent to non-FreshWater terrain,\n\ ; the whole contiguous FreshWater area will be flooded\n\ diff --git a/data/sandbox/terrain.ruleset b/data/sandbox/terrain.ruleset index adccb05a12..61b2509ad8 100644 --- a/data/sandbox/terrain.ruleset +++ b/data/sandbox/terrain.ruleset @@ -175,7 +175,7 @@ ocean_resources = FALSE ; actual chance of river generation is controlled ; separately). ; - UnsafeCoast = This terrain does not provide a safe voyage for -; units with flag "Trireme" +; units with flag "CoastStrict" ; - FreshWater = This terrain is used for small bodies of water. ; If this becomes adjacent to non-FreshWater terrain, ; the whole contiguous FreshWater area will be flooded diff --git a/data/stub/terrain.ruleset b/data/stub/terrain.ruleset index 0b0332cbfb..fa16393a6b 100644 --- a/data/stub/terrain.ruleset +++ b/data/stub/terrain.ruleset @@ -156,7 +156,7 @@ ocean_resources = FALSE ; actual chance of river generation is controlled ; separately). ; - UnsafeCoast = This terrain does not provide a safe coast for -; units with flag "Trireme" +; units with flag "CoastStrict" ; - FreshWater = This terrain is used for small bodies of water. ; If this becomes adjacent to non-FreshWater terrain, ; the whole contiguous FreshWater area will be flooded diff --git a/data/webperimental/terrain.ruleset b/data/webperimental/terrain.ruleset index f3610c1cac..6cccd949a0 100644 --- a/data/webperimental/terrain.ruleset +++ b/data/webperimental/terrain.ruleset @@ -167,7 +167,7 @@ ocean_resources = FALSE ; actual chance of river generation is controlled ; separately). ; - UnsafeCoast = This terrain does not provide a safe voyage for -; units with flag "Trireme" +; units with flag "CoastStrict" ; - FreshWater = This terrain is used for small bodies of water. ; If this becomes adjacent to non-FreshWater terrain, ; the whole contiguous FreshWater area will be flooded -- 2.30.2