From 123e228e22f56e209a5e56bcdcfdc30b78fb6642 Mon Sep 17 00:00:00 2001
From: skelsoft <9147770-skelsoft@users.noreply.gitlab.com>
Date: Thu, 2 Sep 2021 11:38:51 +0000
Subject: [PATCH] Fix: Wizards' Guild Portals and more Taverley Dungeon work

---
 Server/data/configs/ground_spawns.json               |  2 +-
 Server/data/configs/npc_configs.json                 |  5 +++++
 Server/data/configs/npc_spawns.json                  |  6 +++++-
 .../game/interaction/object/WizardGuildPortals.kt    | 12 +++++++++---
 4 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/Server/data/configs/ground_spawns.json b/Server/data/configs/ground_spawns.json
index a08750389..929d1b89b 100644
--- a/Server/data/configs/ground_spawns.json
+++ b/Server/data/configs/ground_spawns.json
@@ -173,7 +173,7 @@
   },
   {
     "item_id": "946",
-    "loc_data": "{1,3218,9887,0,6553680}-{1,3205,3212,0,6553680}-{1,3215,9625,0,6553680}-{1,3224,3202,0,6553680}-{1,2903,3148,0,6553680}-{1,2820,3450,0,7209050}-{1,3218,3416,1,7864410}-{1,3106,3956,0,5242940}-{1,2566,9526,0,5898270}"
+    "loc_data": "{1,3218,9887,0,6553680}{1,2700,3407,0,6553680}-{1,3205,3212,0,6553680}-{1,3215,9625,0,6553680}-{1,3224,3202,0,6553680}-{1,2903,3148,0,6553680}-{1,2820,3450,0,7209050}-{1,3218,3416,1,7864410}-{1,3106,3956,0,5242940}-{1,2566,9526,0,5898270}"
   },
   {
     "item_id": "952",
diff --git a/Server/data/configs/npc_configs.json b/Server/data/configs/npc_configs.json
index 57078bb9a..cf6325028 100644
--- a/Server/data/configs/npc_configs.json
+++ b/Server/data/configs/npc_configs.json
@@ -275496,5 +275496,10 @@
     "examine": "I can see fish swimming in the water.",
     "name": "Fishing spot",
     "id": "1176"
+  },
+  {
+    "examine": "Nice hat.",
+    "name": "Thormac",
+    "id": "389"
   }
 ]
