From 1b4a98141dfbd18252344af3d242308e9252110c Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Wed, 15 Sep 2021 02:32:32 +0300 Subject: [PATCH 27/27] Add support for TerrainAlter requirement value CanBase See osdn #42849 Signed-off-by: Marko Lindqvist --- common/terrain.c | 3 +++ common/terrain.h | 3 +++ doc/README.effects | 2 +- fc_version | 2 +- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/common/terrain.c b/common/terrain.c index d2fc122778..971d0803bf 100644 --- a/common/terrain.c +++ b/common/terrain.c @@ -676,11 +676,14 @@ bool terrain_can_support_alteration(const struct terrain *pterrain, return (pterrain->mining_time > 0); case TA_CAN_ROAD: return (pterrain->road_time > 0); + case TA_CAN_BASE: + return (pterrain->base_time > 0); default: break; } fc_assert(FALSE); + return FALSE; } diff --git a/common/terrain.h b/common/terrain.h index efb5475929..56279c4e91 100644 --- a/common/terrain.h +++ b/common/terrain.h @@ -95,6 +95,9 @@ struct resource_type { /* Can build roads and/or railroads */ #define SPECENUM_VALUE2 TA_CAN_ROAD #define SPECENUM_VALUE2NAME N_("CanRoad") +/* Can build military base */ +#define SPECENUM_VALUE3 TA_CAN_BASE +#define SPECENUM_VALUE3NAME N_("CanBase") #define SPECENUM_COUNT TA_COUNT #include "specenum_gen.h" diff --git a/doc/README.effects b/doc/README.effects index 82773dc7ef..5bf2236193 100644 --- a/doc/README.effects +++ b/doc/README.effects @@ -105,7 +105,7 @@ MinHitPoints: Local MinSize is the minimum size of a city required. AI is ai player difficulty level. TerrainClass is either "Land" or "Oceanic". -TerrainAlter is "CanIrrigate", "CanMine", or "CanRoad". +TerrainAlter is "CanIrrigate", "CanMine", "CanRoad", or "CanBase". CityTile is "Center" (city center), "Claimed" (tile owned) or "Extras Owned" (extra on tile owned). CityStatus is "OwnedByOriginal", "Starved", "Disorder", or "Celebration" diff --git a/fc_version b/fc_version index 7db6481397..3bbb06505c 100755 --- a/fc_version +++ b/fc_version @@ -56,7 +56,7 @@ DEFAULT_FOLLOW_TAG=S3_2 # - No new mandatory capabilities can be added to the release branch; doing # so would break network capability of supposedly "compatible" releases. # -NETWORK_CAPSTRING="+Freeciv.Devel-3.2-2021.Jul.20" +NETWORK_CAPSTRING="+Freeciv.Devel-3.2-2021.Sep.15" FREECIV_DISTRIBUTOR="" -- 2.33.0