rename explosions events to deaths

malytomas · malytomas · commit b147252e5453 · 2025-07-11T01:58:39.000+02:00
diff --git a/.github/workflows/csharp.yml b/.github/workflows/csharp.yml
@@ -0,0 +1,24 @@
+name: C#
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: install .NET SDK
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: '8.0.x'
+
+      - name: compile
+        run: |
+          mkdir temp_proj
+          cd temp_proj
+          dotnet new console --framework net8.0
+          find ../ -name '*.cs' -not -path "../temp_proj/*" -exec cp {} . \; # copy source files
+          dotnet add package System.Text.Json
+          dotnet add package System.Memory
+          dotnet build --configuration Release
diff --git a/c/uwapi/uwapi/modules/game.h b/c/uwapi/uwapi/modules/game.h
@@ -47,7 +47,7 @@ extern "C"
 	UNNATURAL_ENTRY void uwUpdateCallback(bool stepping);
 #endif
 
-	// shooting callback
+	// shootings callback
 
 	typedef struct UwShootingUnit
 	{
@@ -61,39 +61,40 @@ extern "C"
 		UwShootingUnit shooter;
 		UwShootingUnit target;
 	} UwShootingData;
-	typedef struct UwShootingArray
+	typedef struct UwShootingsArray
 	{
 		UNNATURAL_POINTER(const UwShootingData *) data;
 		uint32 count;
-	} UwShootingArray;
+	} UwShootingsArray;
 #ifdef UNNATURAL_BOTS
-	typedef void (*UwShootingCallbackType)(const UwShootingArray *data);
-	UNNATURAL_API void uwSetShootingCallback(UwShootingCallbackType callback);
+	typedef void (*UwShootingsCallbackType)(const UwShootingsArray *data);
+	UNNATURAL_API void uwSetShootingsCallback(UwShootingsCallbackType callback);
 #endif
 #ifdef UNNATURAL_SCRIPTS
-	UNNATURAL_ENTRY void uwShootingCallback(const UwShootingArray *data);
+	UNNATURAL_ENTRY void uwShootingsCallback(const UwShootingsArray *data);
 #endif
 
-	// explosions callback
+	// deaths callback
 
-	typedef struct UwExplosionData
+	typedef struct UwDeathData
 	{
 		uint32 position;
 		uint32 force;
 		uint32 prototype;
 		uint32 id; // beware, it is expired
-	} UwExplosionData;
-	typedef struct UwExplosionsArray
+		bool explosion;
+	} UwDeathData;
+	typedef struct UwDeathsArray
 	{
-		UNNATURAL_POINTER(const UwExplosionData *) data;
+		UNNATURAL_POINTER(const UwDeathData *) data;
 		uint32 count;
-	} UwExplosionsArray;
+	} UwDeathsArray;
 #ifdef UNNATURAL_BOTS
-	typedef void (*UwExplosionsCallbackType)(const UwExplosionsArray *data);
-	UNNATURAL_API void uwSetExplosionsCallback(UwExplosionsCallbackType callback);
+	typedef void (*UwDeathsCallbackType)(const UwDeathsArray *data);
+	UNNATURAL_API void uwSetDeathsCallback(UwDeathsCallbackType callback);
 #endif
 #ifdef UNNATURAL_SCRIPTS
-	UNNATURAL_ENTRY void uwExplosionsCallback(const UwExplosionsArray *data);
+	UNNATURAL_ENTRY void uwDeathsCallback(const UwDeathsArray *data);
 #endif
 
 	// force eliminated callback
diff --git a/csharp/uwapi/events.cs b/csharp/uwapi/events.cs
@@ -7,9 +7,9 @@ namespace Unnatural
     using GameStateEnum = Interop.UwGameStateEnum;
     using MapStateEnum = Interop.UwMapStateEnum;
     using ShootingData = Interop.UwShootingData;
-    using ShootingArray = Interop.UwShootingArray;
-    using ExplosionData = Interop.UwExplosionData;
-    using ExplosionsArray = Interop.UwExplosionsArray;
+    using ShootingsArray = Interop.UwShootingsArray;
+    using DeathData = Interop.UwDeathData;
+    using DeathsArray = Interop.UwDeathsArray;
     using ChatTargetFLags = Interop.UwChatTargetFlags;
 
     public class ChatMessage
