From b130ca596f3517b7a0a4c93fccfb808bbd430205 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/goldkeep/terrain.ruleset | 2 +- data/granularity/terrain.ruleset | 2 +- data/multiplayer/terrain.ruleset | 2 +- data/ruledit/comments-3.2.txt | 2 +- data/sandbox/terrain.ruleset | 2 +- data/stub/terrain.ruleset | 2 +- data/webperimental/terrain.ruleset | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/common/aicore/path_finding.c b/common/aicore/path_finding.c index 74ee749e4f..69d520442d 100644 --- a/common/aicore/path_finding.c +++ b/common/aicore/path_finding.c @@ -935,7 +935,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 b63faa9ef1..4b4c1400c0 100644 --- a/data/alien/terrain.ruleset +++ b/data/alien/terrain.ruleset @@ -170,7 +170,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 aecf5f5555..a3bc300d16 100644 --- a/data/civ1/terrain.ruleset +++ b/data/civ1/terrain.ruleset @@ -164,7 +164,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 50bf818c3f..4157d5c2e1 100644 --- a/data/civ2/terrain.ruleset +++ b/data/civ2/terrain.ruleset @@ -164,7 +164,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 5b5b2146c2..6298f8690b 100644 --- a/data/civ2civ3/terrain.ruleset +++ b/data/civ2civ3/terrain.ruleset @@ -176,7 +176,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 05e01fef29..6b4af87dec 100644 --- a/data/classic/terrain.ruleset +++ b/data/classic/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/goldkeep/terrain.ruleset b/data/goldkeep/terrain.ruleset index 9902892e0a..e1d13fe4d4 100644 --- a/data/goldkeep/terrain.ruleset +++ b/data/goldkeep/terrain.ruleset @@ -171,7 +171,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/granularity/terrain.ruleset b/data/granularity/terrain.ruleset index b28c369f30..44a588db87 100644 --- a/data/granularity/terrain.ruleset +++ b/data/granularity/terrain.ruleset @@ -166,7 +166,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/multiplayer/terrain.ruleset b/data/multiplayer/terrain.ruleset index 4acfa62058..abe377ea04 100644 --- a/data/multiplayer/terrain.ruleset +++ b/data/multiplayer/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/ruledit/comments-3.2.txt b/data/ruledit/comments-3.2.txt index 7ad71aa60b..820eed05be 100644 --- a/data/ruledit/comments-3.2.txt +++ b/data/ruledit/comments-3.2.txt @@ -644,7 +644,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 43f55f9797..13159094ae 100644 --- a/data/sandbox/terrain.ruleset +++ b/data/sandbox/terrain.ruleset @@ -177,7 +177,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 5a59ae3de4..a83fc46af3 100644 --- a/data/stub/terrain.ruleset +++ b/data/stub/terrain.ruleset @@ -157,7 +157,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 ac6b8f2d9f..1d2b617afe 100644 --- a/data/webperimental/terrain.ruleset +++ b/data/webperimental/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 -- 2.30.2