From 6f409b6e9e5acd08f83cee81a7eea1cc87e5bf39 Mon Sep 17 00:00:00 2001
From: vddCore <t.cichon.64@outlook.com>
Date: Mon, 11 Jul 2022 15:11:04 +0200
Subject: [PATCH] Update the outdated configuration files.

---
 game/data/configs/npc_spawns.json | 42 +++++++++++++++++++++++++------
 game/data/configs/shops.json      |  2 +-
 2 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/game/data/configs/npc_spawns.json b/game/data/configs/npc_spawns.json
index 1f76ded..e316e7a 100644
--- a/game/data/configs/npc_spawns.json
+++ b/game/data/configs/npc_spawns.json
@@ -101,7 +101,11 @@
   },
   {
     "npc_id": "32",
-    "loc_data": "{2651,3307,0,1,1}-{2659,3309,0,1,6}-{2660,3309,0,1,3}-{2661,3309,0,1,1}-{2661,3317,0,1,5}-{2663,3301,0,1,3}-{2665,3300,0,1,3}-{2636,3342,0,1,4}-{2634,3342,0,1,3}-{2635,3339,0,1,3}-{2548,3111,1,1,3}-{2545,3116,1,1,7}-{2549,3115,1,1,1}-{2549,3112,1,1,4}"
+    "loc_data": "{2651,3307,0,1,1}-{2659,3309,0,1,6}-{2660,3309,0,1,3}-{2661,3309,0,1,1}-{2661,3317,0,1,5}-{2663,3301,0,1,3}-{2665,3300,0,1,3}-{2636,3342,0,1,4}-{2634,3342,0,1,3}-{2635,3339,0,1,3}"
+  },
+  {
+    "npc_id": "34",
+    "loc_data": "{2548,3111,1,1,3}-{2545,3116,1,1,7}-{2549,3115,1,1,1}-{2549,3112,1,1,4}"
   },
   {
     "npc_id": "35",
@@ -433,7 +437,7 @@
   },
   {
     "npc_id": "133",
-    "loc_data": "{3079,3618,0,0,7}-{3070,3629,0,0,3}-{3073,3634,0,0,6}-{3088,3636,0,0,3}-{3092,3637,0,0,2}-{3073,3636,0,0,0}-{3070,3657,0,0,5}-{3109,3634,0,0,2}-{3114,3628,0,0,1}-{3107,3626,0,0,2}-{3118,3639,0,0,5}-{3119,3627,0,0,3}-{3119,3604,0,0,1}-{3136,3612,0,0,5}-{3124,3586,0,0,0}"
+    "loc_data": "{2730,3660,0,1,7}-{2709,3672,0,1,7}-{3079,3618,0,0,7}-{3070,3629,0,0,3}-{3073,3634,0,0,6}-{3088,3636,0,0,3}-{3092,3637,0,0,2}-{3073,3636,0,0,0}-{3070,3657,0,0,5}-{3109,3634,0,0,2}-{3114,3628,0,0,1}-{3107,3626,0,0,2}-{3118,3639,0,0,5}-{3119,3627,0,0,3}-{3119,3604,0,0,1}-{3136,3612,0,0,5}-{3124,3586,0,0,0}"
   },
   {
     "npc_id": "134",
@@ -1261,7 +1265,7 @@
   },
   {
     "npc_id": "494",
-    "loc_data": "{2807,3443,0,0,6}-{2810,3443,0,0,6}-{2657,3283,0,0,3}-{2657,3286,0,0,3}-{2615,3094,0,0,3}-{2615,3092,0,0,3}-{2615,3092,0,0,3}-{2615,3094,0,0,3}-{3122,3125,0,0,6}-{3120,3125,0,0,6}-{3090,3242,0,0,4}-{3090,3245,0,0,4}-{3090,3243,0,0,4}-{2584,3422,0,0,4}-{2584,3419,0,0,4}-{3682,2981,0,0,3}-{2618,3330,0,0,0}-{2619,3330,0,0,0}-{2584,3418,0,0,4}"
+    "loc_data": "{2807,3443,0,0,6}-{2810,3443,0,0,6}-{2657,3283,0,0,3}-{2657,3286,0,0,3}-{2615,3094,0,0,3}-{2615,3092,0,0,3}-{2615,3092,0,0,3}-{2615,3094,0,0,3}-{3122,3125,0,0,6}-{3120,3125,0,0,6}-{3090,3242,0,0,4}-{3090,3245,0,0,4}-{3090,3243,0,0,4}-{2584,3422,0,0,4}-{2584,3419,0,0,4}-{2618,3330,0,0,0}-{2619,3330,0,0,0}-{2584,3418,0,0,4}"
   },
   {
     "npc_id": "495",
@@ -1269,11 +1273,11 @@
   },
   {
     "npc_id": "496",
-    "loc_data": "{3267,3164,0,0,4}-{3267,3167,0,0,4}-{3267,3169,0,0,4}-{3682,2983,0,0,3}"
+    "loc_data": "{3267,3164,0,0,4}-{3267,3167,0,0,4}-{3267,3169,0,0,4}"
   },
   {
     "npc_id": "497",
-    "loc_data": "{3267,3166,0,0,4}-{3267,3168,0,0,4}-{3682,2982,0,0,3}"
+    "loc_data": "{3267,3166,0,0,4}-{3267,3168,0,0,4}"
   },
   {
     "npc_id": "498",
@@ -2481,7 +2485,7 @@
   },
   {
     "npc_id": "1036",
-    "loc_data": "{3514,3479,1,0,0}-{3514,3481,1,0,0}-{3514,3481,0,0,3}-{3514,3479,0,0,3}"
+    "loc_data": "{3514,3478,0,0,0}-{3514,3479,0,0,0}-{3514,3480,0,0,0}-{3514,3481,0,0,0}-{3514,3482,0,0,0}-{3514,3483,0,0,0}"
   },
   {
     "npc_id": "1037",
@@ -5511,6 +5515,14 @@
     "npc_id": "3196",
     "loc_data": "{3649,3004,0,1,6}"
   },