@@ -26,8 +26,8 @@ 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[]> Shooting;
-        public static event EventHandler<ExplosionData[]> Explosions;
+        public static event EventHandler<ShootingData[]> Shootings;
+        public static event EventHandler<DeathData[]> Deaths;
         public static event EventHandler<uint> ForceEliminated;
         public static event EventHandler<ChatMessage> ChatReceived;
 
@@ -36,8 +36,8 @@ public static class Events
         static readonly Interop.UwGameStateCallbackType GameStateDelegate = new Interop.UwGameStateCallbackType(GameStateCallback);
         static readonly Interop.UwMapStateCallbackType MapStateDelegate = new Interop.UwMapStateCallbackType(MapStateCallback);
         static readonly Interop.UwUpdateCallbackType UpdateDelegate = new Interop.UwUpdateCallbackType(UpdateCallback);
-        static readonly Interop.UwShootingCallbackType ShootingDelegate = new Interop.UwShootingCallbackType(ShootingCallback);
-        static readonly Interop.UwExplosionsCallbackType ExplosionsDelegate = new Interop.UwExplosionsCallbackType(ExplosionsCallback);
+        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);
 
@@ -72,9 +72,9 @@ static void UpdateCallback(bool stepping)
                 Updating(null, stepping);
         }
 
-        static void ShootingCallback(ref ShootingArray data)
+        static void ShootingsCallback(ref ShootingsArray data)
         {
-            if (Shooting == null)
+            if (Shootings == null)
                 return;
             ShootingData[] arr = new ShootingData[data.count];
             int size = Marshal.SizeOf(typeof(ShootingData));
@@ -83,21 +83,21 @@ static void ShootingCallback(ref ShootingArray data)
                 IntPtr currentPtr = IntPtr.Add(data.data, i * size);
                 arr[i] = Marshal.PtrToStructure<ShootingData>(currentPtr);
             }
-            Shooting(null, arr);
+            Shootings(null, arr);
         }
 
-        static void ExplosionsCallback(ref ExplosionsArray data)
+        static void DeathsCallback(ref DeathsArray data)
         {
-            if (Explosions == null)
+            if (Deaths == null)
                 return;
-            ExplosionData[] arr = new ExplosionData[data.count];
-            int size = Marshal.SizeOf(typeof(ExplosionData));
+            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<ExplosionData>(currentPtr);
+                arr[i] = Marshal.PtrToStructure<DeathData>(currentPtr);
             }
-            Explosions(null, arr);
+            Deaths(null, arr);
         }
 
         static void ForceEliminatedCallback(uint force)
@@ -130,8 +130,8 @@ static Events()
             Interop.uwSetGameStateCallback(GameStateDelegate);
             Interop.uwSetMapStateCallback(MapStateDelegate);
             Interop.uwSetUpdateCallback(UpdateDelegate);
-            Interop.uwSetShootingCallback(ShootingDelegate);
-            Interop.uwSetExplosionsCallback(ExplosionsDelegate);
+            Interop.uwSetShootingsCallback(ShootingsDelegate);
+            Interop.uwSetDeathsCallback(DeathsDelegate);
             Interop.uwSetForceEliminatedCallback(ForceEliminatedDelegate);
             Interop.uwSetChatCallback(ChatDelegate);
 
diff --git a/csharp/uwapi/interop.cs b/csharp/uwapi/interop.cs
@@ -742,39 +742,41 @@ public struct UwShootingData
         }
 
         [StructLayout(LayoutKind.Sequential)]
