remove deaths events

malytomas · malytomas · commit 22339970ed28 · 2025-08-12T12:11:44.000+02:00
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 = 39;
+	static const uint32 UW_VERSION = 40;
 	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
@@ -49,21 +49,16 @@ extern "C"
 
 	// shootings callback
 
-	typedef struct UwShootingUnit
+	typedef enum UwShootingEventEnum
 	{
-		uint32 position;
-		uint32 force;
-		uint32 prototype;
-		uint32 id; // beware, it may have expired
-	} UwShootingUnit;
-	typedef struct UwShootingData
-	{
-		UwShootingUnit shooter;
-		UwShootingUnit target;
-	} UwShootingData;
+		UwShootingEventEnum_None = 0,
+		UwShootingEventEnum_Shooting = 1,
+		UwShootingEventEnum_Death = 2,
+		UwShootingEventEnum_Explosion = 3,
+	} UwShootingEventEnum;
 	typedef struct UwShootingsArray
 	{
-		UNNATURAL_POINTER(const UwShootingData *) data;
+		UNNATURAL_POINTER(const uint32 *) data;
 		uint32 count;
 	} UwShootingsArray;
 #ifdef UNNATURAL_BOTS
@@ -74,29 +69,6 @@ extern "C"
 	UNNATURAL_ENTRY void uwShootingsCallback(const UwShootingsArray *data);
 #endif
 
-	// deaths callback
-
-	typedef struct UwDeathData
-	{
-		uint32 position;
-		uint32 force;
-		uint32 prototype;
-		uint32 id; // beware, it is expired
-		bool explosion;
-	} UwDeathData;
-	typedef struct UwDeathsArray
-	{
-		UNNATURAL_POINTER(const UwDeathData *) data;
-		uint32 count;
-	} UwDeathsArray;
-#ifdef UNNATURAL_BOTS
-	typedef void (*UwDeathsCallbackType)(const UwDeathsArray *data);
-	UNNATURAL_API void uwSetDeathsCallback(UwDeathsCallbackType callback);
-#endif
-#ifdef UNNATURAL_SCRIPTS
-	UNNATURAL_ENTRY void uwDeathsCallback(const UwDeathsArray *data);
-#endif
-
 	// force eliminated callback
 
 #ifdef UNNATURAL_BOTS
diff --git a/c/uwapi/uwapi/scripts.hpp b/c/uwapi/uwapi/scripts.hpp
@@ -1,8 +1,8 @@
 #ifndef unnatural_uwapi_scripts_hpp_zhgfa8g4
 #define unnatural_uwapi_scripts_hpp_zhgfa8g4
 
-#include <vector>
 #include <cstring> // memcpy
+#include <vector>
 
 #include "scripts.h"
 
@@ -18,7 +18,7 @@ namespace uw
 	}
 
 	template<class S>
-		requires(requires { S::data; })
+	requires(requires { S::data; })
 	auto makeVector(const S *src)
 	{
 		return makeVector(src->data, src->count);
@@ -35,6 +35,19 @@ namespace uw
 		uwAllEntities(&ids);
 		return makeVector(ids);
 	}
+
+	inline auto shootingControlData(uint32 id)
+	{
+		struct ShootingControlData
+		{
+			UwShootingEventEnum type;
+			uint16 count;
+		};
+
+		uint16_t high = static_cast<uint16_t>(id >> 16);
+		uint16_t low = static_cast<uint16_t>(id & 0xFFFF);
+		return ShootingControlData{ (UwShootingEventEnum)high, low };
+	}
 }
 
 #endif // unnatural_uwapi_scripts_hpp_zhgfa8g4
diff --git a/csharp/uwapi/events.cs b/csharp/uwapi/events.cs
@@ -6,10 +6,7 @@ namespace Unnatural
     using ConnectionStateEnum = Interop.UwConnectionStateEnum;
     using GameStateEnum = Interop.UwGameStateEnum;
     using MapStateEnum = Interop.UwMapStateEnum;
-    using ShootingData = Interop.UwShootingData;
     using ShootingsArray = Interop.UwShootingsArray;
-    using DeathData = Interop.UwDeathData;
-    using DeathsArray = Interop.UwDeathsArray;
     using ChatTargetFLags = Interop.UwChatTargetFlags;
 
     public class ChatMessage
@@ -26,8 +23,6 @@ public static class Events
         public static event EventHandler<GameStateEnum> GameStateChanged;
         public static event EventHandler<MapStateEnum> MapStateChanged;
         public static event EventHandler<bool> Updating;
-        public static event EventHandler<ShootingData[]> Shootings;
-        public static event EventHandler<DeathData[]> Deaths;
         public static event EventHandler<uint> ForceEliminated;
         public static event EventHandler<ChatMessage> ChatReceived;
 
