more game config; game speed

Author: malytomas

c/uwapi/uwapi/modules/botsAdmin.h

@@ -18,8 +18,6 @@ extern "C"
 	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);
 	UNNATURAL_API void uwAdminTerminateGame(void);
 	UNNATURAL_API void uwAdminPauseGame(bool pause);

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 = 45;
+	static const uint32 UW_VERSION = 46;
 	static const uint32 UW_GameTicksPerSecond = 20;
 
 	typedef struct UwIds

c/uwapi/uwapi/modules/game.h

@@ -18,10 +18,15 @@ extern "C"
 	{
 		bool ranked;
 		bool diplomacy;
+		bool lockedSpeed;
+		bool cheats;
 	} UwGameConfig;
 
 	UNNATURAL_API void uwGameConfig(UwGameConfig *config);
 
+	UNNATURAL_API void uwSetGameSpeed(float speed);
+	UNNATURAL_API void uwSetWeatherSpeed(float speed, float offset);
+
 	// game state
 
 	typedef enum UwGameStateEnum

csharp/uwapi/admin.cs

@@ -25,16 +25,6 @@ public static void SetMapSelection(string path)
             Interop.uwAdminSetMapSelection(path);
         }
 
-        public static void SetGameSpeed(float speed)
-        {
-            Interop.uwAdminSetGameSpeed(speed);
-        }
-
-        public static void SetWeatherSpeed(float speed, float offset)
-        {
-            Interop.uwAdminSetWeatherSpeed(speed, offset);
-        }
-
         public static void StartGame()
         {
             Interop.uwAdminStartGame();

csharp/uwapi/game.cs

@@ -108,6 +108,16 @@ public static uint GameTick()
             return Interop.uwGameTick();
         }
 
+        public static void SetGameSpeed(float speed)
+        {
+            Interop.uwSetGameSpeed(speed);
+        }
+
+        public static void SetWeatherSpeed(float speed, float offset)
+        {
+            Interop.uwSetWeatherSpeed(speed, offset);
+        }
+
         public static MapStateEnum MapState()
         {
             return Interop.uwMapState();

csharp/uwapi/interop.cs

@@ -32,12 +32,6 @@ public static class Interop
         [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);
-
-        [DllImport(LibName, CallingConvention = CallingConvention.Cdecl)]
-        public static extern void uwAdminSetWeatherSpeed(float speed, float offset);
-
         [DllImport(LibName, CallingConvention = CallingConvention.Cdecl)]
         public static extern void uwAdminStartGame();
 
@@ -326,7 +320,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 = 45;
+        public const uint UW_VERSION = 46;
         public const uint UW_GameTicksPerSecond = 20;
         [StructLayout(LayoutKind.Sequential)]
         public struct UwIds
@@ -699,11 +693,21 @@ public struct UwGameConfig
             public bool ranked;
             [MarshalAs(UnmanagedType.I1)]
             public bool diplomacy;
+            [MarshalAs(UnmanagedType.I1)]
+            public bool lockedSpeed;
+            [MarshalAs(UnmanagedType.I1)]
+            public bool cheats;
         }
 
         [DllImport(LibName, CallingConvention = CallingConvention.Cdecl)]
         public static extern void uwGameConfig(ref UwGameConfig config);
 
+        [DllImport(LibName, CallingConvention = CallingConvention.Cdecl)]
+        public static extern void uwSetGameSpeed(float speed);
+
+        [DllImport(LibName, CallingConvention = CallingConvention.Cdecl)]
+        public static extern void uwSetWeatherSpeed(float speed, float offset);
+
         public enum UwGameStateEnum
         {
             None = 0,

python/uwapi/admin.py

@@ -27,12 +27,6 @@ def start_game(self) -> None:
     def terminate_game(self) -> None:
         uw_interop.uwAdminTerminateGame()
 
-    def set_game_speed(self, speed: float) -> None:
-        uw_interop.uwAdminSetGameSpeed(speed)
-
-    def set_weather_speed(self, speed: float, offset: float) -> None:
-        uw_interop.uwAdminSetWeatherSpeed(speed, offset)
-
     def add_ai(self, intendedRace: int = 0, difficulty: float = 0) -> None:
         uw_interop.uwAdminAddAi(intendedRace, difficulty)
 

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 = 45;
+static const uint32 UW_VERSION = 46;
 static const uint32 UW_GameTicksPerSecond = 20;
 
 typedef struct UwIds
@@ -74,8 +74,6 @@ 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);
 void uwAdminTerminateGame(void);
 void uwAdminPauseGame(bool pause);
@@ -425,10 +423,15 @@ typedef struct UwGameConfig
 {
 	bool ranked;
 	bool diplomacy;
+	bool lockedSpeed;
+	bool cheats;
 } UwGameConfig;
 
 void uwGameConfig(UwGameConfig *config);
 
+void uwSetGameSpeed(float speed);
+void uwSetWeatherSpeed(float speed, float offset);
+
 typedef enum UwGameStateEnum
 {
 	UwGameStateEnum_None = 0,

python/uwapi/game.py

@@ -79,6 +79,12 @@ def map_state(self) -> UwMapStateEnum:
     def game_config(self) -> UwGameConfig:
         return uw_interop.uwGameConfig()
 
+    def set_game_speed(self, speed: float) -> None:
+        uw_interop.uwSetGameSpeed(speed)
+
+    def set_weather_speed(self, speed: float, offset: float) -> None:
+        uw_interop.uwSetWeatherSpeed(speed, offset)
+
     def performance_statistics(self) -> UwPerformanceStatistics:
         return uw_interop.uwPerformanceStatistics()
 

python/uwapi/interop.py

@@ -321,6 +321,8 @@ class UwDiplomacyProposalComponent:
 class UwGameConfig:
     ranked: bool
     diplomacy: bool
+    lockedSpeed: bool
+    cheats: bool
 
 @dataclass
 class UwShootingsArray:
@@ -530,12 +532,6 @@ 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)
-
-    def uwAdminSetWeatherSpeed(self, speed: float, offset: float) -> None:
-        self._api.uwAdminSetWeatherSpeed(speed, offset)
-
     def uwAdminStartGame(self) -> None:
         self._api.uwAdminStartGame()
 
@@ -949,6 +945,12 @@ def uwGameConfig(self) -> UwGameConfig:
         config_ = self._UwGameConfig_ctopy(config)
         return config_
 
+    def uwSetGameSpeed(self, speed: float) -> None:
+        self._api.uwSetGameSpeed(speed)
+
+    def uwSetWeatherSpeed(self, speed: float, offset: float) -> None:
+        self._api.uwSetWeatherSpeed(speed, offset)
+
     def uwSetGameStateCallback(self, callback: UwGameStateCallbackType) -> None:
         @self._ffi.callback("UwGameStateCallbackType")
         def c_callback(state):
@@ -1318,12 +1320,14 @@ def _UwDiplomacyProposalComponent_ctopy(self, val) -> UwDiplomacyProposalCompone
         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))
+        return UwGameConfig(bool(val.ranked), bool(val.diplomacy), bool(val.lockedSpeed), bool(val.cheats))
 
     def _UwGameConfig_pytoc(self, val: UwGameConfig):
         r = self._ffi.new("UwGameConfig *")
         r.ranked = val.ranked
         r.diplomacy = val.diplomacy
+        r.lockedSpeed = val.lockedSpeed
+        r.cheats = val.cheats
         return r
 
     def _UwShootingsArray_ctopy(self, val) -> UwShootingsArray: