From caf2def082dc529a0ac553a6c3f662e55ac6ec2f Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Mon, 7 Mar 2016 07:42:51 +0000
Subject: [PATCH] Spawns rework. Contributed by hlwrave.

---
 .../sql/game/raidboss_spawnlist.sql           |  2 +-
 .../dist/db_installer/sql/game/spawnlist.sql  | 39 +------------------
 .../data/buylists/{ => custom}/3175709.xml    |  0
 .../data/buylists/{ => custom}/3175710.xml    |  0
 .../data/buylists/{ => custom}/3175711.xml    |  0
 5 files changed, 3 insertions(+), 38 deletions(-)
 rename trunk/dist/game/data/buylists/{ => custom}/3175709.xml (100%)
 rename trunk/dist/game/data/buylists/{ => custom}/3175710.xml (100%)
 rename trunk/dist/game/data/buylists/{ => custom}/3175711.xml (100%)

diff --git a/trunk/dist/db_installer/sql/game/raidboss_spawnlist.sql b/trunk/dist/db_installer/sql/game/raidboss_spawnlist.sql
index b8e2ac1fde..49e617fe28 100644
--- a/trunk/dist/db_installer/sql/game/raidboss_spawnlist.sql
+++ b/trunk/dist/db_installer/sql/game/raidboss_spawnlist.sql
@@ -182,7 +182,7 @@ INSERT IGNORE INTO `raidboss_spawnlist` (`boss_id`,`loc_x`,`loc_y`,`loc_z`,`head
 (25415,128352,138464,-3467,0,86400,43200,218810,1062), -- Nakondas (40)
 (25418,62416,8096,-3376,0,86400,43200,273375,1296), -- Dread Avenger Kraven (44)
 (25420,42032,24128,-4704,0,86400,43200,335987,1537), -- Orfen's Handmaiden (48)
-(25423,113600,47120,-4640,0,86400,43200,539706,2368), -- Fairy Queen Timiniel (61)
+-- (25423,113600,47120,-4640,0,86400,43200,539706,2368), -- Fairy Queen Timiniel [Removed Infinite Odyssey] (61)
 (25426,-18048,-101264,-2112,0,86400,43200,103092,575), -- Betrayer Of Urutu Freki (25)
 (25429,172064,-214752,-3565,0,86400,43200,103092,575), -- Mammon Collector Talos (25)
 (25431,79648,18320,-5232,0,86400,43200,273375,1296), -- Flamestone Golem (44)
diff --git a/trunk/dist/db_installer/sql/game/spawnlist.sql b/trunk/dist/db_installer/sql/game/spawnlist.sql
index 1399245220..2a9fa9b871 100644
--- a/trunk/dist/db_installer/sql/game/spawnlist.sql
+++ b/trunk/dist/db_installer/sql/game/spawnlist.sql
@@ -3044,8 +3044,6 @@ INSERT INTO `spawnlist` VALUES
 ("Stronghold II", 1, 23267, -102389, 46719, -1149, 0, 0, 6925, 60, 0, 0, 0),
 -- Rogent
 ("Isle of Souls", 1, 30930, -110635, 47485, -1043, 0, 0, 64013, 60, 0, 0, 0),
--- Lottery Ticket Seller
-("Isle of Souls", 1, 30990, -117079, 47175, 448, 0, 0, 16384, 60, 0, 0, 0),
 -- Perwan
 ("Isle of Souls", 1, 32133, -125872, 38208, 1232, 0, 0, 0, 60, 0, 0, 0),
 -- Newbie Helper
@@ -6811,8 +6809,6 @@ INSERT INTO `spawnlist` VALUES
 ("17_22", 1, 30731, -84624, 150832, -3120, 0, 0, 0, 60, 0, 0, 0),
 -- Auctioneer
 ("17_22", 1, 30767, -81424, 151699, -3120, 0, 0, 49152, 60, 0, 0, 0),
--- Lottery Ticket Seller
-("17_22", 1, 30990, -80785, 149735, -3040, 0, 0, 23000, 60, 0, 0, 0),
 -- Broadcasting Tower
 ("17_22", 1, 31031, -81280, 154369, -3165, 0, 0, 16384, 5, 0, 0, 0),
 -- Marsden
@@ -7443,8 +7439,6 @@ INSERT INTO `spawnlist` VALUES
 
 -- Teleport Device
 ("18_14", 1, 30576, -43964, -113389, -232, 0, 0, 0, 60, 0, 0, 0),
--- Lottery Ticket Seller
-("18_14", 1, 30994, -45266, -112468, -240, 0, 0, 500, 60, 0, 0, 0),
 
 -- [18_16]
 
@@ -14085,8 +14079,6 @@ INSERT INTO `spawnlist` VALUES
 ("19_21", 1, 30767, -14767, 122955, -3112, 0, 0, 0, 60, 0, 0, 0),
 -- Lundy
 ("19_21", 1, 30827, -14797, 123283, -3112, 0, 0, 800, 60, 0, 0, 0),
--- Lottery Ticket Seller
-("19_21", 1, 30990, -12676, 122821, -3112, 0, 0, 48000, 60, 0, 0, 0),
 -- Broadcasting Tower
 ("gludio_broadcast", 1, 31031, -13188, 124432, -3110, 0, 0, 16384, 5, 0, 0, 0),
 -- Kell
@@ -17950,8 +17942,6 @@ INSERT INTO `spawnlist` VALUES
 ("Dark_Elf_Village_Npc", 1, 30133, 27921, 12991, -3720, 0, 0, 16500, 60, 0, 0, 0),
 -- Teleport Device
 ("20_18", 1, 30134, 11171, 15932, -4584, 0, 0, 0, 60, 0, 0, 0),
--- Lottery Ticket Seller
-("20_18", 1, 30992, 9656, 15578, -4568, 0, 0, 6000, 60, 0, 0, 0),
 -- Sentry
 ("Dark_Elf_Village_Npc", 1, 31034, 24078, 12029, -3632, 0, 0, 45499, 60, 0, 0, 0),
 ("Dark_Elf_Village_Npc", 1, 31034, 25028, 23321, -3416, 0, 0, 31447, 60, 0, 0, 0),
@@ -19820,8 +19810,6 @@ INSERT INTO `spawnlist` VALUES
 ("20_22", 1, 30960, 21025, 144931, -3064, 0, 0, 40960, 60, 0, 0, 0),
 -- Clothes Chest
 ("20_22", 1, 30961, 19490, 145930, -3064, 0, 0, 0, 60, 0, 0, 0),
--- Lottery Ticket Seller
-("20_22", 1, 30990, 15693, 142886, -2696, 0, 0, 16000, 60, 0, 0, 0),
 -- Broadcasting Tower
 ("20_22", 1, 31031, 20368, 144912, -3088, 0, 0, 0, 60, 0, 0, 0),
 -- Octavia
@@ -20372,9 +20360,6 @@ INSERT INTO `spawnlist` VALUES
 ("dion16_npc2023_02", 1, 30728, 10699, 171474, -3572, 0, 0, 0, 60, 0, 0, 0),
 -- Dark Judge
 ("gludio04_npc1924_001", 1, 30981, 15520, 174572, -3637, 0, 0, 57344, 60, 0, 0, 0),
--- Lottery Ticket Seller
-("Lottery Ticket Seller", 1, 30990, 13015, 181610, -3560, 0, 0, 16000, 60, 0, 0, 0),
-("Lottery Ticket Seller", 1, 30990, 13637, 182626, -3560, 0, 0, 48000, 60, 0, 0, 0),
 -- Race Manager
 ("Race Manager", 1, 30995, 12962, 181603, -3560, 0, 0, 16384, 60, 0, 0, 0),
 -- Broadcasting Tower
@@ -21894,8 +21879,6 @@ INSERT INTO `spawnlist` VALUES
 ("21_16", 1, 27381, 40368, -65424, -2424, 0, 0, 0, 60, 0, 0, 0),
 -- Auctioneer
 ("21_16", 1, 30767, 42984, -47792, -792, 0, 0, 1000, 60, 0, 0, 0),
--- Lottery Ticket Seller
-("21_16", 1, 30990, 43664, -47664, -792, 0, 0, 50000, 60, 0, 0, 0),
 -- Broadcasting Tower
 ("21_16", 1, 31031, 43259, -50167, -792, 0, 0, 0, 60, 0, 0, 0),
 -- Black Marketeer of Mammon
@@ -23136,8 +23119,6 @@ INSERT INTO `spawnlist` VALUES
 ("Elven Village", 1, 27060, 36910, 61471, -3616, 0, 0, 0, 180, 0, 0, 0),
 -- Teleport Device
 ("21_19", 1, 30146, 45173, 48889, -3056, 0, 0, 0, 60, 0, 0, 0),
--- Lottery Ticket Seller
-("21_19", 1, 30991, 46960, 51506, -2976, 0, 0, 47000, 60, 0, 0, 0),
 -- 
 ("oren03_npc2119_01", 1, 32529, 46199, 39120, -3511, 0, 0, 0, 60, 0, 0, 0),
 ("oren03_npc2119_02", 1, 32529, 46723, 39231, -3511, 0, 0, 0, 60, 0, 0, 0),
@@ -25288,8 +25269,6 @@ INSERT INTO `spawnlist` VALUES
 ("Around Shuttgart Quest", 1, 27322, 69121, -136896, -2660, 0, 0, 25579, 60, 0, 0, 0),
 -- Auctioneer
 ("schuttgart", 1, 30768, 86986, -142001, -1367, 0, 0, 60246, 60, 0, 0, 0),
--- Lottery Ticket Seller
-("Town of Schuttgart", 1, 30994, 87091, -143443, -1293, 0, 0, 13029, 60, 0, 0, 0),
 -- Broadcasting Tower
 ("schuttgart_broadcast", 1, 31031, 88034, -140676, -1542, 0, 0, 16384, 5, 0, 0, 0),
 -- Black Marketeer of Mammon
@@ -28431,8 +28410,6 @@ INSERT INTO `spawnlist` VALUES
 ("22_19", 1, 30830, 81992, 54048, -1488, 0, 0, 0, 60, 0, 0, 0),
 -- Patrin
 ("22_19", 1, 30929, 79769, 55048, -1544, 0, 0, 48500, 60, 0, 0, 0),
--- Lottery Ticket Seller
-("22_19", 1, 30990, 83001, 53224, -1488, 0, 0, 31000, 60, 0, 0, 0),
 -- Reorin
 ("oren17_npc2219_019", 1, 31002, 92743, 55523, -3370, 0, 0, 32768, 60, 0, 0, 0),
 -- Broadcasting Tower
@@ -30163,8 +30140,6 @@ INSERT INTO `spawnlist` VALUES
 ("22_22", 1, 30767, 81424, 149728, -3464, 0, 0, 49000, 60, 0, 0, 0),
 -- Cooper
 ("22_22", 1, 30829, 81100, 145840, -3528, 0, 0, 32768, 60, 0, 0, 0),
--- Lottery Ticket Seller
-("22_22", 1, 30990, 83331, 147905, -3400, 0, 0, 16700, 60, 0, 0, 0),
 -- Broadcasting Tower
 ("22_22", 1, 31031, 82272, 147072, -3514, 0, 0, 0, 60, 0, 0, 0),
 -- Pepper
@@ -32015,8 +31990,6 @@ INSERT INTO `spawnlist` VALUES
 ("Dwarf_Village_Npc", 1, 30555, 114866, -180328, -881, 0, 0, 16384, 60, 0, 0, 0),
 -- Nyakuri
 ("schuttgart03_npc2312_007", 1, 30670, 125832, -180002, -1773, 0, 0, 57344, 60, 0, 0, 0),
--- Lottery Ticket Seller
-("23_12", 1, 30993, 115075, -178133, -912, 0, 0, 1000, 60, 0, 0, 0),
 -- Deserted Dwarven House
 ("23_12", 1, 33788, 117309, -180137, -1152, 0, 0, 20656, 60, 0, 0, 0),
 
@@ -35667,8 +35640,6 @@ INSERT INTO `spawnlist` VALUES
 ("aden14_npc2320__01", 1, 30764, 117380, 75616, -2664, 0, 0, 26000, 60, 0, 0, 0),
 -- Nelson
 ("aden14_npc2320__02", 1, 30831, 117432, 76044, -2716, 0, 0, 15000, 60, 0, 0, 0),
--- Lottery Ticket Seller
-("Lottery Ticket Seller", 1, 30990, 117148, 76865, -2688, 0, 0, 34000, 5, 0, 0, 0),
 -- Broadcasting Tower
 ("hunters_broadcast", 1, 31031, 116036, 76319, -2703, 0, 0, 16384, 5, 0, 0, 0),
 -- Keach
@@ -37175,8 +37146,6 @@ INSERT INTO `spawnlist` VALUES
 ("innadril01_npc2324_18", 1, 30971, 129812, 219005, -3583, 0, 0, 24952, 60, 0, 0, 0),
 -- Medium Jar
 ("innadril09_npc2324_13", 1, 30973, 115531, 220194, -3627, 0, 0, -76928, 60, 0, 0, 0),
--- Lottery Ticket Seller
-("Lottery Ticket Seller", 1, 30990, 111417, 219422, -3544, 0, 0, 48000, 5, 0, 0, 0),
 -- Broadcasting Tower
 ("heine_broadcast", 1, 31031, 109825, 219399, -3470, 0, 0, 16384, 5, 0, 0, 0),
 -- Kantabilon
@@ -39042,8 +39011,6 @@ INSERT INTO `spawnlist` VALUES
 ("godard28_2316_01", 1, 21352, 131088, -42386, -3378, 0, 0, 0, 109, 0, 0, 0),
 -- Auctioneer
 ("24_16", 1, 30767, 149272, -55888, -2760, 0, 0, 48000, 60, 0, 0, 0),
--- Lottery Ticket Seller
-("24_16", 1, 30990, 147908, -55221, -2728, 0, 0, 48000, 60, 0, 0, 0),
 -- Black Marketeer of Mammon
 ("24_16", 1, 31092, 144400, -54048, -2976, 0, 0, 49000, 60, 0, 0, 0),
 -- Leon
@@ -40019,8 +39986,6 @@ INSERT INTO `spawnlist` VALUES
 ("24_18", 1, 30876, 152007, 24856, -2136, 0, 0, 0, 60, 0, 0, 0),
 -- Grayson
 ("24_18", 1, 30877, 152004, 25352, -2128, 0, 0, 0, 60, 0, 0, 0),
--- Lottery Ticket Seller
-("24_18", 1, 30990, 146738, 25756, -2008, 0, 0, 0, 60, 0, 0, 0),
 -- Claudia Athebaldt
 ("24_18", 1, 31001, 148700, 16834, -1544, 0, 0, 0, 60, 0, 0, 0),
 -- Broadcasting Tower
@@ -49689,8 +49654,8 @@ INSERT INTO `spawnlist` VALUES
 
 -- Hunters Village
 INSERT INTO `spawnlist` VALUES 
-('HuntersVillage', 1, 34018, 116503, 75392, -2712, 0, 0, 12298, 60, 0, 0, 0),
-('HuntersVillage', 1, 33918, 116390, 75387, -2712, 0, 0, 12298, 60, 0, 0, 0);
+('Hunters Village', 1, 34018, 116503, 75392, -2712, 0, 0, 12298, 60, 0, 0, 0),
+('Hunters Village', 1, 33918, 116390, 75387, -2712, 0, 0, 12298, 60, 0, 0, 0);
 
 -- Imperial Tomb
 INSERT INTO `spawnlist` VALUES
diff --git a/trunk/dist/game/data/buylists/3175709.xml b/trunk/dist/game/data/buylists/custom/3175709.xml
similarity index 100%
rename from trunk/dist/game/data/buylists/3175709.xml
rename to trunk/dist/game/data/buylists/custom/3175709.xml
diff --git a/trunk/dist/game/data/buylists/3175710.xml b/trunk/dist/game/data/buylists/custom/3175710.xml
similarity index 100%
rename from trunk/dist/game/data/buylists/3175710.xml
rename to trunk/dist/game/data/buylists/custom/3175710.xml
diff --git a/trunk/dist/game/data/buylists/3175711.xml b/trunk/dist/game/data/buylists/custom/3175711.xml
similarity index 100%
rename from trunk/dist/game/data/buylists/3175711.xml
rename to trunk/dist/game/data/buylists/custom/3175711.xml