+  {
+    "npc_id": "3198",
+    "loc_data": "{3682,2982,0,0,3}"
+  },
+  {
+    "npc_id": "3199",
+    "loc_data": "{3682,2981,0,0,3}-{3682,2983,0,0,3}"
+  },
   {
     "npc_id": "3200",
     "loc_data": "{3263,3932,0,1,3}"
@@ -7295,6 +7307,10 @@
     "npc_id": "5111",
     "loc_data": "{2569,3083,0,1,1}"
   },
+  {
+    "npc_id": "5112",
+    "loc_data": "{2712,3833,1,1,1}"
+  },
   {
     "npc_id": "5113",
     "loc_data": "{2525,2916,0,1,5}"
@@ -7391,6 +7407,14 @@
     "npc_id": "5202",
     "loc_data": "{3621,3528,0,1,4}"
   },
+  {
+    "npc_id": "5258",
+    "loc_data": "{2666,2651,0,0,1}-{2668,2651,0,0,1}"
+  },
+  {
+    "npc_id": "5260",
+    "loc_data": "{2665,2651,0,0,1}-{2667,2651,0,0,1}"
+  },
   {
     "npc_id": "5291",
     "loc_data": "{3300,2792,0,0,6}-{3282,2807,0,0,6}-{3285,2811,0,0,1}-{3283,2772,0,1,5}-{3281,2771,0,1,7}-{3283,2776,0,1,6}-{3278,2770,0,1,6}"
@@ -10822,7 +10846,11 @@
   {
     "npc_id": "4885",
     "loc_data": "{2705,3287,0,1,1}-{2716,3287,0,1,1}-{2732,3282,0,1,1}"
-  },  
+  },
+  { 
+    "npc_id": "7780", 
+    "loc_data": "{3358,2993,0,1,0}" 
+  },   
   {
     "npc_id": "4887",
     "loc_data": "{2738,3303,0,1,1}-{2723,3274,0,1,1}"
diff --git a/game/data/configs/shops.json b/game/data/configs/shops.json
index 4963ac8..4a56b12 100644
--- a/game/data/configs/shops.json
+++ b/game/data/configs/shops.json
@@ -1404,7 +1404,7 @@
     "stock": "{2323,1,100}-{2325,1,100}-{2327,1,100}-{7178,1,100}-{7188,1,100}-{7198,1,100}"
   },
   {
-    "npcs": "70,1598,1596,1597,1599,8274,8275,8276,8277,8273,8271,8270,2253",
+    "npcs": "70,1598,1596,1597,1599,8274,8275,8276,8277,8273,8271,8270,2253,7780",
     "high_alch": "0",
     "currency": "995",
     "general_store": "false",