-        public struct UwShootingArray
+        public struct UwShootingsArray
         {
             public IntPtr data;
             public uint count;
         }
 
         [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
-        public delegate void UwShootingCallbackType(ref UwShootingArray data);
+        public delegate void UwShootingsCallbackType(ref UwShootingsArray data);
 
         [DllImport(LibName, CallingConvention = CallingConvention.Cdecl)]
-        public static extern void uwSetShootingCallback(UwShootingCallbackType callback);
+        public static extern void uwSetShootingsCallback(UwShootingsCallbackType callback);
 
         [StructLayout(LayoutKind.Sequential)]
-        public struct UwExplosionData
+        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 UwExplosionsArray
+        public struct UwDeathsArray
         {
             public IntPtr data;
             public uint count;
         }
 
         [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
-        public delegate void UwExplosionsCallbackType(ref UwExplosionsArray data);
+        public delegate void UwDeathsCallbackType(ref UwDeathsArray data);
 
         [DllImport(LibName, CallingConvention = CallingConvention.Cdecl)]
-        public static extern void uwSetExplosionsCallback(UwExplosionsCallbackType callback);
+        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","ShootingArray","ExplosionData","ExplosionsArray","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","ShootingUnit","ShootingData","ShootingsArray","DeathData","DeathsArray","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
@@ -462,30 +462,31 @@ typedef struct UwShootingData
 	UwShootingUnit shooter;
 	UwShootingUnit target;
 } UwShootingData;
-typedef struct UwShootingArray
+typedef struct UwShootingsArray
 {
 	const UwShootingData *data;
 	uint32 count;
-} UwShootingArray;
+} UwShootingsArray;
 
-typedef void (*UwShootingCallbackType)(const UwShootingArray *data);
-void uwSetShootingCallback(UwShootingCallbackType callback);
+typedef void (*UwShootingsCallbackType)(const UwShootingsArray *data);
+void uwSetShootingsCallback(UwShootingsCallbackType callback);
 
-typedef struct UwExplosionData
+typedef struct UwDeathData
 {
 	uint32 position;
 	uint32 force;
 	uint32 prototype;
 	uint32 id;
-} UwExplosionData;
-typedef struct UwExplosionsArray
+	bool explosion;
+} UwDeathData;
+typedef struct UwDeathsArray
 {
-	const UwExplosionData *data;
+	const UwDeathData *data;
 	uint32 count;
-} UwExplosionsArray;
+} UwDeathsArray;
 
-typedef void (*UwExplosionsCallbackType)(const UwExplosionsArray *data);
-void uwSetExplosionsCallback(UwExplosionsCallbackType callback);
+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
@@ -8,8 +8,8 @@ class Events:
     _connection_state_listeners: List[Callable[[UwConnectionStateEnum], None]] = []
     _game_state_listeners: List[Callable[[UwGameStateEnum], None]] = []
     _update_listeners: List[Callable[[bool], None]] = []
-    _shooting_listeners: List[Callable[[UwShootingArray], None]] = []
-    _explosions_listeners: List[Callable[[UwExplosionsArray], 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]] = []
@@ -25,8 +25,8 @@ def initialize(self) -> None:
         uw_interop.uwSetConnectionStateCallback(self._connection_state_callback)
         uw_interop.uwSetGameStateCallback(self._game_state_callback)
         uw_interop.uwSetUpdateCallback(self._update_callback)
-        uw_interop.uwSetShootingCallback(self._shooting_callback)
-        uw_interop.uwSetExplosionsCallback(self._explosions_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)
@@ -45,11 +45,11 @@ def on_game_state(self, listener: Callable[[UwGameStateEnum], None]) -> None:
     def on_update(self, listener: Callable[[bool], None]) -> None:
         self._update_listeners.append(listener)
 
-    def on_shooting(self, listener: Callable[[UwShootingArray], None]) -> None:
-        self._shooting_listeners.append(listener)
+    def on_shootings(self, listener: Callable[[UwShootingsArray], None]) -> None:
+        self._shootings_listeners.append(listener)
 
-    def on_explosions(self, listener: Callable[[UwExplosionsArray], None]) -> None:
-        self._explosions_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)
@@ -78,12 +78,12 @@ def _update_callback(self, stepping: bool) -> None:
         for listener in self._update_listeners:
             listener(stepping)
 
-    def _shooting_callback(self, data: UwShootingArray) -> None:
-        for listener in self._shooting_listeners:
+    def _shootings_callback(self, data: UwShootingsArray) -> None:
+        for listener in self._shootings_listeners:
             listener(data)
 
-    def _explosions_callback(self, data: UwExplosionsArray) -> None:
-        for listener in self._explosions_listeners:
+    def _deaths_callback(self, data: UwDeathsArray) -> None:
+        for listener in self._deaths_listeners:
             listener(data)
 
     def _force_eliminated_callback(self, force: int) -> None:
diff --git a/python/uwapi/interop.py b/python/uwapi/interop.py
diff --git a/sphinx/source/concepts/callbacks.rst b/sphinx/source/concepts/callbacks.rst
