From bd763c59ef513b8a03bb39d89b0c53687cc7605e Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Thu, 6 Jan 2022 01:06:22 +0200 Subject: [PATCH 42/42] Add TerrainAlter requirement value CanPlace See osdn #42873 Signed-off-by: Marko Lindqvist --- common/terrain.c | 2 ++ common/terrain.h | 3 +++ doc/README.effects | 2 +- fc_version | 2 +- 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/common/terrain.c b/common/terrain.c index 971d0803bf..886d4cc422 100644 --- a/common/terrain.c +++ b/common/terrain.c @@ -678,6 +678,8 @@ bool terrain_can_support_alteration(const struct terrain *pterrain, return (pterrain->road_time > 0); case TA_CAN_BASE: return (pterrain->base_time > 0); + case TA_CAN_PLACE: + return (pterrain->placing_time > 0); default: break; } diff --git a/common/terrain.h b/common/terrain.h index 56279c4e91..8685245a78 100644 --- a/common/terrain.h +++ b/common/terrain.h @@ -98,6 +98,9 @@ struct resource_type { /* Can build military base */ #define SPECENUM_VALUE3 TA_CAN_BASE #define SPECENUM_VALUE3NAME N_("CanBase") +/* Can place extras with infrapoints */ +#define SPECENUM_VALUE4 TA_CAN_PLACE +#define SPECENUM_VALUE4NAME N_("CanPlace") #define SPECENUM_COUNT TA_COUNT #include "specenum_gen.h" diff --git a/doc/README.effects b/doc/README.effects index 895135b686..160029897e 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", "CanRoad", or "CanBase". +TerrainAlter is "CanIrrigate", "CanMine", "CanRoad", "CanBase", or "CanPlace" CityTile is "Center" (city center), "Claimed" (tile owned), "Extras Owned" (extra on tile owned), or "Worked" (worked by any city) CityStatus is "OwnedByOriginal", "Starved", "Disorder", or "Celebration" diff --git a/fc_version b/fc_version index df6e3edf0e..73056cdfff 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-2022.Jan.05" +NETWORK_CAPSTRING="+Freeciv.Devel-3.2-2022.Jan.06" FREECIV_DISTRIBUTOR="" -- 2.34.1