From 73a8dc5b4ae978b97a1d12d779ac281b7cdd5a28 Mon Sep 17 00:00:00 2001 From: KnowOne Date: Tue, 28 Jan 2025 21:31:22 -0600 Subject: [PATCH] make work with LSB --- scripts/globals/dark_rider.lua | 112 ++++++++---------- scripts/zones/Bhaflau_Thickets/IDs.lua | 1 + scripts/zones/Bhaflau_Thickets/Zone.lua | 11 +- .../npcs/Warhorse_Hoofprint.lua | 9 -- scripts/zones/Caedarva_Mire/IDs.lua | 1 + scripts/zones/Caedarva_Mire/Zone.lua | 12 +- .../Caedarva_Mire/npcs/Warhorse_Hoofprint.lua | 9 -- scripts/zones/Mount_Zhayolm/IDs.lua | 3 +- scripts/zones/Mount_Zhayolm/Zone.lua | 11 +- .../Mount_Zhayolm/npcs/Warhorse_Hoofprint.lua | 9 -- scripts/zones/Wajaom_Woodlands/IDs.lua | 1 + scripts/zones/Wajaom_Woodlands/Zone.lua | 12 +- .../npcs/Warhorse_Hoofprint.lua | 9 -- sql/npc_list.sql | 24 ++-- 14 files changed, 92 insertions(+), 132 deletions(-) delete mode 100644 scripts/zones/Bhaflau_Thickets/npcs/Warhorse_Hoofprint.lua delete mode 100644 scripts/zones/Caedarva_Mire/npcs/Warhorse_Hoofprint.lua delete mode 100644 scripts/zones/Mount_Zhayolm/npcs/Warhorse_Hoofprint.lua delete mode 100644 scripts/zones/Wajaom_Woodlands/npcs/Warhorse_Hoofprint.lua diff --git a/scripts/globals/dark_rider.lua b/scripts/globals/dark_rider.lua index ac3ac4309f8..816a3b1a3c2 100644 --- a/scripts/globals/dark_rider.lua +++ b/scripts/globals/dark_rider.lua @@ -1,35 +1,41 @@ -require('scripts/globals/zone') -require('scripts/globals/keyitems') -require('scripts/globals/npc_util') - -darkRider = {} -darkRider.MAX_HOOFPRINTS_PER_DAY = 2 +----------------------------------- +-- Warhorse Hoofprint global file +----------------------------------- +local bhaflauID = zones[xi.zone.BHAFLAU_THICKETS] +local caedarvaID = zones[xi.zone.CAEDARVA_MIRE] +local mountID = zones[xi.zone.MOUNT_ZHAYOLM] +local wajaomID = zones[xi.zone.WAJAOM_WOODLANDS] +----------------------------------- + +xi = xi or {} +xi.darkRider = {} +xi.darkRider.MAX_HOOFPRINTS_PER_DAY = 2 local hoofprintIds = { - [dsp.zone.WAJAOM_WOODLANDS] = { - 16986599, - 16986600, - 16986601, + [xi.zone.WAJAOM_WOODLANDS] = { + wajaomID.npc.HOOFPRINT, + wajaomID.npc.HOOFPRINT + 1, + wajaomID.npc.HOOFPRINT + 2, }, - [dsp.zone.BHAFLAU_THICKETS] = { - 16990560, - 16990561, - 16990562, + [xi.zone.BHAFLAU_THICKETS] = { + bhaflauID.npc.HOOFPRINT, + bhaflauID.npc.HOOFPRINT + 1, + bhaflauID.npc.HOOFPRINT + 2, }, - [dsp.zone.MOUNT_ZHAYOLM] = { - 17027510, - 17027511, - 17027512, + [xi.zone.MOUNT_ZHAYOLM] = { + mountID.npc.HOOFPRINT, + mountID.npc.HOOFPRINT + 1, + mountID.npc.HOOFPRINT + 2, }, - [dsp.zone.CAEDARVA_MIRE] = { - 17101242, - 17101243, - 17101244, + [xi.zone.CAEDARVA_MIRE] = { + caedarvaID.npc.HOOFPRINT, + caedarvaID.npc.HOOFPRINT + 1, + caedarvaID.npc.HOOFPRINT + 2, }, } local hoofprintPositions = { - [dsp.zone.WAJAOM_WOODLANDS] = { + [xi.zone.WAJAOM_WOODLANDS] = { { 400, -24, 2 }, -- K-9 { 345, -18, -41 }, -- J-9 E edge { 221, -18, -63 }, -- J-9 W edge @@ -52,7 +58,7 @@ local hoofprintPositions = { { -360, -32, 680 }, -- F-5 behind tower { 105, -26, 320 }, -- I-7 }, - [dsp.zone.BHAFLAU_THICKETS] = { + [xi.zone.BHAFLAU_THICKETS] = { { 447, -18, 266 }, -- I-8 { 425, -20.25, 239 }, -- I-9 { 298, -8.5, 211 }, -- H-8 center of open area @@ -66,7 +72,7 @@ local hoofprintPositions = { { 336, -18, 380 }, -- H-7 SE corner { 379, -17, 380 }, -- I-7 in tunnel }, - [dsp.zone.MOUNT_ZHAYOLM] = { + [xi.zone.MOUNT_ZHAYOLM] = { { -401, -14.5, 374 }, -- D/E-6 { -458, -13, 357 }, -- D-6 { -350, -14, 330 }, -- E-6 near manhole cover @@ -76,7 +82,7 @@ local hoofprintPositions = { { 598, -14, -4 }, -- K-8 { 762, -14.5, -55 }, -- L-8 }, - [dsp.zone.CAEDARVA_MIRE] = { + [xi.zone.CAEDARVA_MIRE] = { { -600, 4.5, -100 }, -- G-9 (2nd map) { 212, 0, -533 }, -- I-9 { 280, -16, -357 }, -- J-8 @@ -87,17 +93,13 @@ local hoofprintPositions = { }, } - local hoofprintZones = {} for zoneId, _ in pairs(hoofprintPositions) do - hoofprintZones[#hoofprintZones+1] = zoneId + hoofprintZones[#hoofprintZones + 1] = zoneId end -darkRider.zone = {} - -- Adds hoofprints if the current zone is the one picked for that day -function darkRider.zone.addHoofprints(zone) - +xi.darkRider.addHoofprints = function(zone) -- We need a random number that's the same across servers, -- so we add a bunch of vanadiel time values, which will be the same across servers, but should -- result in a seemingly "random" area and positions each time when combined with the modulo operator. @@ -113,10 +115,10 @@ function darkRider.zone.addHoofprints(zone) local possiblePositions = utils.shuffle(hoofprintPositions[zone:getID()]) local possibleHoofprintIds = hoofprintIds[zone:getID()] - local daysSinceEpoch = VanadielDaySinceEpoch() - local currentHoofprintCount = zone:getLocalVar("HoofprintCount") + local daysSinceEpoch = VanadielUniqueDay() + local currentHoofprintCount = zone:getLocalVar('HoofprintCount') - local hoofprintsToAdd = math.fmod(fakeRandomNum, darkRider.MAX_HOOFPRINTS_PER_DAY) + 1 + local hoofprintsToAdd = math.fmod(fakeRandomNum, xi.darkRider.MAX_HOOFPRINTS_PER_DAY) + 1 for i = 1, #possibleHoofprintIds do if hoofprintsToAdd <= 0 then @@ -124,59 +126,47 @@ function darkRider.zone.addHoofprints(zone) end local hoofprint = GetNPCByID(possibleHoofprintIds[i]) - if hoofprint ~= nil and hoofprint:getStatus() ~= dsp.status.NORMAL then + if hoofprint ~= nil and hoofprint:getStatus() ~= xi.status.NORMAL then hoofprint:setPos(possiblePositions[i]) - hoofprint:setStatus(dsp.status.NORMAL) - hoofprint:untargetable(false) - hoofprint:setLocalVar("DaysSinceEpoch", daysSinceEpoch) + hoofprint:setStatus(xi.status.NORMAL) + hoofprint:setLocalVar('DaysSinceEpoch', daysSinceEpoch) currentHoofprintCount = currentHoofprintCount + 1 hoofprintsToAdd = hoofprintsToAdd - 1 else - printf("Did not find hoofprint with ID: %d", possibleHoofprintIds[i]) + printf('Did not find hoofprint with ID: %d', possibleHoofprintIds[i]) end end - zone:setLocalVar("HoofprintCount", currentHoofprintCount) + zone:setLocalVar('HoofprintCount', currentHoofprintCount) end -- Remove hoofprints at 06:00 from previous day -function darkRider.zone.onGameHour(zone) +xi.darkRider.onGameHour = function(zone) if VanadielHour() ~= 6 then return end - local hoofprintCount = zone:getLocalVar("HoofprintCount") + local hoofprintCount = zone:getLocalVar('HoofprintCount') if hoofprintCount == 0 then return end - local daysSinceEpoch = VanadielDaySinceEpoch() + local daysSinceEpoch = VanadielUniqueDay() local possibleHoofprintIds = hoofprintIds[zone:getID()] for i = 1, #possibleHoofprintIds do local hoofprint = GetNPCByID(possibleHoofprintIds[i]) -- Hide hoofprint if it was shown in a previous day - if hoofprint ~= nil and - hoofprint:getStatus() == dsp.status.NORMAL and - hoofprint:getLocalVar("DaysSinceEpoch") < daysSinceEpoch + if + hoofprint ~= nil and + hoofprint:getStatus() == xi.status.NORMAL and + hoofprint:getLocalVar('DaysSinceEpoch') < daysSinceEpoch then - hoofprint:setStatus(dsp.status.DISAPPEAR) - hoofprint:untargetable(true) + hoofprint:setStatus(xi.status.DISAPPEAR) hoofprint:resetLocalVars() hoofprintCount = hoofprintCount - 1 end end - zone:setLocalVar("HoofprintCount", hoofprintCount) -end - - -function darkRider.hoofprintTrigger(player, npc) - if not player:hasKeyItem(dsp.ki.SP_WILDCAT_BADGE) then - if player:hasKeyItem(dsp.ki.DARK_RIDER_HOOFPRINT) or player:getVar("[Assault]SP") == 0 then - return - end - - npcUtil.giveKeyItem(player, dsp.ki.DARK_RIDER_HOOFPRINT) - end + zone:setLocalVar('HoofprintCount', hoofprintCount) end diff --git a/scripts/zones/Bhaflau_Thickets/IDs.lua b/scripts/zones/Bhaflau_Thickets/IDs.lua index c38e0f2e137..48ae6c953c5 100644 --- a/scripts/zones/Bhaflau_Thickets/IDs.lua +++ b/scripts/zones/Bhaflau_Thickets/IDs.lua @@ -55,6 +55,7 @@ zones[xi.zone.BHAFLAU_THICKETS] = npc = { HARVESTING = GetTableOfIDs('Harvesting_Point'), + HOOFPRINT = GetFirstID('Warhorse_Hoofprint'), }, } diff --git a/scripts/zones/Bhaflau_Thickets/Zone.lua b/scripts/zones/Bhaflau_Thickets/Zone.lua index 1aa3dd0c7c0..e777b3c5226 100644 --- a/scripts/zones/Bhaflau_Thickets/Zone.lua +++ b/scripts/zones/Bhaflau_Thickets/Zone.lua @@ -11,7 +11,7 @@ zoneObject.onInitialize = function(zone) GetMobByID(ID.mob.HARVESTMAN):setRespawnTime(math.random(900, 10800)) xi.helm.initZone(zone, xi.helmType.HARVESTING) - darkRider.zone.addHoofprints(zone) + xi.darkRider.addHoofprints(zone) end zoneObject.onZoneIn = function(player, prevZone) @@ -38,12 +38,11 @@ zoneObject.afterZoneIn = function(player) end zoneObject.onGameHour = function(zone) - updateZoneDigItems(zone) - darkRider.zone.onGameHour(zone) -end + xi.darkRider.onGameHour(zone) -zoneObjectonGameDay = function(zone) - darkRider.zone.addHoofprints(zone) + if VanadielHour() == 0 then + xi.darkRider.addHoofprints(zone) + end end zoneObject.onEventUpdate = function(player, csid, option, npc) diff --git a/scripts/zones/Bhaflau_Thickets/npcs/Warhorse_Hoofprint.lua b/scripts/zones/Bhaflau_Thickets/npcs/Warhorse_Hoofprint.lua deleted file mode 100644 index 0393aa915b0..00000000000 --- a/scripts/zones/Bhaflau_Thickets/npcs/Warhorse_Hoofprint.lua +++ /dev/null @@ -1,9 +0,0 @@ ------------------------------------ --- Area: Bhaflau Thickets --- NPC: Warhorse Hoofprint ------------------------------------ -require("scripts/globals/dark_rider") - -function onTrigger(player, npc) - return darkRider.hoofprintTrigger(player, npc) -end diff --git a/scripts/zones/Caedarva_Mire/IDs.lua b/scripts/zones/Caedarva_Mire/IDs.lua index 9a85da747e5..231b64691af 100644 --- a/scripts/zones/Caedarva_Mire/IDs.lua +++ b/scripts/zones/Caedarva_Mire/IDs.lua @@ -69,6 +69,7 @@ zones[xi.zone.CAEDARVA_MIRE] = LOGGING = GetTableOfIDs('Logging_Point'), RUNIC_PORTAL_AZOUPH = GetFirstID('Runic_Portal_Azouph'), RUNIC_PORTAL_DVUCCA = GetFirstID('Runic_Portal_Dvucca'), + HOOFPRINT = GetFirstID('Warhorse_Hoofprint'), }, } diff --git a/scripts/zones/Caedarva_Mire/Zone.lua b/scripts/zones/Caedarva_Mire/Zone.lua index db0082c5ac3..60cc4737ad4 100644 --- a/scripts/zones/Caedarva_Mire/Zone.lua +++ b/scripts/zones/Caedarva_Mire/Zone.lua @@ -12,7 +12,7 @@ zoneObject.onInitialize = function(zone) GetMobByID(ID.mob.KHIMAIRA):setRespawnTime(math.random(12, 36) * 3600) -- 12 to 36 hours after maintenance, in 1-hour increments xi.helm.initZone(zone, xi.helmType.LOGGING) - darkRider.zone.addHoofprints(zone) + xi.darkRider.addHoofprints(zone) end zoneObject.onZoneIn = function(player, prevZone) @@ -47,12 +47,12 @@ end zoneObject.onTriggerAreaEnter = function(player, triggerArea) end -zoneObject.onGameDay = function(zone) - darkRider.zone.addHoofprints(zone) -end - zoneObject.onGameHour = function(zone) - darkRider.zone.onGameHour(zone) + xi.darkRider.onGameHour(zone) + + if VanadielHour() == 0 then + xi.darkRider.addHoofprints(zone) + end end zoneObject.onEventUpdate = function(player, csid, option, npc) diff --git a/scripts/zones/Caedarva_Mire/npcs/Warhorse_Hoofprint.lua b/scripts/zones/Caedarva_Mire/npcs/Warhorse_Hoofprint.lua deleted file mode 100644 index 45d357a71d2..00000000000 --- a/scripts/zones/Caedarva_Mire/npcs/Warhorse_Hoofprint.lua +++ /dev/null @@ -1,9 +0,0 @@ ------------------------------------ --- Area: Caedarva Mire --- NPC: Warhorse Hoofprint ------------------------------------ -require("scripts/globals/dark_rider") - -function onTrigger(player, npc) - return darkRider.hoofprintTrigger(player, npc) -end diff --git a/scripts/zones/Mount_Zhayolm/IDs.lua b/scripts/zones/Mount_Zhayolm/IDs.lua index 0f6501ad8ec..a78da661be5 100644 --- a/scripts/zones/Mount_Zhayolm/IDs.lua +++ b/scripts/zones/Mount_Zhayolm/IDs.lua @@ -55,7 +55,8 @@ zones[xi.zone.MOUNT_ZHAYOLM] = }, npc = { - MINING = GetTableOfIDs('Mining_Point'), + MINING = GetTableOfIDs('Mining_Point'), + HOOFPRINT = GetFirstID('Warhorse_Hoofprint'), }, } diff --git a/scripts/zones/Mount_Zhayolm/Zone.lua b/scripts/zones/Mount_Zhayolm/Zone.lua index 03cd42f9db7..dd6ab740e96 100644 --- a/scripts/zones/Mount_Zhayolm/Zone.lua +++ b/scripts/zones/Mount_Zhayolm/Zone.lua @@ -10,7 +10,7 @@ zoneObject.onInitialize = function(zone) GetMobByID(ID.mob.CERBERUS):setRespawnTime(math.random(12, 36) * 3600) xi.helm.initZone(zone, xi.helmType.MINING) - darkRider.zone.addHoofprints(zone) + xi.darkRider.addHoofprints(zone) end zoneObject.onZoneIn = function(player, prevZone) @@ -37,13 +37,16 @@ end zoneObject.onTriggerAreaEnter = function(player, triggerArea) end -zoneObject.onGameDay = function(zone) +zoneObject.onGameDay = function() xi.apkallu.updateHate(xi.zone.MOUNT_ZHAYOLM, -3) - darkRider.zone.addHoofprints(zone) end zoneObject.onGameHour = function(zone) - darkRider.zone.onGameHour(zone) + xi.darkRider.onGameHour(zone) + + if VanadielHour() == 0 then + xi.darkRider.addHoofprints(zone) + end end zoneObject.onEventUpdate = function(player, csid, option, npc) diff --git a/scripts/zones/Mount_Zhayolm/npcs/Warhorse_Hoofprint.lua b/scripts/zones/Mount_Zhayolm/npcs/Warhorse_Hoofprint.lua deleted file mode 100644 index 28c06345a18..00000000000 --- a/scripts/zones/Mount_Zhayolm/npcs/Warhorse_Hoofprint.lua +++ /dev/null @@ -1,9 +0,0 @@ ------------------------------------ --- Area: Mount Zhayolm --- NPC: Warhorse Hoofprint ------------------------------------ -require("scripts/globals/dark_rider") - -function onTrigger(player, npc) - return darkRider.hoofprintTrigger(player, npc) -end diff --git a/scripts/zones/Wajaom_Woodlands/IDs.lua b/scripts/zones/Wajaom_Woodlands/IDs.lua index f9a1c7e359b..95df3fb4108 100644 --- a/scripts/zones/Wajaom_Woodlands/IDs.lua +++ b/scripts/zones/Wajaom_Woodlands/IDs.lua @@ -50,6 +50,7 @@ zones[xi.zone.WAJAOM_WOODLANDS] = npc = { HARVESTING = GetTableOfIDs('Harvesting_Point'), + HOOFPRINT = GetFirstID('Warhorse_Hoofprint'), }, } diff --git a/scripts/zones/Wajaom_Woodlands/Zone.lua b/scripts/zones/Wajaom_Woodlands/Zone.lua index 06ddbd09bb9..af9f6ce5849 100644 --- a/scripts/zones/Wajaom_Woodlands/Zone.lua +++ b/scripts/zones/Wajaom_Woodlands/Zone.lua @@ -7,7 +7,7 @@ local zoneObject = {} zoneObject.onInitialize = function(zone) xi.helm.initZone(zone, xi.helmType.HARVESTING) xi.chocobo.initZone(zone) - darkRider.zone.addHoofprints(zone) + xi.darkRider.addHoofprints(zone) end zoneObject.onZoneIn = function(player, prevZone) @@ -27,12 +27,12 @@ end zoneObject.onTriggerAreaEnter = function(player, triggerArea) end -zoneObject.onGameDay = function(zone) - darkRider.zone.addHoofprints(zone) -end - zoneObject.onGameHour = function(zone) - darkRider.zone.onGameHour(zone) + xi.darkRider.onGameHour(zone) + + if VanadielHour() == 0 then + xi.darkRider.addHoofprints(zone) + end end zoneObject.onEventUpdate = function(player, csid, option, npc) diff --git a/scripts/zones/Wajaom_Woodlands/npcs/Warhorse_Hoofprint.lua b/scripts/zones/Wajaom_Woodlands/npcs/Warhorse_Hoofprint.lua deleted file mode 100644 index b29bc03f68d..00000000000 --- a/scripts/zones/Wajaom_Woodlands/npcs/Warhorse_Hoofprint.lua +++ /dev/null @@ -1,9 +0,0 @@ ------------------------------------ --- Area: Wajaom Woodlands --- NPC: Warhorse Hoofprint ------------------------------------ -require("scripts/globals/dark_rider") - -function onTrigger(player, npc) - return darkRider.hoofprintTrigger(player, npc) -end diff --git a/sql/npc_list.sql b/sql/npc_list.sql index be6e21e66a9..c2454825e04 100644 --- a/sql/npc_list.sql +++ b/sql/npc_list.sql @@ -4630,9 +4630,9 @@ INSERT INTO `npc_list` VALUES (16982653,'qm','???',0,0.000,0.000,0.000,0,50,50,0 INSERT INTO `npc_list` VALUES (16986598,'NPC[1e6]','NPC',0,0.000,0.000,0.000,0,50,50,0,0,0,2,3,0x0000320000000000000000000000000000000000,0,NULL,1); INSERT INTO `npc_list` VALUES (16986599,'NPC[1e7]','NPC',0,0.000,0.000,0.000,0,50,50,0,0,0,2,3,0x0000320000000000000000000000000000000000,0,NULL,1); INSERT INTO `npc_list` VALUES (16986600,'Peculiar_Bud','Peculiar Bud',0,-485.000,-28.000,-744.000,8,40,40,0,0,0,2,3,0x0000340000000000000000000000000000000000,0,'TOAU',1); -INSERT INTO `npc_list` VALUES (16986601,'Warhorse_Hoofprint','Warhorse Hoofprint',0,0.000,0.000,0.000,0,40,40,0,0,0,2,3,0x0000340000000000000000000000000000000000,0,'TOAU',1); -INSERT INTO `npc_list` VALUES (16986602,'Warhorse_Hoofprint','Warhorse Hoofprint',0,0.000,0.000,0.000,0,40,40,0,0,0,2,3,0x0000340000000000000000000000000000000000,0,'TOAU',1); -INSERT INTO `npc_list` VALUES (16986603,'Warhorse_Hoofprint','Warhorse Hoofprint',0,0.000,0.000,0.000,0,40,40,0,0,0,2,3,0x0000340000000000000000000000000000000000,0,'TOAU',1); +INSERT INTO `npc_list` VALUES (16986601,'Warhorse_Hoofprint','Warhorse Hoofprint',0,1.000,0.000,0.000,7,40,40,0,0,32,2,27,0x0000340000000000000000000000000000000000,32,'TOAU',1); +INSERT INTO `npc_list` VALUES (16986602,'Warhorse_Hoofprint','Warhorse Hoofprint',0,1.000,0.000,0.000,7,40,40,0,0,32,2,27,0x0000340000000000000000000000000000000000,32,'TOAU',1); +INSERT INTO `npc_list` VALUES (16986603,'Warhorse_Hoofprint','Warhorse Hoofprint',0,1.000,0.000,0.000,7,40,40,0,0,32,2,27,0x0000340000000000000000000000000000000000,32,'TOAU',1); INSERT INTO `npc_list` VALUES (16986604,'NPC[1ec]','NPC',0,0.000,0.000,0.000,0,50,50,0,0,0,2,3,0x0000320000000000000000000000000000000000,0,NULL,1); INSERT INTO `npc_list` VALUES (16986605,'qm1','???',252,-695.558,-7.500,-126.721,1,40,40,0,0,0,0,3,0x0000340000000000000000000000000000000000,0,'TOAU',0); INSERT INTO `npc_list` VALUES (16986606,'qm2','???',187,257.462,-23.433,120.741,1,40,40,0,0,0,0,3,0x0000340000000000000000000000000000000000,0,'TOAU',0); @@ -4864,9 +4864,9 @@ INSERT INTO `npc_list` VALUES (16986829,'Ethereal_Junction','Ethereal Junction', -- Bhaflau Thickets (Zone 52) -- ------------------------------------------------------------ -INSERT INTO `npc_list` VALUES (16990593,'Warhorse_Hoofprint','Warhorse Hoofprint',0,130.335,-35.292,498.318,6,40,40,0,0,0,0,3,0x0000340000000000000000000000000000000000,0,'TOAU',1); -INSERT INTO `npc_list` VALUES (16990594,'Warhorse_Hoofprint','Warhorse Hoofprint',0,58.927,-34.997,580.882,7,40,40,0,0,0,0,3,0x0000340000000000000000000000000000000000,0,'TOAU',1); -INSERT INTO `npc_list` VALUES (16990595,'Warhorse_Hoofprint','Warhorse Hoofprint',0,257.156,-27.492,449.737,7,40,40,0,0,0,0,3,0x0000340000000000000000000000000000000000,0,'TOAU',1); +INSERT INTO `npc_list` VALUES (16990593,'Warhorse_Hoofprint','Warhorse Hoofprint',0,1.000,0.000,0.000,7,40,40,0,0,32,2,27,0x0000340000000000000000000000000000000000,32,'TOAU',1); +INSERT INTO `npc_list` VALUES (16990594,'Warhorse_Hoofprint','Warhorse Hoofprint',0,1.000,0.000,0.000,7,40,40,0,0,32,2,27,0x0000340000000000000000000000000000000000,32,'TOAU',1); +INSERT INTO `npc_list` VALUES (16990595,'Warhorse_Hoofprint','Warhorse Hoofprint',0,1.000,0.000,0.000,7,40,40,0,0,32,2,27,0x0000340000000000000000000000000000000000,32,'TOAU',1); INSERT INTO `npc_list` VALUES (16990596,'qm1','???',104,331.456,-10.000,182.845,1,40,40,0,0,0,0,3,0x0000340000000000000000000000000000000000,0,'TOAU',0); INSERT INTO `npc_list` VALUES (16990597,'qm4','???',192,460.166,-14.926,256.214,1,40,40,0,0,0,0,3,0x0000340000000000000000000000000000000000,0,'TOAU',0); INSERT INTO `npc_list` VALUES (16990598,'Achieve_Master','Achieve Master',0,0.000,0.000,0.000,0,50,50,0,0,0,2,3,0x0000320000000000000000000000000000000000,0,'SOA',0); @@ -5677,9 +5677,9 @@ INSERT INTO `npc_list` VALUES (17023067,'_1o3','FX_TEST_1o3',0,17.971,-24.021,3. -- ----------------------------------------------------------- INSERT INTO `npc_list` VALUES (17027510,'Peculiar_Seed','Peculiar Seed',0,858.000,-15.000,223.000,6,40,40,0,0,0,2,3,0x0000340000000000000000000000000000000000,0,'TOAU',1); -INSERT INTO `npc_list` VALUES (17027511,'Warhorse_Hoofprint','Warhorse Hoofprint',0,0.000,0.000,0.000,0,40,40,0,0,0,2,3,0x0000340000000000000000000000000000000000,0,'TOAU',1); -INSERT INTO `npc_list` VALUES (17027512,'Warhorse_Hoofprint','Warhorse Hoofprint',0,0.000,0.000,0.000,0,40,40,0,0,0,2,3,0x0000340000000000000000000000000000000000,0,'TOAU',1); -INSERT INTO `npc_list` VALUES (17027513,'Warhorse_Hoofprint','Warhorse Hoofprint',0,0.000,0.000,0.000,0,40,40,0,0,0,2,3,0x0000340000000000000000000000000000000000,0,'TOAU',1); +INSERT INTO `npc_list` VALUES (17027511,'Warhorse_Hoofprint','Warhorse Hoofprint',0,1.000,0.000,0.000,7,40,40,0,0,32,2,27,0x0000340000000000000000000000000000000000,32,'TOAU',1); +INSERT INTO `npc_list` VALUES (17027512,'Warhorse_Hoofprint','Warhorse Hoofprint',0,1.000,0.000,0.000,7,40,40,0,0,32,2,27,0x0000340000000000000000000000000000000000,32,'TOAU',1); +INSERT INTO `npc_list` VALUES (17027513,'Warhorse_Hoofprint','Warhorse Hoofprint',0,1.000,0.000,0.000,7,40,40,0,0,32,2,27,0x0000340000000000000000000000000000000000,32,'TOAU',1); -- 17027514 gap INSERT INTO `npc_list` VALUES (17027515,'qm1','???',162,402.600,-27.513,121.544,1,40,40,0,0,0,0,3,0x0000340000000000000000000000000000000000,0,'TOAU',0); INSERT INTO `npc_list` VALUES (17027516,'qm2','???',238,501.415,-8.768,52.986,1,40,40,0,0,0,0,3,0x0000340000000000000000000000000000000000,0,'TOAU',0); @@ -7867,9 +7867,9 @@ INSERT INTO `npc_list` VALUES (17097374,'4','4',128,5.604,0.000,47.149,0,40,40,0 -- ------------------------------------------------------------ INSERT INTO `npc_list` VALUES (17101287,'Peculiar_Plant','Peculiar Plant',0,0.000,0.000,0.000,0,40,40,0,0,0,2,3,0x0000340000000000000000000000000000000000,0,'TOAU',1); -INSERT INTO `npc_list` VALUES (17101288,'Warhorse_Hoofprint','Warhorse Hoofprint',0,420.568,-19.807,-85.785,7,40,40,0,0,0,0,3,0x0000340000000000000000000000000000000000,0,'TOAU',1); -INSERT INTO `npc_list` VALUES (17101289,'Warhorse_Hoofprint','Warhorse Hoofprint',0,397.899,-8.557,0.000,0,40,40,0,0,0,2,3,0x0000340000000000000000000000000000000000,0,'TOAU',1); -INSERT INTO `npc_list` VALUES (17101290,'Warhorse_Hoofprint','Warhorse Hoofprint',0,389.040,-17.686,0.000,0,40,40,0,0,0,2,3,0x0000340000000000000000000000000000000000,0,'TOAU',1); +INSERT INTO `npc_list` VALUES (17101288,'Warhorse_Hoofprint','Warhorse Hoofprint',0,1.000,0.000,0.000,7,40,40,0,0,32,2,27,0x0000340000000000000000000000000000000000,32,'TOAU',1); +INSERT INTO `npc_list` VALUES (17101289,'Warhorse_Hoofprint','Warhorse Hoofprint',0,1.000,0.000,0.000,7,40,40,0,0,32,2,27,0x0000340000000000000000000000000000000000,32,'TOAU',1); +INSERT INTO `npc_list` VALUES (17101290,'Warhorse_Hoofprint','Warhorse Hoofprint',0,1.000,0.000,0.000,7,40,40,0,0,32,2,27,0x0000340000000000000000000000000000000000,32,'TOAU',1); INSERT INTO `npc_list` VALUES (17101291,'NPC[1C7]','',0,0.000,0.000,0.000,0,40,40,0,0,0,2,1,0x0000320000000000000000000000000000000000,0,'TOAU',1); INSERT INTO `npc_list` VALUES (17101292,'qm1','???',0,417.795,-19.631,-74.338,1,40,40,0,0,0,0,3,0x0000340000000000000000000000000000000000,0,'TOAU',0); INSERT INTO `npc_list` VALUES (17101293,'qm2','???',0,-771.466,-11.750,322.087,1,40,40,0,0,0,0,3,0x0000340000000000000000000000000000000000,0,'TOAU',0);