diplomacy

malytomas · malytomas · commit efaa3b0f3424 · 2025-09-13T22:57:47.000+02:00
diff --git a/c/uwapi/uwapi/modules/botsAdmin.h b/c/uwapi/uwapi/modules/botsAdmin.h
@@ -10,12 +10,14 @@ extern "C"
 
 #ifdef UNNATURAL_BOTS
 
+	typedef struct UwGameConfig UwGameConfig;
 	typedef struct UwPlayerAiConfigComponent UwPlayerAiConfigComponent;
 
 	UNNATURAL_API uint64 uwGetLobbyId(void);
 	UNNATURAL_API uint64 uwGetUserId(void);
 	UNNATURAL_API uint16 uwGetServerPort(void);
 	UNNATURAL_API void uwAdminSetMapSelection(const char *path);
+	UNNATURAL_API void uwAdminSetGameConfig(const UwGameConfig *config);
 	UNNATURAL_API void uwAdminSetGameSpeed(float speed);
 	UNNATURAL_API void uwAdminSetWeatherSpeed(float speed, float offset);
 	UNNATURAL_API void uwAdminStartGame(void);
diff --git a/c/uwapi/uwapi/modules/common.h b/c/uwapi/uwapi/modules/common.h
@@ -34,7 +34,7 @@ extern "C"
 	typedef uint64_t uint64;
 	typedef int64_t sint64;
 
-	static const uint32 UW_VERSION = 44;
+	static const uint32 UW_VERSION = 45;
 	static const uint32 UW_GameTicksPerSecond = 20;
 
 	typedef struct UwIds
diff --git a/c/uwapi/uwapi/modules/game.h b/c/uwapi/uwapi/modules/game.h
@@ -12,6 +12,16 @@ extern "C"
 
 #endif
 
+	// game config
+
+	typedef struct UwGameConfig
+	{
+		bool ranked;
+		bool diplomacy;
+	} UwGameConfig;
+
+	UNNATURAL_API void uwGameConfig(UwGameConfig *config);
+
 	// game state
 
 	typedef enum UwGameStateEnum
diff --git a/c/uwapi/uwapi/modules/world.h b/c/uwapi/uwapi/modules/world.h
@@ -49,6 +49,10 @@ extern "C"
 	UNNATURAL_API uint32 uwFindConstructionPlacement(uint32 constructionProto, uint32 position, uint32 owner, uint32 recipeProto); // recipeProto may be 0
 #endif
 
+#ifdef UNNATURAL_BOTS
+	UNNATURAL_API void uwOfferForeignPolicy(uint32 forceId, UwForeignPolicyEnum policy);
+#endif
+
 	// overview
 
 	typedef enum UwOverviewFlags
diff --git a/csharp/uwapi/game.cs b/csharp/uwapi/game.cs
@@ -113,6 +113,13 @@ public static MapStateEnum MapState()
             return Interop.uwMapState();
         }
 
