From d9d2bbd213f20a98fc9a4f4e57bcc02a054d03cc Mon Sep 17 00:00:00 2001
From: Razor2142 <Razor2142@graveyardgames.net>
Date: Fri, 31 Jan 2025 19:54:33 +0100
Subject: [PATCH 1/2] feat(Core/Scripting): added generic instance map script

---
 .../Scripting/ScriptDefines/InstanceMapScript.h   | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/server/game/Scripting/ScriptDefines/InstanceMapScript.h b/src/server/game/Scripting/ScriptDefines/InstanceMapScript.h
index edbc9a3baa2030..1c23f3005da7e0 100644
--- a/src/server/game/Scripting/ScriptDefines/InstanceMapScript.h
+++ b/src/server/game/Scripting/ScriptDefines/InstanceMapScript.h
@@ -34,4 +34,19 @@ class InstanceMapScript : public ScriptObject, public MapScript<InstanceMap>
     virtual InstanceScript* GetInstanceScript(InstanceMap* /*map*/) const { return nullptr; }
 };
 
+template<typename IS>
+class GenericInstanceMapScript
+    : public InstanceMapScript
+{
+public:
+    GenericInstanceMapScript(const char* name, uint32 mapId) : InstanceMapScript(name, mapId) { }
+
+    InstanceScript* GetInstanceScript(InstanceMap* map) const override
+    {
+        return new IS(map);
+    }
+};
+
+#define RegisterInstanceMapGenericScript(script, mapId) new GenericInstanceMapScript<script>(#script, mapId)
+
 #endif

From 64e6b5f415a4dadc289167dee30963aa73003042 Mon Sep 17 00:00:00 2001
From: Kitzunu <24550914+Kitzunu@users.noreply.github.com>
Date: Sat, 15 Feb 2025 23:43:56 +0100
Subject: [PATCH 2/2] ready for merge

---
 .../Scripting/ScriptDefines/InstanceMapScript.h     | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/server/game/Scripting/ScriptDefines/InstanceMapScript.h b/src/server/game/Scripting/ScriptDefines/InstanceMapScript.h
index 1c23f3005da7e0..74b5024ba345e2 100644
--- a/src/server/game/Scripting/ScriptDefines/InstanceMapScript.h
+++ b/src/server/game/Scripting/ScriptDefines/InstanceMapScript.h
@@ -35,18 +35,13 @@ class InstanceMapScript : public ScriptObject, public MapScript<InstanceMap>
 };
 
 template<typename IS>
-class GenericInstanceMapScript
-    : public InstanceMapScript
+class GenericInstanceMapScript : public InstanceMapScript
 {
 public:
-    GenericInstanceMapScript(const char* name, uint32 mapId) : InstanceMapScript(name, mapId) { }
-
-    InstanceScript* GetInstanceScript(InstanceMap* map) const override
-    {
-        return new IS(map);
-    }
+    GenericInstanceMapScript(char const* name, uint32 mapId) : InstanceMapScript(name, mapId) { }
+    InstanceScript* GetInstanceScript(InstanceMap* map) const override { return new IS(map); }
 };
 
-#define RegisterInstanceMapGenericScript(script, mapId) new GenericInstanceMapScript<script>(#script, mapId)
+#define RegisterInstanceScript(script_name, mapId) new GenericInstanceMapScript<script_name>(#script_name, mapId)
 
 #endif