@@ -37,7 +32,6 @@ public static class Events
         static readonly Interop.UwMapStateCallbackType MapStateDelegate = new Interop.UwMapStateCallbackType(MapStateCallback);
         static readonly Interop.UwUpdateCallbackType UpdateDelegate = new Interop.UwUpdateCallbackType(UpdateCallback);
         static readonly Interop.UwShootingsCallbackType ShootingsDelegate = new Interop.UwShootingsCallbackType(ShootingsCallback);
-        static readonly Interop.UwDeathsCallbackType DeathsDelegate = new Interop.UwDeathsCallbackType(DeathsCallback);
         static readonly Interop.UwForceEliminatedCallbackType ForceEliminatedDelegate = new Interop.UwForceEliminatedCallbackType(ForceEliminatedCallback);
         static readonly Interop.UwChatCallbackType ChatDelegate = new Interop.UwChatCallbackType(ChatCallback);
 
@@ -74,30 +68,7 @@ static void UpdateCallback(bool stepping)
 
         static void ShootingsCallback(ref ShootingsArray data)
         {
-            if (Shootings == null)
-                return;
-            ShootingData[] arr = new ShootingData[data.count];
-            int size = Marshal.SizeOf(typeof(ShootingData));
-            for (int i = 0; i < data.count; i++)
-            {
-                IntPtr currentPtr = IntPtr.Add(data.data, i * size);
-                arr[i] = Marshal.PtrToStructure<ShootingData>(currentPtr);
-            }
-            Shootings(null, arr);
-        }
-
-        static void DeathsCallback(ref DeathsArray data)
-        {
-            if (Deaths == null)
-                return;
-            DeathData[] arr = new DeathData[data.count];
-            int size = Marshal.SizeOf(typeof(DeathData));
-            for (int i = 0; i < data.count; i++)
-            {
-                IntPtr currentPtr = IntPtr.Add(data.data, i * size);
-                arr[i] = Marshal.PtrToStructure<DeathData>(currentPtr);
-            }
-            Deaths(null, arr);
+            // todo decode shooting
         }
 
         static void ForceEliminatedCallback(uint force)
@@ -131,7 +102,6 @@ static Events()
             Interop.uwSetMapStateCallback(MapStateDelegate);
             Interop.uwSetUpdateCallback(UpdateDelegate);
             Interop.uwSetShootingsCallback(ShootingsDelegate);
-            Interop.uwSetDeathsCallback(DeathsDelegate);
             Interop.uwSetForceEliminatedCallback(ForceEliminatedDelegate);
             Interop.uwSetChatCallback(ChatDelegate);
 
diff --git a/csharp/uwapi/interop.cs b/csharp/uwapi/interop.cs
@@ -317,7 +317,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 = 39;
+        public const uint UW_VERSION = 40;
         public const uint UW_GameTicksPerSecond = 20;
         [StructLayout(LayoutKind.Sequential)]
         public struct UwIds
@@ -725,20 +725,12 @@ public enum UwGameStateEnum
         [DllImport(LibName, CallingConvention = CallingConvention.Cdecl)]
         public static extern void uwSetUpdateCallback(UwUpdateCallbackType callback);
 
-        [StructLayout(LayoutKind.Sequential)]
-        public struct UwShootingUnit
-        {
-            public uint position;
-            public uint force;
-            public uint prototype;
-            public uint id;
-        }
-
-        [StructLayout(LayoutKind.Sequential)]
-        public struct UwShootingData
+        public enum UwShootingEventEnum
         {
-            public UwShootingUnit shooter;
-            public UwShootingUnit target;
+            None = 0,
+            Shooting = 1,
+            Death = 2,
+            Explosion = 3,
         }
 
         [StructLayout(LayoutKind.Sequential)]
@@ -754,30 +746,6 @@ public struct UwShootingsArray
         [DllImport(LibName, CallingConvention = CallingConvention.Cdecl)]
         public static extern void uwSetShootingsCallback(UwShootingsCallbackType callback);
 