+        public static Interop.UwGameConfig GameConfig()
+        {
+            Interop.UwGameConfig data = new Interop.UwGameConfig();
+            Interop.uwGameConfig(ref data);
+            return data;
+        }
+
         public static Interop.UwPerformanceStatistics PerformanceStatistics()
         {
             Interop.UwPerformanceStatistics data = new Interop.UwPerformanceStatistics();
diff --git a/csharp/uwapi/interop.cs b/csharp/uwapi/interop.cs
@@ -29,6 +29,9 @@ public static class Interop
         [DllImport(LibName, CallingConvention = CallingConvention.Cdecl)]
         public static extern void uwAdminSetMapSelection([MarshalAs(UnmanagedType.LPStr)] string path);
 
+        [DllImport(LibName, CallingConvention = CallingConvention.Cdecl)]
+        public static extern void uwAdminSetGameConfig(ref UwGameConfig config);
+
         [DllImport(LibName, CallingConvention = CallingConvention.Cdecl)]
         public static extern void uwAdminSetGameSpeed(float speed);
 
@@ -323,7 +326,7 @@ public static extern void uwCommandPlaceConstruction(uint constructionProto, uin
         [DllImport(LibName, CallingConvention = CallingConvention.Cdecl)]
         public static extern void uwCommandSelfDestruct(uint entityId);
 
-        public const uint UW_VERSION = 44;
+        public const uint UW_VERSION = 45;
         public const uint UW_GameTicksPerSecond = 20;
         [StructLayout(LayoutKind.Sequential)]
         public struct UwIds
@@ -689,6 +692,18 @@ public struct UwDiplomacyProposalComponent
         public static extern bool uwFetchDiplomacyProposalComponent(IntPtr entity,
                                                                     ref UwDiplomacyProposalComponent data);
 
+        [StructLayout(LayoutKind.Sequential)]
+        public struct UwGameConfig
+        {
+            [MarshalAs(UnmanagedType.I1)]
+            public bool ranked;
+            [MarshalAs(UnmanagedType.I1)]
+            public bool diplomacy;
+        }
+
+        [DllImport(LibName, CallingConvention = CallingConvention.Cdecl)]
+        public static extern void uwGameConfig(ref UwGameConfig config);
+
         public enum UwGameStateEnum
         {
             None = 0,
@@ -973,6 +988,9 @@ public struct UwUnitUpgrades
         [DllImport(LibName, CallingConvention = CallingConvention.Cdecl)]
         public static extern uint uwFindConstructionPlacement(uint constructionProto, uint position, uint recipeProto);
 
+        [DllImport(LibName, CallingConvention = CallingConvention.Cdecl)]
+        public static extern void uwOfferForeignPolicy(uint forceId, UwForeignPolicyEnum policy);
+
         [Flags]
         public enum UwOverviewFlags
         {
diff --git a/csharp/uwapi/world.cs b/csharp/uwapi/world.cs
@@ -113,10 +113,15 @@ public static Entity Entity(uint id)
             return entities[id];
         }
 
-        public static PolicyEnum Policy(uint force)
+        public static PolicyEnum Policy(uint forceId)
         {
             PolicyEnum val;
-            return policies.TryGetValue(force, out val) ? val : PolicyEnum.None;
+            return policies.TryGetValue(forceId, out val) ? val : PolicyEnum.None;
+        }
+
+        public static void OfferForeignPolicy(uint forceId, PolicyEnum policy)
+        {
+            Interop.uwOfferForeignPolicy(forceId, policy);
         }
 
         static Interop.UwMyPlayer myPlayer;
diff --git a/python/uwapi/__init__.py b/python/uwapi/__init__.py
@@ -13,4 +13,4 @@
 from .prototypes import uw_prototypes
 from .world import uw_world
 
-__all__ = ["uw_admin","uw_commands","Entity","INVALID","uw_events","uw_game","UwapiLibrary","uw_map","uw_prototypes","uw_world","Severity","LogCallback","ConnectionState","MyPlayer","AssistConfig","PerformanceStatistics","OrderType","OrderPriority","Order","Orders","Ids","Priority","Ping","PathState","ForeignPolicy","ChatTarget","ProtoComponent","OwnerComponent","ControllerComponent","PositionComponent","UnitState","UnitComponent","LifeComponent","ManaComponent","MoveComponent","AimComponent","RecipeComponent","RecipeStatisticsComponent","LogisticsTimestampComponent","PriorityComponent","AmountComponent","AttachmentComponent","PingComponent","PlayerState","PlayerConnectionClass","PlayerComponent","PlayerAiConfigComponent","ForceState","ForceComponent","ForceDetailsComponent","ForeignPolicyComponent","DiplomacyProposalComponent","GameState","ShootingEvent","ShootingsArray","TaskType","MapState","MapInfo","MapStartingPosition","MapStartingPositionsArray","Tile","Cluster","ClustersDistancesQuery","ClustersDistancesResult","PrototypeType","MyForceStatistics","UnitUpgrades","Overview","OverviewExtract","UnitPathfindingQuery","UnitPathfindingResult"]
+__all__ = ["uw_admin","uw_commands","Entity","INVALID","uw_events","uw_game","UwapiLibrary","uw_map","uw_prototypes","uw_world","Severity","LogCallback","ConnectionState","MyPlayer","AssistConfig","PerformanceStatistics","OrderType","OrderPriority","Order","Orders","Ids","Priority","Ping","PathState","ForeignPolicy","ChatTarget","ProtoComponent","OwnerComponent","ControllerComponent","PositionComponent","UnitState","UnitComponent","LifeComponent","ManaComponent","MoveComponent","AimComponent","RecipeComponent","RecipeStatisticsComponent","LogisticsTimestampComponent","PriorityComponent","AmountComponent","AttachmentComponent","PingComponent","PlayerState","PlayerConnectionClass","PlayerComponent","PlayerAiConfigComponent","ForceState","ForceComponent","ForceDetailsComponent","ForeignPolicyComponent","DiplomacyProposalComponent","GameConfig","GameState","ShootingEvent","ShootingsArray","TaskType","MapState","MapInfo","MapStartingPosition","MapStartingPositionsArray","Tile","Cluster","ClustersDistancesQuery","ClustersDistancesResult","PrototypeType","MyForceStatistics","UnitUpgrades","Overview","OverviewExtract","UnitPathfindingQuery","UnitPathfindingResult"]
diff --git a/python/uwapi/bots.h b/python/uwapi/bots.h
@@ -9,7 +9,7 @@ typedef int32_t sint32;
 typedef uint64_t uint64;
 typedef int64_t sint64;
 
-static const uint32 UW_VERSION = 44;
+static const uint32 UW_VERSION = 45;
 static const uint32 UW_GameTicksPerSecond = 20;
 
 typedef struct UwIds
@@ -66,12 +66,14 @@ typedef enum UwChatTargetEnum
 	UwChatTargetEnum_Observers = 5,
 } UwChatTargetEnum;
 
+typedef struct UwGameConfig UwGameConfig;
 typedef struct UwPlayerAiConfigComponent UwPlayerAiConfigComponent;
 
 uint64 uwGetLobbyId(void);
 uint64 uwGetUserId(void);
 uint16 uwGetServerPort(void);
 void uwAdminSetMapSelection(const char *path);
+void uwAdminSetGameConfig(const UwGameConfig *config);
 void uwAdminSetGameSpeed(float speed);
 void uwAdminSetWeatherSpeed(float speed, float offset);
 void uwAdminStartGame(void);
@@ -419,6 +421,14 @@ typedef struct UwDiplomacyProposalComponent
 	UwForeignPolicyEnum proposal;
 } UwDiplomacyProposalComponent;
 bool uwFetchDiplomacyProposalComponent(UwEntityPtr entity, UwDiplomacyProposalComponent *data);
+typedef struct UwGameConfig
+{
+	bool ranked;
+	bool diplomacy;
+} UwGameConfig;
+
+void uwGameConfig(UwGameConfig *config);
+
 typedef enum UwGameStateEnum
 {
 	UwGameStateEnum_None = 0,
@@ -597,6 +607,8 @@ bool uwTestShootingEntities(uint32 shooterId, uint32 targetId);
 
 bool uwTestConstructionPlacement(uint32 constructionProto, uint32 position, uint32 recipeProto);
 uint32 uwFindConstructionPlacement(uint32 constructionProto, uint32 position, uint32 recipeProto);
+void uwOfferForeignPolicy(uint32 forceId, UwForeignPolicyEnum policy);
+
 typedef enum UwOverviewFlags
 {
 	UwOverviewFlags_None = 0,
diff --git a/python/uwapi/game.py b/python/uwapi/game.py
@@ -76,6 +76,9 @@ def game_tick(self) -> int:
     def map_state(self) -> UwMapStateEnum:
         return uw_interop.uwMapState()
 
+    def game_config(self) -> UwGameConfig:
+        return uw_interop.uwGameConfig()
+
     def performance_statistics(self) -> UwPerformanceStatistics:
         return uw_interop.uwPerformanceStatistics()
 
diff --git a/python/uwapi/interop.py b/python/uwapi/interop.py
@@ -317,6 +317,11 @@ class UwDiplomacyProposalComponent:
     offeree: int
     proposal: UwForeignPolicyEnum
 
+@dataclass
+class UwGameConfig:
+    ranked: bool
+    diplomacy: bool
+
 @dataclass
 class UwShootingsArray:
     data: list[int]
@@ -447,6 +452,7 @@ class UwUnitPathfindingResult:
 ForceDetailsComponent = UwForceDetailsComponent
 ForeignPolicyComponent = UwForeignPolicyComponent
 DiplomacyProposalComponent = UwDiplomacyProposalComponent
+GameConfig = UwGameConfig
 GameState = UwGameStateEnum
 ShootingEvent = UwShootingEventEnum
 ShootingsArray = UwShootingsArray
@@ -520,6 +526,10 @@ def uwAdminSetMapSelection(self, path: str) -> None:
         path_ = self._str_pytoc(path)
         self._api.uwAdminSetMapSelection(path_)
 
+    def uwAdminSetGameConfig(self, config: UwGameConfig) -> None:
+        config_ = self._UwGameConfig_pytoc(config)
+        self._api.uwAdminSetGameConfig(config_)
+
     def uwAdminSetGameSpeed(self, speed: float) -> None:
         self._api.uwAdminSetGameSpeed(speed)
 
@@ -933,6 +943,12 @@ def uwFetchDiplomacyProposalComponent(self, entity) -> Tuple[bool, UwDiplomacyPr
         ret = bool(ret)
         return ret, data_
 
+    def uwGameConfig(self) -> UwGameConfig:
+        config = self._ffi.new("UwGameConfig *")
+        self._api.uwGameConfig(config)
+        config_ = self._UwGameConfig_ctopy(config)
+        return config_
+
     def uwSetGameStateCallback(self, callback: UwGameStateCallbackType) -> None:
         @self._ffi.callback("UwGameStateCallbackType")
         def c_callback(state):
@@ -1160,6 +1176,10 @@ def uwFindConstructionPlacement(self, constructionProto: int, position: int, rec
         ret = int(ret)
         return ret
 
+    def uwOfferForeignPolicy(self, forceId: int, policy: UwForeignPolicyEnum) -> None:
+        policy_ = int(policy.value)
+        self._api.uwOfferForeignPolicy(forceId, policy_)
+
     def uwOverviewFlags(self, position: int) -> UwOverviewFlags:
         ret = self._api.uwOverviewFlags(position)
         ret = UwOverviewFlags(ret)
@@ -1297,6 +1317,15 @@ def _UwForeignPolicyComponent_ctopy(self, val) -> UwForeignPolicyComponent:
     def _UwDiplomacyProposalComponent_ctopy(self, val) -> UwDiplomacyProposalComponent:
         return UwDiplomacyProposalComponent(int(val.offeror), int(val.offeree), UwForeignPolicyEnum(val.proposal))
 
+    def _UwGameConfig_ctopy(self, val) -> UwGameConfig:
+        return UwGameConfig(bool(val.ranked), bool(val.diplomacy))
+
+    def _UwGameConfig_pytoc(self, val: UwGameConfig):
+        r = self._ffi.new("UwGameConfig *")
+        r.ranked = val.ranked
+        r.diplomacy = val.diplomacy
+        return r
+
     def _UwShootingsArray_ctopy(self, val) -> UwShootingsArray:
         return UwShootingsArray(list[int]([int(val.data[i]) for i in range(val.count)]), int(val.count))
 
diff --git a/python/uwapi/world.py b/python/uwapi/world.py
@@ -104,6 +104,9 @@ def entity(self, entity_id: int) -> Entity:
     def policy(self, force_id: int) -> UwForeignPolicyEnum:
         return self._policies.get(force_id, UwForeignPolicyEnum.Nothing)
 
+    def offer_foreign_policy(self, force_id: int, policy: UwForeignPolicyEnum) -> None:
+        uw_interop.uwOfferForeignPolicy(force_id, policy)
+
     def _all_ids(self) -> list[int]:
         return uw_interop.uwAllEntities().ids
 

Original file line number	Diff line number	Diff line change
`@@ -113,6 +113,13 @@ public static MapStateEnum MapState()`
`113`	`113`	`return Interop.uwMapState();`
`114`	`114`	`}`
`115`	`115`
	`116`	`+ public static Interop.UwGameConfig GameConfig()`
	`117`	`+ {`
	`118`	`+ Interop.UwGameConfig data = new Interop.UwGameConfig();`
	`119`	`+ Interop.uwGameConfig(ref data);`
	`120`	`+ return data;`
	`121`	`+ }`
	`122`	`+`
`116`	`123`	`public static Interop.UwPerformanceStatistics PerformanceStatistics()`
`117`	`124`	`{`
`118`	`125`	`Interop.UwPerformanceStatistics data = new Interop.UwPerformanceStatistics();`
Original file line number	Diff line number	Diff line change
`@@ -113,10 +113,15 @@ public static Entity Entity(uint id)`
`113`	`113`	`return entities[id];`
`114`	`114`	`}`
`115`	`115`
`116`		`- public static PolicyEnum Policy(uint force)`
	`116`	`+ public static PolicyEnum Policy(uint forceId)`
`117`	`117`	`{`
`118`	`118`	`PolicyEnum val;`
`119`		`- return policies.TryGetValue(force, out val) ? val : PolicyEnum.None;`
	`119`	`+ return policies.TryGetValue(forceId, out val) ? val : PolicyEnum.None;`
	`120`	`+ }`
	`121`	`+`
	`122`	`+ public static void OfferForeignPolicy(uint forceId, PolicyEnum policy)`
	`123`	`+ {`
	`124`	`+ Interop.uwOfferForeignPolicy(forceId, policy);`
`120`	`125`	`}`
`121`	`126`
`122`	`127`	`static Interop.UwMyPlayer myPlayer;`