From 47a2eddaf000850d1153dcc25b7f900511302678 Mon Sep 17 00:00:00 2001 From: Filip Maj Date: Sun, 15 Mar 2020 01:05:43 -0400 Subject: [PATCH] Adding NPCs in fields from captures. Updated Shop script. The captures we have are full of npcs that were never imported; finally did so. Updated shop script with Jorge's work. --- .../populace/shop/PopulaceShopSalesman.lua | 741 +++++++++++++----- Data/sql/gamedata_actor_class.sql | 72 +- Data/sql/server_spawn_locations.sql | 59 +- 3 files changed, 644 insertions(+), 228 deletions(-) diff --git a/Data/scripts/base/chara/npc/populace/shop/PopulaceShopSalesman.lua b/Data/scripts/base/chara/npc/populace/shop/PopulaceShopSalesman.lua index a4ef74cc..11d40f56 100644 --- a/Data/scripts/base/chara/npc/populace/shop/PopulaceShopSalesman.lua +++ b/Data/scripts/base/chara/npc/populace/shop/PopulaceShopSalesman.lua @@ -7,10 +7,10 @@ Functions: welcomeTalk(sheetId, player) - Start Message selectMode(askMode) - Shows buy/sell modes. If askmode > 0 show guild tutorial. If askmode == -7/-8/-9 show nothing. Else show affinity/condition tutorials. selectModeOfClassVendor() - Opens categories for class weapons and gear -selectModeOfMultiWeaponVendor(consumptionTutorialId) - Opens categories for weapons/tools (war/magic/land/hand). Arg consumptionTutorialId appends location of item repair person. -1: Ul'dah, -2: Gridania, -3: Limsa -selectModeOfMultiArmorVendor(consumptionTutorialId) - Opens categories for armor in different slots. Arg consumptionTutorialId appends location of item repair person. -1: Ul'dah, -2: Gridania, -3: Limsa +selectModeOfMultiWeaponVendor(consumptionmenuId) - Opens categories for weapons/tools (war/magic/land/hand). Arg consumptionmenuId appends location of item repair person. -1: Ul'dah, -2: Gridania, -3: Limsa +selectModeOfMultiArmorVendor(consumptionmenuId) - Opens categories for armor in different slots. Arg consumptionmenuId appends location of item repair person. -1: Ul'dah, -2: Gridania, -3: Limsa -openShopBuy(player, shopPack, currancyItemId) - ShopPack: Items to appear in window. CurrancyItemId: What is being used to buy these items. +openShopBuy(player, shopPack, CurrencyItemId) - ShopPack: Items to appear in window. CurrencyItemId: What is being used to buy these items. selectShopBuy(player) - Call after openShopBuy() to open widget closeShopBuy(player) - Closes the buy window @@ -25,7 +25,7 @@ confirmUseFacility(player, cost) - Facility cost confirm informSellPrice(1, chosenItem, price) - Shows sell confirm window. ChosenItem must be correct. -startTutorial(nil, tutorialId) - Opens up a tutorial menu for each guild type based on tutorialId +startTutorial(nil, menuId) - Opens up a tutorial menu for each guild type based on menuId finishTalkTurn() - Done at the end. @@ -34,88 +34,412 @@ finishTalkTurn() - Done at the end. require ("global") require ("shop") -shopInfo = { -- [actorclass id] = { welcomeText, shopMode, shopPack{s} } -[1000159] = {34, 0, 1016}, -[1000163] = {49, 0, 1017}, -[1000165] = {74, 0, 1019}, -[1001458] = {44, 0, 1018}, -[1500405] = {320, 0, 1013}, -[1500407] = {321, 0, 1012}, -[1500411] = {322, 0, 2017}, -[1500414] = {324, 0, 1012}, -[1500419] = {327, 0, 1012}, -[1500422] = {332, 0, 1013}, -[1500423] = {331, 0, 2017}, -[1500429] = {328, 0, 2017}, -[1500430] = {281, 0, 5121}, -[1600001] = {6, 0, 1006}, -[1600002] = {7, 0, 1007}, -[1600003] = {8, 0, 1008}, -[1600004] = {9, 0, 1009}, -[1600005] = {10, 0, 1010}, -[1600006] = {11, 0, 1011}, -[1600007] = {12, 0, 1012}, -[1600008] = {13, 0, 1013}, -[1600009] = {14, 0, 1014}, -[1600010] = {15, 0, 1015}, -[1600011] = {1, 0, 1001}, -[1600012] = {2, 0, 1002}, -[1600013] = {3, 0, 1003}, -[1600014] = {4, 0, 1004}, -[1600016] = {5, 0, 1005}, -[1600017] = {39, 0, 2020}, -[1600018] = {59, 0, 2021}, -[1600019] = {75, 0, 2022}, -[1600020] = {77, 0, 2010}, -[1600021] = {78, 0, 2011}, -[1600022] = {79, 0, 2012}, -[1600023] = {80, 0, 2013}, -[1600024] = {81, 0, 2014}, -[1600025] = {82, 0, 2015}, -[1600026] = {83, 0, 2016}, -[1600027] = {84, 0, 2017}, -[1600028] = {85, 0, 2018}, -[1600029] = {86, 0, 2019}, -[1600030] = {87, 0, 2001}, -[1600031] = {88, 0, 2003}, -[1600032] = {89, 0, 2002}, -[1600033] = {90, 0, 2004}, -[1600034] = {91, 0, 2005}, -[1600035] = {92, 0, 2006}, -[1600036] = {93, 0, 2007}, -[1600037] = {94, 0, 2008}, -[1600039] = {69, 0, 3020}, -[1600040] = {54, 0, 3019}, -[1600041] = {64, 0, 3021}, -[1600042] = {76, 0, 3022}, -[1600043] = {96, 0, 3009}, -[1600044] = {97, 0, 3010}, -[1600045] = {98, 0, 3011}, -[1600046] = {99, 0, 3012}, -[1600047] = {100, 0, 3013}, -[1600048] = {101, 0, 3014}, -[1600049] = {102, 0, 3016}, -[1600050] = {103, 0, 3015}, -[1600051] = {104, 0, 3017}, -[1600052] = {105, 0, 3004}, -[1600053] = {106, 0, 3007}, -[1600054] = {107, 0, 3018}, -[1600055] = {108, 0, 3006}, -[1600056] = {109, 0, 3005}, -[1600057] = {110, 0, 3002}, -[1600058] = {111, 0, 3003}, -[1600059] = {112, 0, 3001}, -[1600064] = {235, 0, 2023}, -[1600066] = {237, 0, 3023}, -[1600075] = {245, 1, {5021,5022,5023,5024,5025,5026} }, -[1600076] = {247, 1, {5027,5028,5029,5030,5031,5032} }, -[1600077] = {248, 1, {5033,5034,5035,5036,5037,5038} }, -[1600080] = {251, 1, {5051,5052,5053,5054,5055,5056} }, -[1600081] = {255, 1, {5075,5076,5077,5078,5079,5080} }, -[1600089] = {260, 1, {5105,5106,5107,5108,5109,5110} }, -[1600092] = {263, 0, 2024}, -[1600094] = {265, 0, 3024}, -[1600100] = {281, 2, {5001, 5002, 5007, 5008} }, +shopInfo = { +--[[ + [actorclass id] = + { + welcomeText - Dialog for the NPC to speak when interacting + menuId, - Displays certain menu/dialog. 29-36 = DoH Facilities menus. -1 Ul'dah, -2 Gridania, -3 Limsa. -7/-8/-9/nil show nothing + shopMode, - Type of shop. 0 = Single shop pack, 1 = Class vendor, 2 = Weapon vendor, 3 = Armor vendor, 4 = Hamlet vendor + shopPack{s}, - The item table index to send the client containing the list of items to display, shopmode 2/3 have a static list + } +--]] +[1000159] = {34, 36, 0, 1016}, +[1000163] = {49, 31, 0, 1017}, +[1000165] = {74, -8, 0, 1019}, +[1001458] = {44, 30, 0, 1018}, +[1500142] = {266, -1, 0, 5001}, +[1500143] = {267, -1, 0, 5002}, +[1500144] = {268, -1, 0, 5003}, +[1500145] = {269, -1, 0, 5004}, +[1500146] = {269, -1, 0, 5005}, +[1500147] = {270, -1, 0, 5006}, +[1500150] = {266, -8, 0, 5001}, +[1500151] = {267, -8, 0, 5002}, +[1500152] = {268, -8, 0, 5003}, +[1500153] = {269, -8, 0, 5004}, +[1500154] = {269, -8, 0, 5005}, +[1500155] = {270, -8, 0, 5006}, +[1500158] = {266, -8, 0, 5001}, +[1500159] = {267, -8, 0, 5002}, +[1500160] = {268, -8, 0, 5003}, +[1500161] = {269, -8, 0, 5004}, +[1500162] = {269, -8, 0, 5005}, +[1500163] = {270, -8, 0, 5006}, +[1500401] = {317, -8, 0, 1013}, +[1500405] = {320, -8, 0, 1013}, +[1500407] = {321, -8, 0, 1012}, +[1500411] = {322, -8, 0, 2017}, +[1500414] = {324, -8, 0, 1012}, +[1500419] = {327, -8, 0, 1012}, +[1500422] = {332, -8, 0, 1013}, +[1500423] = {331, -8, 0, 2017}, +[1500429] = {328, -8, 0, 2017}, +[1500430] = {281, -8, 4, 5122}, +[1500431] = {281, -8, 4, 5118}, +[1500432] = {281, -8, 4, 5120}, +[1600001] = {6, -8, 0, 1006}, +[1600002] = {7, -8, 0, 1007}, +[1600003] = {8, -8, 0, 1008}, +[1600004] = {9, -8, 0, 1009}, +[1600005] = {10, -8, 0, 1010}, +[1600006] = {11, -8, 0, 1011}, +[1600007] = {12, -8, 0, 1012}, +[1600008] = {13, -8, 0, 1013}, +[1600009] = {14, -8, 0, 1014}, +[1600010] = {15, -8, 0, 1015}, +[1600011] = {1, -8, 0, 1001}, +[1600012] = {2, -8, 0, 1002}, +[1600013] = {3, -8, 0, 1003}, +[1600014] = {4, -8, 0, 1004}, +[1600016] = {5, -8, 0, 1005}, +[1600017] = {39, 29, 0, 2020}, +[1600018] = {59, 33, 0, 2021}, +[1600019] = {75, -8, 0, 2022}, +[1600020] = {77, -8, 0, 2010}, +[1600021] = {78, -8, 0, 2011}, +[1600022] = {79, -8, 0, 2012}, +[1600023] = {80, -8, 0, 2013}, +[1600024] = {81, -8, 0, 2014}, +[1600025] = {82, -8, 0, 2015}, +[1600026] = {83, -8, 0, 2016}, +[1600027] = {84, -8, 0, 2017}, +[1600028] = {85, -8, 0, 2018}, +[1600029] = {86, -8, 0, 2019}, +[1600030] = {87, -8, 0, 2001}, +[1600031] = {88, -8, 0, 2003}, +[1600032] = {89, -8, 0, 2002}, +[1600033] = {90, -8, 0, 2004}, +[1600034] = {91, -8, 0, 2005}, +[1600035] = {92, -8, 0, 2006}, +[1600036] = {93, -8, 0, 2007}, +[1600037] = {94, -8, 0, 2008}, +[1600039] = {69, 35, 0, 3020}, +[1600040] = {54, 32, 0, 3019}, +[1600041] = {64, 34, 0, 3021}, +[1600042] = {76, -8, 0, 3022}, +[1600043] = {96, -8, 0, 3009}, +[1600044] = {97, -8, 0, 3010}, +[1600045] = {98, -8, 0, 3011}, +[1600046] = {99, -8, 0, 3012}, +[1600047] = {100, -8, 0, 3013}, +[1600048] = {101, -8, 0, 3014}, +[1600049] = {102, -8, 0, 3016}, +[1600050] = {103, -8, 0, 3015}, +[1600051] = {104, -8, 0, 3017}, +[1600052] = {105, -8, 0, 3004}, +[1600053] = {106, -8, 0, 3007}, +[1600054] = {107, -8, 0, 3018}, +[1600055] = {108, -8, 0, 3006}, +[1600056] = {109, -8, 0, 3005}, +[1600057] = {110, -8, 0, 3002}, +[1600058] = {111, -8, 0, 3003}, +[1600059] = {112, -8, 0, 3001}, +[1600061] = {95, -8, 0, 2009}, +[1600062] = {113, -8, 0, 3008}, +[1600063] = {114, -8, 0, 4001}, +[1600064] = {235, -8, 0, 2023}, +[1600065] = {236, -8, 0, 1020}, +[1600066] = {237, -8, 0, 3023}, +[1600067] = {238, -8, 0, 5007}, +[1600068] = {239, -8, 0, 5007}, +[1600069] = {240, -1, 0, 5007}, +[1600070] = {241, -8, 0, 5008}, +[1600071] = {242, -8, 0, 5008}, +[1600072] = {243, -8, 0, 5008}, +[1600073] = {244, -8, 1, 5009}, +[1600074] = {245, -8, 1, 5015}, +[1600075] = {246, -8, 1, 5021}, +[1600076] = {247, -8, 1, 5027}, +[1600077] = {248, -8, 1, 5033}, +[1600078] = {249, -8, 1, 5039}, +[1600079] = {250, -8, 1, 5045}, +[1600080] = {251, -8, 1, 5051}, +[1600081] = {252, -8, 1, 5057}, +[1600082] = {253, -8, 1, 5063}, +[1600083] = {254, -8, 1, 5069}, +[1600084] = {255, -8, 1, 5075}, +[1600085] = {256, -8, 1, 5081}, +[1600086] = {257, -8, 1, 5087}, +[1600087] = {258, -8, 1, 5093}, +[1600088] = {259, -8, 1, 5099}, +[1600089] = {260, -8, 1, 5105}, +[1600090] = {261, -8, 1, 5111}, +[1600092] = {263, -8, 0, 2024}, +[1600093] = {264, -8, 0, 1021}, +[1600094] = {265, -8, 0, 3024}, +[1600095] = {281, -8, 0, 1005}, +[1600096] = {281, -8, 0, 2009}, +[1600097] = {281, -8, 0, 4001}, +[1600098] = {281, -8, 0, 4002}, +[1600099] = {281, -8, 0, 2009}, +[1600100] = {281, -2, 2, 0}, +[1600101] = {281, -8, 0, 2009}, +[1600103] = {281, -8, 0, 3008}, +[1600104] = {281, -8, 0, 3008}, +[1600107] = {281, -8, 3, 0}, +[1600108] = {281, -8, 0, 3008}, +[1600109] = {281, -3, 2, 0}, +[1600110] = {281, -8, 0, 4001}, +[1600111] = {281, -8, 0, 2009}, +[1600112] = {281, -8, 0, 4002}, +[1600113] = {281, -8, 0, 4001}, +[1600117] = {281, -8, 0, 2009}, +[1600119] = {281, -2, 3, 0}, +[1600120] = {281, -8, 0, 3008}, +[1600121] = {281, -8, 0, 2009}, +[1600122] = {281, -8, 0, 3008}, +[1600125] = {281, -8, 0, 1005}, +[1600126] = {281, -8, 0, 3008}, +[1600129] = {281, -1, 3, 0}, +[1600130] = {281, -8, 0, 4001}, +[1600133] = {281, -1, 2, 0}, +[1600137] = {281, -8, 0, 1005}, +[1600142] = {281, -8, 0, 1005}, + +} + + +shopRange = { --shopRangeStart, shopRangeEnd +[101] = {101001, 101010}; +[102] = {102001, 102010}; +[103] = {103001, 103010}; +[104] = {104001, 104010}; +[105] = {105001, 105010}; +[106] = {106001, 106010}; +[107] = {107001, 107010}; +[108] = {108001, 108017}; +[109] = {109001, 109015}; +[110] = {110001, 110018}; +[111] = {111001, 111018}; +[112] = {112001, 112018}; +[113] = {113001, 113019}; +[114] = {114001, 114015}; +[115] = {115001, 115015}; +[116] = {116001, 116010}; +[117] = {117001, 117010}; +[118] = {118001, 118010}; +[120] = {120001, 120012}; +[121] = {121001, 121012}; +[122] = {122001, 122012}; +[123] = {123001, 123012}; +[124] = {124001, 124012}; +[125] = {125001, 125012}; +[126] = {126001, 126012}; +[127] = {127001, 127012}; +[128] = {128001, 128012}; +[129] = {129001, 129016}; +[130] = {130001, 130012}; +[131] = {131001, 131012}; +[132] = {132001, 132012}; +[133] = {133001, 133012}; +[134] = {134001, 134016}; +[135] = {135001, 135012}; +[136] = {136001, 136012}; +[137] = {137001, 137012}; +[138] = {138001, 138012}; +[139] = {139001, 139012}; +[140] = {140001, 140012}; +[141] = {141001, 141012}; +[142] = {142001, 142012}; +[143] = {143001, 143016}; +[144] = {144001, 144018}; +[145] = {1071001, 1071002}; +[146] = {1072001, 1072006}; +[1001] = {1001001, 1001008}; +[1002] = {1002001, 1002008}; +[1003] = {1003001, 1003007}; +[1004] = {1004001, 1004002}; +[1005] = {1005001, 1005017}; +[1006] = {1006001, 1006006}; +[1007] = {1007001, 1007010}; +[1008] = {1008001, 1008009}; +[1009] = {1009001, 1009012}; +[1010] = {1010001, 1010014}; +[1011] = {1011001, 1011010}; +[1012] = {1012001, 1012007}; +[1013] = {1013001, 1013011}; +[1014] = {1014001, 1014006}; +[1015] = {1015001, 1015007}; +[1016] = {1016001, 1016016}; +[1017] = {1018001, 1018010}; +[1018] = {1017001, 1017013}; +[1019] = {1019001, 1019005}; +[1020] = {1066001, 1066004}; +[1021] = {1069001, 1069005}; +[2001] = {1020001, 1020008}; +[2002] = {1021001, 1021006}; +[2003] = {1022001, 1022007}; +[2004] = {1023001, 1023008}; +[2005] = {1024001, 1024003}; +[2006] = {1025001, 1025008}; +[2007] = {1026001, 1026006}; +[2008] = {1027001, 1027004}; +[2009] = {1028001, 1028016}; +[2010] = {1029001, 1029009}; +[2011] = {1030001, 1030008}; +[2012] = {1031001, 1031010}; +[2013] = {1032001, 1032010}; +[2014] = {1033001, 1033012}; +[2015] = {1034001, 1034015}; +[2016] = {1035001, 1035013}; +[2017] = {1036001, 1036006}; +[2018] = {1037001, 1037006}; +[2019] = {1038001, 1038008}; +[2020] = {1039001, 1039009}; +[2021] = {1040001, 1040010}; +[2022] = {1041001, 1041005}; +[2023] = {1065001, 1065006}; +[2024] = {1068001, 1068006}; +[3001] = {1042001, 1042008}; +[3002] = {1043001, 1043008}; +[3003] = {1044001, 1044008}; +[3004] = {1045001, 1045008}; +[3005] = {1046001, 1046010}; +[3006] = {1047001, 1047008}; +[3007] = {1048001, 1048006}; +[3008] = {1049001, 1049016}; +[3009] = {1050001, 1050013}; +[3010] = {1051001, 1051008}; +[3011] = {1052001, 1052009}; +[3012] = {1053001, 1053010}; +[3013] = {1054001, 1054006}; +[3014] = {1055001, 1055013}; +[3015] = {1056001, 1056005}; +[3016] = {1057001, 1057008}; +[3017] = {1058001, 1058011}; +[3018] = {1059001, 1059007}; +[3019] = {1060001, 1060011}; +[3020] = {1061001, 1061014}; +[3021] = {1062001, 1062016}; +[3022] = {1063001, 1063004}; +[3023] = {1067001, 1067008}; +[3024] = {1070001, 1070004}; +[4001] = {1064001, 1064011}; +[4002] = {1064001, 1064011}; +[5001] = {2001001, 2001018}; +[5002] = {2002001, 2002006}; +[5003] = {2003001, 2003010}; +[5004] = {2004001, 2004009}; +[5005] = {2005001, 2005010}; +[5006] = {2006001, 2006012}; +[5007] = {2007001, 2007010}; +[5008] = {2008001, 2008016}; +[5009] = {2009001, 2009007}; +[5010] = {2009101, 2009104}; +[5011] = {2009201, 2009204}; +[5012] = {2009301, 2009304}; +[5013] = {2009401, 2009404}; +[5014] = {2009501, 2009504}; +[5015] = {2010001, 2010004}; +[5016] = {2010101, 2010104}; +[5017] = {2010201, 2010204}; +[5018] = {2010301, 2010304}; +[5019] = {2010401, 2010404}; +[5020] = {2010501, 2010504}; +[5021] = {2011001, 2011004}; +[5022] = {2011101, 2011104}; +[5023] = {2011201, 2011204}; +[5024] = {2011301, 2011304}; +[5025] = {2011401, 2011404}; +[5026] = {2011501, 2011504}; +[5027] = {2012001, 2012007}; +[5028] = {2012101, 2012104}; +[5029] = {2012201, 2012204}; +[5030] = {2012301, 2012304}; +[5031] = {2012401, 2012404}; +[5032] = {2012501, 2012504}; +[5033] = {2013001, 2013004}; +[5034] = {2013101, 2013104}; +[5035] = {2013201, 2013204}; +[5036] = {2013301, 2013304}; +[5037] = {2013401, 2013404}; +[5038] = {2013501, 2013504}; +[5039] = {2014001, 2014007}; +[5040] = {2014101, 2014104}; +[5041] = {2014201, 2014204}; +[5042] = {2014301, 2014304}; +[5043] = {2014401, 2014404}; +[5044] = {2014501, 2014504}; +[5045] = {2015001, 2015007}; +[5046] = {2015101, 2015104}; +[5047] = {2015201, 2015204}; +[5048] = {2015301, 2015304}; +[5049] = {2015401, 2015404}; +[5050] = {2015501, 2015504}; +[5051] = {2016001, 2016006}; +[5052] = {2016101, 2016104}; +[5053] = {2016201, 2016204}; +[5054] = {2016301, 2016304}; +[5055] = {2016401, 2016404}; +[5056] = {2016501, 2016504}; +[5057] = {2017001, 2017006}; +[5058] = {2017101, 2017104}; +[5059] = {2017201, 2017204}; +[5060] = {2017301, 2017304}; +[5061] = {2017401, 2017404}; +[5062] = {2017501, 2017504}; +[5063] = {2018001, 2018006}; +[5064] = {2018101, 2018104}; +[5065] = {2018201, 2018204}; +[5066] = {2018301, 2018304}; +[5067] = {2018401, 2018404}; +[5068] = {2018501, 2018504}; +[5069] = {2019001, 2019006}; +[5070] = {2019101, 2019104}; +[5071] = {2019201, 2019204}; +[5072] = {2019301, 2019304}; +[5073] = {2019401, 2019404}; +[5074] = {2019501, 2019504}; +[5075] = {2020001, 2020006}; +[5076] = {2020101, 2020104}; +[5077] = {2020201, 2020204}; +[5078] = {2020301, 2020304}; +[5079] = {2020401, 2020404}; +[5080] = {2020501, 2020504}; +[5081] = {2021001, 2021006}; +[5082] = {2021101, 2021104}; +[5083] = {2021201, 2021204}; +[5084] = {2021301, 2021304}; +[5085] = {2021401, 2021404}; +[5086] = {2021501, 2021504}; +[5087] = {2022001, 2022006}; +[5088] = {2022101, 2022104}; +[5089] = {2022201, 2022204}; +[5090] = {2022301, 2022304}; +[5091] = {2022401, 2022404}; +[5092] = {2022501, 2022504}; +[5093] = {2023001, 2023006}; +[5094] = {2023101, 2023104}; +[5095] = {2023201, 2023204}; +[5096] = {2023301, 2023304}; +[5097] = {2023401, 2023404}; +[5098] = {2023501, 2023504}; +[5099] = {2024001, 2024006}; +[5100] = {2024101, 2024104}; +[5101] = {2024201, 2024204}; +[5102] = {2024301, 2024304}; +[5103] = {2024401, 2024404}; +[5104] = {2024501, 2024504}; +[5105] = {2025001, 2025006}; +[5106] = {2025101, 2025104}; +[5107] = {2025201, 2025204}; +[5108] = {2025301, 2025304}; +[5109] = {2025401, 2025404}; +[5110] = {2025501, 2025504}; +[5111] = {2026001, 2026006}; +[5112] = {2026101, 2026104}; +[5113] = {2026201, 2026204}; +[5114] = {2026301, 2026304}; +[5115] = {2026401, 2026404}; +[5116] = {2026501, 2026504}; +[5117] = {2026601, 2026606}; +[5118] = {2026701, 2026708}; +[5119] = {2026801, 2026808}; +[5120] = {2026901, 2026908}; +[5121] = {2027001, 2027008}; +[5122] = {2027101, 2027110}; +[5123] = {2027201, 2027211}; } @@ -125,9 +449,8 @@ end function onEventStarted(player, npc, triggerName) - -- require("/unique/".. npc.zone.zoneName .."/PopulaceShopSalesman/" .. npc:GetUniqueId()) npcId = npc:GetActorClassId(); - + if shopInfo[npcId] == nil then errorMsg = string.format("This PopulaceShopSalesman actor has no shop set. Actor Class Id: %s", npcId); player:SendMessage(MESSAGE_TYPE_SYSTEM_ERROR, "", errorMsg ); @@ -135,124 +458,167 @@ function onEventStarted(player, npc, triggerName) return; end; - shopCurrancy = 1000001; - callClientFunction(player, "welcomeTalk", shopInfo[npcId][1], player); - - if npcId == 1000159 then -- DoH Guild NPCs with Facility menu - tutorialId = 36; - elseif npcId == 1000163 then - tutorialId = 31; - elseif npcId == 1001458 then - tutorialId = 30; - elseif npcId == 1600017 then - tutorialId = 29; - elseif npcId == 1600018 then - tutorialId = 33; - elseif npcId == 1600039 then - tutorialId = 35; - elseif npcId == 1600040 then - tutorialId = 32; - elseif npcId == 1600041 then - tutorialId = 34; - else - tutorialId = -8; - end + local shopCurrency = 1000001; + local welcomeText = 1; + local menuId = shopInfo[npcId][2]; + local shopCategory = shopInfo[npcId][3]; + local itemShop = 0; + local classShop = 1; + local weaponShop = 2; + local armorShop = 3; + local hamletShop = 4; + + local weaponShopPack = {5001,5002,5007,5008}; + local armorShopPack = {5004,5005,5006,5003}; + + local menuBuy = 1; + local menuBuyCount = 1; -- For Shops with multiple buying categories + local menuSell = 2; + local menuFacility = 3; + local menuTutorial = 4; + local menuClose = -3; + local menuHasFacility = false; + local menuHasTutorial = false; + + local shopPack = shopInfo[npcId][4]; -- Starting value for the shopPack of the current NPC Actor + local chosenShopPackage = 0; -- Var to send to openShopMenu() once desired shopPack is determined + local choice; + callClientFunction(player, "welcomeTalk", shopInfo[npcId][welcomeText], player); while (true) do + + if (shopCategory == itemShop) then + choice = callClientFunction(player, "selectMode", menuId); + menuHasFacility = true; + menuHasTutorial = true; + elseif (shopCategory == classShop) then + choice = callClientFunction(player, "selectModeOfClassVendor"); + menuBuyCount = 6; + menuSell = 0; + elseif (shopCategory == weaponShop) then + choice = callClientFunction(player, "selectModeOfMultiWeaponVendor", menuId); + menuBuyCount = 4; + menuSell = 0; + elseif (shopCategory == armorShop) then + choice = callClientFunction(player, "selectModeOfMultiArmorVendor", menuId); + menuBuyCount = 4; + menuSell = 0; + elseif (shopCategory == hamletShop) then + choice = callClientFunction(player, "selectMode", menuId); - if (shopInfo[npcId][2] == 0) then - choice = callClientFunction(player, "selectMode", tutorialId); - elseif (shopInfo[npcId][2] == 1) then - choice = callClientFunction(player, "selectModeOfClassVendor"); - elseif (shopInfo[npcId][2] == 2) then - choice = callClientFunction(player, "selectModeOfMultiWeaponVendor", tutorialId); - elseif (shopInfo[npcId][2] == 3) then - choice = callClientFunction(player, "selectModeOfMultiArmorVendor", tutorialId); - end - - if (choice == nil or choice == -3) then - break; + local hamletRegion = shopPack; + local hamletPackAleport = {5117, 5122, 5123}; + local hamletPackHyrstmill = {5117, 5118, 5119}; + local hamletPackGoldenBazaar = {5117, 5120, 5121}; + local hamletLevel = 3; -- Defaulting to highest value for now + + if hamletRegion == 5122 then -- Aleport + -- hamletLevel = GetHamletStatus(idAleport); + shopPack = hamletPackAleport[hamletLevel] or 5117; + elseif hamletRegion == 5118 then -- Hyrstmill + -- hamletLevel = GetHamletStatus(idHyrstmill); + shopPack = hamletPackHyrstmill[hamletLevel] or 5117; + elseif hamletRegion == 5120 then -- The Golden Bazaar + -- hamletLevel = GetHamletStatus(idGoldenBazaar); + shopPack = hamletPackGoldenBazaar[hamletLevel] or 5117; + end end - if (shopInfo[npcId][2] == 0) then - processNormalShop(player, choice); - elseif (shopInfo[npcId][2] == 1) then - processMultiShop(player, choice); - elseif (shopInfo[npcId][2] == 2) then - processMultiShop(player, choice); - elseif (shopInfo[npcId][2] == 3) then - processMultiShop(player, choice); - end + if choice and (choice >= menuBuy and choice <= menuBuyCount) then + --player:SendMessage(0x20,"", "Menu option: "..choice); + + if (shopCategory == weaponShop) then + chosenShopPackage = weaponShopPack[choice]; + elseif (shopCategory == armorShop) then + chosenShopPackage = armorShopPack[choice]; + else + chosenShopPackage = ((shopPack-1) + choice); + end + + openShopMenu( + player, + menuId, + chosenShopPackage, + shopRange[chosenShopPackage][1], + shopRange[chosenShopPackage][2], + shopCurrency + ); + + elseif (choice == menuSell) then + openSellMenu(player); + + elseif (choice == menuFacility) and (menuHasFacility == true) then + if menuId > 0 then + local classFacility = (shopInfo[npcId][1] + 1) or 35; + facilityChoice = callClientFunction(player, "selectFacility", nil, classFacility, 3); + + if facilityChoice == 1 then + callClientFunction(player, "confirmUseFacility", player, 200); + elseif facilityChoice == 2 then + callClientFunction(player, "confirmUseFacility", player, 400); + elseif facilityChoice == 3 then + callClientFunction(player, "confirmUseFacility", player, 1000); + end + end + elseif (choice == menuTutorial) and (menuHasTutorial == true) then + callClientFunction(player, "startTutorial", nil, menuId); + end + + if (choice == menuClose or choice == nil) then + break; + end end callClientFunction(player, "finishTalkTurn", player); player:EndEvent(); end + -function processNormalShop(player, choice) - if (choice == 1) then - callClientFunction(player, "openShopBuy", player, shopInfo[npcId][3], shopCurrancy); - - while (true) do - buyResult, quantity = callClientFunction(player, "selectShopBuy", player); - - if (buyResult == 0) then - callClientFunction(player, "closeShopBuy", player); - break; - else - -- purchaseItem(player, shopInfo.shopContents[buyResult].id, quantity, shopInfo.shopContents[buyResult].hq, shopInfo.shopContents[buyResult].gil, shopInfo.shopCurrancy); - end - end - elseif (choice == 2) then - openSellMenu(player); - elseif (choice == 3) then - local classFacility = (shopInfo[npcId][1] + 1) or 35; - facilityChoice = callClientFunction(player, "selectFacility", nil, classFacility, 3); - - if facilityChoice == 1 then - callClientFunction(player, "confirmUseFacility", player, 200); - elseif facilityChoice == 2 then - callClientFunction(player, "confirmUseFacility", player, 400); - elseif facilityChoice == 3 then - callClientFunction(player, "confirmUseFacility", player, 1000); - end - - elseif (choice == 4) then - callClientFunction(player, "startTutorial", nil, tutorialId); - end -end -function processMultiShop(player, choice, sellType) +function openShopMenu(player, menuId, shopPack, itemRangeStart, itemRangeEnd, shopCurrency) - if (choice >= 1 and choice <= 6) then - callClientFunction(player, "openShopBuy", player, shopInfo[npcId][3][choice], shopCurrancy); - - while (true) do - buyResult, quantity = callClientFunction(player, "selectShopBuy", player); - - if (buyResult == 0) then - callClientFunction(player, "closeShopBuy", player); - break; - else - -- purchaseItem(player, shopInfo.shopContents[choice][buyResult].id, quantity, shopInfo.shopContents[choice][buyResult].hq, shopInfo.shopContents[choice][buyResult].gil, shopInfo.shopCurrancy); - end - end - elseif (choice == 0) then - openSellMenu(player); - elseif (choice == 6) then - callClientFunction(player, "selectFacility", 2, 35, 3); - callClientFunction(player, "confirmUseFacility", player, 35); - elseif (choice == 7) then - callClientFunction(player, "startTutorial", nil, tutorialId); - end + callClientFunction(player, "openShopBuy", player, shopPack, shopCurrency); + player:SendMessage(0x20, "", "shopPack: "..shopPack.." Range: "..itemRangeStart.."-"..itemRangeEnd); + + while (true) do + buyResult, quantity = callClientFunction(player, "selectShopBuy", player); + + if (buyResult == 0) then + callClientFunction(player, "closeShopBuy", player); + break; + else + if itemRangeStart and itemRangeEnd then + itemChosen = (itemRangeStart - 1) + buyResult; + + if (((itemRangeStart-1) + itemChosen) < itemRangeStart) or (itemChosen > itemRangeEnd) then + player:SendMessage(0x20, "", "[ERROR] Client selected item exceeds the valid range."); + callClientFunction(player, "finishTalkTurn", player); + player:EndEvent(); + return; + else + player:SendMessage(0x20, "", "Item chosen: " .. itemChosen .. " Quantity: ".. quantity); + + --[[ + TO-DO: Request item information from server table and throw result to purchaseItem() + + requestItem = GetItemShopInfoThing(itemChosen); + purchaseItem(player, INVENTORY_NORMAL, requestItem.id, quantity, requestItem.quality, requestItem.price, shopCurrency); + --]] + end + end + + end + end + end + function openSellMenu(player) callClientFunction(player, "openShopSell", player); @@ -282,9 +648,8 @@ function openSellMenu(player) callClientFunction(player, "informSellPrice", 1, sellItemSlot, gItemPrice); elseif sellState == nil then - sellItem(player, gItemSellId, sellQuantity, gItemQuality, gItemPrice, sellItemSlot-1, shopCurrancy); + sellItem(player, gItemSellId, sellQuantity, gItemQuality, gItemPrice, sellItemSlot-1, shopCurrency); end end end -end - +end \ No newline at end of file diff --git a/Data/sql/gamedata_actor_class.sql b/Data/sql/gamedata_actor_class.sql index 947f06dd..903d6d4b 100644 --- a/Data/sql/gamedata_actor_class.sql +++ b/Data/sql/gamedata_actor_class.sql @@ -4,7 +4,7 @@ Source Host: localhost Source Database: ffxiv_server Target Host: localhost Target Database: ffxiv_server -Date: 3/14/2020 12:58:23 PM +Date: 3/15/2020 1:03:58 AM */ SET FOREIGN_KEY_CHECKS=0; @@ -384,8 +384,8 @@ INSERT INTO `gamedata_actor_class` VALUES ('1000357', '', '1900043', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1000358', '', '1400034', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1000359', '/Chara/Npc/Populace/PopulaceStandard', '1600154', '19', '{\r\n \"talkEventConditions\": [\r\n {\r\n \"unknown1\": 4,\r\n \"unknown2\": 0,\r\n \"conditionName\": \"talkDefault\"\r\n }\r\n ],\r\n \"noticeEventConditions\": [\r\n {\r\n \"unknown1\": 0,\r\n \"unknown2\": 1,\r\n \"conditionName\": \"noticeEvent\"\r\n }\r\n ]\r\n}'); INSERT INTO `gamedata_actor_class` VALUES ('1000360', '/Chara/Npc/Populace/PopulaceStandard', '1900068', '19', '{\r\n \"talkEventConditions\": [\r\n {\r\n \"unknown1\": 4,\r\n \"unknown2\": 0,\r\n \"conditionName\": \"talkDefault\"\r\n }\r\n ],\r\n \"noticeEventConditions\": [\r\n {\r\n \"unknown1\": 0,\r\n \"unknown2\": 1,\r\n \"conditionName\": \"noticeEvent\"\r\n }\r\n ]\r\n}'); -INSERT INTO `gamedata_actor_class` VALUES ('1000361', '', '1600018', '0', null); -INSERT INTO `gamedata_actor_class` VALUES ('1000362', '', '1300083', '0', null); +INSERT INTO `gamedata_actor_class` VALUES ('1000361', '/Chara/Npc/Populace/PopulaceCampMaster', '1600018', '19', '{\r\n \"talkEventConditions\": [\r\n {\r\n \"unknown1\": 4,\r\n \"unknown2\": 0,\r\n \"conditionName\": \"talkDefault\"\r\n }\r\n ],\r\n \"noticeEventConditions\": [\r\n {\r\n \"unknown1\": 0,\r\n \"unknown2\": 1,\r\n \"conditionName\": \"noticeEvent\"\r\n }\r\n ]\r\n}'); +INSERT INTO `gamedata_actor_class` VALUES ('1000362', '/Chara/Npc/Populace/PopulaceStandard', '1300083', '19', '{\r\n \"talkEventConditions\": [\r\n {\r\n \"unknown1\": 4,\r\n \"unknown2\": 0,\r\n \"conditionName\": \"talkDefault\"\r\n }\r\n ],\r\n \"noticeEventConditions\": [\r\n {\r\n \"unknown1\": 0,\r\n \"unknown2\": 1,\r\n \"conditionName\": \"noticeEvent\"\r\n }\r\n ]\r\n}'); INSERT INTO `gamedata_actor_class` VALUES ('1000363', '', '1000182', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1000364', '', '1600031', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1000365', '/Chara/Npc/Populace/PopulaceStandard', '2200107', '19', '{\r\n \"talkEventConditions\": [\r\n {\r\n \"unknown1\": 4,\r\n \"unknown2\": 0,\r\n \"conditionName\": \"talkDefault\"\r\n }\r\n ],\r\n \"noticeEventConditions\": [\r\n {\r\n \"unknown1\": 0,\r\n \"unknown2\": 1,\r\n \"conditionName\": \"noticeEvent\"\r\n }\r\n ]\r\n}'); @@ -694,10 +694,10 @@ INSERT INTO `gamedata_actor_class` VALUES ('1000667', '', '1400042', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1000668', '/Chara/Npc/Populace/PopulaceStandard', '1900083', '19', '{\r\n \"talkEventConditions\": [\r\n {\r\n \"unknown1\": 4,\r\n \"unknown2\": 0,\r\n \"conditionName\": \"talkDefault\"\r\n }\r\n ],\r\n \"noticeEventConditions\": [\r\n {\r\n \"unknown1\": 0,\r\n \"unknown2\": 1,\r\n \"conditionName\": \"noticeEvent\"\r\n }\r\n ]\r\n}'); INSERT INTO `gamedata_actor_class` VALUES ('1000669', '', '1400003', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1000670', '', '1500055', '0', null); -INSERT INTO `gamedata_actor_class` VALUES ('1000671', '', '1200066', '0', null); +INSERT INTO `gamedata_actor_class` VALUES ('1000671', '/Chara/Npc/Populace/PopulaceStandard', '1200066', '19', '{\r\n \"talkEventConditions\": [\r\n {\r\n \"unknown1\": 4,\r\n \"unknown2\": 0,\r\n \"conditionName\": \"talkDefault\"\r\n }\r\n ],\r\n \"noticeEventConditions\": [\r\n {\r\n \"unknown1\": 0,\r\n \"unknown2\": 1,\r\n \"conditionName\": \"noticeEvent\"\r\n }\r\n ]\r\n}'); INSERT INTO `gamedata_actor_class` VALUES ('1000672', '', '1600036', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1000673', '', '1400032', '0', null); -INSERT INTO `gamedata_actor_class` VALUES ('1000674', '', '1900090', '0', null); +INSERT INTO `gamedata_actor_class` VALUES ('1000674', '/Chara/Npc/Populace/PopulaceStandard', '1900090', '19', '{\r\n \"talkEventConditions\": [\r\n {\r\n \"unknown1\": 4,\r\n \"unknown2\": 0,\r\n \"conditionName\": \"talkDefault\"\r\n }\r\n ],\r\n \"noticeEventConditions\": [\r\n {\r\n \"unknown1\": 0,\r\n \"unknown2\": 1,\r\n \"conditionName\": \"noticeEvent\"\r\n }\r\n ]\r\n}'); INSERT INTO `gamedata_actor_class` VALUES ('1000675', '', '1300082', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1000676', '', '1400088', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1000677', '', '1000191', '0', null); @@ -1321,14 +1321,14 @@ INSERT INTO `gamedata_actor_class` VALUES ('1001294', '', '1300138', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1001295', '', '1000065', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1001296', '', '1600236', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1001297', '', '1100049', '0', null); -INSERT INTO `gamedata_actor_class` VALUES ('1001298', '', '1500045', '0', null); -INSERT INTO `gamedata_actor_class` VALUES ('1001299', '', '1900141', '0', null); -INSERT INTO `gamedata_actor_class` VALUES ('1001300', '', '1600121', '0', null); -INSERT INTO `gamedata_actor_class` VALUES ('1001301', '', '1500121', '0', null); -INSERT INTO `gamedata_actor_class` VALUES ('1001302', '', '1600290', '0', null); -INSERT INTO `gamedata_actor_class` VALUES ('1001303', '', '1200135', '0', null); -INSERT INTO `gamedata_actor_class` VALUES ('1001304', '', '1600169', '0', null); -INSERT INTO `gamedata_actor_class` VALUES ('1001305', '', '1900017', '0', null); +INSERT INTO `gamedata_actor_class` VALUES ('1001298', '/Chara/Npc/Populace/PopulaceStandard', '1500045', '19', '{\r\n \"talkEventConditions\": [\r\n {\r\n \"unknown1\": 4,\r\n \"unknown2\": 0,\r\n \"conditionName\": \"talkDefault\"\r\n }\r\n ],\r\n \"noticeEventConditions\": [\r\n {\r\n \"unknown1\": 0,\r\n \"unknown2\": 1,\r\n \"conditionName\": \"noticeEvent\"\r\n }\r\n ]\r\n}'); +INSERT INTO `gamedata_actor_class` VALUES ('1001299', '/Chara/Npc/Populace/PopulaceStandard', '1900141', '19', '{\r\n \"talkEventConditions\": [\r\n {\r\n \"unknown1\": 4,\r\n \"unknown2\": 0,\r\n \"conditionName\": \"talkDefault\"\r\n }\r\n ],\r\n \"noticeEventConditions\": [\r\n {\r\n \"unknown1\": 0,\r\n \"unknown2\": 1,\r\n \"conditionName\": \"noticeEvent\"\r\n }\r\n ]\r\n}'); +INSERT INTO `gamedata_actor_class` VALUES ('1001300', '/Chara/Npc/Populace/PopulaceStandard', '1600121', '19', '{\r\n \"talkEventConditions\": [\r\n {\r\n \"unknown1\": 4,\r\n \"unknown2\": 0,\r\n \"conditionName\": \"talkDefault\"\r\n }\r\n ],\r\n \"noticeEventConditions\": [\r\n {\r\n \"unknown1\": 0,\r\n \"unknown2\": 1,\r\n \"conditionName\": \"noticeEvent\"\r\n }\r\n ]\r\n}'); +INSERT INTO `gamedata_actor_class` VALUES ('1001301', '/Chara/Npc/Populace/PopulaceStandard', '1500121', '19', '{\r\n \"talkEventConditions\": [\r\n {\r\n \"unknown1\": 4,\r\n \"unknown2\": 0,\r\n \"conditionName\": \"talkDefault\"\r\n }\r\n ],\r\n \"noticeEventConditions\": [\r\n {\r\n \"unknown1\": 0,\r\n \"unknown2\": 1,\r\n \"conditionName\": \"noticeEvent\"\r\n }\r\n ]\r\n}'); +INSERT INTO `gamedata_actor_class` VALUES ('1001302', '/Chara/Npc/Populace/PopulaceStandard', '1600290', '19', '{\r\n \"talkEventConditions\": [\r\n {\r\n \"unknown1\": 4,\r\n \"unknown2\": 0,\r\n \"conditionName\": \"talkDefault\"\r\n }\r\n ],\r\n \"noticeEventConditions\": [\r\n {\r\n \"unknown1\": 0,\r\n \"unknown2\": 1,\r\n \"conditionName\": \"noticeEvent\"\r\n }\r\n ]\r\n}'); +INSERT INTO `gamedata_actor_class` VALUES ('1001303', '/Chara/Npc/Populace/PopulaceStandard', '1200135', '19', '{\r\n \"talkEventConditions\": [\r\n {\r\n \"unknown1\": 4,\r\n \"unknown2\": 0,\r\n \"conditionName\": \"talkDefault\"\r\n }\r\n ],\r\n \"noticeEventConditions\": [\r\n {\r\n \"unknown1\": 0,\r\n \"unknown2\": 1,\r\n \"conditionName\": \"noticeEvent\"\r\n }\r\n ]\r\n}'); +INSERT INTO `gamedata_actor_class` VALUES ('1001304', '/Chara/Npc/Populace/PopulaceStandard', '1600169', '19', '{\r\n \"talkEventConditions\": [\r\n {\r\n \"unknown1\": 4,\r\n \"unknown2\": 0,\r\n \"conditionName\": \"talkDefault\"\r\n }\r\n ],\r\n \"noticeEventConditions\": [\r\n {\r\n \"unknown1\": 0,\r\n \"unknown2\": 1,\r\n \"conditionName\": \"noticeEvent\"\r\n }\r\n ]\r\n}'); +INSERT INTO `gamedata_actor_class` VALUES ('1001305', '/Chara/Npc/Populace/PopulaceStandard', '1900017', '19', '{\r\n \"talkEventConditions\": [\r\n {\r\n \"unknown1\": 4,\r\n \"unknown2\": 0,\r\n \"conditionName\": \"talkDefault\"\r\n }\r\n ],\r\n \"noticeEventConditions\": [\r\n {\r\n \"unknown1\": 0,\r\n \"unknown2\": 1,\r\n \"conditionName\": \"noticeEvent\"\r\n }\r\n ]\r\n}'); INSERT INTO `gamedata_actor_class` VALUES ('1001306', '', '1600198', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1001307', '', '1900133', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1001308', '', '1600111', '0', null); @@ -1532,9 +1532,9 @@ INSERT INTO `gamedata_actor_class` VALUES ('1001505', '', '1600306', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1001506', '', '1300136', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1001507', '', '2200204', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1001508', '/Chara/Npc/Populace/PopulaceStandard', '1300051', '19', '{\r\n \"talkEventConditions\": [\r\n {\r\n \"unknown1\": 4,\r\n \"unknown2\": 0,\r\n \"conditionName\": \"talkDefault\"\r\n }\r\n ],\r\n \"noticeEventConditions\": [\r\n {\r\n \"unknown1\": 0,\r\n \"unknown2\": 1,\r\n \"conditionName\": \"noticeEvent\"\r\n }\r\n ]\r\n}'); -INSERT INTO `gamedata_actor_class` VALUES ('1001509', '', '1600196', '0', null); +INSERT INTO `gamedata_actor_class` VALUES ('1001509', '/Chara/Npc/Populace/PopulaceStandard', '1600196', '19', '{\r\n \"talkEventConditions\": [\r\n {\r\n \"unknown1\": 4,\r\n \"unknown2\": 0,\r\n \"conditionName\": \"talkDefault\"\r\n }\r\n ],\r\n \"noticeEventConditions\": [\r\n {\r\n \"unknown1\": 0,\r\n \"unknown2\": 1,\r\n \"conditionName\": \"noticeEvent\"\r\n }\r\n ]\r\n}'); INSERT INTO `gamedata_actor_class` VALUES ('1001510', '/Chara/Npc/Populace/PopulaceStandard', '1600305', '19', '{\r\n \"talkEventConditions\": [\r\n {\r\n \"unknown1\": 4,\r\n \"unknown2\": 0,\r\n \"conditionName\": \"talkDefault\"\r\n }\r\n ],\r\n \"noticeEventConditions\": [\r\n {\r\n \"unknown1\": 0,\r\n \"unknown2\": 1,\r\n \"conditionName\": \"noticeEvent\"\r\n }\r\n ]\r\n}'); -INSERT INTO `gamedata_actor_class` VALUES ('1001511', '', '1400154', '0', null); +INSERT INTO `gamedata_actor_class` VALUES ('1001511', '/Chara/Npc/Populace/PopulaceStandard', '1400154', '19', '{\r\n \"talkEventConditions\": [\r\n {\r\n \"unknown1\": 4,\r\n \"unknown2\": 0,\r\n \"conditionName\": \"talkDefault\"\r\n }\r\n ],\r\n \"noticeEventConditions\": [\r\n {\r\n \"unknown1\": 0,\r\n \"unknown2\": 1,\r\n \"conditionName\": \"noticeEvent\"\r\n }\r\n ]\r\n}'); INSERT INTO `gamedata_actor_class` VALUES ('1001512', '', '2200211', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1001513', '', '1900156', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1001514', '', '1900054', '0', null); @@ -2324,7 +2324,7 @@ INSERT INTO `gamedata_actor_class` VALUES ('1080072', '', '4000257', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1080073', '', '4000257', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1080074', '', '4000257', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1080075', '', '0', '0', null); -INSERT INTO `gamedata_actor_class` VALUES ('1080076', '', '0', '0', null); +INSERT INTO `gamedata_actor_class` VALUES ('1080076', '/Chara/Npc/Populace/PopulaceStandard', '0', '3', '{\r\n \"talkEventConditions\": [\r\n {\r\n \"unknown1\": 4,\r\n \"unknown2\": 0,\r\n \"conditionName\": \"talkDefault\"\r\n }\r\n ],\r\n \"noticeEventConditions\": [\r\n {\r\n \"unknown1\": 0,\r\n \"unknown2\": 1,\r\n \"conditionName\": \"noticeEvent\"\r\n }\r\n ]\r\n}'); INSERT INTO `gamedata_actor_class` VALUES ('1080077', '', '0', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1080078', '/Chara/Npc/MapObj/MapObjStandard', '1', '0', '{ \r\n \"noticeEventConditions\": [\r\n {\r\n \"unknown1\": 0,\r\n \"unknown2\": 1,\r\n \"conditionName\": \"noticeEvent\"\r\n }\r\n ]\r\n}\r\n'); INSERT INTO `gamedata_actor_class` VALUES ('1080079', '/Chara/Npc/MapObj/MapObjStandard', '1', '0', '{ \r\n \"noticeEventConditions\": [\r\n {\r\n \"unknown1\": 0,\r\n \"unknown2\": 1,\r\n \"conditionName\": \"noticeEvent\"\r\n }\r\n ]\r\n}\r\n'); @@ -2457,7 +2457,7 @@ INSERT INTO `gamedata_actor_class` VALUES ('1090072', '', '0', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1090073', '', '0', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1090074', '', '0', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1090075', '', '0', '0', null); -INSERT INTO `gamedata_actor_class` VALUES ('1090076', '', '0', '0', null); +INSERT INTO `gamedata_actor_class` VALUES ('1090076', '/Chara/Npc/Populace/PopulaceStandard', '0', '1', '{\r\n \"noticeEventConditions\": [\r\n {\r\n \"unknown1\": 0,\r\n \"unknown2\": 1,\r\n \"conditionName\": \"noticeEvent\"\r\n }\r\n ],\r\n \"pushWithCircleEventConditions\": [\r\n {\r\n \"radius\": \"6.0\",\r\n \"outwards\": \"false\",\r\n \"silent\": \"false\",\r\n \"conditionName\": \"pushDefault\"\r\n }\r\n ]\r\n}'); INSERT INTO `gamedata_actor_class` VALUES ('1090077', '/Chara/Npc/Populace/PopulaceStandard', '0', '19', '{\r\n \"talkEventConditions\": [\r\n {\r\n \"unknown1\": 4,\r\n \"unknown2\": 0,\r\n \"conditionName\": \"talkDefault\"\r\n }\r\n ],\r\n \"noticeEventConditions\": [\r\n {\r\n \"unknown1\": 0,\r\n \"unknown2\": 1,\r\n \"conditionName\": \"noticeEvent\"\r\n }\r\n ]\r\n}'); INSERT INTO `gamedata_actor_class` VALUES ('1090078', '/Chara/Npc/Populace/PopulaceStandard', '0', '19', '{\r\n \"talkEventConditions\": [\r\n {\r\n \"unknown1\": 4,\r\n \"unknown2\": 0,\r\n \"conditionName\": \"talkDefault\"\r\n }\r\n ],\r\n \"noticeEventConditions\": [\r\n {\r\n \"unknown1\": 0,\r\n \"unknown2\": 1,\r\n \"conditionName\": \"noticeEvent\"\r\n }\r\n ]\r\n}'); INSERT INTO `gamedata_actor_class` VALUES ('1090079', '', '0', '0', null); @@ -2622,13 +2622,13 @@ INSERT INTO `gamedata_actor_class` VALUES ('1090237', '', '0', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1090238', '/Chara/Npc/Object/MarketEntrance', '0', '1', '{\r\n \"noticeEventConditions\": [\r\n {\r\n \"unknown1\": 0,\r\n \"unknown2\": 1,\r\n \"conditionName\": \"noticeEvent\"\r\n }\r\n ],\r\n pushWithBoxEventConditions: [\r\n {\r\n size: 4143,\r\n outwards: 0,\r\n silent: 0,\r\n \"conditionName\": \"in\"\r\n }\r\n ]\r\n}'); INSERT INTO `gamedata_actor_class` VALUES ('1090239', '', '0', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1090240', '', '0', '0', null); -INSERT INTO `gamedata_actor_class` VALUES ('1090241', '', '0', '0', null); +INSERT INTO `gamedata_actor_class` VALUES ('1090241', '/Chara/Npc/Populace/PopulaceStandard', '0', '1', '{\r\n \"noticeEventConditions\": [\r\n {\r\n \"unknown1\": 0,\r\n \"unknown2\": 1,\r\n \"conditionName\": \"noticeEvent\"\r\n }\r\n ],\r\n \"pushWithCircleEventConditions\": [\r\n {\r\n \"radius\": \"6.0\",\r\n \"outwards\": \"false\",\r\n \"silent\": \"false\",\r\n \"conditionName\": \"pushDefault\"\r\n }\r\n ]\r\n}'); INSERT INTO `gamedata_actor_class` VALUES ('1090242', '', '0', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1090243', '', '0', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1090244', '', '0', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1090245', '', '0', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1090246', '', '0', '0', null); -INSERT INTO `gamedata_actor_class` VALUES ('1090247', '', '0', '0', null); +INSERT INTO `gamedata_actor_class` VALUES ('1090247', '/Chara/Npc/Populace/PopulaceStandard', '0', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1090248', '', '0', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1090249', '', '0', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1090250', '', '0', '0', null); @@ -2654,7 +2654,7 @@ INSERT INTO `gamedata_actor_class` VALUES ('1090269', '', '0', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1090270', '', '0', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1090271', '', '0', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1090272', '', '0', '0', null); -INSERT INTO `gamedata_actor_class` VALUES ('1090273', '', '0', '0', null); +INSERT INTO `gamedata_actor_class` VALUES ('1090273', '/Chara/Npc/Populace/PopulaceStandard', '0', '1', '{\r\n \"talkEventConditions\": [],\r\n \"noticeEventConditions\": [\r\n {\r\n \"unknown1\": 0,\r\n \"unknown2\": 1,\r\n \"conditionName\": \"noticeEvent\"\r\n }\r\n ],\r\n \"pushWithCircleEventConditions\": [\r\n {\r\n \"radius\": \"6.0\",\r\n \"outwards\": \"false\",\r\n \"silent\": \"false\",\r\n \"conditionName\": \"pushDefault\"\r\n }\r\n ]\r\n}'); INSERT INTO `gamedata_actor_class` VALUES ('1090274', '', '0', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1090275', '', '0', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1090276', '', '0', '0', null); @@ -2755,7 +2755,7 @@ INSERT INTO `gamedata_actor_class` VALUES ('1090370', '', '0', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1090371', '', '0', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1090372', '/Chara/Npc/Populace/PopulaceStandard', '0', '19', '{\r\n \"noticeEventConditions\": [\r\n {\r\n \"unknown1\": 0,\r\n \"unknown2\": 1,\r\n \"conditionName\": \"noticeEvent\"\r\n }\r\n ],\r\n \"pushWithCircleEventConditions\": [\r\n {\r\n \"radius\": \"6.0\",\r\n \"outwards\": \"false\",\r\n \"silent\": \"false\",\r\n \"conditionName\": \"pushDefault\"\r\n }\r\n ]\r\n}'); INSERT INTO `gamedata_actor_class` VALUES ('1090373', '/Chara/Npc/Object/OpeningStoperW0B1', '0', '1', '{\r\n \"talkEventConditions\": [],\r\n \"noticeEventConditions\": [\r\n {\r\n \"unknown1\": 1,\r\n \"unknown2\": 0,\r\n \"conditionName\": \"noticeEvent\"\r\n }\r\n ],\r\n \"emoteEventConditions\": [],\r\n \"pushWithCircleEventConditions\": [\r\n {\r\n \"conditionName\": \"exit\",\r\n \"radius\": 4.0,\r\n \"silent\": true,\r\n \"outwards\": false\r\n },\r\n {\r\n \"conditionName\": \"caution\",\r\n \"radius\": 5.0,\r\n \"silent\": true,\r\n \"outwards\": false\r\n }\r\n ]\r\n}'); -INSERT INTO `gamedata_actor_class` VALUES ('1090374', '', '0', '0', null); +INSERT INTO `gamedata_actor_class` VALUES ('1090374', '/Chara/Npc/Populace/PopulaceStandard', '0', '1', '{\r\n \"noticeEventConditions\": [\r\n {\r\n \"unknown1\": 0,\r\n \"unknown2\": 1,\r\n \"conditionName\": \"noticeEvent\"\r\n }\r\n ],\r\n \"pushWithCircleEventConditions\": [\r\n {\r\n \"radius\": \"6.0\",\r\n \"outwards\": \"false\",\r\n \"silent\": \"false\",\r\n \"conditionName\": \"pushDefault\"\r\n }\r\n ]\r\n}'); INSERT INTO `gamedata_actor_class` VALUES ('1090375', '/Chara/Npc/Populace/PopulaceStandard', '0', '19', '{\r\n \"talkEventConditions\": [\r\n {\r\n \"unknown1\": 4,\r\n \"unknown2\": 0,\r\n \"conditionName\": \"talkDefault\"\r\n }\r\n ],\r\n \"noticeEventConditions\": [\r\n {\r\n \"unknown1\": 0,\r\n \"unknown2\": 1,\r\n \"conditionName\": \"noticeEvent\"\r\n }\r\n ]\r\n}'); INSERT INTO `gamedata_actor_class` VALUES ('1090376', '', '0', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1090377', '', '0', '0', null); @@ -2789,7 +2789,7 @@ INSERT INTO `gamedata_actor_class` VALUES ('1090404', '', '0', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1090405', '', '0', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1090406', '', '0', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1090407', '', '0', '0', null); -INSERT INTO `gamedata_actor_class` VALUES ('1090408', '', '0', '0', null); +INSERT INTO `gamedata_actor_class` VALUES ('1090408', '/Chara/Npc/Populace/PopulaceStandard', '0', '1', '{\r\n \"talkEventConditions\": [],\r\n \"noticeEventConditions\": [\r\n {\r\n \"unknown1\": 0,\r\n \"unknown2\": 1,\r\n \"conditionName\": \"noticeEvent\"\r\n }\r\n ],\r\n \"pushWithCircleEventConditions\": [\r\n {\r\n \"radius\": \"6.0\",\r\n \"outwards\": \"false\",\r\n \"silent\": \"false\",\r\n \"conditionName\": \"pushDefault\"\r\n }\r\n ]\r\n}'); INSERT INTO `gamedata_actor_class` VALUES ('1090409', '', '0', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1090410', '', '0', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1090411', '', '0', '0', null); @@ -3773,23 +3773,23 @@ INSERT INTO `gamedata_actor_class` VALUES ('1500210', '/Chara/Npc/Populace/Popul INSERT INTO `gamedata_actor_class` VALUES ('1500211', '/Chara/Npc/Populace/PopulaceCompanySupply', '1600153', '19', '{\r\n \"talkEventConditions\": [\r\n {\r\n \"unknown1\": 4,\r\n \"unknown2\": 0,\r\n \"conditionName\": \"talkDefault\"\r\n }\r\n ],\r\n \"noticeEventConditions\": [\r\n {\r\n \"unknown1\": 0,\r\n \"unknown2\": 1,\r\n \"conditionName\": \"noticeEvent\"\r\n }\r\n ]\r\n}'); INSERT INTO `gamedata_actor_class` VALUES ('1500212', '/Chara/Npc/Populace/PopulaceCompanySupply', '1200188', '19', '{\r\n \"talkEventConditions\": [\r\n {\r\n \"unknown1\": 4,\r\n \"unknown2\": 0,\r\n \"conditionName\": \"talkDefault\"\r\n }\r\n ],\r\n \"noticeEventConditions\": [\r\n {\r\n \"unknown1\": 0,\r\n \"unknown2\": 1,\r\n \"conditionName\": \"noticeEvent\"\r\n }\r\n ]\r\n}'); INSERT INTO `gamedata_actor_class` VALUES ('1500213', '', '1300165', '0', null); -INSERT INTO `gamedata_actor_class` VALUES ('1500214', '', '1300112', '0', null); +INSERT INTO `gamedata_actor_class` VALUES ('1500214', '/Chara/Npc/Populace/PopulaceCaravanManager', '1300112', '19', '{\r\n \"talkEventConditions\": [\r\n {\r\n \"unknown1\": 4,\r\n \"unknown2\": 0,\r\n \"conditionName\": \"talkDefault\"\r\n }\r\n ],\r\n \"noticeEventConditions\": [\r\n {\r\n \"unknown1\": 0,\r\n \"unknown2\": 1,\r\n \"conditionName\": \"noticeEvent\"\r\n }\r\n ]\r\n}\r\n'); INSERT INTO `gamedata_actor_class` VALUES ('1500215', '', '1300161', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1500216', '', '1000358', '0', null); -INSERT INTO `gamedata_actor_class` VALUES ('1500217', '', '1000046', '0', null); +INSERT INTO `gamedata_actor_class` VALUES ('1500217', '/Chara/Npc/Populace/PopulaceCaravanAdviser', '1000046', '19', '{\r\n \"talkEventConditions\": [\r\n {\r\n \"unknown1\": 4,\r\n \"unknown2\": 0,\r\n \"conditionName\": \"talkDefault\"\r\n }\r\n ],\r\n \"noticeEventConditions\": [\r\n {\r\n \"unknown1\": 0,\r\n \"unknown2\": 1,\r\n \"conditionName\": \"noticeEvent\"\r\n }\r\n ]\r\n}\r\n'); INSERT INTO `gamedata_actor_class` VALUES ('1500218', '', '1000129', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1500219', '', '1600170', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1500220', '', '1600251', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1500221', '', '1600271', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1500222', '', '2200035', '0', null); -INSERT INTO `gamedata_actor_class` VALUES ('1500223', '', '2200045', '0', null); +INSERT INTO `gamedata_actor_class` VALUES ('1500223', '/Chara/Npc/Populace/PopulaceCompanyGLPublisher', '2200045', '19', '{\r\n \"talkEventConditions\": [\r\n {\r\n \"unknown1\": 4,\r\n \"unknown2\": 0,\r\n \"conditionName\": \"talkDefault\"\r\n }\r\n ],\r\n \"noticeEventConditions\": [\r\n {\r\n \"unknown1\": 0,\r\n \"unknown2\": 1,\r\n \"conditionName\": \"noticeEvent\"\r\n }\r\n ]\r\n}\r\n'); INSERT INTO `gamedata_actor_class` VALUES ('1500224', '', '2200067', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1500225', '', '2200070', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1500226', '', '2200077', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1500227', '', '2200089', '0', null); -INSERT INTO `gamedata_actor_class` VALUES ('1500228', '', '4000621', '0', null); -INSERT INTO `gamedata_actor_class` VALUES ('1500229', '', '4000621', '0', null); -INSERT INTO `gamedata_actor_class` VALUES ('1500230', '', '4000621', '0', null); +INSERT INTO `gamedata_actor_class` VALUES ('1500228', '/Chara/Npc/Populace/PopulaceStandard', '4000621', '19', '{\r\n \"talkEventConditions\": [\r\n {\r\n \"unknown1\": 4,\r\n \"unknown2\": 0,\r\n \"conditionName\": \"talkDefault\"\r\n }\r\n ],\r\n \"noticeEventConditions\": [\r\n {\r\n \"unknown1\": 0,\r\n \"unknown2\": 1,\r\n \"conditionName\": \"noticeEvent\"\r\n }\r\n ]\r\n}\r\n'); +INSERT INTO `gamedata_actor_class` VALUES ('1500229', '/Chara/Npc/Populace/PopulaceStandard', '4000621', '19', '{\r\n \"talkEventConditions\": [\r\n {\r\n \"unknown1\": 4,\r\n \"unknown2\": 0,\r\n \"conditionName\": \"talkDefault\"\r\n }\r\n ],\r\n \"noticeEventConditions\": [\r\n {\r\n \"unknown1\": 0,\r\n \"unknown2\": 1,\r\n \"conditionName\": \"noticeEvent\"\r\n }\r\n ]\r\n}\r\n'); +INSERT INTO `gamedata_actor_class` VALUES ('1500230', '/Chara/Npc/Populace/PopulaceStandard', '4000621', '19', '{\r\n \"talkEventConditions\": [\r\n {\r\n \"unknown1\": 4,\r\n \"unknown2\": 0,\r\n \"conditionName\": \"talkDefault\"\r\n }\r\n ],\r\n \"noticeEventConditions\": [\r\n {\r\n \"unknown1\": 0,\r\n \"unknown2\": 1,\r\n \"conditionName\": \"noticeEvent\"\r\n }\r\n ]\r\n}\r\n'); INSERT INTO `gamedata_actor_class` VALUES ('1500231', '', '1000280', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1500232', '', '1100415', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1500233', '', '1200222', '0', null); @@ -3797,7 +3797,7 @@ INSERT INTO `gamedata_actor_class` VALUES ('1500234', '', '1000133', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1500235', '', '1600043', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1500236', '', '1300107', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1500237', '/Chara/Npc/Populace/PopulaceItemRepairer', '1000035', '19', '{\r\n \"talkEventConditions\": [\r\n {\r\n \"unknown1\": 4,\r\n \"unknown2\": 0,\r\n \"conditionName\": \"talkDefault\"\r\n }\r\n ],\r\n \"noticeEventConditions\": [\r\n {\r\n \"unknown1\": 0,\r\n \"unknown2\": 1,\r\n \"conditionName\": \"noticeEvent\"\r\n }\r\n ]\r\n}'); -INSERT INTO `gamedata_actor_class` VALUES ('1500238', '', '1000048', '0', null); +INSERT INTO `gamedata_actor_class` VALUES ('1500238', '/Chara/Npc/Populace/PopulaceItemRepairer', '1000048', '19', '{\r\n \"talkEventConditions\": [\r\n {\r\n \"unknown1\": 4,\r\n \"unknown2\": 0,\r\n \"conditionName\": \"talkDefault\"\r\n }\r\n ],\r\n \"noticeEventConditions\": [\r\n {\r\n \"unknown1\": 0,\r\n \"unknown2\": 1,\r\n \"conditionName\": \"noticeEvent\"\r\n }\r\n ]\r\n}'); INSERT INTO `gamedata_actor_class` VALUES ('1500239', '/Chara/Npc/Populace/PopulaceItemRepairer', '1000068', '19', '{\r\n \"talkEventConditions\": [\r\n {\r\n \"unknown1\": 4,\r\n \"unknown2\": 0,\r\n \"conditionName\": \"talkDefault\"\r\n }\r\n ],\r\n \"noticeEventConditions\": [\r\n {\r\n \"unknown1\": 0,\r\n \"unknown2\": 1,\r\n \"conditionName\": \"noticeEvent\"\r\n }\r\n ]\r\n}'); INSERT INTO `gamedata_actor_class` VALUES ('1500240', '', '1000080', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1500241', '/Chara/Npc/Populace/PopulaceItemRepairer', '1600265', '19', '{\r\n \"talkEventConditions\": [\r\n {\r\n \"unknown1\": 4,\r\n \"unknown2\": 0,\r\n \"conditionName\": \"talkDefault\"\r\n }\r\n ],\r\n \"noticeEventConditions\": [\r\n {\r\n \"unknown1\": 0,\r\n \"unknown2\": 1,\r\n \"conditionName\": \"noticeEvent\"\r\n }\r\n ]\r\n}'); @@ -3811,10 +3811,10 @@ INSERT INTO `gamedata_actor_class` VALUES ('1500248', '', '1200213', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1500249', '/Chara/Npc/Populace/PopulaceItemRepairer', '1900263', '19', '{\r\n \"talkEventConditions\": [\r\n {\r\n \"unknown1\": 4,\r\n \"unknown2\": 0,\r\n \"conditionName\": \"talkDefault\"\r\n }\r\n ],\r\n \"noticeEventConditions\": [\r\n {\r\n \"unknown1\": 0,\r\n \"unknown2\": 1,\r\n \"conditionName\": \"noticeEvent\"\r\n }\r\n ]\r\n}'); INSERT INTO `gamedata_actor_class` VALUES ('1500250', '', '1200211', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1500251', '/Chara/Npc/Populace/PopulaceItemRepairer', '1900257', '19', '{\r\n \"talkEventConditions\": [\r\n {\r\n \"unknown1\": 4,\r\n \"unknown2\": 0,\r\n \"conditionName\": \"talkDefault\"\r\n }\r\n ],\r\n \"noticeEventConditions\": [\r\n {\r\n \"unknown1\": 0,\r\n \"unknown2\": 1,\r\n \"conditionName\": \"noticeEvent\"\r\n }\r\n ]\r\n}'); -INSERT INTO `gamedata_actor_class` VALUES ('1500252', '', '1900261', '0', null); +INSERT INTO `gamedata_actor_class` VALUES ('1500252', '/Chara/Npc/Populace/PopulaceItemRepairer', '1900261', '19', '{\r\n \"talkEventConditions\": [\r\n {\r\n \"unknown1\": 4,\r\n \"unknown2\": 0,\r\n \"conditionName\": \"talkDefault\"\r\n }\r\n ],\r\n \"noticeEventConditions\": [\r\n {\r\n \"unknown1\": 0,\r\n \"unknown2\": 1,\r\n \"conditionName\": \"noticeEvent\"\r\n }\r\n ]\r\n}'); INSERT INTO `gamedata_actor_class` VALUES ('1500253', '', '1200206', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1500254', '/Chara/Npc/Populace/PopulaceItemRepairer', '1200205', '19', '{\r\n \"talkEventConditions\": [\r\n {\r\n \"unknown1\": 4,\r\n \"unknown2\": 0,\r\n \"conditionName\": \"talkDefault\"\r\n }\r\n ],\r\n \"noticeEventConditions\": [\r\n {\r\n \"unknown1\": 0,\r\n \"unknown2\": 1,\r\n \"conditionName\": \"noticeEvent\"\r\n }\r\n ]\r\n}'); -INSERT INTO `gamedata_actor_class` VALUES ('1500255', '', '1200204', '0', null); +INSERT INTO `gamedata_actor_class` VALUES ('1500255', '/Chara/Npc/Populace/PopulaceItemRepairer', '1200204', '19', '{\r\n \"talkEventConditions\": [\r\n {\r\n \"unknown1\": 4,\r\n \"unknown2\": 0,\r\n \"conditionName\": \"talkDefault\"\r\n }\r\n ],\r\n \"noticeEventConditions\": [\r\n {\r\n \"unknown1\": 0,\r\n \"unknown2\": 1,\r\n \"conditionName\": \"noticeEvent\"\r\n }\r\n ]\r\n}'); INSERT INTO `gamedata_actor_class` VALUES ('1500256', '/Chara/Npc/Populace/PopulaceItemRepairer', '1100084', '19', '{\r\n \"talkEventConditions\": [\r\n {\r\n \"unknown1\": 4,\r\n \"unknown2\": 0,\r\n \"conditionName\": \"talkDefault\"\r\n }\r\n ],\r\n \"noticeEventConditions\": [\r\n {\r\n \"unknown1\": 0,\r\n \"unknown2\": 1,\r\n \"conditionName\": \"noticeEvent\"\r\n }\r\n ]\r\n}'); INSERT INTO `gamedata_actor_class` VALUES ('1500257', '', '1200203', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1500258', '/Chara/Npc/Populace/PopulaceItemRepairer', '1100074', '19', '{\r\n \"talkEventConditions\": [\r\n {\r\n \"unknown1\": 4,\r\n \"unknown2\": 0,\r\n \"conditionName\": \"talkDefault\"\r\n }\r\n ],\r\n \"noticeEventConditions\": [\r\n {\r\n \"unknown1\": 0,\r\n \"unknown2\": 1,\r\n \"conditionName\": \"noticeEvent\"\r\n }\r\n ]\r\n}'); @@ -3848,7 +3848,7 @@ INSERT INTO `gamedata_actor_class` VALUES ('1500285', '', '1300167', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1500286', '', '1300168', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1500287', '', '1000200', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1500288', '', '1000201', '0', null); -INSERT INTO `gamedata_actor_class` VALUES ('1500289', '', '1000202', '0', null); +INSERT INTO `gamedata_actor_class` VALUES ('1500289', '/Chara/Npc/Populace/PopulaceCaravanAdviser', '1000202', '19', '{\r\n \"talkEventConditions\": [\r\n {\r\n \"unknown1\": 4,\r\n \"unknown2\": 0,\r\n \"conditionName\": \"talkDefault\"\r\n }\r\n ],\r\n \"noticeEventConditions\": [\r\n {\r\n \"unknown1\": 0,\r\n \"unknown2\": 1,\r\n \"conditionName\": \"noticeEvent\"\r\n }\r\n ]\r\n}'); INSERT INTO `gamedata_actor_class` VALUES ('1500290', '', '1600330', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1500291', '', '1600331', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1500292', '', '1600332', '0', null); @@ -4092,10 +4092,10 @@ INSERT INTO `gamedata_actor_class` VALUES ('1600092', '/Chara/Npc/Populace/Shop/ INSERT INTO `gamedata_actor_class` VALUES ('1600093', '/Chara/Npc/Populace/Shop/PopulaceShopSalesman', '1900194', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1600094', '/Chara/Npc/Populace/Shop/PopulaceShopSalesman', '1600218', '19', '{\r\n \"talkEventConditions\": [\r\n {\r\n \"unknown1\": 4,\r\n \"unknown2\": 0,\r\n \"conditionName\": \"talkDefault\"\r\n }\r\n ],\r\n \"noticeEventConditions\": [\r\n {\r\n \"unknown1\": 0,\r\n \"unknown2\": 1,\r\n \"conditionName\": \"noticeEvent\"\r\n }\r\n ]\r\n}'); INSERT INTO `gamedata_actor_class` VALUES ('1600095', '/Chara/Npc/Populace/Shop/PopulaceShopSalesman', '1000082', '0', null); -INSERT INTO `gamedata_actor_class` VALUES ('1600096', '/Chara/Npc/Populace/Shop/PopulaceShopSalesman', '1000096', '0', null); +INSERT INTO `gamedata_actor_class` VALUES ('1600096', '/Chara/Npc/Populace/Shop/PopulaceShopSalesman', '1000096', '19', '{\r\n \"talkEventConditions\": [\r\n {\r\n \"unknown1\": 4,\r\n \"unknown2\": 0,\r\n \"conditionName\": \"talkDefault\"\r\n }\r\n ],\r\n \"noticeEventConditions\": [\r\n {\r\n \"unknown1\": 0,\r\n \"unknown2\": 1,\r\n \"conditionName\": \"noticeEvent\"\r\n }\r\n ]\r\n}'); INSERT INTO `gamedata_actor_class` VALUES ('1600097', '/Chara/Npc/Populace/Shop/PopulaceShopSalesman', '1000107', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1600098', '/Chara/Npc/Populace/Shop/PopulaceShopSalesman', '1400195', '0', null); -INSERT INTO `gamedata_actor_class` VALUES ('1600099', '/Chara/Npc/Populace/Shop/PopulaceShopSalesman', '1600259', '0', null); +INSERT INTO `gamedata_actor_class` VALUES ('1600099', '/Chara/Npc/Populace/Shop/PopulaceShopSalesman', '1600259', '19', '{\r\n \"talkEventConditions\": [\r\n {\r\n \"unknown1\": 4,\r\n \"unknown2\": 0,\r\n \"conditionName\": \"talkDefault\"\r\n }\r\n ],\r\n \"noticeEventConditions\": [\r\n {\r\n \"unknown1\": 0,\r\n \"unknown2\": 1,\r\n \"conditionName\": \"noticeEvent\"\r\n }\r\n ]\r\n}'); INSERT INTO `gamedata_actor_class` VALUES ('1600100', '/Chara/Npc/Populace/Shop/PopulaceShopSalesman', '1600253', '19', '{\r\n \"talkEventConditions\": [\r\n {\r\n \"unknown1\": 4,\r\n \"unknown2\": 0,\r\n \"conditionName\": \"talkDefault\"\r\n }\r\n ],\r\n \"noticeEventConditions\": [\r\n {\r\n \"unknown1\": 0,\r\n \"unknown2\": 1,\r\n \"conditionName\": \"noticeEvent\"\r\n }\r\n ]\r\n}'); INSERT INTO `gamedata_actor_class` VALUES ('1600101', '/Chara/Npc/Populace/Shop/PopulaceShopSalesman', '1500164', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1600102', '', '1300194', '0', null); @@ -4117,7 +4117,7 @@ INSERT INTO `gamedata_actor_class` VALUES ('1600117', '/Chara/Npc/Populace/Shop/ INSERT INTO `gamedata_actor_class` VALUES ('1600118', '', '1200212', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1600119', '/Chara/Npc/Populace/Shop/PopulaceShopSalesman', '1900259', '19', '{\r\n \"talkEventConditions\": [\r\n {\r\n \"unknown1\": 4,\r\n \"unknown2\": 0,\r\n \"conditionName\": \"talkDefault\"\r\n }\r\n ],\r\n \"noticeEventConditions\": [\r\n {\r\n \"unknown1\": 0,\r\n \"unknown2\": 1,\r\n \"conditionName\": \"noticeEvent\"\r\n }\r\n ]\r\n}'); INSERT INTO `gamedata_actor_class` VALUES ('1600120', '/Chara/Npc/Populace/Shop/PopulaceShopSalesman', '1200210', '0', null); -INSERT INTO `gamedata_actor_class` VALUES ('1600121', '/Chara/Npc/Populace/Shop/PopulaceShopSalesman', '1300196', '0', null); +INSERT INTO `gamedata_actor_class` VALUES ('1600121', '/Chara/Npc/Populace/Shop/PopulaceShopSalesman', '1300196', '19', '{\r\n \"talkEventConditions\": [\r\n {\r\n \"unknown1\": 4,\r\n \"unknown2\": 0,\r\n \"conditionName\": \"talkDefault\"\r\n }\r\n ],\r\n \"noticeEventConditions\": [\r\n {\r\n \"unknown1\": 0,\r\n \"unknown2\": 1,\r\n \"conditionName\": \"noticeEvent\"\r\n }\r\n ]\r\n}'); INSERT INTO `gamedata_actor_class` VALUES ('1600122', '/Chara/Npc/Populace/Shop/PopulaceShopSalesman', '1200208', '19', '{\r\n \"talkEventConditions\": [\r\n {\r\n \"unknown1\": 1,\r\n \"unknown2\": 0,\r\n \"conditionName\": \"talkDefault\"\r\n }\r\n ],\r\n \"noticeEventConditions\": [\r\n {\r\n \"unknown1\": 1,\r\n \"unknown2\": 0,\r\n \"conditionName\": \"noticeEvent\"\r\n }\r\n ],\r\n \"emoteEventConditions\": [],\r\n \"pushWithCircleEventConditions\": []\r\n}'); INSERT INTO `gamedata_actor_class` VALUES ('1600123', '', '1100092', '0', '{\r\n \"talkEventConditions\": [\r\n {\r\n \"unknown1\": 1,\r\n \"unknown2\": 0,\r\n \"conditionName\": \"talkDefault\"\r\n }\r\n ],\r\n \"noticeEventConditions\": [\r\n {\r\n \"unknown1\": 1,\r\n \"unknown2\": 0,\r\n \"conditionName\": \"noticeEvent\"\r\n }\r\n ],\r\n \"emoteEventConditions\": [],\r\n \"pushWithCircleEventConditions\": []\r\n}'); INSERT INTO `gamedata_actor_class` VALUES ('1600124', '', '1100090', '0', null); @@ -4133,7 +4133,7 @@ INSERT INTO `gamedata_actor_class` VALUES ('1600133', '/Chara/Npc/Populace/Shop/ INSERT INTO `gamedata_actor_class` VALUES ('1600134', '', '1100057', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1600135', '', '1100055', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1600136', '', '1100053', '0', null); -INSERT INTO `gamedata_actor_class` VALUES ('1600137', '/Chara/Npc/Populace/Shop/PopulaceShopSalesman', '1000083', '0', null); +INSERT INTO `gamedata_actor_class` VALUES ('1600137', '/Chara/Npc/Populace/Shop/PopulaceShopSalesman', '1000083', '19', '{\r\n \"talkEventConditions\": [\r\n {\r\n \"unknown1\": 4,\r\n \"unknown2\": 0,\r\n \"conditionName\": \"talkDefault\"\r\n }\r\n ],\r\n \"noticeEventConditions\": [\r\n {\r\n \"unknown1\": 0,\r\n \"unknown2\": 1,\r\n \"conditionName\": \"noticeEvent\"\r\n }\r\n ]\r\n}'); INSERT INTO `gamedata_actor_class` VALUES ('1600138', '', '1300195', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1600139', '', '1900256', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1600140', '', '2200062', '0', null); diff --git a/Data/sql/server_spawn_locations.sql b/Data/sql/server_spawn_locations.sql index 50cf797c..a75b2b08 100644 --- a/Data/sql/server_spawn_locations.sql +++ b/Data/sql/server_spawn_locations.sql @@ -4,7 +4,7 @@ Source Host: localhost Source Database: ffxiv_server Target Host: localhost Target Database: ffxiv_server -Date: 3/14/2020 12:57:15 PM +Date: 3/15/2020 1:01:54 AM */ SET FOREIGN_KEY_CHECKS=0; @@ -26,7 +26,7 @@ CREATE TABLE `server_spawn_locations` ( `animationId` int(10) unsigned NOT NULL DEFAULT '0', `customDisplayName` varchar(32) DEFAULT NULL, PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=968 DEFAULT CHARSET=latin1; +) ENGINE=InnoDB AUTO_INCREMENT=1019 DEFAULT CHARSET=latin1; -- ---------------------------- -- Records @@ -705,7 +705,7 @@ INSERT INTO `server_spawn_locations` VALUES ('676', '1000701', 'zuzupoja', '206' INSERT INTO `server_spawn_locations` VALUES ('677', '1001583', 'marcette', '206', '', '0', '22.84', '10.9', '-1306.83', '1.06', '0', '0', null); INSERT INTO `server_spawn_locations` VALUES ('678', '1500294', 'gagaroon', '206', '', '0', '198.6', '25.21', '-1341.66', '2.79', '0', '0', null); INSERT INTO `server_spawn_locations` VALUES ('679', '1001396', 'lefwyne', '206', '', '0', '180.42', '25.82', '-1400.37', '2.87', '0', '0', null); -INSERT INTO `server_spawn_locations` VALUES ('680', '1700038', 'aubrenard (check cnstctr)', '206', '', '0', '179.74', '25.82', '-1415.51', '-1.07', '0', '1040', null); +INSERT INTO `server_spawn_locations` VALUES ('680', '1700038', 'aubrenard', '206', '', '0', '179.74', '25.82', '-1415.51', '-1.07', '0', '1040', null); INSERT INTO `server_spawn_locations` VALUES ('681', '1080040', '', '206', '', '0', '108.78', '20', '-1467.61', '0', '0', '0', null); INSERT INTO `server_spawn_locations` VALUES ('682', '1001080', 'tatagoi', '206', '', '0', '106.26', '20', '-1472.57', '0.04', '0', '0', null); INSERT INTO `server_spawn_locations` VALUES ('683', '1001081', 'khuma_moshroca', '206', '', '0', '105.99', '20', '-1478.71', '-0.8', '0', '1041', null); @@ -800,7 +800,7 @@ INSERT INTO `server_spawn_locations` VALUES ('774', '1280059', '', '0', '', '0', INSERT INTO `server_spawn_locations` VALUES ('775', '1280061', 'gridania_aetheryte', '206', '', '0', '-130.63', '16.08', '-1323.99', '0', '0', '0', null); INSERT INTO `server_spawn_locations` VALUES ('776', '1280062', 'camp_bentbranch_aetheryte', '150', '', '0', '288', '4', '-543.928', '0', '0', '0', null); INSERT INTO `server_spawn_locations` VALUES ('777', '1280063', 'camp_nineivies_aetheryte', '151', '', '0', '1702', '20', '-862', '0', '0', '0', null); -INSERT INTO `server_spawn_locations` VALUES ('778', '1280064', 'camp_emeraldmoss_aetheryte', '152', '', '0', '-1052', '20', '-1760', '0', '0', '0', null); +INSERT INTO `server_spawn_locations` VALUES ('778', '1280064', 'camp_emeraldmoss_aetheryte', '152', '', '0', '-1052', '20.6', '-1760', '0', '0', '0', null); INSERT INTO `server_spawn_locations` VALUES ('779', '1280065', 'camp_crimsonbark_aetheryte', '153', '', '0', '-1566.04', '-11.89', '-550.51', '0', '0', '0', null); INSERT INTO `server_spawn_locations` VALUES ('780', '1280066', 'camp_tranquil_aetheryte', '154', '', '0', '734', '-12', '1126', '0', '0', '0', null); INSERT INTO `server_spawn_locations` VALUES ('781', '1280067', 'humblehearth_aetherytegate', '150', '', '0', '-94.07', '4', '-543.16', '0', '0', '0', null); @@ -979,3 +979,54 @@ INSERT INTO `server_spawn_locations` VALUES ('964', '1000822', 'caplan', '206', INSERT INTO `server_spawn_locations` VALUES ('965', '1000821', 'nellaure', '206', '', '0', '-13.954', '10.75', '-1261.49', '1.576', '0', '0', null); INSERT INTO `server_spawn_locations` VALUES ('966', '1080101', 'sys_chocoview_lim', '133', '', '0', '-436.185', '19', '206.26', '3.13', '0', '0', null); INSERT INTO `server_spawn_locations` VALUES ('967', '1080101', 'sys_chocoview_uld', '175', '', '0', '-36.611', '192.037', '18.759', '-0.81', '0', '0', null); +INSERT INTO `server_spawn_locations` VALUES ('968', '1500252', 'mauh_lihzeh', '151', '', '0', '1703.37', '20.57', '-850.32', '-3.04', '0', '0', null); +INSERT INTO `server_spawn_locations` VALUES ('969', '1600099', 'zehkrepf', '151', '', '0', '1700.51', '20.31', '-852.16', '2.79', '0', '0', null); +INSERT INTO `server_spawn_locations` VALUES ('970', '1500095', 'troegmoer', '151', '', '0', '1707.27', '20.47', '-854.72', '-2.41', '0', '1041', null); +INSERT INTO `server_spawn_locations` VALUES ('971', '1500069', 'ahldwaen', '151', '', '0', '1710.52', '20.51', '-854.6', '-2.38', '0', '1016', null); +INSERT INTO `server_spawn_locations` VALUES ('972', '1500214', 'serpent_sergeant_marquaile', '154', '', '0', '739.15', '-11.93', '1113.85', '2.16', '0', '1331', null); +INSERT INTO `server_spawn_locations` VALUES ('973', '1600096', 'edwyn', '154', '', '0', '724.85', '-11.76', '1124.45', '1.74', '0', '0', null); +INSERT INTO `server_spawn_locations` VALUES ('974', '1500098', 'juliembert', '154', '', '0', '726.57', '-11.52', '1131.33', '2.33', '0', '1041', null); +INSERT INTO `server_spawn_locations` VALUES ('975', '1500238', 'beneger', '154', '', '0', '723.07', '-11.45', '1127.25', '1.63', '0', '0', null); +INSERT INTO `server_spawn_locations` VALUES ('976', '1500229', 'pack_chocobo', '154', '', '0', '737.36', '-11.89', '1112.58', '2.66', '0', '1333', null); +INSERT INTO `server_spawn_locations` VALUES ('977', '1090374', '', '154', '', '0', '734.57', '-11.92', '1126.5', '1.57', '0', '0', null); +INSERT INTO `server_spawn_locations` VALUES ('978', '1500217', 'belmont', '154', '', '0', '736.07', '-11.86', '1111.7', '1.58', '0', '1031', null); +INSERT INTO `server_spawn_locations` VALUES ('979', '1500072', 'hab', '154', '', '0', '726.22', '-11.49', '1134.18', '2.41', '0', '1016', null); +INSERT INTO `server_spawn_locations` VALUES ('980', '1500038', 'tranquil_battlewarden', '154', '', '0', '740.8', '-11.15', '1140.14', '0.59', '0', '0', null); +INSERT INTO `server_spawn_locations` VALUES ('981', '1000671', 'miraudont', '152', '', '0', '-1047.55', '20.6', '-1744.68', '-0.38', '0', '1056', null); +INSERT INTO `server_spawn_locations` VALUES ('982', '1090076', '', '152', '', '0', '-1067.15', '20.25', '-1764.7', '0', '0', '0', null); +INSERT INTO `server_spawn_locations` VALUES ('983', '1500096', 'bubunakka', '152', '', '0', '-1046.8', '20.39', '-1768.75', '-0.78', '0', '1041', null); +INSERT INTO `server_spawn_locations` VALUES ('984', '1600121', 'maenne', '152', '', '0', '-1049.49', '20.35', '-1771.81', '-1.07', '0', '0', null); +INSERT INTO `server_spawn_locations` VALUES ('985', '1500261', 'emanuel', '152', '', '0', '-1046.89', '20.5', '-1773.95', '-1.54', '0', '0', null); +INSERT INTO `server_spawn_locations` VALUES ('986', '1500070', 'rdyunbu', '152', '', '0', '-1045.87', '20.51', '-1771.25', '-0.76', '0', '1017', null); +INSERT INTO `server_spawn_locations` VALUES ('987', '1600122', 'logedanrel', '171', '', '0', '1259.98', '264', '-547.6', '-2.55', '0', '0', null); +INSERT INTO `server_spawn_locations` VALUES ('988', '1500100', 'frediswitha', '171', '', '0', '1258.01', '264', '-542.71', '-1.58', '0', '1040', null); +INSERT INTO `server_spawn_locations` VALUES ('989', '1500264', 'audouin', '171', '', '0', '1262.77', '264', '-547.56', '-2.54', '0', '0', null); +INSERT INTO `server_spawn_locations` VALUES ('990', '1500286', 'flame_sergeant_hanette', '171', '', '0', '1242.28', '264.02', '-526.07', '-0.2', '0', '1332', null); +INSERT INTO `server_spawn_locations` VALUES ('991', '1090241', '', '171', '', '0', '1241.42', '264', '-548.82', '-2.42', '0', '0', null); +INSERT INTO `server_spawn_locations` VALUES ('992', '1500074', 'doesfolg', '171', '', '0', '1260.72', '264', '-544.44', '-1.54', '0', '1015', null); +INSERT INTO `server_spawn_locations` VALUES ('993', '1000674', 'zllayan', '171', '', '0', '1238.51', '264', '-537.59', '-1.61', '0', '1056', null); +INSERT INTO `server_spawn_locations` VALUES ('994', '1500230', 'pack_chocobo', '171', '', '0', '1243.61', '264.03', '-524.55', '-1.18', '0', '1333', null); +INSERT INTO `server_spawn_locations` VALUES ('995', '1500289', 'raulin', '171', '', '0', '1244.71', '264.04', '-523.13', '-2.72', '0', '1031', null); +INSERT INTO `server_spawn_locations` VALUES ('996', '1001511', 'bibiraka', '230', '', '0', '-244.1', '12.5', '197.19', '2.3', '0', '0', null); +INSERT INTO `server_spawn_locations` VALUES ('997', '1001509', 'syntberk', '230', '', '0', '-245.65', '12.5', '187.16', '0.73', '0', '0', null); +INSERT INTO `server_spawn_locations` VALUES ('998', '1500009', 'brunadier', '130', '', '0', '1130.47', '45.54', '-929.31', '-0.77', '0', '1040', null); +INSERT INTO `server_spawn_locations` VALUES ('999', '1000614', 'kokomui', '130', '', '0', '1131.02', '45.51', '-926.48', '-0.6', '0', '1015', null); +INSERT INTO `server_spawn_locations` VALUES ('1000', '1500016', 'bloodshore_battlewarden', '130', '', '0', '1110.33', '46.51', '-925.96', '-0.84', '0', '0', null); +INSERT INTO `server_spawn_locations` VALUES ('1001', '1000615', 'eptomi', '129', '', '0', '-990.78', '61.51', '-1131.11', '0', '0', '1017', null); +INSERT INTO `server_spawn_locations` VALUES ('1002', '1000362', 'solelle', '129', '', '0', '-994', '61.8', '-1109', '0', '0', '1016', null); +INSERT INTO `server_spawn_locations` VALUES ('1003', '1000361', 'ahldoen', '129', '', '0', '-992.57', '61.46', '-1133.43', '-0.01', '0', '1015', null); +INSERT INTO `server_spawn_locations` VALUES ('1004', '1500014', 'skull_valley_battlewarden', '129', '', '0', '-1052.19', '42.76', '-858.79', '1.02', '0', '0', null); +INSERT INTO `server_spawn_locations` VALUES ('1005', '1001305', 'yalabali', '129', '', '0', '-1260.03', '6.91', '-647.88', '-2.68', '0', '0', null); +INSERT INTO `server_spawn_locations` VALUES ('1006', '1001303', 'duchesnelt', '129', '', '0', '-1296.32', '4.88', '-649.39', '-0.09', '0', '0', null); +INSERT INTO `server_spawn_locations` VALUES ('1007', '1001302', 'immodest_mouse', '129', '', '0', '-1301.88', '1.85', '-612.65', '2.69', '0', '0', null); +INSERT INTO `server_spawn_locations` VALUES ('1008', '1001300', 'myndeidin', '129', '', '0', '-1292.31', '11.39', '-592.56', '0.39', '0', '0', null); +INSERT INTO `server_spawn_locations` VALUES ('1009', '1001298', 'bubusha', '129', '', '0', '-1323.06', '0.61', '-597', '-1.31', '0', '0', null); +INSERT INTO `server_spawn_locations` VALUES ('1010', '1001301', 'fupepe', '129', '', '0', '-1332.09', '1.68', '-609', '-0.26', '0', '0', null); +INSERT INTO `server_spawn_locations` VALUES ('1011', '1001299', 'oadebh', '129', '', '0', '-1345', '1.72', '-563', '1', '0', '0', null); +INSERT INTO `server_spawn_locations` VALUES ('1012', '1001304', 'skribskoef', '129', '', '0', '-1385', '2.89', '-610', '-2', '0', '0', null); +INSERT INTO `server_spawn_locations` VALUES ('1013', '1500011', 'tsimh_panipahr', '129', '', '0', '-1364', '6.6', '-635', '0', '0', '1040', null); +INSERT INTO `server_spawn_locations` VALUES ('1014', '1500008', 'guntard', '129', '', '0', '-1887.09', '53.52', '-1364.87', '-2.3', '0', '1040', null); +INSERT INTO `server_spawn_locations` VALUES ('1015', '1000616', 'zabinie', '129', '', '0', '-1889.73', '53.51', '-1364.93', '-2.6', '0', '1017', null); +INSERT INTO `server_spawn_locations` VALUES ('1016', '1500255', 'hortefense', '129', '', '0', '-1893.68', '53.41', '-1361.25', '3.12', '0', '0', null); +INSERT INTO `server_spawn_locations` VALUES ('1017', '1600137', 'dauid', '129', '', '0', '-1896.61', '53.42', '-1362.99', '2.82', '0', '0', null); +INSERT INTO `server_spawn_locations` VALUES ('1018', '1500223', 'storm_sergeant_stemn', '129', '', '0', '-1878.12', '53.86', '-1374.38', '-0.79', '0', '1045', null);