-        [StructLayout(LayoutKind.Sequential)]
-        public struct UwDeathData
-        {
-            public uint position;
-            public uint force;
-            public uint prototype;
-            public uint id;
-            [MarshalAs(UnmanagedType.I1)]
-            public bool explosion;
-        }
-
-        [StructLayout(LayoutKind.Sequential)]
-        public struct UwDeathsArray
-        {
-            public IntPtr data;
-            public uint count;
-        }
-
-        [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
-        public delegate void UwDeathsCallbackType(ref UwDeathsArray data);
-
-        [DllImport(LibName, CallingConvention = CallingConvention.Cdecl)]
-        public static extern void uwSetDeathsCallback(UwDeathsCallbackType callback);
-
         [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
         public delegate void UwForceEliminatedCallbackType(uint id);
 
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","ShootingUnit","ShootingData","ShootingsArray","DeathData","DeathsArray","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","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 = 39;
+static const uint32 UW_VERSION = 40;
 static const uint32 UW_GameTicksPerSecond = 20;
 
 typedef struct UwIds
@@ -450,43 +450,21 @@ uint32 uwGameTick(void);
 typedef void (*UwUpdateCallbackType)(bool stepping);
 void uwSetUpdateCallback(UwUpdateCallbackType callback);
 
-typedef struct UwShootingUnit
+typedef enum UwShootingEventEnum
 {
-	uint32 position;
-	uint32 force;
-	uint32 prototype;
-	uint32 id;
-} UwShootingUnit;
-typedef struct UwShootingData
-{
-	UwShootingUnit shooter;
-	UwShootingUnit target;
-} UwShootingData;
+	UwShootingEventEnum_None = 0,
+	UwShootingEventEnum_Shooting = 1,
+	UwShootingEventEnum_Death = 2,
+	UwShootingEventEnum_Explosion = 3,
+} UwShootingEventEnum;
 typedef struct UwShootingsArray
 {
-	const UwShootingData *data;
+	const uint32 *data;
 	uint32 count;
 } UwShootingsArray;
 
 typedef void (*UwShootingsCallbackType)(const UwShootingsArray *data);
 void uwSetShootingsCallback(UwShootingsCallbackType callback);
-
-typedef struct UwDeathData
-{
-	uint32 position;
-	uint32 force;
-	uint32 prototype;
-	uint32 id;
-	bool explosion;
-} UwDeathData;
-typedef struct UwDeathsArray
-{
-	const UwDeathData *data;
-	uint32 count;
-} UwDeathsArray;
-
-typedef void (*UwDeathsCallbackType)(const UwDeathsArray *data);
-void uwSetDeathsCallback(UwDeathsCallbackType callback);
 typedef void (*UwForceEliminatedCallbackType)(uint32 id);
 void uwSetForceEliminatedCallback(UwForceEliminatedCallbackType callback);
 typedef void (*UwChatCallbackType)(const char *msg, uint32 sender, UwChatTargetFlags flags);
diff --git a/python/uwapi/events.py b/python/uwapi/events.py
@@ -9,7 +9,6 @@ class Events:
     _game_state_listeners: List[Callable[[UwGameStateEnum], None]] = []
     _update_listeners: List[Callable[[bool], None]] = []
     _shootings_listeners: List[Callable[[UwShootingsArray], None]] = []
-    _deaths_listeners: List[Callable[[UwDeathsArray], None]] = []
     _force_eliminated_listeners: List[Callable[[int], None]] = []
     _chat_listeners: List[Callable[[str, int, UwChatTargetFlags], None]] = []
     _map_state_listeners: List[Callable[[UwMapStateEnum], None]] = []
@@ -26,7 +25,6 @@ def initialize(self) -> None:
         uw_interop.uwSetGameStateCallback(self._game_state_callback)
         uw_interop.uwSetUpdateCallback(self._update_callback)
         uw_interop.uwSetShootingsCallback(self._shootings_callback)
-        uw_interop.uwSetDeathsCallback(self._deaths_callback)
         uw_interop.uwSetForceEliminatedCallback(self._force_eliminated_callback)
         uw_interop.uwSetChatCallback(self._chat_callback)
         uw_interop.uwSetTaskCompletedCallback(self._task_completed_callback)
@@ -48,9 +46,6 @@ def on_update(self, listener: Callable[[bool], None]) -> None:
     def on_shootings(self, listener: Callable[[UwShootingsArray], None]) -> None:
         self._shootings_listeners.append(listener)
 
-    def on_deaths(self, listener: Callable[[UwDeathsArray], None]) -> None:
-        self._deaths_listeners.append(listener)
-
     def on_force_eliminated(self, listener: Callable[[int], None]) -> None:
         self._force_eliminated_listeners.append(listener)
 
@@ -82,10 +77,6 @@ def _shootings_callback(self, data: UwShootingsArray) -> None:
         for listener in self._shootings_listeners:
             listener(data)
 
-    def _deaths_callback(self, data: UwDeathsArray) -> None:
-        for listener in self._deaths_listeners:
-            listener(data)
-
     def _force_eliminated_callback(self, force: int) -> None:
         for listener in self._force_eliminated_listeners:
             listener(force)
diff --git a/python/uwapi/interop.py b/python/uwapi/interop.py