\ No newline at end of file
diff --git a/Server/data/configs/npc_spawns.json b/Server/data/configs/npc_spawns.json
index a46688cde..5894f7646 100644
--- a/Server/data/configs/npc_spawns.json
+++ b/Server/data/configs/npc_spawns.json
@@ -157,7 +157,7 @@
   },
   {
     "npc_id": "49",
-    "loc_data": "{2861,9838,0,1,3}-{2858,9842,0,1,4}-{2854,9847,0,1,5}-{2857,9850,0,1,7}-{2865,9849,0,1,6}-{2869,9838,0,1,6}-{3104,3680,0,1,3}-{3114,3688,0,1,1}-{3121,3675,0,1,1}-{3127,3695,0,1,3}-{3129,3678,0,1,2}-{3130,3689,0,1,2}-{3128,3665,0,1,3}-{3135,3701,0,1,6}-{3085,10134,0,1,0}-{3090,10123,0,1,0}-{3094,10133,0,1,0}-{3095,10120,0,1,0}-{3095,10128,0,1,0}-{3098,10122,0,1,0}-{3104,10127,0,1,0}-{3105,10125,0,1,0}-{3177,3905,0,1,4}-{3180,3908,0,1,2}-{3189,3914,0,1,6}-{3193,3906,0,1,2}-{2402,9785,0,1,1}-{2403,9782,0,1,1}-{2408,9782,0,1,1}-{2408,9785,0,1,1}-{2413,9776,0,1,1}-{2417,9777,0,1,1}-{2412,9773,0,1,1}-{2416,9773,0,1,1}-{2735,9692,0,1,1}-{2732,9687,0,1,1}-{2733,9688,0,1,1}-{2734,9690,0,1,1}-{2733,9686,0,1,1}-{2732,9692,0,1,1}-{2736,9685,0,1,1}-{2730,9691,0,1,1}"
+    "loc_data": "{2871,9819,0,1,0}-{2871,9822,0,1,0}-{2870,9826,0,1,0}-{2869,9829,0,1,0}-{2867,9834,0,1,0}-{2867,9841,0,1,0}-{2864,9853,0,1,0}-{2859,9852,0,1,0}-{2851,9850,0,1,0}-{2856,9846,0,1,0}-{2857,9841,0,1,0}-{2861,9838,0,1,0}-{2854,9838,0,1,0}-{3104,3680,0,1,3}-{3114,3688,0,1,1}-{3121,3675,0,1,1}-{3127,3695,0,1,3}-{3129,3678,0,1,2}-{3130,3689,0,1,2}-{3128,3665,0,1,3}-{3135,3701,0,1,6}-{3085,10134,0,1,0}-{3090,10123,0,1,0}-{3094,10133,0,1,0}-{3095,10120,0,1,0}-{3095,10128,0,1,0}-{3098,10122,0,1,0}-{3104,10127,0,1,0}-{3105,10125,0,1,0}-{3177,3905,0,1,4}-{3180,3908,0,1,2}-{3189,3914,0,1,6}-{3193,3906,0,1,2}-{2402,9785,0,1,1}-{2403,9782,0,1,1}-{2408,9782,0,1,1}-{2408,9785,0,1,1}-{2413,9776,0,1,1}-{2417,9777,0,1,1}-{2412,9773,0,1,1}-{2416,9773,0,1,1}-{2735,9692,0,1,1}-{2732,9687,0,1,1}-{2733,9688,0,1,1}-{2734,9690,0,1,1}-{2733,9686,0,1,1}-{2732,9692,0,1,1}-{2736,9685,0,1,1}-{2730,9691,0,1,1}"
   },
   {
     "npc_id": "50",
@@ -5743,6 +5743,10 @@
     "npc_id": "3307",
     "loc_data": "{2467,4438,0,1,4}-{2471,4439,0,1,7}-{2465,4436,0,1,3}-{2464,4432,0,1,4}"
   },
+  {
+    "npc_id": "3308",
+    "loc_data": "{2905,3333,2,1,0}"
+  },  
   {
     "npc_id": "3310",
     "loc_data": "{2415,4451,0,1,6}-{2416,4435,0,1,7}-{2423,4432,0,1,4}"
diff --git a/Server/src/main/kotlin/rs09/game/interaction/object/WizardGuildPortals.kt b/Server/src/main/kotlin/rs09/game/interaction/object/WizardGuildPortals.kt
index d12e0e634..960b9c88c 100644
--- a/Server/src/main/kotlin/rs09/game/interaction/object/WizardGuildPortals.kt
+++ b/Server/src/main/kotlin/rs09/game/interaction/object/WizardGuildPortals.kt
@@ -12,17 +12,23 @@ class WizardGuildPortals : InteractionListener() {
 
     override fun defineListeners() {
         on(WTOWER_PORTAL, SCENERY, "enter"){player, _ ->
-            ContentAPI.teleport(player, Location.create(3114, 3171, 0))
+            ContentAPI.teleport(player, Location.create(3109, 3159, 0))
+			ContentAPI.sendMessage(player, "You enter the magic portal...")
+			ContentAPI.sendMessage(player, "You teleport to the Wizards' tower.")
             return@on true
         }
 
         on(DWTOWER_PORTAL, SCENERY, "enter"){player, _ ->
-            ContentAPI.teleport(player, Location.create(2916, 3335, 0))
+            ContentAPI.teleport(player, Location.create(2907, 3333, 0))
+			ContentAPI.sendMessage(player, "You enter the magic portal...")
+			ContentAPI.sendMessage(player, "You teleport to the Dark Wizards' tower.")
             return@on true
         }
 
         on(SORC_TOWER_PORTAL, SCENERY, "enter"){player, _ ->
-            ContentAPI.teleport(player, Location.create(2701, 3395, 0))
+            ContentAPI.teleport(player, Location.create(2703, 3406, 0))
+			ContentAPI.sendMessage(player, "You enter the magic portal...")
+			ContentAPI.sendMessage(player, "You teleport to Thormac the Sorceror's house.")
             return@on true
         }
     }