From 4e6902207238a91564917d9b0924d08fcb6de0fe Mon Sep 17 00:00:00 2001 From: Filip Maj Date: Fri, 17 Jun 2016 23:17:24 -0400 Subject: [PATCH 01/15] New style of scripting for better complex menus. --- FFXIVClassic Map Server/PacketProcessor.cs | 10 +- .../actors/chara/npc/Npc.cs | 29 +++--- .../actors/chara/player/Player.cs | 46 ++++++--- .../dataobjects/ConnectedPlayer.cs | 20 ++-- FFXIVClassic Map Server/lua/LuaEngine.cs | 8 +- .../npc/populace/shop/PopulaceGuildShop.lua | 15 +++ .../populace/shop/PopulaceShopSalesman.lua | 94 +++++++++++++++++-- .../PopulaceShopSalesman/jossy.lua | 6 ++ 8 files changed, 170 insertions(+), 58 deletions(-) create mode 100644 data/scripts/unique/sea0Town01a/PopulaceShopSalesman/jossy.lua diff --git a/FFXIVClassic Map Server/PacketProcessor.cs b/FFXIVClassic Map Server/PacketProcessor.cs index 09b203aa..43ac25c8 100644 --- a/FFXIVClassic Map Server/PacketProcessor.cs +++ b/FFXIVClassic Map Server/PacketProcessor.cs @@ -273,8 +273,8 @@ namespace FFXIVClassic_Map_Server } } } - - LuaEngine.DoActorOnEventStarted(player.GetActor(), ownerActor, eventStart); + + player.GetActor().StartEvent(ownerActor, eventStart); Program.Log.Debug("\n===Event START===\nSource Actor: 0x{0:X}\nCaller Actor: 0x{1:X}\nVal1: 0x{2:X}\nVal2: 0x{3:X}\nEvent Starter: {4}\nParams: {5}", eventStart.actorID, eventStart.scriptOwnerActorID, eventStart.val1, eventStart.val2, eventStart.triggerName, LuaUtils.DumpParams(eventStart.luaParams)); break; @@ -286,7 +286,7 @@ namespace FFXIVClassic_Map_Server subpacket.DebugPrintSubPacket(); EventUpdatePacket eventUpdate = new EventUpdatePacket(subpacket.data); Program.Log.Debug("\n===Event UPDATE===\nSource Actor: 0x{0:X}\nCaller Actor: 0x{1:X}\nVal1: 0x{2:X}\nVal2: 0x{3:X}\nStep: 0x{4:X}\nParams: {5}", eventUpdate.actorID, eventUpdate.scriptOwnerActorID, eventUpdate.val1, eventUpdate.val2, eventUpdate.step, LuaUtils.DumpParams(eventUpdate.luaParams)); - + /* //Is it a static actor? If not look in the player's instance Actor updateOwnerActor = Server.GetStaticActors(player.GetActor().currentEventOwner); if (updateOwnerActor == null) @@ -299,8 +299,10 @@ namespace FFXIVClassic_Map_Server if (updateOwnerActor == null) break; } + */ + player.GetActor().UpdateEvent(eventUpdate); - LuaEngine.DoActorOnEventUpdated(player.GetActor(), updateOwnerActor, eventUpdate); + //LuaEngine.DoActorOnEventUpdated(player.GetActor(), updateOwnerActor, eventUpdate); break; case 0x012F: diff --git a/FFXIVClassic Map Server/actors/chara/npc/Npc.cs b/FFXIVClassic Map Server/actors/chara/npc/Npc.cs index 69e43813..e12c367a 100644 --- a/FFXIVClassic Map Server/actors/chara/npc/Npc.cs +++ b/FFXIVClassic Map Server/actors/chara/npc/Npc.cs @@ -181,6 +181,11 @@ namespace FFXIVClassic_Map_Server.Actors return BasePacket.CreatePacket(propPacketUtil.Done(), true, false); } + public string GetUniqueId() + { + return uniqueIdentifier; + } + public uint GetActorClassId() { return actorClassId; @@ -322,7 +327,7 @@ namespace FFXIVClassic_Map_Server.Actors return lparams; } - public void DoEventStart(Player player, EventStartPacket eventStart) + public Coroutine GetEventStartCoroutine(Player player) { Script parent = null, child = null; @@ -331,31 +336,23 @@ namespace FFXIVClassic_Map_Server.Actors if (File.Exists(String.Format("./scripts/unique/{0}/{1}/{2}.lua", zone.zoneName, className, uniqueIdentifier))) child = LuaEngine.LoadScript(String.Format("./scripts/unique/{0}/{1}/{2}.lua", zone.zoneName, className, uniqueIdentifier)); - if (parent == null) + if (parent == null && child == null) { LuaEngine.SendError(player, String.Format("ERROR: Could not find script for actor {0}.", GetName())); - return; + return null; } - //Have to do this to combine LuaParams - List objects = new List(); - objects.Add(player); - objects.Add(this); - objects.Add(eventStart.triggerName); - - if (eventStart.luaParams != null) - objects.AddRange(LuaUtils.CreateLuaParamObjectList(eventStart.luaParams)); - //Run Script - DynValue result; + Coroutine coroutine; if (child != null && !child.Globals.Get("onEventStarted").IsNil()) - result = child.Call(child.Globals["onEventStarted"], objects.ToArray()); + coroutine = child.CreateCoroutine(child.Globals["onEventStarted"]).Coroutine; else if (!parent.Globals.Get("onEventStarted").IsNil()) - result = parent.Call(parent.Globals["onEventStarted"], objects.ToArray()); + coroutine = parent.CreateCoroutine(parent.Globals["onEventStarted"]).Coroutine; else - return; + return null; + return coroutine; } public void DoEventUpdate(Player player, EventUpdatePacket eventUpdate) diff --git a/FFXIVClassic Map Server/actors/chara/player/Player.cs b/FFXIVClassic Map Server/actors/chara/player/Player.cs index 53be333c..215da839 100644 --- a/FFXIVClassic Map Server/actors/chara/player/Player.cs +++ b/FFXIVClassic Map Server/actors/chara/player/Player.cs @@ -15,6 +15,8 @@ using FFXIVClassic_Map_Server.packets.send.player; using FFXIVClassic_Map_Server.utils; using System; using System.Collections.Generic; +using MoonSharp.Interpreter; +using FFXIVClassic_Map_Server.packets.receive.events; namespace FFXIVClassic_Map_Server.Actors { @@ -82,8 +84,8 @@ namespace FFXIVClassic_Map_Server.Actors public uint currentCommand = 0; public string currentCommandName = ""; - - public uint eventMenuId = 0; + + public Coroutine currentEventRunning; //Player Info public uint[] timers = new uint[20]; @@ -1118,6 +1120,35 @@ namespace FFXIVClassic_Map_Server.Actors QueuePacket(spacket); } + public void StartEvent(Actor owner, EventStartPacket start) + { + //Have to do this to combine LuaParams + List objects = new List(); + objects.Add(this); + objects.Add(owner); + objects.Add(start.triggerName); + + if (start.luaParams != null) + objects.AddRange(LuaUtils.CreateLuaParamObjectList(start.luaParams)); + + if (owner is Npc) + { + currentEventRunning = ((Npc)owner).GetEventStartCoroutine(this); + currentEventRunning.Resume(objects.ToArray()); + } + else + LuaEngine.DoActorOnEventStarted(this, owner, start); + } + + public void UpdateEvent(EventUpdatePacket update) + { + if (currentEventRunning == null) + return; + + if (currentEventRunning.State == CoroutineState.Suspended) + currentEventRunning.Resume(LuaUtils.CreateLuaParamObjectList(update.luaParams)); + } + public void KickEvent(Actor actor, string conditionName, params object[] parameters) { if (actor == null) @@ -1150,7 +1181,6 @@ namespace FFXIVClassic_Map_Server.Actors currentEventOwner = 0; currentEventName = ""; - eventMenuId = 0; } public void EndCommand() @@ -1163,16 +1193,6 @@ namespace FFXIVClassic_Map_Server.Actors currentCommandName = ""; } - public void SetCurrentMenuId(uint id) - { - eventMenuId = id; - } - - public uint GetCurrentMenuId() - { - return eventMenuId; - } - public void SendInstanceUpdate() { diff --git a/FFXIVClassic Map Server/dataobjects/ConnectedPlayer.cs b/FFXIVClassic Map Server/dataobjects/ConnectedPlayer.cs index f5eef9a4..e2f59293 100644 --- a/FFXIVClassic Map Server/dataobjects/ConnectedPlayer.cs +++ b/FFXIVClassic Map Server/dataobjects/ConnectedPlayer.cs @@ -47,7 +47,7 @@ namespace FFXIVClassic_Map_Server.dataobjects break; } } - + public bool IsClientConnectionsReady() { return (zoneConnection != null && chatConnection != null); @@ -57,7 +57,7 @@ namespace FFXIVClassic_Map_Server.dataobjects { zoneConnection.Disconnect(); chatConnection.Disconnect(); - } + } public bool IsDisconnected() { @@ -71,7 +71,7 @@ namespace FFXIVClassic_Map_Server.dataobjects public void QueuePacket(SubPacket subPacket, bool isAuthed, bool isEncrypted) { - zoneConnection.QueuePacket(subPacket, isAuthed, isEncrypted); + zoneConnection.QueuePacket(subPacket, isAuthed, isEncrypted); } public Player GetActor() @@ -97,7 +97,7 @@ namespace FFXIVClassic_Map_Server.dataobjects } public void UpdatePlayerActorPosition(float x, float y, float z, float rot, ushort moveState) - { + { playerActor.oldPositionX = playerActor.positionX; playerActor.oldPositionY = playerActor.positionY; playerActor.oldPositionZ = playerActor.positionZ; @@ -110,11 +110,11 @@ namespace FFXIVClassic_Map_Server.dataobjects playerActor.moveState = moveState; GetActor().zone.UpdateActorPosition(GetActor()); - - } - + + } + public void UpdateInstance(List list) - { + { List basePackets = new List(); List RemoveActorSubpackets = new List(); List posUpdateSubpackets = new List(); @@ -125,7 +125,7 @@ namespace FFXIVClassic_Map_Server.dataobjects if (!list.Contains(actorInstanceList[i])) { GetActor().QueuePacket(RemoveActorPacket.BuildPacket(playerActor.actorId, actorInstanceList[i].actorId)); - actorInstanceList.RemoveAt(i); + actorInstanceList.RemoveAt(i); } } @@ -145,7 +145,7 @@ namespace FFXIVClassic_Map_Server.dataobjects { GetActor().QueuePacket(actor.GetSpawnPackets(playerActor.actorId, 1)); GetActor().QueuePacket(actor.GetInitPackets(playerActor.actorId)); - GetActor().QueuePacket(actor.GetSetEventStatusPackets(playerActor.actorId)); + GetActor().QueuePacket(actor.GetSetEventStatusPackets(playerActor.actorId)); actorInstanceList.Add(actor); if (actor is Npc) diff --git a/FFXIVClassic Map Server/lua/LuaEngine.cs b/FFXIVClassic Map Server/lua/LuaEngine.cs index fef4e299..fa1db54c 100644 --- a/FFXIVClassic Map Server/lua/LuaEngine.cs +++ b/FFXIVClassic Map Server/lua/LuaEngine.cs @@ -57,13 +57,7 @@ namespace FFXIVClassic_Map_Server.lua } public static void DoActorOnEventStarted(Player player, Actor target, EventStartPacket eventStart) - { - if (target is Npc) - { - ((Npc)target).DoEventStart(player, eventStart); - return; - } - + { string luaPath; if (target is Command) diff --git a/data/scripts/base/chara/npc/populace/shop/PopulaceGuildShop.lua b/data/scripts/base/chara/npc/populace/shop/PopulaceGuildShop.lua index dcdb098b..a3727d1f 100644 --- a/data/scripts/base/chara/npc/populace/shop/PopulaceGuildShop.lua +++ b/data/scripts/base/chara/npc/populace/shop/PopulaceGuildShop.lua @@ -45,6 +45,21 @@ function onEventStarted(player, npc) end player:RunEventFunction("welcomeTalk", nil, saySheetId, player); + coroutine.yield(); + + while (true) do + player:RunEventFunction("selectMode", nil, npc:GetActorClassId(), false, 1000001); --Step 2, state your business + choice = coroutine.yield(); + + if (choice == 3) then + + elseif (choice == 4) then + player:EndEvent(); + break; + end + + end + end function onEventUpdate(player, npc, step, menuOptionSelected) diff --git a/data/scripts/base/chara/npc/populace/shop/PopulaceShopSalesman.lua b/data/scripts/base/chara/npc/populace/shop/PopulaceShopSalesman.lua index a06d99ce..067cf001 100644 --- a/data/scripts/base/chara/npc/populace/shop/PopulaceShopSalesman.lua +++ b/data/scripts/base/chara/npc/populace/shop/PopulaceShopSalesman.lua @@ -1,15 +1,93 @@ +--[[ + +PopulaceShopSalesman Script + +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 + +openShopBuy(player, shopPack, currancyItemId) - ShopPack: Items to appear in window. CurrancyItemId: What is being used to buy these items. +selectShopBuy(player) - Call after openShopBuy() to open widget +closeShopBuy(player) - Closes the buy window + +openShopSell(player) - Call this to open sell window +selectShopSell(player) - Call after openShopSell() +closeShopSell(player) - Closes the sell window + +selectFacility(?, sheetId, 3) - Opens the facility chooser. +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 + +finishTalkTurn() - Done at the end. + +--]] + +function callClientFunction(player, functionName, ...) + player:RunEventFunction(functionName, ...); + result = coroutine.yield(); + return result; +end + function init(npc) return false, false, 0, 0; end function onEventStarted(player, npc) - player:SendMessage(0x20, "", "This PopulaceShopSalesman actor has no event set. Actor Class Id: " .. tostring(npc:GetActorClassId())) - player:EndEvent(); - --player:RunEventFunction("welcomeTalk"); -end -function onEventUpdate(player, npc, step, menuOptionSelected, lsName, lsCrest) - - player:EndEvent(); + require("/unique/".. npc.zone.zoneName .."/PopulaceShopSalesman/" .. npc:GetUniqueId()) -end \ No newline at end of file + callClientFunction(player, "welcomeTalk", shopInfo.welcomeText, player); + + while (true) do + choice = callClientFunction(player, "selectMode", 1); + + if (choice == nil) then + break; + elseif (choice == 1) then + callClientFunction(player, "openShopBuy", player, shopInfo.shopPack, shopInfo.shopCurrancy); + + while (true) do + buyResult = callClientFunction(player, "selectShopBuy", player); + + if (buyResult == 0) then + callClientFunction(player, "closeShopBuy", player); + break; + else + player:SendMessage(0x20, "", "Player bought a thing at slot " .. tostring(buyResult).."."); + end + + end + + elseif (choice == 2) then + callClientFunction(player, "openShopSell", player); + + while (true) do + sellResult = callClientFunction(player, "selectShopSell", player); + + if (sellResult == nil) then + callClientFunction(player, "closeShopSell", player); + break; + else + player:SendMessage(0x20, "", "Player sold a thing at slot " .. tostring(sellResult).."."); + end + + end + elseif (choice == 3) then + callClientFunction(player, "selectFacility", 2, 35, 3); + callClientFunction(player, "confirmUseFacility", player, 35); + elseif (choice == 4) then + callClientFunction(player, "startTutorial", nil, 29); + end + end + + callClientFunction(player, "finishTalkTurn", player); + player:EndEvent(); + +end diff --git a/data/scripts/unique/sea0Town01a/PopulaceShopSalesman/jossy.lua b/data/scripts/unique/sea0Town01a/PopulaceShopSalesman/jossy.lua new file mode 100644 index 00000000..b0781436 --- /dev/null +++ b/data/scripts/unique/sea0Town01a/PopulaceShopSalesman/jossy.lua @@ -0,0 +1,6 @@ + +shopInfo = { +welcomeText = 94, +shopPack = 0x67, +shopCurrancy = nil +} \ No newline at end of file From 51bbf4ae2e31da9951436840407230c8ed6dc3c6 Mon Sep 17 00:00:00 2001 From: Filip Maj Date: Sat, 18 Jun 2016 12:26:29 -0400 Subject: [PATCH 02/15] Non-npc stuff is now also using script system. Wrote new scripts for all sidemenu commands. --- FFXIVClassic Map Server/PacketProcessor.cs | 8 ++----- .../actors/chara/player/Player.cs | 22 ++++++------------- FFXIVClassic Map Server/lua/LuaEngine.cs | 21 ++++++------------ .../populace/shop/PopulaceShopSalesman.lua | 2 +- 4 files changed, 17 insertions(+), 36 deletions(-) diff --git a/FFXIVClassic Map Server/PacketProcessor.cs b/FFXIVClassic Map Server/PacketProcessor.cs index 43ac25c8..11777b0c 100644 --- a/FFXIVClassic Map Server/PacketProcessor.cs +++ b/FFXIVClassic Map Server/PacketProcessor.cs @@ -246,12 +246,8 @@ namespace FFXIVClassic_Map_Server */ Actor ownerActor = Server.GetStaticActors(eventStart.scriptOwnerActorID); - if (ownerActor != null && ownerActor is Command) - { - player.GetActor().currentCommand = eventStart.scriptOwnerActorID; - player.GetActor().currentCommandName = eventStart.triggerName; - } - else + + if (ownerActor != null) { player.GetActor().currentEventOwner = eventStart.scriptOwnerActorID; player.GetActor().currentEventName = eventStart.triggerName; diff --git a/FFXIVClassic Map Server/actors/chara/player/Player.cs b/FFXIVClassic Map Server/actors/chara/player/Player.cs index 215da839..9df32c67 100644 --- a/FFXIVClassic Map Server/actors/chara/player/Player.cs +++ b/FFXIVClassic Map Server/actors/chara/player/Player.cs @@ -82,9 +82,6 @@ namespace FFXIVClassic_Map_Server.Actors public uint currentEventOwner = 0; public string currentEventName = ""; - public uint currentCommand = 0; - public string currentCommandName = ""; - public Coroutine currentEventRunning; //Player Info @@ -1137,7 +1134,11 @@ namespace FFXIVClassic_Map_Server.Actors currentEventRunning.Resume(objects.ToArray()); } else - LuaEngine.DoActorOnEventStarted(this, owner, start); + { + currentEventRunning = LuaEngine.DoActorOnEventStarted(this, owner, start); + currentEventRunning.Resume(objects.ToArray()); + } + } public void UpdateEvent(EventUpdatePacket update) @@ -1181,18 +1182,9 @@ namespace FFXIVClassic_Map_Server.Actors currentEventOwner = 0; currentEventName = ""; + currentEventRunning = null; } - - public void EndCommand() - { - SubPacket p = EndEventPacket.BuildPacket(actorId, currentCommand, currentCommandName); - p.DebugPrintSubPacket(); - QueuePacket(p); - - currentCommand = 0; - currentCommandName = ""; - } - + public void SendInstanceUpdate() { diff --git a/FFXIVClassic Map Server/lua/LuaEngine.cs b/FFXIVClassic Map Server/lua/LuaEngine.cs index fa1db54c..2de73e97 100644 --- a/FFXIVClassic Map Server/lua/LuaEngine.cs +++ b/FFXIVClassic Map Server/lua/LuaEngine.cs @@ -54,9 +54,9 @@ namespace FFXIVClassic_Map_Server.lua } return null; - } + } - public static void DoActorOnEventStarted(Player player, Actor target, EventStartPacket eventStart) + public static Coroutine DoActorOnEventStarted(Player player, Actor target, EventStartPacket eventStart) { string luaPath; @@ -76,24 +76,17 @@ namespace FFXIVClassic_Map_Server.lua Script script = LoadScript(luaPath); if (script == null) - return; + return null; - //Have to Do this to combine LuaParams - List objects = new List(); - objects.Add(player); - objects.Add(target); - objects.Add(eventStart.triggerName); - - if (eventStart.luaParams != null) - objects.AddRange(LuaUtils.CreateLuaParamObjectList(eventStart.luaParams)); - - //Run Script if (!script.Globals.Get("onEventStarted").IsNil()) - script.Call(script.Globals["onEventStarted"], objects.ToArray()); + return script.CreateCoroutine(script.Globals["onEventStarted"]).Coroutine; + else + return null; } else { SendError(player, String.Format("ERROR: Could not find script for actor {0}.", target.GetName())); + return null; } } diff --git a/data/scripts/base/chara/npc/populace/shop/PopulaceShopSalesman.lua b/data/scripts/base/chara/npc/populace/shop/PopulaceShopSalesman.lua index 067cf001..31ae2c80 100644 --- a/data/scripts/base/chara/npc/populace/shop/PopulaceShopSalesman.lua +++ b/data/scripts/base/chara/npc/populace/shop/PopulaceShopSalesman.lua @@ -39,7 +39,7 @@ function init(npc) return false, false, 0, 0; end -function onEventStarted(player, npc) +function onEventStarted(player, npc, triggerName) require("/unique/".. npc.zone.zoneName .."/PopulaceShopSalesman/" .. npc:GetUniqueId()) From 87430429500bb37b54c5024f4e50cfcc456b0f61 Mon Sep 17 00:00:00 2001 From: Filip Maj Date: Sun, 19 Jun 2016 18:52:34 -0400 Subject: [PATCH 03/15] Cleaned up the new scripting code. Added a helper function to do the yielding automatically. Modified all the scripts to use the new system and added a few new ones. --- FFXIVClassic Map Server/PacketProcessor.cs | 9 +-- .../actors/chara/player/Player.cs | 14 +++- .../base/chara/npc/object/BookShelf.lua | 9 +-- .../base/chara/npc/object/ObjectBed.lua | 18 ++--- .../base/chara/npc/object/ObjectInnDoor.lua | 13 ++-- .../npc/populace/PopulaceCutscenePlayer.lua | 6 -- .../populace/PopulaceGuildlevePublisher.lua | 67 ++++++++++++++-- .../npc/populace/PopulaceLinkshellManager.lua | 68 +++++++++++----- .../npc/populace/PopulaceRetainerManager.lua | 77 +++++++++++++++++++ .../npc/populace/shop/PopulaceGuildShop.lua | 21 +---- .../populace/shop/PopulaceShopSalesman.lua | 6 +- data/scripts/commands/ActivateCommand.lua | 2 +- data/scripts/commands/AttackWeaponSkill.lua | 2 +- data/scripts/commands/BonusPointCommand.lua | 14 ++-- data/scripts/commands/CheckCommand.lua | 2 +- data/scripts/commands/ChocoboRideCommand.lua | 2 +- data/scripts/commands/DiceCommand.lua | 2 +- data/scripts/commands/EmoteSitCommand.lua | 2 +- .../scripts/commands/EmoteStandardCommand.lua | 2 +- data/scripts/commands/EquipCommand.lua | 2 +- data/scripts/commands/ItemWasteCommand.lua | 2 +- data/scripts/commands/LogoutCommand.lua | 46 +++-------- data/scripts/commands/PartyInviteCommand.lua | 2 +- data/scripts/commands/TeleportCommand.lua | 46 +++++++---- data/scripts/global.lua | 10 ++- .../fst0Town01/PopulaceStandard/vkorolon.lua | 12 +-- .../sea0Town01/PopulaceStandard/mytesyn.lua | 17 ++-- .../wil0Town01/PopulaceStandard/momodi.lua | 10 ++- 28 files changed, 316 insertions(+), 167 deletions(-) create mode 100644 data/scripts/base/chara/npc/populace/PopulaceRetainerManager.lua diff --git a/FFXIVClassic Map Server/PacketProcessor.cs b/FFXIVClassic Map Server/PacketProcessor.cs index 11777b0c..5300ce79 100644 --- a/FFXIVClassic Map Server/PacketProcessor.cs +++ b/FFXIVClassic Map Server/PacketProcessor.cs @@ -247,11 +247,10 @@ namespace FFXIVClassic_Map_Server Actor ownerActor = Server.GetStaticActors(eventStart.scriptOwnerActorID); - if (ownerActor != null) - { - player.GetActor().currentEventOwner = eventStart.scriptOwnerActorID; - player.GetActor().currentEventName = eventStart.triggerName; - } + + player.GetActor().currentEventOwner = eventStart.scriptOwnerActorID; + player.GetActor().currentEventName = eventStart.triggerName; + if (ownerActor == null) { diff --git a/FFXIVClassic Map Server/actors/chara/player/Player.cs b/FFXIVClassic Map Server/actors/chara/player/Player.cs index 9df32c67..6d3454f2 100644 --- a/FFXIVClassic Map Server/actors/chara/player/Player.cs +++ b/FFXIVClassic Map Server/actors/chara/player/Player.cs @@ -1131,7 +1131,19 @@ namespace FFXIVClassic_Map_Server.Actors if (owner is Npc) { currentEventRunning = ((Npc)owner).GetEventStartCoroutine(this); - currentEventRunning.Resume(objects.ToArray()); + + if (currentEventRunning != null) + { + try + { + currentEventRunning.Resume(objects.ToArray()); + } + catch (ScriptRuntimeException e) + { + Program.Log.Error("[LUA] {0}", e.Message); + EndEvent(); + } + } } else { diff --git a/data/scripts/base/chara/npc/object/BookShelf.lua b/data/scripts/base/chara/npc/object/BookShelf.lua index 5d43890a..e5ef5b1d 100644 --- a/data/scripts/base/chara/npc/object/BookShelf.lua +++ b/data/scripts/base/chara/npc/object/BookShelf.lua @@ -1,11 +1,10 @@ +require ("global") + function init(npc) return false, false, 0, 0; end function onEventStarted(player, npc, triggerName) - player:RunEventFunction("bookTalk"); + player:callClientFunction(player, "bookTalk"); + player:EndEvent(); end - -function onEventUpdate(player, npc, step, menuOptionSelected) - player:EndEvent(); -end \ No newline at end of file diff --git a/data/scripts/base/chara/npc/object/ObjectBed.lua b/data/scripts/base/chara/npc/object/ObjectBed.lua index 17640c17..4b211b9c 100644 --- a/data/scripts/base/chara/npc/object/ObjectBed.lua +++ b/data/scripts/base/chara/npc/object/ObjectBed.lua @@ -1,25 +1,21 @@ +require ("global") function init(npc) return false, false, 0, 0; end function onEventStarted(player, npc, triggerName) - player:RunEventFunction("askLogout", player); -end -function onEventUpdate(player, npc, eventStep, menuOptionSelected) + choice = callClientFunction(player, "askLogout", player); - if (menuOptionSelected == 1) then - player:EndEvent(); - return; - elseif (menuOptionSelected == 2) then + if (choice == 2) then player:QuitGame(); - elseif (menuOptionSelected == 3) then + elseif (choice == 3) then player:Logout(); - elseif (menuOptionSelected == 4) then + elseif (choice == 4) then player:SendMessage(33, "", "Heck the bed"); - end + end player:EndEvent(); - + end \ No newline at end of file diff --git a/data/scripts/base/chara/npc/object/ObjectInnDoor.lua b/data/scripts/base/chara/npc/object/ObjectInnDoor.lua index c0c69269..24b7161b 100644 --- a/data/scripts/base/chara/npc/object/ObjectInnDoor.lua +++ b/data/scripts/base/chara/npc/object/ObjectInnDoor.lua @@ -1,3 +1,4 @@ +require ("global") function init(npc) return false, false, 0, 0; @@ -5,15 +6,11 @@ end function onEventStarted(player, npc, triggerName) defaultFst = GetStaticActor("DftFst"); - player:RunEventFunction("delegateEvent", player, defaultFst, "defaultTalkWithInn_ExitDoor", nil, nil, nil); -end - -function onEventUpdate(player, npc, resultId, isExitYes) - - if (isExitYes ~= nil and isExitYes == 1) then + choice = callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithInn_ExitDoor", nil, nil, nil); + + if (choice == 1) then GetWorldManager():DoZoneChange(player, 1); - else - player:EndEvent(); end + player:EndEvent(); end \ No newline at end of file diff --git a/data/scripts/base/chara/npc/populace/PopulaceCutscenePlayer.lua b/data/scripts/base/chara/npc/populace/PopulaceCutscenePlayer.lua index 1e98e2c4..337e5710 100644 --- a/data/scripts/base/chara/npc/populace/PopulaceCutscenePlayer.lua +++ b/data/scripts/base/chara/npc/populace/PopulaceCutscenePlayer.lua @@ -1,9 +1,3 @@ function init(npc) return false, false, 0, 0; -end - -function onEventStarted(player, npc, triggerName) -end - -function onEventUpdate(player, npc) end \ No newline at end of file diff --git a/data/scripts/base/chara/npc/populace/PopulaceGuildlevePublisher.lua b/data/scripts/base/chara/npc/populace/PopulaceGuildlevePublisher.lua index 15bc895a..08bf5ca2 100644 --- a/data/scripts/base/chara/npc/populace/PopulaceGuildlevePublisher.lua +++ b/data/scripts/base/chara/npc/populace/PopulaceGuildlevePublisher.lua @@ -16,23 +16,80 @@ eventTalkChangeOne(skipQuestion) talkOfferMaxOver() askRetryRegionalleve(guildLeveId, leveAllowances); -Menu Ids: - --]] +require ("global") + function init(npc) return false, false, 0, 0; end function onEventStarted(player, npc) - player:RunEventFunction("eventTalkType", 0x30, true, 0x02CE, 0x356, 0x367, true, 0, nil, 0x29, 0,0,0); + + ::MENU_LOOP:: + menuChoice = callClientFunction(player, "eventTalkType", 0x30, true, 0x02CE, 0x356, 0x367, true, 0, nil, 0x29, 0,0,0); + --Battlecraft + if (menuChoice == 1) then + resultGLPack = callClientFunction(player, "eventTalkPack", 201, 207); + + if (resultGLPack == nil) then + goto MENU_LOOP; + else + + ::CARDS_LOOP:: + cards = {0x30C3, 0x30C4, 0x30C1, 0x30C5, 0x30C6, 0x30C7, 0x30C8, 0x30C9}; + + chosenGLCard = callClientFunction(player, "eventTalkCard", cards[1], cards[2], cards[3], cards[4], cards[5], cards[6], cards[7], cards[8]); + + if (chosenGLCard == -1) then + goto MENU_LOOP; + else + wasAccepted = callClientFunction(player, "eventTalkDetail", cards[chosenGLCard], 0, 0xF4242, 0xD, 0xF4242, 0, 0, true, 0); + + if (wasAccepted == true) then + + end + + goto CARDS_LOOP; + + end + end + + --FieldCraft Miner + elseif (menuChoice == 0x15) then + --FieldCraft Botanist + elseif (menuChoice == 0x16) then + --FieldCraft Fisher + elseif (menuChoice == 0x17) then + --FieldCraft Quit + elseif (menuChoice == 0x18) then + --Faction Broken Blade + elseif (menuChoice == 0x29) then + --Faction Shields + elseif (menuChoice == 0x2A) then + --Faction Horn and Hand + elseif (menuChoice == 0x2B) then + --Leve Evaluation + elseif (menuChoice == 5) then + --Tutorial + elseif (menuChoice == 6) then + --End of Info + elseif (menuChoice == 7) then + --Quit + elseif (menuChoice == 8) then + end + + -- + -- + -- + player:EndEvent(); end function onEventUpdate(player, npc, step, menuOptionSelected) --player:RunEventFunction("eventTalkType", 0x32, true, 0x02CE, 0x356, 0x367, false, 2, nil, 0x29, 0,0,0); player:RunEventFunction("eventTalkPack", 201, 207); --player:RunEventFunction("eventTalkCard", 0x30C3, 0x30C4, 0x30C1, 0x30C5, 0x30C6, 0x30C7, 0x30C8, 0x30C9); - --player:RunEventFunction("eventTalkDetail", 0x30C4, 2, 0xF4242, 0xD, 0xF4242, 0, 0xFF, true, 11); + -- --player:RunEventFunction("eventGLChangeDetail", 0xDEAD, 0x30C4, 0xFF, 0xF4242, 0xD, 0xF4242, 0, 2, true); - player:EndEvent(); + end \ No newline at end of file diff --git a/data/scripts/base/chara/npc/populace/PopulaceLinkshellManager.lua b/data/scripts/base/chara/npc/populace/PopulaceLinkshellManager.lua index ce2ac829..53157eb2 100644 --- a/data/scripts/base/chara/npc/populace/PopulaceLinkshellManager.lua +++ b/data/scripts/base/chara/npc/populace/PopulaceLinkshellManager.lua @@ -1,28 +1,56 @@ +--[[ + +PopulaceLinkshellManager Script + +Functions: + +eventTalkStep1(noLinkshellActive) - Says intro. If noLinkshellActive = true, say newbie stuff. +eventTalkStep2(noLinkshellActive) - Shows menu, if noLinkshellActive = true, only give ability to make linkshell. +eventTalkStepMakeupDone() - Confirm when creating LS +eventTalkStepModifyDone() - Confirm when modding LS +eventTalkStepBreakDone() - Confirm when deleting LS + +--]] + +require ("global") + function init(npc) return false, false, 0, 0; end -function onEventStarted(player, npc) - isNew = false; - player:RunEventFunction("eventTalkStep1", isNew); +function createLinkshell(name, crest) + end -function onEventUpdate(player, npc, step, menuOptionSelected, lsName, lsCrest) - - if (menuOptionSelected == nil) then - player:EndEvent(); - return; - end - - isNew = false; - if (menuOptionSelected == 1) then - player:RunEventFunction("eventTalkStep2", isNew); - elseif (menuOptionSelected == 10) then - player:EndEvent(); - return; - elseif (menuOptionSelected == 3) then - --createLinkshell - player:RunEventFunction("eventTalkStepMakeupDone", isNew); - end +function modifyLinkshell(name, crest) +end + +function disbandLinkshell(name, crest) + +end + +function onEventStarted(player, npc, triggerName) + + hasNoActiveLS = false; + + callClientFunction(player, "eventTalkStep1", hasNoActiveLS); + command, lsName, crestId = callClientFunction(player, "eventTalkStep2", hasNoActiveLS); + + --Create + if (result == 3) then + createLinkshell(lsName, crestId); + callClientFunction(player, "eventTalkStepMakeupDone"); + --Modify + elseif (result == 1) then + modifyLinkshell(lsName, crestId); + callClientFunction(player, "eventTalkStepModifyDone"); + --Disband + elseif (result == 5) then + disbandLinkshell(lsName, crestId); + callClientFunction(player, "eventTalkStepBreakDone"); + end + + player:endEvent(); + end \ No newline at end of file diff --git a/data/scripts/base/chara/npc/populace/PopulaceRetainerManager.lua b/data/scripts/base/chara/npc/populace/PopulaceRetainerManager.lua new file mode 100644 index 00000000..50c0b727 --- /dev/null +++ b/data/scripts/base/chara/npc/populace/PopulaceRetainerManager.lua @@ -0,0 +1,77 @@ +--[[ + +PopulaceRetainerManager Script + +Functions: + +eventTalkStep1(true) - Intro tutorial if no retainer +newEventTalkStep1(sayIntro) - Seems to be a post-Tanaka version of the intro???? +eventTalkStep2() - Choose retainer yourself (go to race select) or let npc do it +eventTaklSelectCutSeane(cutsceneName, actorClassId1, actorClassId2, actorClassId3, actorClassId4, actorClassId5) - Starts the advance cutscene to choose a retainer. 5 retainer actorClassId's are given. +eventTalkStep4(actorClassId) - Opens up the retainer naming dialog +eventTalkStepFinalAnswer(actorClassId) - Confirm Dialog +eventTalkStepError(errorCode) - Error dialog, 1: No Extra Retainers, 2: Server Busy. +eventTalkStepFinish() + +--]] + +require ("global") + +function init(npc) + return false, false, 0, 0; +end + +function onEventStarted(player, npc, triggerName) + + introChoice = callClientFunction(player, "newEventTalkStep1", false); + + if (introChoice == 1) then + + raceChoice = callClientFunction(player, "eventTalkStep2"); + + while (true) do + + if (retainerChoice == 0) then + raceChoice = callClientFunction(player, "eventTalkStep22"); + end + + if (raceChoice == 0) then + --Choose random actorId + elseif (raceChoice > 0) then + --Choose 5 random but correct actor ids + retainerChoice = callClientFunction(player, "eventTaklSelectCutSeane", "rtn0g010", 0x2DCB1A, 0x2DCB1A, 0x2DCB1A, 0x2DCB1A, 0x2DCB1A); + + if (retainerChoice == -1) then + player:EndEvent(); + return; + elseif (retainerChoice > 0) then + --Retainer chosen, choose name + retainerName = callClientFunction(player, "eventTalkStep4", 0x2DCB1A); + + if (retainerName ~= "") then + confirmChoice = callClientFunction(player, "eventTalkStepFinalAnswer", 0x2DCB1A); + + if (confirmChoice == 1) then + callClientFunction(player, "eventTalkStepFinish"); + player:EndEvent(); + return; + elseif (confirmChoice == 3) then + raceChoice = 0; + else + player:EndEvent(); + return; + end + + end + + end + else + break; + end + + end + + end + + player:EndEvent(); +end \ No newline at end of file diff --git a/data/scripts/base/chara/npc/populace/shop/PopulaceGuildShop.lua b/data/scripts/base/chara/npc/populace/shop/PopulaceGuildShop.lua index a3727d1f..72348129 100644 --- a/data/scripts/base/chara/npc/populace/shop/PopulaceGuildShop.lua +++ b/data/scripts/base/chara/npc/populace/shop/PopulaceGuildShop.lua @@ -1,3 +1,5 @@ +require ("global") + function init(npc) return false, false, 0, 0; end @@ -44,12 +46,10 @@ function onEventStarted(player, npc) saySheetId = 19; end - player:RunEventFunction("welcomeTalk", nil, saySheetId, player); - coroutine.yield(); + callClientFunction(player, "welcomeTalk", nil, saySheetId, player); while (true) do - player:RunEventFunction("selectMode", nil, npc:GetActorClassId(), false, 1000001); --Step 2, state your business - choice = coroutine.yield(); + choice = callClientFunction(player, "selectMode", nil, npc:GetActorClassId(), false, 1000001); --Step 2, state your business if (choice == 3) then @@ -60,17 +60,4 @@ function onEventStarted(player, npc) end -end - -function onEventUpdate(player, npc, step, menuOptionSelected) - - --player:RunEventFunction("cashbackTalkCommand", 22004, 22004, 22004, 22004, 22004, 22004, 22004, 22004, 22004, 22004, 22004); --Refund Abilities??? - --player:RunEventFunction("cashbackTalk", 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1); --Refund items??? - - if (menuOptionSelected == 4) then - player:EndEvent(); - else - player:RunEventFunction("selectMode", nil, npc:GetActorClassId(), false, 1000001); --Step 2, state your business - end - end \ No newline at end of file diff --git a/data/scripts/base/chara/npc/populace/shop/PopulaceShopSalesman.lua b/data/scripts/base/chara/npc/populace/shop/PopulaceShopSalesman.lua index 31ae2c80..362be4f3 100644 --- a/data/scripts/base/chara/npc/populace/shop/PopulaceShopSalesman.lua +++ b/data/scripts/base/chara/npc/populace/shop/PopulaceShopSalesman.lua @@ -29,11 +29,7 @@ finishTalkTurn() - Done at the end. --]] -function callClientFunction(player, functionName, ...) - player:RunEventFunction(functionName, ...); - result = coroutine.yield(); - return result; -end +require ("global") function init(npc) return false, false, 0, 0; diff --git a/data/scripts/commands/ActivateCommand.lua b/data/scripts/commands/ActivateCommand.lua index 2c9b022d..c15247e5 100644 --- a/data/scripts/commands/ActivateCommand.lua +++ b/data/scripts/commands/ActivateCommand.lua @@ -14,7 +14,7 @@ function onEventStarted(player, command, triggerName) player:ChangeState(0); end - player:EndCommand(); + player:endEvent(); --For Opening Tutorial if (player:HasQuest("Man0l0") or player:HasQuest("Man0g0") or player:HasQuest("Man0u0")) then diff --git a/data/scripts/commands/AttackWeaponSkill.lua b/data/scripts/commands/AttackWeaponSkill.lua index cafc3921..e3f3a3a4 100644 --- a/data/scripts/commands/AttackWeaponSkill.lua +++ b/data/scripts/commands/AttackWeaponSkill.lua @@ -16,7 +16,7 @@ function onEventStarted(player, actor, triggerName) player:SendGameMessage(worldMaster, 32503, 0x20); end - player:EndCommand(); + player:EndEvent(); end diff --git a/data/scripts/commands/BonusPointCommand.lua b/data/scripts/commands/BonusPointCommand.lua index dfda0c2f..d5f48b44 100644 --- a/data/scripts/commands/BonusPointCommand.lua +++ b/data/scripts/commands/BonusPointCommand.lua @@ -8,16 +8,16 @@ operateUI(pointsAvailable, pointsLimit, str, vit, dex, int, min, pie) --]] +require ("global") + function onEventStarted(player, actor, triggerName) --local points = player:GetAttributePoints(); --player:RunEventFunction("delegateCommand", actor, "operateUI", points.available, points.limit, points.inSTR, points.inVIT, points.inDEX, points.inINT, points.inMIN, points.inPIT); - player:RunEventFunction("delegateCommand", actor, "operateUI", 10, 10, 10, 10, 10, 10, 10, 10); -end - -function onEventUpdate(player, actor, step, arg1) - - --Submit + result = callClientFunction(player, "delegateCommand", actor, "operateUI", 100, 100, 10, 10, 10, 10, 10, 10); - player:EndCommand(); + --Do Save + if (result == true) then + end + player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/commands/CheckCommand.lua b/data/scripts/commands/CheckCommand.lua index 9d1bbf52..5e78e279 100644 --- a/data/scripts/commands/CheckCommand.lua +++ b/data/scripts/commands/CheckCommand.lua @@ -14,6 +14,6 @@ function onEventStarted(player, commandactor, triggerName, arg1, arg2, arg3, arg player:examinePlayer(actor); end - player:EndCommand(); + player:EndEvent(); end diff --git a/data/scripts/commands/ChocoboRideCommand.lua b/data/scripts/commands/ChocoboRideCommand.lua index 37267720..9952417f 100644 --- a/data/scripts/commands/ChocoboRideCommand.lua +++ b/data/scripts/commands/ChocoboRideCommand.lua @@ -42,6 +42,6 @@ function onEventStarted(player, actor, triggerName, isGoobbue) player:ChangeState(0); end - player:EndCommand(); + player:EndEvent(); end \ No newline at end of file diff --git a/data/scripts/commands/DiceCommand.lua b/data/scripts/commands/DiceCommand.lua index 1b0ede05..9f9bd110 100644 --- a/data/scripts/commands/DiceCommand.lua +++ b/data/scripts/commands/DiceCommand.lua @@ -15,7 +15,7 @@ function onEventStarted(player, actor, triggerName, maxNumber) worldMaster = GetWorldMaster(); player:SendGameMessage(player, worldMaster, 25342, 0x20, result, maxNumber); - player:EndCommand(); + player:EndEvent(); end diff --git a/data/scripts/commands/EmoteSitCommand.lua b/data/scripts/commands/EmoteSitCommand.lua index 5694c9b5..5f58c4c0 100644 --- a/data/scripts/commands/EmoteSitCommand.lua +++ b/data/scripts/commands/EmoteSitCommand.lua @@ -16,7 +16,7 @@ function onEventStarted(player, actor, triggerName, emoteId) player:ChangeState(0); end - player:EndCommand(); + player:EndEvent(); end diff --git a/data/scripts/commands/EmoteStandardCommand.lua b/data/scripts/commands/EmoteStandardCommand.lua index 82d36f72..505102f9 100644 --- a/data/scripts/commands/EmoteStandardCommand.lua +++ b/data/scripts/commands/EmoteStandardCommand.lua @@ -15,7 +15,7 @@ function onEventStarted(player, actor, triggerName, emoteId) player:DoEmote(emoteId); end - player:EndCommand(); + player:EndEvent(); end diff --git a/data/scripts/commands/EquipCommand.lua b/data/scripts/commands/EquipCommand.lua index dc838845..8d741d32 100644 --- a/data/scripts/commands/EquipCommand.lua +++ b/data/scripts/commands/EquipCommand.lua @@ -69,7 +69,7 @@ function onEventStarted(player, actor, triggerName, invActionInfo, param1, param end end - player:EndCommand(); + player:EndEvent(); end function loadGearset(player, classId) diff --git a/data/scripts/commands/ItemWasteCommand.lua b/data/scripts/commands/ItemWasteCommand.lua index 073576c1..ceb6f493 100644 --- a/data/scripts/commands/ItemWasteCommand.lua +++ b/data/scripts/commands/ItemWasteCommand.lua @@ -11,5 +11,5 @@ The param "itemDBIds" has the vars: item1 and item2. function onEventStarted(player, actor, triggerName, invActionInfo, param1, param2, param3, param4, param5, param6, param7, param8, itemDBIds) player:GetInventory(0x00):RemoveItem(invActionInfo.slot); - player:EndCommand(); + player:EndEvent(); end diff --git a/data/scripts/commands/LogoutCommand.lua b/data/scripts/commands/LogoutCommand.lua index 037e70b9..7f56d757 100644 --- a/data/scripts/commands/LogoutCommand.lua +++ b/data/scripts/commands/LogoutCommand.lua @@ -8,46 +8,20 @@ eventConfirm() eventCountDown() eventLogoutFade() -Menu Ids: - -Menu: 0 -Countdown: 1 - --]] -function onEventStarted(player, command) - --player:SetCurrentMenuId(0); - --player:RunEventFunction("delegateCommand", command, "eventConfirm"); - player:Logout(); -end +require ("global") -function onEventUpdate(player, command, triggerName, step, arg1, arg2) +function onEventStarted(player, command, triggerName) - currentMenuId = player:GetCurrentMenuId(); + choice = callClientFunction(player, "delegateCommand", command, "eventConfirm"); - --Menu Dialog - if (currentMenuId == 0) then - if (arg1 == 1) then --Exit - player:QuitGame(); - player:EndCommand(); - elseif (arg1 == 2) then --Character Screen - player:Logout(); - player:EndCommand(); - --player:SetCurrentMenuId(1); - --player:RunEventFunction("delegateCommand", command, "eventCountDown"); - elseif (arg1 == 3) then --Cancel - player:EndCommand(); - end - --Countdown Dialog - elseif (currentMenuId == 1) then - - if (arg2 == 1) then --Logout Complete - player:Logout(); - player:EndCommand(); - elseif (arg2 == 2) then --Cancel Pressed - player:EndCommand(); - end - + if (choice == 1) then + player:QuitGame(); + elseif (choice == 2) then + player:Logout(); end -end \ No newline at end of file + player:EndEvent(); + +end diff --git a/data/scripts/commands/PartyInviteCommand.lua b/data/scripts/commands/PartyInviteCommand.lua index 74a74db9..59a8fc08 100644 --- a/data/scripts/commands/PartyInviteCommand.lua +++ b/data/scripts/commands/PartyInviteCommand.lua @@ -14,6 +14,6 @@ function onEventStarted(player, actor, triggerName, name, arg1, arg2, arg3, acto GetWorldManager():CreateInvitePartyGroup(player, actorId); end - player:EndCommand(); + player:EndEvent(); end \ No newline at end of file diff --git a/data/scripts/commands/TeleportCommand.lua b/data/scripts/commands/TeleportCommand.lua index 0a558cfb..eb08a965 100644 --- a/data/scripts/commands/TeleportCommand.lua +++ b/data/scripts/commands/TeleportCommand.lua @@ -8,22 +8,42 @@ eventRegion(numAnima) eventAetheryte(region, animaCost1, animaCost2, animaCost3, animaCost4, animaCost5, animaCost6) eventConfirm(isReturn, isInBattle, cityReturnNum, 138821, forceAskReturnOnly) -Menu Ids: - -Region Menu: 0 -Aetheryte Menu: 1 -Confirm Menu: 2 - --]] +require ("global") + +function doTeleport(region, aetheryte) +end + function onEventStarted(player, actor, triggerName, isTeleport) - if (isTeleport == 0) then - player:SetCurrentMenuId(0); - player:RunEventFunction("delegateCommand", actor, "eventRegion", 100); + if (isTeleport == 0) then + while (true) do + regionChoice = callClientFunction(player, "delegateCommand", actor, "eventRegion", 100); + + if (regionChoice == nil) then break end + + while (true) do + aetheryteChoice = callClientFunction(player, "delegateCommand", actor, "eventAetheryte", regionChoice, 2, 2, 2, 4, 4, 4); + + if (aetheryteChoice == nil) then break end + + confirmChoice = callClientFunction(player, "delegateCommand", actor, "eventConfirm", false, false, 1, 138824, false); + + if (confirmChoice == 1) then + doTeleport(regionChoice, aetheryteChoice); + end + + player:endEvent(); + return; + + end + + end else - player:SetCurrentMenuId(2); - player:RunEventFunction("delegateCommand", actor, "eventConfirm", true, false, 1, 0x138824, false); - end + callClientFunction(player, "delegateCommand", actor, "eventConfirm", true, false, 1, 0x138824, false); + end + + player:endEvent(); end function onEventUpdate(player, actor, step, arg1) @@ -48,4 +68,4 @@ function onEventUpdate(player, actor, step, arg1) player:EndCommand(); end -end \ No newline at end of file +end diff --git a/data/scripts/global.lua b/data/scripts/global.lua index 5b7d0984..b51a6403 100644 --- a/data/scripts/global.lua +++ b/data/scripts/global.lua @@ -12,4 +12,12 @@ ACTORSTATE_ACTIVE = 2; ACTORSTATE_DEAD2 = 3; ACTORSTATE_SITTING_ONOBJ = 11; ACTORSTATE_SITTING_ONFLOOR = 13; -ACTORSTATE_MOUNTED = 15; \ No newline at end of file +ACTORSTATE_MOUNTED = 15; + +--UTILS + +function callClientFunction(player, functionName, ...) + player:RunEventFunction(functionName, ...); + result = coroutine.yield(); + return result; +end \ No newline at end of file diff --git a/data/scripts/unique/fst0Town01/PopulaceStandard/vkorolon.lua b/data/scripts/unique/fst0Town01/PopulaceStandard/vkorolon.lua index 22cc60c7..e71825bd 100644 --- a/data/scripts/unique/fst0Town01/PopulaceStandard/vkorolon.lua +++ b/data/scripts/unique/fst0Town01/PopulaceStandard/vkorolon.lua @@ -1,13 +1,13 @@ +require ("global") + function onEventStarted(player, npc) defaultFst = GetStaticActor("DftFst"); - player:RunEventFunction("delegateEvent", player, defaultFst, "defaultTalkWithInn_Desk", nil, nil, nil); + choice = callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithInn_Desk", nil, nil, nil); -end - -function onEventUpdate(player, npc, blah, menuSelect) - - if (menuSelect == 1) then + if (choice == 1) then GetWorldManager():DoZoneChange(player, 13); + elseif (choice == 2) then + --Do Set Homepoint end player:EndEvent(); diff --git a/data/scripts/unique/sea0Town01/PopulaceStandard/mytesyn.lua b/data/scripts/unique/sea0Town01/PopulaceStandard/mytesyn.lua index 2d15ca2b..5c468992 100644 --- a/data/scripts/unique/sea0Town01/PopulaceStandard/mytesyn.lua +++ b/data/scripts/unique/sea0Town01/PopulaceStandard/mytesyn.lua @@ -1,15 +1,14 @@ +require ("global") + function onEventStarted(player, npc) defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithInn_Desk", nil, nil, nil); + choice = callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithInn_Desk", nil, nil, nil); -end - -function onEventUpdate(player, npc, blah, menuSelect) - - if (menuSelect == 1) then - GetWorldManager():DoZoneChange(player, 12); + if (choice == 1) then + GetWorldManager():DoZoneChange(player, 13); + elseif (choice == 2) then + --Do Set Homepoint end - player:EndEvent(); - + player:EndEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01/PopulaceStandard/momodi.lua b/data/scripts/unique/wil0Town01/PopulaceStandard/momodi.lua index 5033af94..8183e89f 100644 --- a/data/scripts/unique/wil0Town01/PopulaceStandard/momodi.lua +++ b/data/scripts/unique/wil0Town01/PopulaceStandard/momodi.lua @@ -1,10 +1,16 @@ +require("global") + function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithMomodi_001", nil, nil, nil); + tutorialU1 = GetStaticActor("Trl0u1"); + --callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithMomodi_001", nil, nil, nil); + callClientFunction(player, "switchEvent", defaultWil, tutorialU1, nil, nil, 1, 1, 0x3F1); + player:endEvent(); + end function onEventUpdate(player, npc, blah, menuSelect) - player:EndEvent(); + end \ No newline at end of file From 97c1fb06cfefdaf58fb8d15727fd6ed099634e5f Mon Sep 17 00:00:00 2001 From: Filip Maj Date: Sun, 19 Jun 2016 23:16:31 -0400 Subject: [PATCH 04/15] More script work. --- .../actors/chara/player/Player.cs | 36 +++++++++++++++++-- .../chara/npc/object/ElevatorStandard.lua | 5 +++ .../chara/npc/object/RetainerFurniture.lua | 32 +++++++++++++++++ .../base/chara/npc/object/TaskBoard.lua | 12 +++---- .../npc/populace/PopulaceAchievement.lua | 25 +++++++++++++ .../chara/npc/populace/PopulaceNMReward.lua | 24 +++++++++++++ .../populace/PopulacePassiveGLPublisher.lua | 11 +++--- data/scripts/commands/PlaceDrivenCommand.lua | 20 +++++++++++ .../ElevatorStandard/crows_lift_lvl1.lua | 13 +++++++ .../ElevatorStandard/crows_lift_lvl2.lua | 13 +++++++ .../ElevatorStandard/crows_lift_lvl3.lua | 13 +++++++ .../sea0Town01/PopulaceStandard/aergwynt.lua | 4 ++- .../sea0Town01/PopulaceStandard/baderon.lua | 4 ++- .../sea0Town01/PopulaceStandard/chantine.lua | 6 ++-- .../sea0Town01/PopulaceStandard/estrilda.lua | 6 ++-- .../sea0Town01/PopulaceStandard/frithuric.lua | 6 ++-- .../sea0Town01/PopulaceStandard/fzhumii.lua | 4 ++- .../sea0Town01/PopulaceStandard/gigirya.lua | 6 ++-- .../sea0Town01/PopulaceStandard/gnibnpha.lua | 4 ++- .../sea0Town01/PopulaceStandard/gregory.lua | 6 ++-- .../sea0Town01/PopulaceStandard/isleen.lua | 4 ++- .../sea0Town01/PopulaceStandard/istrilda.lua | 5 --- .../sea0Town01/PopulaceStandard/josias.lua | 6 ++-- .../sea0Town01/PopulaceStandard/kakamehi.lua | 6 ++-- .../sea0Town01/PopulaceStandard/kokoto.lua | 6 ++-- .../sea0Town01/PopulaceStandard/laniaitte.lua | 4 ++- .../sea0Town01/PopulaceStandard/lauda.lua | 6 ++-- .../sea0Town01/PopulaceStandard/maunie.lua | 6 ++-- .../sea0Town01/PopulaceStandard/nanaka.lua | 6 ++-- .../PopulaceStandard/stephannot.lua | 6 ++-- .../sea0Town01/PopulaceStandard/tirauland.lua | 7 ++-- .../sea0Town01/PopulaceStandard/zanthael.lua | 4 ++- .../sea0Town01/PopulaceStandard/zehrymm.lua | 4 ++- .../ElevatorStandard/wellhead_lift_lvl1.lua | 15 ++++++++ .../ElevatorStandard/wellhead_lift_lvl2.lua | 15 ++++++++ .../ElevatorStandard/wellhead_lift_lvl3.lua | 15 ++++++++ 36 files changed, 298 insertions(+), 67 deletions(-) create mode 100644 data/scripts/base/chara/npc/object/ElevatorStandard.lua create mode 100644 data/scripts/base/chara/npc/object/RetainerFurniture.lua create mode 100644 data/scripts/base/chara/npc/populace/PopulaceAchievement.lua create mode 100644 data/scripts/base/chara/npc/populace/PopulaceNMReward.lua create mode 100644 data/scripts/commands/PlaceDrivenCommand.lua create mode 100644 data/scripts/unique/sea0Town01/ElevatorStandard/crows_lift_lvl1.lua create mode 100644 data/scripts/unique/sea0Town01/ElevatorStandard/crows_lift_lvl2.lua create mode 100644 data/scripts/unique/sea0Town01/ElevatorStandard/crows_lift_lvl3.lua delete mode 100644 data/scripts/unique/sea0Town01/PopulaceStandard/istrilda.lua create mode 100644 data/scripts/unique/wil0Town01/ElevatorStandard/wellhead_lift_lvl1.lua create mode 100644 data/scripts/unique/wil0Town01a/ElevatorStandard/wellhead_lift_lvl2.lua create mode 100644 data/scripts/unique/wil0Town01a/ElevatorStandard/wellhead_lift_lvl3.lua diff --git a/FFXIVClassic Map Server/actors/chara/player/Player.cs b/FFXIVClassic Map Server/actors/chara/player/Player.cs index 6d3454f2..3469d124 100644 --- a/FFXIVClassic Map Server/actors/chara/player/Player.cs +++ b/FFXIVClassic Map Server/actors/chara/player/Player.cs @@ -1144,11 +1144,31 @@ namespace FFXIVClassic_Map_Server.Actors EndEvent(); } } + else + { + EndEvent(); + } } else { currentEventRunning = LuaEngine.DoActorOnEventStarted(this, owner, start); - currentEventRunning.Resume(objects.ToArray()); + + if (currentEventRunning != null) + { + try + { + currentEventRunning.Resume(objects.ToArray()); + } + catch (ScriptRuntimeException e) + { + Program.Log.Error("[LUA] {0}", e.Message); + EndEvent(); + } + } + else + { + EndEvent(); + } } } @@ -1159,8 +1179,18 @@ namespace FFXIVClassic_Map_Server.Actors return; if (currentEventRunning.State == CoroutineState.Suspended) - currentEventRunning.Resume(LuaUtils.CreateLuaParamObjectList(update.luaParams)); - } + { + try + { + currentEventRunning.Resume(LuaUtils.CreateLuaParamObjectList(update.luaParams)); + } + catch (ScriptRuntimeException e) + { + Program.Log.Error("[LUA] {0}", e.Message); + EndEvent(); + } + } + } public void KickEvent(Actor actor, string conditionName, params object[] parameters) { diff --git a/data/scripts/base/chara/npc/object/ElevatorStandard.lua b/data/scripts/base/chara/npc/object/ElevatorStandard.lua new file mode 100644 index 00000000..08e2ea14 --- /dev/null +++ b/data/scripts/base/chara/npc/object/ElevatorStandard.lua @@ -0,0 +1,5 @@ +require ("global") + +function init(npc) + return false, false, 0, 0; +end \ No newline at end of file diff --git a/data/scripts/base/chara/npc/object/RetainerFurniture.lua b/data/scripts/base/chara/npc/object/RetainerFurniture.lua new file mode 100644 index 00000000..2a5b254f --- /dev/null +++ b/data/scripts/base/chara/npc/object/RetainerFurniture.lua @@ -0,0 +1,32 @@ +--[[ + +RetainerFurniture Script + +Functions: + +eventPushStepOpenRetainerMenu() - Opens menu to choose retainer +eventRingBell() - Plays the bell ring animation +eventPushRetainerCallCaution() - Shows warning that a open bazaar will be closed if retainer chosen +eventTalkRetainerMenu(?, ?) - Opens retainer menu +eventTalkRetainerDismissal(?) +eventTalkRetainerMannequin(?) +eventTalkRetainerItemTrade(?) +eventTalkRetainerItemList(?) +eventTalkSelectBazaarStreet(?) +eventReturnResult(?, ?) +eventTalkFinish() +eventPlayerTurn(rotation) - Turns the player +--]] + +require ("global") + +function init(npc) + return false, false, 0, 0; +end + +function onEventStarted(player, npc, triggerName) + retainerNumber = callClientFunction(player, "eventPushStepOpenRetainerMenu"); + callClientFunction(player, "eventRingBell"); + callClientFunction(player, "eventTalkRetainerMenu"); + player:EndEvent(); +end \ No newline at end of file diff --git a/data/scripts/base/chara/npc/object/TaskBoard.lua b/data/scripts/base/chara/npc/object/TaskBoard.lua index c31277ee..43d73c5e 100644 --- a/data/scripts/base/chara/npc/object/TaskBoard.lua +++ b/data/scripts/base/chara/npc/object/TaskBoard.lua @@ -1,3 +1,5 @@ +require ("global") + function init(npc) return false, false, 0, 0; end @@ -6,14 +8,12 @@ function onEventStarted(player, npc, triggerName) questNOC = GetStaticActor("Noc000"); if (npc:GetActorClassId() == 1200193) then - player:RunEventFunction("delegateEvent", player, questNOC, "pETaskBoardAskLimsa", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, questNOC, "pETaskBoardAskLimsa", nil, nil, nil); elseif (npc:GetActorClassId() == 1200194) then - player:RunEventFunction("delegateEvent", player, questNOC, "pETaskBoardAskUldah", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, questNOC, "pETaskBoardAskUldah", nil, nil, nil); else - player:RunEventFunction("delegateEvent", player, questNOC, "pETaskBoardAskGridania", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, questNOC, "pETaskBoardAskGridania", nil, nil, nil); end -end - -function onEventUpdate(player, npc, step, menuOptionSelected) + player:EndEvent(); end \ No newline at end of file diff --git a/data/scripts/base/chara/npc/populace/PopulaceAchievement.lua b/data/scripts/base/chara/npc/populace/PopulaceAchievement.lua new file mode 100644 index 00000000..51b74a31 --- /dev/null +++ b/data/scripts/base/chara/npc/populace/PopulaceAchievement.lua @@ -0,0 +1,25 @@ +--[[ + +PopulaceAchievement Script + +Functions: + +eventNoGC() - +eventUnlock(sheetId) - +eventReward(?, bool, ?, bool) - +defTalk() - Blurb + +--]] + +require ("global") + +function init(npc) + return false, false, 0, 0; +end + +function onEventStarted(player, npc, triggerName) + + callClientFunction(player, "defTalk"); + + player:EndEvent(); +end \ No newline at end of file diff --git a/data/scripts/base/chara/npc/populace/PopulaceNMReward.lua b/data/scripts/base/chara/npc/populace/PopulaceNMReward.lua new file mode 100644 index 00000000..5c717a0a --- /dev/null +++ b/data/scripts/base/chara/npc/populace/PopulaceNMReward.lua @@ -0,0 +1,24 @@ +--[[ + +PopulaceNMReward Script + +Functions: + +eventTalkStep0(player, ?, ?) - Opens the main menu +eventTalkStep0_1(player) - "Ain't running a charity here", message said when you have insufficent funds +eventTalkStep0_2(player, hasItems) - Relic Quest dialog. + +--]] + +require ("global") + +function init(npc) + return false, false, 0, 0; +end + +function onEventStarted(player, npc, triggerName) + + callClientFunction(player, "eventTalkStep0", player, 0); + + player:EndEvent(); +end \ No newline at end of file diff --git a/data/scripts/base/chara/npc/populace/PopulacePassiveGLPublisher.lua b/data/scripts/base/chara/npc/populace/PopulacePassiveGLPublisher.lua index 32fc60ee..3b219bb9 100644 --- a/data/scripts/base/chara/npc/populace/PopulacePassiveGLPublisher.lua +++ b/data/scripts/base/chara/npc/populace/PopulacePassiveGLPublisher.lua @@ -19,19 +19,20 @@ confirmDiscardGuildleve(nil, questId) askRetryRegionalleve(questId, leveAllowances) finishTalkTurn() -Menu Ids: - --]] +require ("global") + function init(npc) return false, false, 0, 0; end function onEventStarted(player, npc) - player:RunEventFunction("talkOfferWelcome", player, 1); + callClientFunction(player, "talkOfferWelcome", player, 1); + player:EndEvent(); end function onEventUpdate(player, npc, step, menuOptionSelected, lsName, lsCrest) - --player:RunEventFunction("askOfferQuest", player, 1000); - player:EndEvent(); + --callClientFunction(player, "askOfferQuest", player, 1000); + end \ No newline at end of file diff --git a/data/scripts/commands/PlaceDrivenCommand.lua b/data/scripts/commands/PlaceDrivenCommand.lua new file mode 100644 index 00000000..0df7be1e --- /dev/null +++ b/data/scripts/commands/PlaceDrivenCommand.lua @@ -0,0 +1,20 @@ +--[[ + +PlaceDrivenCommand Script + +Notes: + + +--]] + +function onEventStarted(player, commandActor, triggerName, pushCommand, unk1, unk2, unk3, ownerActorId, unk4, unk5, unk6, unk7) + + actor = player:GetActorInInstance(ownerActorId); + + if (actor != nil) then + player:kickEvent(actor, "pushCommand", "pushCommand"); + else + player:endEvent(); + end + +end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01/ElevatorStandard/crows_lift_lvl1.lua b/data/scripts/unique/sea0Town01/ElevatorStandard/crows_lift_lvl1.lua new file mode 100644 index 00000000..8ba2b12a --- /dev/null +++ b/data/scripts/unique/sea0Town01/ElevatorStandard/crows_lift_lvl1.lua @@ -0,0 +1,13 @@ +require ("global") + +function onEventStarted(player, npc) + floorChoice = callClientFunction(player, "elevatorAskLimsa001", 0); + + if (floorChoice == 1) then + callClientFunction(player, "elevatorAskLimsa001", 1); + elseif (floorChoice == 2) then + callClientFunction(player, "elevatorAskLimsa001", 2); + end + + player:EndEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01/ElevatorStandard/crows_lift_lvl2.lua b/data/scripts/unique/sea0Town01/ElevatorStandard/crows_lift_lvl2.lua new file mode 100644 index 00000000..aaaf17c8 --- /dev/null +++ b/data/scripts/unique/sea0Town01/ElevatorStandard/crows_lift_lvl2.lua @@ -0,0 +1,13 @@ +require ("global") + +function onEventStarted(player, npc) + floorChoice = callClientFunction(player, "elevatorAskLimsa002", 0); + + if (floorChoice == 1) then + callClientFunction(player, "elevatorAskLimsa002", 1); + elseif (floorChoice == 2) then + callClientFunction(player, "elevatorAskLimsa002", 2); + end + + player:EndEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01/ElevatorStandard/crows_lift_lvl3.lua b/data/scripts/unique/sea0Town01/ElevatorStandard/crows_lift_lvl3.lua new file mode 100644 index 00000000..c64b1f96 --- /dev/null +++ b/data/scripts/unique/sea0Town01/ElevatorStandard/crows_lift_lvl3.lua @@ -0,0 +1,13 @@ +require ("global") + +function onEventStarted(player, npc) + floorChoice = callClientFunction(player, "elevatorAskLimsa003", 0); + + if (floorChoice == 1) then + callClientFunction(player, "elevatorAskLimsa003", 1); + elseif (floorChoice == 2) then + callClientFunction(player, "elevatorAskLimsa003", 2); + end + + player:EndEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01/PopulaceStandard/aergwynt.lua b/data/scripts/unique/sea0Town01/PopulaceStandard/aergwynt.lua index c2508de5..a3d954ad 100644 --- a/data/scripts/unique/sea0Town01/PopulaceStandard/aergwynt.lua +++ b/data/scripts/unique/sea0Town01/PopulaceStandard/aergwynt.lua @@ -1,5 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithAergwynt_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithAergwynt_001", nil, nil, nil); + player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01/PopulaceStandard/baderon.lua b/data/scripts/unique/sea0Town01/PopulaceStandard/baderon.lua index 35ee92da..e76af814 100644 --- a/data/scripts/unique/sea0Town01/PopulaceStandard/baderon.lua +++ b/data/scripts/unique/sea0Town01/PopulaceStandard/baderon.lua @@ -1,5 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithBaderon_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithBaderon_001", nil, nil, nil); + player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01/PopulaceStandard/chantine.lua b/data/scripts/unique/sea0Town01/PopulaceStandard/chantine.lua index 5f131b84..6d18097c 100644 --- a/data/scripts/unique/sea0Town01/PopulaceStandard/chantine.lua +++ b/data/scripts/unique/sea0Town01/PopulaceStandard/chantine.lua @@ -1,7 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithChantine_001", nil, nil, nil); - --player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithChantine_002", nil, nil, nil); --LNC - --player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithChantine_003", nil, nil, nil); --LNC NO GUILD + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithChantine_001", nil, nil, nil); + player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01/PopulaceStandard/estrilda.lua b/data/scripts/unique/sea0Town01/PopulaceStandard/estrilda.lua index 11bdd3ea..201b28f9 100644 --- a/data/scripts/unique/sea0Town01/PopulaceStandard/estrilda.lua +++ b/data/scripts/unique/sea0Town01/PopulaceStandard/estrilda.lua @@ -1,7 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithEstrilda_001", nil, nil, nil); --DEFAULT - --player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithEstrilda_002", nil, nil, nil); --IF ARCHER - --player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithEstrilda_003", nil, nil, nil); --IF ARCHER + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithEstrilda_001", nil, nil, nil); + player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01/PopulaceStandard/frithuric.lua b/data/scripts/unique/sea0Town01/PopulaceStandard/frithuric.lua index 9e944e41..c434e2d4 100644 --- a/data/scripts/unique/sea0Town01/PopulaceStandard/frithuric.lua +++ b/data/scripts/unique/sea0Town01/PopulaceStandard/frithuric.lua @@ -1,7 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithFrithuric_001", nil, nil, nil); - --player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithFrithuric_002", nil, nil, nil); --LTW - --player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithFrithuric_003", nil, nil, nil); --LTW NO GUILD + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithFrithuric_001", nil, nil, nil); + player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01/PopulaceStandard/fzhumii.lua b/data/scripts/unique/sea0Town01/PopulaceStandard/fzhumii.lua index 11489191..8e6adcd1 100644 --- a/data/scripts/unique/sea0Town01/PopulaceStandard/fzhumii.lua +++ b/data/scripts/unique/sea0Town01/PopulaceStandard/fzhumii.lua @@ -1,5 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithFzhumii_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithFzhumii_001", nil, nil, nil); + player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01/PopulaceStandard/gigirya.lua b/data/scripts/unique/sea0Town01/PopulaceStandard/gigirya.lua index de379a19..bff5c847 100644 --- a/data/scripts/unique/sea0Town01/PopulaceStandard/gigirya.lua +++ b/data/scripts/unique/sea0Town01/PopulaceStandard/gigirya.lua @@ -1,7 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithGigirya_001", nil, nil, nil); - --player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithGigirya_002", nil, nil, nil); --THM - --player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithGigirya_003", nil, nil, nil); --THM NO GUILD + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithGigirya_001", nil, nil, nil); + player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01/PopulaceStandard/gnibnpha.lua b/data/scripts/unique/sea0Town01/PopulaceStandard/gnibnpha.lua index f2b2daca..51a9c126 100644 --- a/data/scripts/unique/sea0Town01/PopulaceStandard/gnibnpha.lua +++ b/data/scripts/unique/sea0Town01/PopulaceStandard/gnibnpha.lua @@ -1,5 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithGnibnpha_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithGnibnpha_001", nil, nil, nil); + player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01/PopulaceStandard/gregory.lua b/data/scripts/unique/sea0Town01/PopulaceStandard/gregory.lua index d55899a8..304c6792 100644 --- a/data/scripts/unique/sea0Town01/PopulaceStandard/gregory.lua +++ b/data/scripts/unique/sea0Town01/PopulaceStandard/gregory.lua @@ -1,7 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithGregory_001", nil, nil, nil); - --player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithGregory_002", nil, nil, nil); --CNJ - --player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithGregory_003", nil, nil, nil); --CNJ NO GUILD + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithGregory_001", nil, nil, nil); + player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01/PopulaceStandard/isleen.lua b/data/scripts/unique/sea0Town01/PopulaceStandard/isleen.lua index ef7f008e..da207ca5 100644 --- a/data/scripts/unique/sea0Town01/PopulaceStandard/isleen.lua +++ b/data/scripts/unique/sea0Town01/PopulaceStandard/isleen.lua @@ -1,5 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithIsleen_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithIsleen_001", nil, nil, nil); + player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01/PopulaceStandard/istrilda.lua b/data/scripts/unique/sea0Town01/PopulaceStandard/istrilda.lua deleted file mode 100644 index ef7f008e..00000000 --- a/data/scripts/unique/sea0Town01/PopulaceStandard/istrilda.lua +++ /dev/null @@ -1,5 +0,0 @@ - -function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithIsleen_001", nil, nil, nil); -end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01/PopulaceStandard/josias.lua b/data/scripts/unique/sea0Town01/PopulaceStandard/josias.lua index eefad61f..8b2ddaab 100644 --- a/data/scripts/unique/sea0Town01/PopulaceStandard/josias.lua +++ b/data/scripts/unique/sea0Town01/PopulaceStandard/josias.lua @@ -1,7 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithJosias_001", nil, nil, nil); - --player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithJosias_002", nil, nil, nil); --CRP - --player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithJosias_003", nil, nil, nil); --CRP NO GUILD + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithJosias_001", nil, nil, nil); + player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01/PopulaceStandard/kakamehi.lua b/data/scripts/unique/sea0Town01/PopulaceStandard/kakamehi.lua index 3a5d8daf..1fd8192f 100644 --- a/data/scripts/unique/sea0Town01/PopulaceStandard/kakamehi.lua +++ b/data/scripts/unique/sea0Town01/PopulaceStandard/kakamehi.lua @@ -1,7 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithKakamehi_001", nil, nil, nil); - --player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithKakamehi_002", nil, nil, nil); --IF ALC - --player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithKakamehi_003", nil, nil, nil); --IF ALC + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithKakamehi_001", nil, nil, nil); + player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01/PopulaceStandard/kokoto.lua b/data/scripts/unique/sea0Town01/PopulaceStandard/kokoto.lua index ed92c7e5..57842f54 100644 --- a/data/scripts/unique/sea0Town01/PopulaceStandard/kokoto.lua +++ b/data/scripts/unique/sea0Town01/PopulaceStandard/kokoto.lua @@ -1,7 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithKokoto_001", nil, nil, nil); - --player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithKokoto_002", nil, nil, nil); --LNC - --player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithKokoto_003", nil, nil, nil); --LNC NO GUILD + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithKokoto_001", nil, nil, nil); + player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01/PopulaceStandard/laniaitte.lua b/data/scripts/unique/sea0Town01/PopulaceStandard/laniaitte.lua index d02c6e66..2bc7af95 100644 --- a/data/scripts/unique/sea0Town01/PopulaceStandard/laniaitte.lua +++ b/data/scripts/unique/sea0Town01/PopulaceStandard/laniaitte.lua @@ -1,5 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithLaniaitte_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithLaniaitte_001", nil, nil, nil); + player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01/PopulaceStandard/lauda.lua b/data/scripts/unique/sea0Town01/PopulaceStandard/lauda.lua index 37081f9b..802c9725 100644 --- a/data/scripts/unique/sea0Town01/PopulaceStandard/lauda.lua +++ b/data/scripts/unique/sea0Town01/PopulaceStandard/lauda.lua @@ -1,7 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithLauda_001", nil, nil, nil); - --player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithLauda_002", nil, nil, nil); --BTN - --player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithLauda_003", nil, nil, nil); --BTN NO GUILD + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithLauda_001", nil, nil, nil); + player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01/PopulaceStandard/maunie.lua b/data/scripts/unique/sea0Town01/PopulaceStandard/maunie.lua index 3b47381c..a8bc7c4b 100644 --- a/data/scripts/unique/sea0Town01/PopulaceStandard/maunie.lua +++ b/data/scripts/unique/sea0Town01/PopulaceStandard/maunie.lua @@ -1,7 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithMaunie_001", nil, nil, nil); - --player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithMaunie_002", nil, nil, nil); --PUG - --player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithMaunie_003", nil, nil, nil); --PUG NO GUILD + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithMaunie_001", nil, nil, nil); + player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01/PopulaceStandard/nanaka.lua b/data/scripts/unique/sea0Town01/PopulaceStandard/nanaka.lua index 10a297e3..f9727a03 100644 --- a/data/scripts/unique/sea0Town01/PopulaceStandard/nanaka.lua +++ b/data/scripts/unique/sea0Town01/PopulaceStandard/nanaka.lua @@ -1,7 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithNanaka_001", nil, nil, nil); - --player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithNanaka_002", nil, nil, nil); --GSM - --player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithNanaka_003", nil, nil, nil); --GSM NO GUILD + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithNanaka_001", nil, nil, nil); + player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01/PopulaceStandard/stephannot.lua b/data/scripts/unique/sea0Town01/PopulaceStandard/stephannot.lua index 5562c51e..52a62b12 100644 --- a/data/scripts/unique/sea0Town01/PopulaceStandard/stephannot.lua +++ b/data/scripts/unique/sea0Town01/PopulaceStandard/stephannot.lua @@ -1,7 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithStephannot_001", nil, nil, nil); - --player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithStephannot_002", nil, nil, nil); --MIN - --player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithStephannot_003", nil, nil, nil); --MIN NO GUILD + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithStephannot_001", nil, nil, nil); + player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01/PopulaceStandard/tirauland.lua b/data/scripts/unique/sea0Town01/PopulaceStandard/tirauland.lua index a6a29c2c..562a3b02 100644 --- a/data/scripts/unique/sea0Town01/PopulaceStandard/tirauland.lua +++ b/data/scripts/unique/sea0Town01/PopulaceStandard/tirauland.lua @@ -1,8 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithTirauland_001", nil, nil, nil); - --player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithTirauland_002", nil, nil, nil); --LNC - --player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithTirauland_003", nil, nil, nil); --LNC NO GUILD - --player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithTirauland_010", nil, nil, nil); --NOT DOW/DOM + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithTirauland_001", nil, nil, nil); + player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01/PopulaceStandard/zanthael.lua b/data/scripts/unique/sea0Town01/PopulaceStandard/zanthael.lua index bdf0e75d..060127c1 100644 --- a/data/scripts/unique/sea0Town01/PopulaceStandard/zanthael.lua +++ b/data/scripts/unique/sea0Town01/PopulaceStandard/zanthael.lua @@ -1,5 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithZanthael_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithZanthael_001", nil, nil, nil); + player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01/PopulaceStandard/zehrymm.lua b/data/scripts/unique/sea0Town01/PopulaceStandard/zehrymm.lua index 31002d51..0af2eb18 100644 --- a/data/scripts/unique/sea0Town01/PopulaceStandard/zehrymm.lua +++ b/data/scripts/unique/sea0Town01/PopulaceStandard/zehrymm.lua @@ -1,5 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithZehrymm_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithZehrymm_001", nil, nil, nil); + player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01/ElevatorStandard/wellhead_lift_lvl1.lua b/data/scripts/unique/wil0Town01/ElevatorStandard/wellhead_lift_lvl1.lua new file mode 100644 index 00000000..96d7ba1e --- /dev/null +++ b/data/scripts/unique/wil0Town01/ElevatorStandard/wellhead_lift_lvl1.lua @@ -0,0 +1,15 @@ +require ("global") + +function onEventStarted(player, npc) + floorChoice = callClientFunction(player, "elevatorAskUldah001", 0); + + if (floorChoice == 1) then + callClientFunction(player, "elevatorAskUldah001", 1); + GetWorldManager():DoZoneChange(player, 209, nil, 15, -116.78, 222, 115.7, 2.85); + elseif (floorChoice == 2) then + callClientFunction(player, "elevatorAskUldah001", 2); + GetWorldManager():DoZoneChange(player, 209, nil, 15, -121.60, 269.8, 135.28, -0.268); + end + + player:EndEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/ElevatorStandard/wellhead_lift_lvl2.lua b/data/scripts/unique/wil0Town01a/ElevatorStandard/wellhead_lift_lvl2.lua new file mode 100644 index 00000000..8cdd8585 --- /dev/null +++ b/data/scripts/unique/wil0Town01a/ElevatorStandard/wellhead_lift_lvl2.lua @@ -0,0 +1,15 @@ +require ("global") + +function onEventStarted(player, npc) + floorChoice = callClientFunction(player, "elevatorAskUldah002", 0); + + if (floorChoice == 1) then + callClientFunction(player, "elevatorAskUldah002", 1); + GetWorldManager():DoZoneChange(player, 175, nil, 15, -116.78, 198, 115.7, -2.8911); + elseif (floorChoice == 2) then + callClientFunction(player, "elevatorAskUldah002", 2); + GetWorldManager():DoZoneChange(player, 209, nil, 15, -121.60, 269.8, 135.28, -0.268); + end + + player:EndEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/ElevatorStandard/wellhead_lift_lvl3.lua b/data/scripts/unique/wil0Town01a/ElevatorStandard/wellhead_lift_lvl3.lua new file mode 100644 index 00000000..eb2ec4f2 --- /dev/null +++ b/data/scripts/unique/wil0Town01a/ElevatorStandard/wellhead_lift_lvl3.lua @@ -0,0 +1,15 @@ +require ("global") + +function onEventStarted(player, npc) + floorChoice = callClientFunction(player, "elevatorAskUldah003", 0); + + if (floorChoice == 1) then + callClientFunction(player, "elevatorAskUldah003", 1); + GetWorldManager():DoZoneChange(player, 175, nil, 15, -116.78, 198, 115.7, -2.8911); + elseif (floorChoice == 2) then + callClientFunction(player, "elevatorAskUldah003", 2); + GetWorldManager():DoZoneChange(player, 209, nil, 15, -116.78, 222, 115.7, 2.85); + end + + player:EndEvent(); +end \ No newline at end of file From 1546ed54fc407ca424f82707f6c5fe33db490ff8 Mon Sep 17 00:00:00 2001 From: Filip Maj Date: Sun, 19 Jun 2016 23:23:01 -0400 Subject: [PATCH 05/15] Moved aetheryte script to new system. --- .../npc/object/aetheryte/AetheryteParent.lua | 24 ++++++------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/data/scripts/base/chara/npc/object/aetheryte/AetheryteParent.lua b/data/scripts/base/chara/npc/object/aetheryte/AetheryteParent.lua index 17cf3f5e..8d9b4c07 100644 --- a/data/scripts/base/chara/npc/object/aetheryte/AetheryteParent.lua +++ b/data/scripts/base/chara/npc/object/aetheryte/AetheryteParent.lua @@ -5,30 +5,20 @@ AetheryteParent Script Functions: eventAetheryteParentSelect(0x0, false, 0x60, 0x138807,0,0,0,0) -eventAetheryteParentDesion( -showAetheryteTips( -eventGLSelect(0) -eventSelectGLDetail(0x2a48, a, f4241, 136, 98b1d9, 1, 1, true, false) -eventGLDifficulty(0x2a48) -eventGLStart(0x2a48, 2, c8, 0, 0, 0, 0) -eventGLBoost() -eventGLPlay -eventGLReward() - - -Menu Ids: +eventAetheryteParentDesion(sheetId) +processGuildleveBoost(?, ?) +processGuildlevePlaying(??) +processGuildleveJoin() - Join party leader's levequest? --]] +require ("global") + function init(npc) return false, false, 0, 0; end function onEventStarted(player, npc, triggerName) - player:RunEventFunction("eventAetheryteParentSelect", 0x0, false, 0x61, 0x0,0,0,0,0); -end - -function onEventUpdate(player, npc, step, menuOptionSelected, lsName, lsCrest) - --player:RunEventFunction("askOfferQuest", player, 1000); + callClientFunction(player, "eventAetheryteParentSelect", 0x0, false, 0x61, 0x0,0,0,0,0); player:EndEvent(); end \ No newline at end of file From 1242a8b00cb1bd2fb0e7b3be0e64df1d4dc84930 Mon Sep 17 00:00:00 2001 From: Filip Maj Date: Sun, 19 Jun 2016 23:24:19 -0400 Subject: [PATCH 06/15] New event conditions to take advantage of PlaceDrivenCommands. --- sql/gamedata_actor_class.sql | 56 +++++++++++++++++----------------- sql/server_spawn_locations.sql | 32 +++++++++---------- 2 files changed, 44 insertions(+), 44 deletions(-) diff --git a/sql/gamedata_actor_class.sql b/sql/gamedata_actor_class.sql index 99859dd8..1c6cfb97 100644 --- a/sql/gamedata_actor_class.sql +++ b/sql/gamedata_actor_class.sql @@ -4,7 +4,7 @@ Source Host: localhost Source Database: ffxiv_server Target Host: localhost Target Database: ffxiv_server -Date: 6/12/2016 9:24:55 PM +Date: 6/19/2016 11:23:44 PM */ SET FOREIGN_KEY_CHECKS=0; @@ -2618,7 +2618,7 @@ INSERT INTO `gamedata_actor_class` VALUES ('1090234', '', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1090235', '', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1090236', '', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1090237', '', '0', null); -INSERT INTO `gamedata_actor_class` VALUES ('1090238', '/Chara/Npc/Object/MarketEntrance', '0', null); +INSERT INTO `gamedata_actor_class` VALUES ('1090238', '/Chara/Npc/Object/MarketEntrance', '0', '{\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 ('1090239', '', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1090240', '', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1090241', '', '0', null); @@ -2644,8 +2644,8 @@ INSERT INTO `gamedata_actor_class` VALUES ('1090260', '', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1090261', '', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1090262', '', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1090263', '', '0', null); -INSERT INTO `gamedata_actor_class` VALUES ('1090264', '/Chara/Npc/Object/MarketEntrance', '0', null); -INSERT INTO `gamedata_actor_class` VALUES ('1090265', '/Chara/Npc/Object/MarketEntrance', '0', null); +INSERT INTO `gamedata_actor_class` VALUES ('1090264', '/Chara/Npc/Object/MarketEntrance', '0', '{\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 ('1090265', '/Chara/Npc/Object/MarketEntrance', '0', '{\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 ('1090266', '', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1090267', '', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1090268', '', '0', null); @@ -2839,9 +2839,9 @@ INSERT INTO `gamedata_actor_class` VALUES ('1090456', '', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1090457', '', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1090458', '', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1090459', '', '0', null); -INSERT INTO `gamedata_actor_class` VALUES ('1090460', '/Chara/Npc/Object/ElevatorStandard', '0', null); -INSERT INTO `gamedata_actor_class` VALUES ('1090461', '/Chara/Npc/Object/ElevatorStandard', '0', null); -INSERT INTO `gamedata_actor_class` VALUES ('1090462', '/Chara/Npc/Object/ElevatorStandard', '0', null); +INSERT INTO `gamedata_actor_class` VALUES ('1090460', '/Chara/Npc/Object/ElevatorStandard', '0', '{\r\n \"talkEventConditions\": [],\r\n \"noticeEventConditions\": [\r\n {\r\n \"unknown1\": 4,\r\n \"unknown2\": 0,\r\n \"conditionName\": \"pushCommand\"\r\n },\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\": \"2.0\",\r\n \"outwards\": \"false\",\r\n \"silent\": \"true\",\r\n \"conditionName\": \"pushCommandIn\"\r\n },\r\n {\r\n \"radius\": \"2.0\",\r\n \"outwards\": \"true\",\r\n \"silent\": \"true\",\r\n \"conditionName\": \"pushCommandOut\"\r\n }\r\n ]\r\n}'); +INSERT INTO `gamedata_actor_class` VALUES ('1090461', '/Chara/Npc/Object/ElevatorStandard', '0', '{\r\n \"talkEventConditions\": [],\r\n \"noticeEventConditions\": [\r\n {\r\n \"unknown1\": 4,\r\n \"unknown2\": 0,\r\n \"conditionName\": \"pushCommand\"\r\n },\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\": \"2.0\",\r\n \"outwards\": \"false\",\r\n \"silent\": \"true\",\r\n \"conditionName\": \"pushCommandIn\"\r\n },\r\n {\r\n \"radius\": \"2.0\",\r\n \"outwards\": \"true\",\r\n \"silent\": \"true\",\r\n \"conditionName\": \"pushCommandOut\"\r\n }\r\n ]\r\n}'); +INSERT INTO `gamedata_actor_class` VALUES ('1090462', '/Chara/Npc/Object/ElevatorStandard', '0', '{\r\n \"talkEventConditions\": [],\r\n \"noticeEventConditions\": [\r\n {\r\n \"unknown1\": 4,\r\n \"unknown2\": 0,\r\n \"conditionName\": \"pushCommand\"\r\n },\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\": \"2.0\",\r\n \"outwards\": \"false\",\r\n \"silent\": \"true\",\r\n \"conditionName\": \"pushCommandIn\"\r\n },\r\n {\r\n \"radius\": \"2.0\",\r\n \"outwards\": \"true\",\r\n \"silent\": \"true\",\r\n \"conditionName\": \"pushCommandOut\"\r\n }\r\n ]\r\n}'); INSERT INTO `gamedata_actor_class` VALUES ('1090463', '', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1090464', '/Chara/Npc/Object/ChocoboStop', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1090465', '', '0', null); @@ -3023,12 +3023,12 @@ INSERT INTO `gamedata_actor_class` VALUES ('1200018', '', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1200019', '', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1200020', '', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1200021', '', '0', null); -INSERT INTO `gamedata_actor_class` VALUES ('1200022', '/Chara/Npc/Populace/PopulaceStandard', '0', '{\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 ('1200022', '/Chara/Npc/Populace/PopulaceStandard', '0', '{\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}'); INSERT INTO `gamedata_actor_class` VALUES ('1200023', '', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1200024', '', '4000257', null); INSERT INTO `gamedata_actor_class` VALUES ('1200025', '', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1200026', '', '0', null); -INSERT INTO `gamedata_actor_class` VALUES ('1200027', '/Chara/Npc/Object/RetainerFurniture', '0', null); +INSERT INTO `gamedata_actor_class` VALUES ('1200027', '/Chara/Npc/Object/RetainerFurniture', '0', '{\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\": 4,\r\n \"unknown2\": 0,\r\n \"conditionName\": \"pushCommand\"\r\n },\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\": \"4.0\",\r\n \"outwards\": \"false\",\r\n \"silent\": \"true\",\r\n \"conditionName\": \"pushCommandIn\"\r\n },\r\n {\r\n \"radius\": \"4.0\",\r\n \"outwards\": \"true\",\r\n \"silent\": \"true\",\r\n \"conditionName\": \"pushCommandOut\"\r\n }\r\n ]\r\n}'); INSERT INTO `gamedata_actor_class` VALUES ('1200028', '', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1200029', '', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1200030', '', '0', null); @@ -3045,7 +3045,7 @@ INSERT INTO `gamedata_actor_class` VALUES ('1200040', '', '4010016', null); INSERT INTO `gamedata_actor_class` VALUES ('1200041', '', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1200042', '', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1200043', '', '0', null); -INSERT INTO `gamedata_actor_class` VALUES ('1200044', '/Chara/Npc/Populace/PopulaceStandard', '0', '{\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 ('1200044', '/Chara/Npc/Populace/PopulaceStandard', '0', '{\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 ('1200045', '', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1200046', '', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1200047', '', '0', null); @@ -3120,9 +3120,9 @@ INSERT INTO `gamedata_actor_class` VALUES ('1200115', '', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1200116', '', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1200117', '', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1200118', '', '0', null); -INSERT INTO `gamedata_actor_class` VALUES ('1200119', '/Chara/Npc/Object/BookShelf', '4000600', null); +INSERT INTO `gamedata_actor_class` VALUES ('1200119', '/Chara/Npc/Object/BookShelf', '4000600', '{\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 ('1200120', '/Chara/Npc/Object/BookShelf', '4000600', '{\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 ('1200121', '', '4000600', null); +INSERT INTO `gamedata_actor_class` VALUES ('1200121', '/Chara/Npc/Object/BookShelf', '4000600', '{\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 ('1200122', '', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1200123', '', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1200124', '', '0', null); @@ -3409,12 +3409,12 @@ INSERT INTO `gamedata_actor_class` VALUES ('1200410', '', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1200411', '', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1200412', '', '4000257', null); INSERT INTO `gamedata_actor_class` VALUES ('1280000', '', '0', null); -INSERT INTO `gamedata_actor_class` VALUES ('1280001', '/Chara/Npc/Object/Aetheryte/AetheryteParent', '4010014', '{\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 ('1280002', '', '4010014', null); -INSERT INTO `gamedata_actor_class` VALUES ('1280003', '', '4010014', null); -INSERT INTO `gamedata_actor_class` VALUES ('1280004', '', '4010014', null); -INSERT INTO `gamedata_actor_class` VALUES ('1280005', '', '4010014', null); -INSERT INTO `gamedata_actor_class` VALUES ('1280006', '', '4010014', null); +INSERT INTO `gamedata_actor_class` VALUES ('1280001', '/Chara/Npc/Object/Aetheryte/AetheryteParent', '4010014', '{\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\": 4,\r\n \"unknown2\": 0,\r\n \"conditionName\": \"pushCommand\"\r\n },\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\": \"10.0\",\r\n \"outwards\": \"false\",\r\n \"silent\": \"true\",\r\n \"conditionName\": \"pushCommandIn\"\r\n },\r\n {\r\n \"radius\": \"10.0\",\r\n \"outwards\": \"true\",\r\n \"silent\": \"true\",\r\n \"conditionName\": \"pushCommandOut\"\r\n }\r\n ]\r\n}'); +INSERT INTO `gamedata_actor_class` VALUES ('1280002', '', '4010014', '{\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\": 4,\r\n \"unknown2\": 0,\r\n \"conditionName\": \"pushCommand\"\r\n },\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\": \"10.0\",\r\n \"outwards\": \"false\",\r\n \"silent\": \"true\",\r\n \"conditionName\": \"pushCommandIn\"\r\n },\r\n {\r\n \"radius\": \"10.0\",\r\n \"outwards\": \"true\",\r\n \"silent\": \"true\",\r\n \"conditionName\": \"pushCommandOut\"\r\n }\r\n ]\r\n}'); +INSERT INTO `gamedata_actor_class` VALUES ('1280003', '', '4010014', '{\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\": 4,\r\n \"unknown2\": 0,\r\n \"conditionName\": \"pushCommand\"\r\n },\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\": \"10.0\",\r\n \"outwards\": \"false\",\r\n \"silent\": \"true\",\r\n \"conditionName\": \"pushCommandIn\"\r\n },\r\n {\r\n \"radius\": \"10.0\",\r\n \"outwards\": \"true\",\r\n \"silent\": \"true\",\r\n \"conditionName\": \"pushCommandOut\"\r\n }\r\n ]\r\n}'); +INSERT INTO `gamedata_actor_class` VALUES ('1280004', '', '4010014', '{\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\": 4,\r\n \"unknown2\": 0,\r\n \"conditionName\": \"pushCommand\"\r\n },\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\": \"10.0\",\r\n \"outwards\": \"false\",\r\n \"silent\": \"true\",\r\n \"conditionName\": \"pushCommandIn\"\r\n },\r\n {\r\n \"radius\": \"10.0\",\r\n \"outwards\": \"true\",\r\n \"silent\": \"true\",\r\n \"conditionName\": \"pushCommandOut\"\r\n }\r\n ]\r\n}'); +INSERT INTO `gamedata_actor_class` VALUES ('1280005', '', '4010014', '{\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\": 4,\r\n \"unknown2\": 0,\r\n \"conditionName\": \"pushCommand\"\r\n },\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\": \"10.0\",\r\n \"outwards\": \"false\",\r\n \"silent\": \"true\",\r\n \"conditionName\": \"pushCommandIn\"\r\n },\r\n {\r\n \"radius\": \"10.0\",\r\n \"outwards\": \"true\",\r\n \"silent\": \"true\",\r\n \"conditionName\": \"pushCommandOut\"\r\n }\r\n ]\r\n}'); +INSERT INTO `gamedata_actor_class` VALUES ('1280006', '', '4010014', '{\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\": 4,\r\n \"unknown2\": 0,\r\n \"conditionName\": \"pushCommand\"\r\n },\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\": \"10.0\",\r\n \"outwards\": \"false\",\r\n \"silent\": \"true\",\r\n \"conditionName\": \"pushCommandIn\"\r\n },\r\n {\r\n \"radius\": \"10.0\",\r\n \"outwards\": \"true\",\r\n \"silent\": \"true\",\r\n \"conditionName\": \"pushCommandOut\"\r\n }\r\n ]\r\n}'); INSERT INTO `gamedata_actor_class` VALUES ('1280007', '', '4010015', null); INSERT INTO `gamedata_actor_class` VALUES ('1280008', '', '4010015', null); INSERT INTO `gamedata_actor_class` VALUES ('1280009', '', '4010015', null); @@ -3432,12 +3432,12 @@ INSERT INTO `gamedata_actor_class` VALUES ('1280020', '', '4010015', null); INSERT INTO `gamedata_actor_class` VALUES ('1280021', '', '4010015', null); INSERT INTO `gamedata_actor_class` VALUES ('1280022', '', '4010015', null); INSERT INTO `gamedata_actor_class` VALUES ('1280023', '', '4010015', null); -INSERT INTO `gamedata_actor_class` VALUES ('1280031', '/Chara/Npc/Object/Aetheryte/AetheryteParent', '4010014', null); -INSERT INTO `gamedata_actor_class` VALUES ('1280032', '', '4010014', null); -INSERT INTO `gamedata_actor_class` VALUES ('1280033', '', '4010014', null); -INSERT INTO `gamedata_actor_class` VALUES ('1280034', '', '4010014', null); -INSERT INTO `gamedata_actor_class` VALUES ('1280035', '', '4010014', null); -INSERT INTO `gamedata_actor_class` VALUES ('1280036', '', '4010014', null); +INSERT INTO `gamedata_actor_class` VALUES ('1280031', '/Chara/Npc/Object/Aetheryte/AetheryteParent', '4010014', '{\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\": 4,\r\n \"unknown2\": 0,\r\n \"conditionName\": \"pushCommand\"\r\n },\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\": \"10.0\",\r\n \"outwards\": \"false\",\r\n \"silent\": \"true\",\r\n \"conditionName\": \"pushCommandIn\"\r\n },\r\n {\r\n \"radius\": \"10.0\",\r\n \"outwards\": \"true\",\r\n \"silent\": \"true\",\r\n \"conditionName\": \"pushCommandOut\"\r\n }\r\n ]\r\n}'); +INSERT INTO `gamedata_actor_class` VALUES ('1280032', '', '4010014', '{\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\": 4,\r\n \"unknown2\": 0,\r\n \"conditionName\": \"pushCommand\"\r\n },\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\": \"10.0\",\r\n \"outwards\": \"false\",\r\n \"silent\": \"true\",\r\n \"conditionName\": \"pushCommandIn\"\r\n },\r\n {\r\n \"radius\": \"10.0\",\r\n \"outwards\": \"true\",\r\n \"silent\": \"true\",\r\n \"conditionName\": \"pushCommandOut\"\r\n }\r\n ]\r\n}'); +INSERT INTO `gamedata_actor_class` VALUES ('1280033', '', '4010014', '{\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\": 4,\r\n \"unknown2\": 0,\r\n \"conditionName\": \"pushCommand\"\r\n },\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\": \"10.0\",\r\n \"outwards\": \"false\",\r\n \"silent\": \"true\",\r\n \"conditionName\": \"pushCommandIn\"\r\n },\r\n {\r\n \"radius\": \"10.0\",\r\n \"outwards\": \"true\",\r\n \"silent\": \"true\",\r\n \"conditionName\": \"pushCommandOut\"\r\n }\r\n ]\r\n}'); +INSERT INTO `gamedata_actor_class` VALUES ('1280034', '', '4010014', '{\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\": 4,\r\n \"unknown2\": 0,\r\n \"conditionName\": \"pushCommand\"\r\n },\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\": \"10.0\",\r\n \"outwards\": \"false\",\r\n \"silent\": \"true\",\r\n \"conditionName\": \"pushCommandIn\"\r\n },\r\n {\r\n \"radius\": \"10.0\",\r\n \"outwards\": \"true\",\r\n \"silent\": \"true\",\r\n \"conditionName\": \"pushCommandOut\"\r\n }\r\n ]\r\n}'); +INSERT INTO `gamedata_actor_class` VALUES ('1280035', '', '4010014', '{\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\": 4,\r\n \"unknown2\": 0,\r\n \"conditionName\": \"pushCommand\"\r\n },\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\": \"10.0\",\r\n \"outwards\": \"false\",\r\n \"silent\": \"true\",\r\n \"conditionName\": \"pushCommandIn\"\r\n },\r\n {\r\n \"radius\": \"10.0\",\r\n \"outwards\": \"true\",\r\n \"silent\": \"true\",\r\n \"conditionName\": \"pushCommandOut\"\r\n }\r\n ]\r\n}'); +INSERT INTO `gamedata_actor_class` VALUES ('1280036', '', '4010014', '{\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\": 4,\r\n \"unknown2\": 0,\r\n \"conditionName\": \"pushCommand\"\r\n },\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\": \"10.0\",\r\n \"outwards\": \"false\",\r\n \"silent\": \"true\",\r\n \"conditionName\": \"pushCommandIn\"\r\n },\r\n {\r\n \"radius\": \"10.0\",\r\n \"outwards\": \"true\",\r\n \"silent\": \"true\",\r\n \"conditionName\": \"pushCommandOut\"\r\n }\r\n ]\r\n}'); INSERT INTO `gamedata_actor_class` VALUES ('1280037', '', '4010015', null); INSERT INTO `gamedata_actor_class` VALUES ('1280038', '', '4010015', null); INSERT INTO `gamedata_actor_class` VALUES ('1280039', '', '4010015', null); @@ -3532,9 +3532,9 @@ INSERT INTO `gamedata_actor_class` VALUES ('1290003', '', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1290004', '/Chara/Npc/Object/BgKeepout', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1290005', '', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1290006', '', '0', null); -INSERT INTO `gamedata_actor_class` VALUES ('1290007', '/Chara/Npc/Object/ElevatorStandard', '0', null); -INSERT INTO `gamedata_actor_class` VALUES ('1290008', '/Chara/Npc/Object/ElevatorStandard', '0', null); -INSERT INTO `gamedata_actor_class` VALUES ('1290009', '/Chara/Npc/Object/ElevatorStandard', '0', null); +INSERT INTO `gamedata_actor_class` VALUES ('1290007', '/Chara/Npc/Object/ElevatorStandard', '0', '{\r\n \"talkEventConditions\": [],\r\n \"noticeEventConditions\": [\r\n {\r\n \"unknown1\": 4,\r\n \"unknown2\": 0,\r\n \"conditionName\": \"pushCommand\"\r\n },\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\": \"3.0\",\r\n \"outwards\": \"false\",\r\n \"silent\": \"true\",\r\n \"conditionName\": \"pushCommandIn\"\r\n },\r\n {\r\n \"radius\": \"3.0\",\r\n \"outwards\": \"true\",\r\n \"silent\": \"true\",\r\n \"conditionName\": \"pushCommandOut\"\r\n }\r\n ]\r\n}'); +INSERT INTO `gamedata_actor_class` VALUES ('1290008', '/Chara/Npc/Object/ElevatorStandard', '0', '{\r\n \"talkEventConditions\": [],\r\n \"noticeEventConditions\": [\r\n {\r\n \"unknown1\": 4,\r\n \"unknown2\": 0,\r\n \"conditionName\": \"pushCommand\"\r\n },\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\": \"3.0\",\r\n \"outwards\": \"false\",\r\n \"silent\": \"true\",\r\n \"conditionName\": \"pushCommandIn\"\r\n },\r\n {\r\n \"radius\": \"3.0\",\r\n \"outwards\": \"true\",\r\n \"silent\": \"true\",\r\n \"conditionName\": \"pushCommandOut\"\r\n }\r\n ]\r\n}'); +INSERT INTO `gamedata_actor_class` VALUES ('1290009', '/Chara/Npc/Object/ElevatorStandard', '0', '{\r\n \"talkEventConditions\": [],\r\n \"noticeEventConditions\": [\r\n {\r\n \"unknown1\": 4,\r\n \"unknown2\": 0,\r\n \"conditionName\": \"pushCommand\"\r\n },\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\": \"3.0\",\r\n \"outwards\": \"false\",\r\n \"silent\": \"true\",\r\n \"conditionName\": \"pushCommandIn\"\r\n },\r\n {\r\n \"radius\": \"3.0\",\r\n \"outwards\": \"true\",\r\n \"silent\": \"true\",\r\n \"conditionName\": \"pushCommandOut\"\r\n }\r\n ]\r\n}'); INSERT INTO `gamedata_actor_class` VALUES ('1290010', '', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1290011', '', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1290012', '', '0', null); @@ -3548,7 +3548,7 @@ INSERT INTO `gamedata_actor_class` VALUES ('1290019', '', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1290020', '', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1290021', '', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1290022', '', '0', null); -INSERT INTO `gamedata_actor_class` VALUES ('1290023', '/Chara/Npc/Object/ElevatorStandard', '0', null); +INSERT INTO `gamedata_actor_class` VALUES ('1290023', '/Chara/Npc/Object/ElevatorStandard', '0', '{\r\n \"talkEventConditions\": [],\r\n \"noticeEventConditions\": [\r\n {\r\n \"unknown1\": 4,\r\n \"unknown2\": 0,\r\n \"conditionName\": \"pushCommand\"\r\n },\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\": \"2.0\",\r\n \"outwards\": \"false\",\r\n \"silent\": \"true\",\r\n \"conditionName\": \"pushCommandIn\"\r\n },\r\n {\r\n \"radius\": \"2.0\",\r\n \"outwards\": \"true\",\r\n \"silent\": \"true\",\r\n \"conditionName\": \"pushCommandOut\"\r\n }\r\n ]\r\n}'); INSERT INTO `gamedata_actor_class` VALUES ('1290024', '', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1290025', '', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1290026', '', '0', null); diff --git a/sql/server_spawn_locations.sql b/sql/server_spawn_locations.sql index 38e81a5e..5395a991 100644 --- a/sql/server_spawn_locations.sql +++ b/sql/server_spawn_locations.sql @@ -4,7 +4,7 @@ Source Host: localhost Source Database: ffxiv_server Target Host: localhost Target Database: ffxiv_server -Date: 6/12/2016 9:25:03 PM +Date: 6/19/2016 11:23:52 PM */ SET FOREIGN_KEY_CHECKS=0; @@ -60,12 +60,12 @@ INSERT INTO `server_spawn_locations` VALUES ('26', '1000455', 'tmokkri', '133', INSERT INTO `server_spawn_locations` VALUES ('27', '1000351', 'zanthael', '133', '', '0', '-441.8', '21', '175', '-0.35', '0', '10', null); INSERT INTO `server_spawn_locations` VALUES ('28', '1500125', 'merewina', '133', '', '0', '-423.93', '32', '224.19', '1.28', '0', '1040', null); INSERT INTO `server_spawn_locations` VALUES ('29', '1001573', 'sweetnix_rosycheeks', '133', '', '0', '-477.8', '32', '168.21', '-2.49', '0', '0', null); -INSERT INTO `server_spawn_locations` VALUES ('30', '1290007', '', '133', '', '0', '-447', '19', '220', '-2', '0', '0', null); -INSERT INTO `server_spawn_locations` VALUES ('31', '1290008', '', '133', '', '0', '-447.13', '40', '220.03', '-2', '0', '0', null); -INSERT INTO `server_spawn_locations` VALUES ('32', '1290009', '', '133', '', '0', '-458', '92', '175', '-1', '0', '0', null); -INSERT INTO `server_spawn_locations` VALUES ('33', '1200044', '', '133', '', '0', '-441.12', '19', '206.39', '2.59', '0', '0', null); -INSERT INTO `server_spawn_locations` VALUES ('34', '1200022', '', '133', '', '0', '-438.76', '19', '207.6', '3.14', '0', '0', null); -INSERT INTO `server_spawn_locations` VALUES ('35', '1200027', '', '133', '', '0', '-432', '40', '202', '-1', '0', '0', null); +INSERT INTO `server_spawn_locations` VALUES ('30', '1290007', 'crows_lift_lvl1', '133', '', '0', '-447', '19', '220', '-2', '0', '0', null); +INSERT INTO `server_spawn_locations` VALUES ('31', '1290008', 'crows_lift_lvl2', '133', '', '0', '-447.13', '40', '220.03', '-2', '0', '0', null); +INSERT INTO `server_spawn_locations` VALUES ('32', '1290009', 'crows_lift_lvl3', '133', '', '0', '-458', '92', '175', '-1', '0', '0', null); +INSERT INTO `server_spawn_locations` VALUES ('33', '1200044', 'chocobo', '133', '', '0', '-441.12', '19', '206.39', '2.59', '0', '0', null); +INSERT INTO `server_spawn_locations` VALUES ('34', '1200022', 'chocobo_standard', '133', '', '0', '-438.76', '19', '207.6', '3.14', '0', '0', null); +INSERT INTO `server_spawn_locations` VALUES ('35', '1200027', 'retainer_bell', '133', '', '0', '-432', '40', '202', '-1', '0', '0', null); INSERT INTO `server_spawn_locations` VALUES ('36', '1200193', 'task_board', '133', '', '0', '-464.77', '41.71', '183.27', '0', '0', '0', null); INSERT INTO `server_spawn_locations` VALUES ('37', '1001424', 'gegeissa', '170', '', '0', '-56.69', '192', '-6.59', '2.89', '0', '0', null); INSERT INTO `server_spawn_locations` VALUES ('38', '1001425', 'gdatnan', '170', '', '0', '-46.93', '191.98', '-3.62', '2.89', '0', '0', null); @@ -137,7 +137,7 @@ INSERT INTO `server_spawn_locations` VALUES ('103', '1090114', '', '175', '', '0 INSERT INTO `server_spawn_locations` VALUES ('104', '1090265', '', '175', '', '0', '-235', '189', '50.5', '0', '0', '0', null); INSERT INTO `server_spawn_locations` VALUES ('105', '1090375', '', '175', '', '0', '-66.1', '196', '48.94', '-1.7', '0', '0', null); INSERT INTO `server_spawn_locations` VALUES ('106', '1090402', '', '175', '', '0', '-22.81', '196', '87.82', '0', '0', '0', null); -INSERT INTO `server_spawn_locations` VALUES ('107', '1090460', '', '175', '', '0', '-117.2', '198', '117.6', '0', '0', '0', null); +INSERT INTO `server_spawn_locations` VALUES ('107', '1090460', 'wellhead_lift_lvl1', '175', '', '0', '-117.2', '198', '117.6', '0', '0', '0', null); INSERT INTO `server_spawn_locations` VALUES ('108', '1200022', '', '175', '', '0', '-39.26', '192.1', '13.97', '-0.38', '0', '0', null); INSERT INTO `server_spawn_locations` VALUES ('109', '1200027', '', '175', '', '0', '-58.4', '195', '75.84', '-0.89', '0', '0', null); INSERT INTO `server_spawn_locations` VALUES ('110', '1200027', '', '175', '', '0', '27.35', '192.1', '109.02', '3.13', '0', '0', null); @@ -255,10 +255,10 @@ INSERT INTO `server_spawn_locations` VALUES ('221', '1001421', 'peneli_zuneli', INSERT INTO `server_spawn_locations` VALUES ('222', '1001422', 'milgogo', '209', '', '0', '-115.68', '226', '245.98', '2.85', '0', '0', null); INSERT INTO `server_spawn_locations` VALUES ('223', '1001423', 'mumutano', '209', '', '0', '-121.98', '226', '244.1', '2.85', '0', '1015', null); INSERT INTO `server_spawn_locations` VALUES ('224', '1001445', 'singleton', '209', '', '0', '-191.98', '194.6', '181.33', '1.06', '0', '1016', null); -INSERT INTO `server_spawn_locations` VALUES ('225', '1001451', 'mammet', '209', '', '0', '-138.31', '203.5', '274.12', '-1.42', '0', '0', null); -INSERT INTO `server_spawn_locations` VALUES ('226', '1001452', 'mammet', '209', '', '0', '-136.17', '201.5', '266.45', '-2.63', '0', '0', null); -INSERT INTO `server_spawn_locations` VALUES ('227', '1001453', 'mammet', '209', '', '0', '49.71', '194.39', '243.82', '-1.11', '0', '0', null); -INSERT INTO `server_spawn_locations` VALUES ('228', '1001454', 'mammet', '209', '', '0', '-203.9', '228.2', '297.97', '-0.4', '0', '0', null); +INSERT INTO `server_spawn_locations` VALUES ('225', '1001451', 'mammet_gsm', '209', '', '0', '-138.31', '203.5', '274.12', '-1.42', '0', '0', null); +INSERT INTO `server_spawn_locations` VALUES ('226', '1001452', 'mammet_gsm2', '209', '', '0', '-136.17', '201.5', '266.45', '-2.63', '0', '0', null); +INSERT INTO `server_spawn_locations` VALUES ('227', '1001453', 'mammet_wvr', '209', '', '0', '49.71', '194.39', '243.82', '-1.11', '0', '0', null); +INSERT INTO `server_spawn_locations` VALUES ('228', '1001454', 'mammet_alc', '209', '', '0', '-203.9', '228.2', '297.97', '-0.4', '0', '0', null); INSERT INTO `server_spawn_locations` VALUES ('229', '1001463', 'kukusi', '209', '', '0', '-195.01', '228.2', '293.18', '0.69', '0', '1041', null); INSERT INTO `server_spawn_locations` VALUES ('230', '1001464', 'vannes', '209', '', '0', '-185.18', '195.03', '149.95', '0.07', '0', '1076', null); INSERT INTO `server_spawn_locations` VALUES ('231', '1001465', 'tatasha', '209', '', '0', '-193.23', '195.01', '168.92', '2.31', '0', '1041', null); @@ -290,13 +290,13 @@ INSERT INTO `server_spawn_locations` VALUES ('256', '1090253', '', '209', '', '0 INSERT INTO `server_spawn_locations` VALUES ('257', '1090283', '', '209', '', '0', '-185.26', '195', '179.74', '-2.28', '0', '0', null); INSERT INTO `server_spawn_locations` VALUES ('258', '1090314', '', '209', '', '0', '-72.53', '202.02', '153.78', '0', '0', '0', null); INSERT INTO `server_spawn_locations` VALUES ('259', '1090452', '', '209', '', '0', '-105.3', '222.01', '194.83', '0', '0', '0', null); -INSERT INTO `server_spawn_locations` VALUES ('260', '1090461', '', '209', '', '0', '-117.2', '222', '117.6', '0', '0', '0', null); -INSERT INTO `server_spawn_locations` VALUES ('261', '1090462', '', '209', '', '0', '-119.84', '269.86', '127.86', '0', '0', '0', null); +INSERT INTO `server_spawn_locations` VALUES ('260', '1090461', 'wellhead_lift_lvl2', '209', '', '0', '-117.2', '222', '117.6', '0', '0', '0', null); +INSERT INTO `server_spawn_locations` VALUES ('261', '1090462', 'wellhead_lift_lvl3', '209', '', '0', '-119.84', '269.86', '127.86', '0', '0', '0', null); INSERT INTO `server_spawn_locations` VALUES ('262', '1090524', '', '209', '', '0', '-111.41', '224', '217.13', '0', '0', '0', null); INSERT INTO `server_spawn_locations` VALUES ('263', '1200120', 'dusty_tomes', '209', '', '0', '-289', '207.1', '221.54', '0', '0', '0', null); INSERT INTO `server_spawn_locations` VALUES ('264', '1200288', '', '209', '', '0', '-151.15', '198', '160.49', '1.62', '0', '0', null); INSERT INTO `server_spawn_locations` VALUES ('265', '1290004', '', '209', '', '0', '-147.71', '234.14', '198.37', '0', '0', '0', null); -INSERT INTO `server_spawn_locations` VALUES ('266', '1290023', '', '209', '', '0', '-117.2', '222', '117.6', '0', '0', '0', null); +INSERT INTO `server_spawn_locations` VALUES ('266', '1290023', 'wellhead_lift_lvl2', '209', '', '0', '-117.2', '222', '117.6', '0', '0', '0', null); INSERT INTO `server_spawn_locations` VALUES ('267', '1500126', 'vavaki', '209', '', '0', '-32.44', '198', '143.58', '1.52', '0', '1040', null); INSERT INTO `server_spawn_locations` VALUES ('268', '1500208', 'stangyth', '209', '', '0', '-121.95', '271.2', '158.42', '-2.95', '0', '0', null); INSERT INTO `server_spawn_locations` VALUES ('269', '1500209', 'lunnie', '209', '', '0', '-120.52', '271.2', '161.81', '0.21', '0', '0', null); @@ -640,7 +640,7 @@ INSERT INTO `server_spawn_locations` VALUES ('606', '1000431', '', '155', '', '0 INSERT INTO `server_spawn_locations` VALUES ('607', '1000432', '', '155', '', '0', '66.15', '4', '-1199.99', '-2.93', '0', '1026', null); INSERT INTO `server_spawn_locations` VALUES ('608', '1000434', '', '155', '', '0', '71.95', '4', '-1200.24', '-1', '0', '1025', null); INSERT INTO `server_spawn_locations` VALUES ('609', '1000433', '', '155', '', '0', '75.45', '4', '-1202.3', '-2.06', '0', '1015', null); -INSERT INTO `server_spawn_locations` VALUES ('610', '1200195', '', '155', '', '0', '75.73', '5.5', '-1201.37', '0', '0', '0', null); +INSERT INTO `server_spawn_locations` VALUES ('610', '1200195', 'task_board', '155', '', '0', '75.73', '5.5', '-1201.37', '0', '0', '0', null); INSERT INTO `server_spawn_locations` VALUES ('611', '1000435', '', '155', '', '0', '69.39', '4', '-1196.54', '2.97', '0', '1041', null); INSERT INTO `server_spawn_locations` VALUES ('612', '1000436', '', '155', '', '0', '62.33', '4', '-1194.06', '-2.53', '0', '1025', null); INSERT INTO `server_spawn_locations` VALUES ('613', '1001951', '', '155', '', '0', '66.94', '4', '-1194.13', '-2.32', '0', '1016', null); From ff2f587959aebb944798aea18496b81dd8ba7697 Mon Sep 17 00:00:00 2001 From: Filip Maj Date: Tue, 21 Jun 2016 15:29:48 -0400 Subject: [PATCH 07/15] Modified all wil0Town01a scripts to new way. --- .../PopulaceStandard/abylgo_hamylgo.lua | 4 +++- .../wil0Town01a/PopulaceStandard/anthoinette.lua | 7 ++++--- .../wil0Town01a/PopulaceStandard/apacho_naccho.lua | 5 +++-- .../unique/wil0Town01a/PopulaceStandard/aspipi.lua | 7 ++++--- .../unique/wil0Town01a/PopulaceStandard/babaki.lua | 5 +++-- .../wil0Town01a/PopulaceStandard/barnabaix.lua | 7 ++++--- .../wil0Town01a/PopulaceStandard/berthar.lua | 7 ++++--- .../wil0Town01a/PopulaceStandard/bouchard.lua | 7 ++++--- .../wil0Town01a/PopulaceStandard/cahernaut.lua | 7 ++++--- .../wil0Town01a/PopulaceStandard/chachai.lua | 7 ++++--- .../wil0Town01a/PopulaceStandard/ciceroix.lua | 7 ++++--- .../wil0Town01a/PopulaceStandard/crhabye.lua | 7 ++++--- .../wil0Town01a/PopulaceStandard/dariustel.lua | 5 +++-- .../wil0Town01a/PopulaceStandard/deaustie.lua | 7 ++++--- .../wil0Town01a/PopulaceStandard/diriaine.lua | 7 ++++--- .../unique/wil0Town01a/PopulaceStandard/dylise.lua | 5 +++-- .../unique/wil0Town01a/PopulaceStandard/eara.lua | 7 ++++--- .../wil0Town01a/PopulaceStandard/eleanor.lua | 7 ++++--- .../wil0Town01a/PopulaceStandard/elecotte.lua | 7 ++++--- .../unique/wil0Town01a/PopulaceStandard/fifilo.lua | 7 ++++--- .../PopulaceStandard/fineco_romanecco.lua | 5 +++-- .../wil0Town01a/PopulaceStandard/fruhybolg.lua | 5 +++-- .../wil0Town01a/PopulaceStandard/fyrilsunn.lua | 7 ++++--- .../wil0Town01a/PopulaceStandard/galeren.lua | 5 +++-- .../wil0Town01a/PopulaceStandard/gloiucen.lua | 5 +++-- .../unique/wil0Town01a/PopulaceStandard/gogofu.lua | 7 ++++--- .../wil0Town01a/PopulaceStandard/goodife.lua | 7 ++++--- .../wil0Town01a/PopulaceStandard/guencen.lua | 8 ++++---- .../wil0Town01a/PopulaceStandard/guillestet.lua | 7 ++++--- .../unique/wil0Town01a/PopulaceStandard/hahayo.lua | 4 +++- .../wil0Town01a/PopulaceStandard/hawazi_zowazi.lua | 7 ++++--- .../wil0Town01a/PopulaceStandard/hcidjaa.lua | 7 ++++--- .../wil0Town01a/PopulaceStandard/holbubu.lua | 7 ++++--- .../wil0Town01a/PopulaceStandard/illofii.lua | 7 ++++--- .../wil0Town01a/PopulaceStandard/isabella.lua | 7 ++++--- .../wil0Town01a/PopulaceStandard/jajanzo.lua | 7 ++++--- .../unique/wil0Town01a/PopulaceStandard/jannie.lua | 7 ++++--- .../unique/wil0Town01a/PopulaceStandard/jeger.lua | 7 ++++--- .../wil0Town01a/PopulaceStandard/jenlyns.lua | 7 ++++--- .../PopulaceStandard/kamlito_halito.lua | 7 ++++--- .../wil0Town01a/PopulaceStandard/kopuru_fupuru.lua | 14 +++----------- .../unique/wil0Town01a/PopulaceStandard/kukusi.lua | 7 ++++--- .../wil0Town01a/PopulaceStandard/lefchild.lua | 7 ++++--- .../unique/wil0Town01a/PopulaceStandard/liaime.lua | 7 ++++--- .../wil0Town01a/PopulaceStandard/linette.lua | 7 ++++--- .../wil0Town01a/PopulaceStandard/lohwaeb.lua | 7 ++++--- .../wil0Town01a/PopulaceStandard/lulutsu.lua | 7 ++++--- .../wil0Town01a/PopulaceStandard/lyngwaek.lua | 7 ++++--- .../unique/wil0Town01a/PopulaceStandard/mamaza.lua | 7 ++++--- .../unique/wil0Town01a/PopulaceStandard/mammet.lua | 7 ++++--- .../wil0Town01a/PopulaceStandard/mammet_alc.lua | 4 +++- .../wil0Town01a/PopulaceStandard/mammet_gsm.lua | 5 +++-- .../wil0Town01a/PopulaceStandard/mammet_gsm2.lua | 4 +++- .../wil0Town01a/PopulaceStandard/mammet_wvr.lua | 7 ++++--- .../wil0Town01a/PopulaceStandard/margarete.lua | 5 +++-- .../wil0Town01a/PopulaceStandard/martine.lua | 7 ++++--- .../wil0Town01a/PopulaceStandard/milgogo.lua | 5 +++-- .../unique/wil0Town01a/PopulaceStandard/miyaya.lua | 7 ++++--- .../wil0Town01a/PopulaceStandard/mohtfryd.lua | 4 +++- .../wil0Town01a/PopulaceStandard/mumukiya.lua | 4 +++- .../wil0Town01a/PopulaceStandard/mumutano.lua | 4 +++- .../wil0Town01a/PopulaceStandard/neymumu.lua | 7 ++++--- .../wil0Town01a/PopulaceStandard/nhagi_amariyo.lua | 7 ++++--- .../wil0Town01a/PopulaceStandard/nogeloix.lua | 7 ++++--- .../wil0Town01a/PopulaceStandard/obili_tambili.lua | 7 ++++--- .../wil0Town01a/PopulaceStandard/oefyrblaet.lua | 5 +++-- .../unique/wil0Town01a/PopulaceStandard/papawa.lua | 7 ++++--- .../wil0Town01a/PopulaceStandard/peneli_zuneli.lua | 7 ++++--- .../wil0Town01a/PopulaceStandard/pierriquet.lua | 5 +++-- .../wil0Town01a/PopulaceStandard/qhota_nbolo.lua | 5 +++-- .../wil0Town01a/PopulaceStandard/qmhalawi.lua | 7 ++++--- .../wil0Town01a/PopulaceStandard/rinh_maimhov.lua | 5 +++-- .../wil0Town01a/PopulaceStandard/rosalind.lua | 7 ++++--- .../unique/wil0Town01a/PopulaceStandard/safufu.lua | 7 ++++--- .../wil0Town01a/PopulaceStandard/sinette.lua | 7 ++++--- .../wil0Town01a/PopulaceStandard/singleton.lua | 7 ++++--- .../wil0Town01a/PopulaceStandard/sungi_kelungi.lua | 7 ++++--- .../wil0Town01a/PopulaceStandard/swerdahrm.lua | 5 +++-- .../wil0Town01a/PopulaceStandard/tatasha.lua | 7 ++++--- .../unique/wil0Town01a/PopulaceStandard/totono.lua | 7 ++++--- .../wil0Town01a/PopulaceStandard/tutubuki.lua | 5 +++-- .../wil0Town01a/PopulaceStandard/tyago_moui.lua | 7 ++++--- .../unique/wil0Town01a/PopulaceStandard/ubokhn.lua | 7 ++++--- .../wil0Town01a/PopulaceStandard/uwilsyng.lua | 7 ++++--- .../unique/wil0Town01a/PopulaceStandard/vannes.lua | 5 +++-- .../unique/wil0Town01a/PopulaceStandard/vavaki.lua | 5 +++-- .../wil0Town01a/PopulaceStandard/wannore.lua | 5 +++-- .../wil0Town01a/PopulaceStandard/wawaton.lua | 4 +++- .../wil0Town01a/PopulaceStandard/wise_moon.lua | 7 ++++--- .../wil0Town01a/PopulaceStandard/wyznguld.lua | 7 ++++--- .../wil0Town01a/PopulaceStandard/xau_nbolo.lua | 5 +++-- .../wil0Town01a/PopulaceStandard/xdhilogo.lua | 7 ++++--- .../unique/wil0Town01a/PopulaceStandard/yayake.lua | 5 +++-- .../wil0Town01a/PopulaceStandard/yuyubesu.lua | 7 ++++--- 94 files changed, 345 insertions(+), 253 deletions(-) diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/abylgo_hamylgo.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/abylgo_hamylgo.lua index 82a9e7d6..e5fc6dde 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/abylgo_hamylgo.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/abylgo_hamylgo.lua @@ -1,6 +1,8 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithAbylgohamylgo_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithAbylgohamylgo_001", nil, nil, nil); + player:endEvent(); end diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/anthoinette.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/anthoinette.lua index f97513f5..9b7dc04d 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/anthoinette.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/anthoinette.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithAnthoinette_001", nil, nil, nil); -end - + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithAnthoinette_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/apacho_naccho.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/apacho_naccho.lua index 2afa3318..2252786c 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/apacho_naccho.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/apacho_naccho.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithApachonaccho_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithApachonaccho_001", nil, nil, nil); + player:endEvent(); end - diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/aspipi.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/aspipi.lua index 6f26f1ec..d48a5793 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/aspipi.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/aspipi.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithAspipi_001", nil, nil, nil); -end - + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithAspipi_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/babaki.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/babaki.lua index e1a86836..9bd578bb 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/babaki.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/babaki.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithBabaki_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithBabaki_001", nil, nil, nil); + player:endEvent(); end - diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/barnabaix.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/barnabaix.lua index 13c3412f..5e7aebcd 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/barnabaix.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/barnabaix.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithBarnabaix_001", nil, nil, nil); -end - + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithBarnabaix_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/berthar.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/berthar.lua index 7694fe11..8d7eccca 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/berthar.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/berthar.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithBerthar_001", nil, nil, nil); -end - + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithBerthar_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/bouchard.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/bouchard.lua index d8dfee61..b901c26b 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/bouchard.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/bouchard.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithBouchard_001", nil, nil, nil); -end - + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithBouchard_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/cahernaut.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/cahernaut.lua index fe229b64..8e8a399e 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/cahernaut.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/cahernaut.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithCahernaut_001", nil, nil, nil); -end - + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithCahernaut_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/chachai.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/chachai.lua index efc65917..8ef3b191 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/chachai.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/chachai.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithChachai_001", nil, nil, nil); -end - + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithChachai_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/ciceroix.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/ciceroix.lua index d4997751..8a04b16a 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/ciceroix.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/ciceroix.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithCiceroix_001", nil, nil, nil); -end - + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithCiceroix_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/crhabye.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/crhabye.lua index aa6c8646..989ef021 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/crhabye.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/crhabye.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithCrhabye_001", nil, nil, nil); -end - + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithCrhabye_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/dariustel.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/dariustel.lua index 348f39ce..cd462aa9 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/dariustel.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/dariustel.lua @@ -1,7 +1,8 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:SendMessage(0x20, "", "This Actorhas no dialog. Actor Class Id: " .. tostring(npc:GetActorClassId())); - player:EndEvent(); + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithElecotte_001", nil, nil, nil); + player:endEvent(); end diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/deaustie.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/deaustie.lua index ed501088..ba8537e0 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/deaustie.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/deaustie.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithDeaustie_001", nil, nil, nil); -end - + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithDeaustie_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/diriaine.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/diriaine.lua index acae751a..e25c06fb 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/diriaine.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/diriaine.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithDiriaine_001", nil, nil, nil); -end - + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithDiriaine_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/dylise.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/dylise.lua index cdb962ba..2f57b021 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/dylise.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/dylise.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithDylise_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithDylise_001", nil, nil, nil); + player:endEvent(); end - diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/eara.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/eara.lua index f08afed0..132cb618 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/eara.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/eara.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithEara_001", nil, nil, nil); -end - + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithEara_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/eleanor.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/eleanor.lua index e77681d3..5e412399 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/eleanor.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/eleanor.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithEleanor_001", nil, nil, nil); -end - + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithEleanor_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/elecotte.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/elecotte.lua index f18b9c7f..08be8891 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/elecotte.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/elecotte.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithElecotte_001", nil, nil, nil); -end - + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithElecotte_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/fifilo.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/fifilo.lua index eaf560e6..d483ba32 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/fifilo.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/fifilo.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithFifilo_001", nil, nil, nil); -end - + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithFifilo_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/fineco_romanecco.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/fineco_romanecco.lua index cfdf260c..2b93d3f1 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/fineco_romanecco.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/fineco_romanecco.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithFinecoromanecco_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithFinecoromanecco_001", nil, nil, nil); + player:endEvent(); end - diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/fruhybolg.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/fruhybolg.lua index 7d359f07..712ceed0 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/fruhybolg.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/fruhybolg.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithFhruybolg_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithFhruybolg_001", nil, nil, nil); + player:endEvent(); end - diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/fyrilsunn.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/fyrilsunn.lua index f14b1f66..0b791820 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/fyrilsunn.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/fyrilsunn.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithFyrilsunn_001", nil, nil, nil); -end - + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithFyrilsunn_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/galeren.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/galeren.lua index 7a14b858..3f11f361 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/galeren.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/galeren.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithGaleren_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithGaleren_001", nil, nil, nil); + player:endEvent(); end - diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/gloiucen.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/gloiucen.lua index 7d8a33ac..1cdf63d9 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/gloiucen.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/gloiucen.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithGloiucen_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithGloiucen_001", nil, nil, nil); + player:endEvent(); end - diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/gogofu.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/gogofu.lua index 325280da..57675414 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/gogofu.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/gogofu.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithGogofu_001", nil, nil, nil); -end - + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithGogofu_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/goodife.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/goodife.lua index 510cdc02..f6118e16 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/goodife.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/goodife.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithGoodife_001", nil, nil, nil); -end - + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithGoodife_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/guencen.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/guencen.lua index 8c816886..08be8891 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/guencen.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/guencen.lua @@ -1,7 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:SendMessage(0x20, "", "This Actorhas no dialog. Actor Class Id: " .. tostring(npc:GetActorClassId())); - player:EndEvent(); -end - + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithElecotte_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/guillestet.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/guillestet.lua index 16e4fc4f..38df3460 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/guillestet.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/guillestet.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithGuillestet_001", nil, nil, nil); -end - + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithGuillestet_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/hahayo.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/hahayo.lua index c3b42919..4684e0cf 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/hahayo.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/hahayo.lua @@ -1,6 +1,8 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithHahayo_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithHahayo_001", nil, nil, nil); + player:endEvent(); end diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/hawazi_zowazi.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/hawazi_zowazi.lua index 9cf3d47c..14e597a0 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/hawazi_zowazi.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/hawazi_zowazi.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithHawazizowazi_001", nil, nil, nil); -end - + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithHawazizowazi_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/hcidjaa.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/hcidjaa.lua index 618837c1..5f8e1a5d 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/hcidjaa.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/hcidjaa.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithHCidjaa_001", nil, nil, nil); -end - + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithHCidjaa_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/holbubu.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/holbubu.lua index 4a03af5e..f15eb699 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/holbubu.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/holbubu.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithHolbubu_001", nil, nil, nil); -end - + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithHolbubu_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/illofii.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/illofii.lua index 364e283d..382e9855 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/illofii.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/illofii.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithIllofii_001", nil, nil, nil); -end - + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithIllofii_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/isabella.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/isabella.lua index 1c010f12..e9768b32 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/isabella.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/isabella.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithIsabella_001", nil, nil, nil); -end - + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithIsabella_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/jajanzo.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/jajanzo.lua index 827ad81b..a404cdf0 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/jajanzo.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/jajanzo.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithJajanzo_001", nil, nil, nil); -end - + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithJajanzo_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/jannie.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/jannie.lua index 605e3234..93e2f5b7 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/jannie.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/jannie.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithJannie_001", nil, nil, nil); -end - + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithJannie_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/jeger.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/jeger.lua index 00bed1ca..a2b3dbb5 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/jeger.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/jeger.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithJeger_001", nil, nil, nil); -end - + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithJeger_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/jenlyns.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/jenlyns.lua index 5d75e729..b43e72c0 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/jenlyns.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/jenlyns.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithJenlyns_001", nil, nil, nil); -end - + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithJenlyns_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/kamlito_halito.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/kamlito_halito.lua index a13f6881..8b1652ce 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/kamlito_halito.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/kamlito_halito.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithKamlitohalito_001", nil, nil, nil); -end - + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithKamlitohalito_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/kopuru_fupuru.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/kopuru_fupuru.lua index 655b6e96..124f6f9a 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/kopuru_fupuru.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/kopuru_fupuru.lua @@ -1,15 +1,7 @@ +require ("global") + function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithInn_Desk_2", nil, nil, nil); --BTN - -end - -function onEventUpdate(player, npc, blah, menuSelect) - - if (menuSelect == 1) then - GetWorldManager():DoZoneChange(player, 11); - end - + result = player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithInn_Desk_2", nil, nil, nil); --BTN player:EndEvent(); - end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/kukusi.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/kukusi.lua index 0d7a8f17..0c90bb30 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/kukusi.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/kukusi.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithKukusi_001", nil, nil, nil); -end - + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithKukusi_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/lefchild.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/lefchild.lua index cb28da43..713f837e 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/lefchild.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/lefchild.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithLefchild_001", nil, nil, nil); -end - + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithLefchild_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/liaime.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/liaime.lua index 22783f02..6624d6cf 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/liaime.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/liaime.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithLiaime_001", nil, nil, nil); -end - + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithLiaime_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/linette.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/linette.lua index 2c0f693c..d5035d3d 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/linette.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/linette.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithLinette_001", nil, nil, nil); -end - + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithLinette_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/lohwaeb.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/lohwaeb.lua index 129ea090..30c3756f 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/lohwaeb.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/lohwaeb.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithLohwaeb_001", nil, nil, nil); -end - + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithLohwaeb_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/lulutsu.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/lulutsu.lua index 9b017f9d..1aecb463 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/lulutsu.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/lulutsu.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithLulutsu_001", nil, nil, nil); -end - + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithLulutsu_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/lyngwaek.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/lyngwaek.lua index 9001b5b3..0cec3d1a 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/lyngwaek.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/lyngwaek.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithLyngwaek_001", nil, nil, nil); -end - + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithLyngwaek_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/mamaza.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/mamaza.lua index 74b00974..c28fdb44 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/mamaza.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/mamaza.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithMamaza_001", nil, nil, nil); -end - + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithMamaza_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/mammet.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/mammet.lua index 5dd2e432..7a354a56 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/mammet.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/mammet.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithMammet_001", nil, nil, nil); -end - + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithMammet_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/mammet_alc.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/mammet_alc.lua index c158c310..60b2e98b 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/mammet_alc.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/mammet_alc.lua @@ -1,6 +1,8 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithDoll004_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithDoll004_001", nil, nil, nil); + player:endEvent(); end diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/mammet_gsm.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/mammet_gsm.lua index db173809..1b02a12a 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/mammet_gsm.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/mammet_gsm.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithDoll001_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithDoll001_001", nil, nil, nil); + player:endEvent(); end - diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/mammet_gsm2.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/mammet_gsm2.lua index d34d0c5f..dbf4b9c5 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/mammet_gsm2.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/mammet_gsm2.lua @@ -1,6 +1,8 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithDoll002_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithDoll002_001", nil, nil, nil); + player:endEvent(); end diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/mammet_wvr.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/mammet_wvr.lua index bad853bb..9c35aeab 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/mammet_wvr.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/mammet_wvr.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithDoll003_001", nil, nil, nil); -end - + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithDoll003_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/margarete.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/margarete.lua index 713daa4c..6cfdbbc4 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/margarete.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/margarete.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithMargarete_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithMargarete_001", nil, nil, nil); + player:endEvent(); end - diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/martine.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/martine.lua index 4592c406..7a0c3482 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/martine.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/martine.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithMartine_001", nil, nil, nil); -end - + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithMartine_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/milgogo.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/milgogo.lua index 39446ce4..837f4d32 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/milgogo.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/milgogo.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithMilgogo_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithMilgogo_001", nil, nil, nil); + player:endEvent(); end - diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/miyaya.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/miyaya.lua index 888a26b6..7e54b933 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/miyaya.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/miyaya.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithMiyaya_001", nil, nil, nil); -end - + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithMiyaya_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/mohtfryd.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/mohtfryd.lua index 21def169..130dcef4 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/mohtfryd.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/mohtfryd.lua @@ -1,6 +1,8 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithMohtfryd_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithMohtfryd_001", nil, nil, nil); + player:endEvent(); end diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/mumukiya.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/mumukiya.lua index bef9a0dc..18fcda6e 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/mumukiya.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/mumukiya.lua @@ -1,6 +1,8 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithMumukiya_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithMumukiya_001", nil, nil, nil); + player:endEvent(); end diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/mumutano.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/mumutano.lua index 8cf1988e..64c52909 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/mumutano.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/mumutano.lua @@ -1,6 +1,8 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithMumutano_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithMumutano_001", nil, nil, nil); + player:endEvent(); end diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/neymumu.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/neymumu.lua index bcab1922..67853b8d 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/neymumu.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/neymumu.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithNeymumu_001", nil, nil, nil); -end - + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithNeymumu_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/nhagi_amariyo.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/nhagi_amariyo.lua index dd6838c0..a68cc0fb 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/nhagi_amariyo.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/nhagi_amariyo.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithNhagiamariyo_001", nil, nil, nil); -end - + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithNhagiamariyo_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/nogeloix.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/nogeloix.lua index 72e2353b..ad971020 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/nogeloix.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/nogeloix.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithNogeloix_001", nil, nil, nil); -end - + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithNogeloix_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/obili_tambili.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/obili_tambili.lua index 11741a81..3fbfa19e 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/obili_tambili.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/obili_tambili.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithObilitambili_001", nil, nil, nil); -end - + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithObilitambili_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/oefyrblaet.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/oefyrblaet.lua index e30cf2f1..87a679d1 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/oefyrblaet.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/oefyrblaet.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithOefyrblaet_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithOefyrblaet_001", nil, nil, nil); + player:endEvent(); end - diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/papawa.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/papawa.lua index 7cb7512e..70f7aca3 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/papawa.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/papawa.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithPapawa_001", nil, nil, nil); -end - + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithPapawa_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/peneli_zuneli.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/peneli_zuneli.lua index 9aed4413..fa2901a3 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/peneli_zuneli.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/peneli_zuneli.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithPenelizuneli_001", nil, nil, nil); -end - + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithPenelizuneli_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/pierriquet.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/pierriquet.lua index ff58ac8b..1e2a9261 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/pierriquet.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/pierriquet.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithPierriquet_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithPierriquet_001", nil, nil, nil); + player:endEvent(); end - diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/qhota_nbolo.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/qhota_nbolo.lua index fdebdec7..568b38df 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/qhota_nbolo.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/qhota_nbolo.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithQhotanbolo_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithQhotanbolo_001", nil, nil, nil); + player:endEvent(); end - diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/qmhalawi.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/qmhalawi.lua index c3a12828..80434c9c 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/qmhalawi.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/qmhalawi.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithQmhalawi_001", nil, nil, nil); -end - + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithQmhalawi_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/rinh_maimhov.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/rinh_maimhov.lua index 8d44da86..408dfe2a 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/rinh_maimhov.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/rinh_maimhov.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithRinhmaimhov_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithRinhmaimhov_001", nil, nil, nil); + player:endEvent(); end - diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/rosalind.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/rosalind.lua index cc3338d2..4bcb5a85 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/rosalind.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/rosalind.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithRosalind_001", nil, nil, nil); -end - + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithRosalind_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/safufu.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/safufu.lua index 4c1bab10..1da5f2f1 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/safufu.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/safufu.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithSafufu_001", nil, nil, nil); -end - + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithSafufu_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/sinette.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/sinette.lua index 20349633..7afcd3f4 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/sinette.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/sinette.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithSinette_001", nil, nil, nil); -end - + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithSinette_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/singleton.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/singleton.lua index 52714c7c..4083d6e1 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/singleton.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/singleton.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithSingleton_001", nil, nil, nil); -end - + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithSingleton_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/sungi_kelungi.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/sungi_kelungi.lua index 2ffbb76c..51d56875 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/sungi_kelungi.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/sungi_kelungi.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithSungikelungi_001", nil, nil, nil); -end - + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithSungikelungi_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/swerdahrm.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/swerdahrm.lua index c6b3f47b..a707fc99 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/swerdahrm.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/swerdahrm.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithSwerdahrm_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithSwerdahrm_001", nil, nil, nil); + player:endEvent(); end - diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/tatasha.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/tatasha.lua index 0dbc2cce..b819b23e 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/tatasha.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/tatasha.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithTatasha_001", nil, nil, nil); -end - + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithTatasha_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/totono.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/totono.lua index 4eebc4ff..d16eeef0 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/totono.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/totono.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithTotono_001", nil, nil, nil); -end - + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithTotono_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/tutubuki.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/tutubuki.lua index 2437ed2a..726ecb4a 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/tutubuki.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/tutubuki.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithTutubuki_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithTutubuki_001", nil, nil, nil); + player:endEvent(); end - diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/tyago_moui.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/tyago_moui.lua index 6ccdde4a..2f22296f 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/tyago_moui.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/tyago_moui.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithTyagomoui_001", nil, nil, nil); -end - + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithTyagomoui_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/ubokhn.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/ubokhn.lua index 3aeb4268..7fb8ff38 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/ubokhn.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/ubokhn.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithUbokhn_001", nil, nil, nil); -end - + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithUbokhn_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/uwilsyng.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/uwilsyng.lua index 77688433..04c6a8e3 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/uwilsyng.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/uwilsyng.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithGuildleveClientU_003", nil, nil, nil); -end - + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithGuildleveClientU_003", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/vannes.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/vannes.lua index ed530632..d9fddde6 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/vannes.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/vannes.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithVannes_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithVannes_001", nil, nil, nil); + player:endEvent(); end - diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/vavaki.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/vavaki.lua index 1dd62ed7..51caccb4 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/vavaki.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/vavaki.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "tribeTalk", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultSea, "tribeTalk", nil, nil, nil); + player:endEvent(); end - diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/wannore.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/wannore.lua index 571cc814..93b6cb81 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/wannore.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/wannore.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithWannore_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithWannore_001", nil, nil, nil); + player:endEvent(); end - diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/wawaton.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/wawaton.lua index 1895ef48..47639679 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/wawaton.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/wawaton.lua @@ -1,6 +1,8 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithWawaton_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithWawaton_001", nil, nil, nil); + player:endEvent(); end diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/wise_moon.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/wise_moon.lua index 9e833126..51d0ae24 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/wise_moon.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/wise_moon.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithWisemoon_001", nil, nil, nil); -end - + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithWisemoon_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/wyznguld.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/wyznguld.lua index 1abb3989..f6dbcda1 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/wyznguld.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/wyznguld.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithWyznguld_001", nil, nil, nil); -end - + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithWyznguld_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/xau_nbolo.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/xau_nbolo.lua index 66371d99..682a17ff 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/xau_nbolo.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/xau_nbolo.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithXaunbolo_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithXaunbolo_001", nil, nil, nil); + player:endEvent(); end - diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/xdhilogo.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/xdhilogo.lua index 092e0e27..83a554cc 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/xdhilogo.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/xdhilogo.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithXdhilogo_001", nil, nil, nil); -end - + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithXdhilogo_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/yayake.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/yayake.lua index 96122fdf..8033c077 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/yayake.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/yayake.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithYayake_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithYayake_001", nil, nil, nil); + player:endEvent(); end - diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/yuyubesu.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/yuyubesu.lua index d5f68e31..4ef931f7 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/yuyubesu.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/yuyubesu.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithYuyubesu_001", nil, nil, nil); -end - + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithYuyubesu_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file From 8b44d90114e453bc80815cc985489e3f9ca5f33b Mon Sep 17 00:00:00 2001 From: Filip Maj Date: Tue, 21 Jun 2016 15:48:16 -0400 Subject: [PATCH 08/15] Modified all wil0Town01 scripts to new way. --- .../wil0Town01/PopulaceStandard/aistan.lua | 5 +++-- .../wil0Town01/PopulaceStandard/baterich.lua | 7 ++++--- .../wil0Town01/PopulaceStandard/berndan.lua | 13 +++++-------- .../wil0Town01/PopulaceStandard/bertram.lua | 15 +++++---------- .../wil0Town01/PopulaceStandard/claroise.lua | 7 ++++--- .../unique/wil0Town01/PopulaceStandard/drew.lua | 7 ++++--- .../PopulaceStandard/dural_tharal.lua | 7 ++++--- .../flame_lieutenant_somber_meadow.lua | 5 +++-- .../flame_private_sisimuza_tetemuza.lua | 7 ++++--- .../flame_sergeant_mimio_mio.lua | 4 +++- .../wil0Town01/PopulaceStandard/gagaruna.lua | 7 ++++--- .../wil0Town01/PopulaceStandard/gairbert.lua | 7 ++++--- .../wil0Town01/PopulaceStandard/gegeissa.lua | 7 ++++--- .../wil0Town01/PopulaceStandard/guillaunaux.lua | 7 ++++--- .../wil0Town01/PopulaceStandard/gunnulf.lua | 5 +++-- .../wil0Town01/PopulaceStandard/halstein.lua | 7 ++++--- .../wil0Town01/PopulaceStandard/hehena.lua | 5 +++-- .../wil0Town01/PopulaceStandard/heibert.lua | 4 +++- .../wil0Town01/PopulaceStandard/hildie.lua | 7 ++++--- .../wil0Town01/PopulaceStandard/ipaghlo.lua | 5 +++-- .../wil0Town01/PopulaceStandard/judithe.lua | 4 +++- .../wil0Town01/PopulaceStandard/kiora.lua | 15 +++++---------- .../wil0Town01/PopulaceStandard/kokobi.lua | 7 ++++--- .../wil0Town01/PopulaceStandard/kukumuko.lua | 4 +++- .../wil0Town01/PopulaceStandard/lettice.lua | 17 ++++++----------- .../wil0Town01/PopulaceStandard/lulumo.lua | 7 ++++--- .../wil0Town01/PopulaceStandard/mammet.lua | 7 ++++--- .../wil0Town01/PopulaceStandard/melisie.lua | 7 ++++--- .../wil0Town01/PopulaceStandard/mimishu.lua | 7 ++++--- .../wil0Town01/PopulaceStandard/minerva.lua | 15 +++++---------- .../wil0Town01/PopulaceStandard/momodi.lua | 15 +++------------ .../PopulaceStandard/naida_zamaida.lua | 7 ++++--- .../PopulaceStandard/nokksu_shanksu.lua | 7 ++++--- .../wil0Town01/PopulaceStandard/ococo.lua | 7 ++++--- .../wil0Town01/PopulaceStandard/opondhao.lua | 15 +++++---------- .../PopulaceStandard/otopa_pottopa.lua | 16 ++++++---------- .../wil0Town01/PopulaceStandard/popori.lua | 5 +++-- .../wil0Town01/PopulaceStandard/qaruru.lua | 7 ++++--- .../wil0Town01/PopulaceStandard/qata_nelhah.lua | 7 ++++--- .../wil0Town01/PopulaceStandard/roarich.lua | 5 +++-- .../wil0Town01/PopulaceStandard/robyn.lua | 7 ++++--- .../wil0Town01/PopulaceStandard/rorojaru.lua | 5 +++-- .../wil0Town01/PopulaceStandard/rururaji.lua | 4 +++- .../PopulaceStandard/shamani_lohmani.lua | 5 +++-- .../wil0Town01/PopulaceStandard/sibold.lua | 5 +++-- .../wil0Town01/PopulaceStandard/styrmoeya.lua | 15 +++++---------- .../wil0Town01/PopulaceStandard/thimm.lua | 5 +++-- .../wil0Town01/PopulaceStandard/titinin.lua | 4 +++- .../unique/wil0Town01/PopulaceStandard/tyon.lua | 15 +++++---------- .../wil0Town01/PopulaceStandard/wenefreda.lua | 7 ++++--- .../wil0Town01/PopulaceStandard/wracwulf.lua | 7 ++++--- .../wil0Town01/PopulaceStandard/yayatoki.lua | 7 ++++--- .../PopulaceStandard/yhah_amariyo.lua | 16 +++++----------- .../wil0Town01/PopulaceStandard/yuyuhase.lua | 7 ++++--- .../wil0Town01/PopulaceStandard/zoengterbin.lua | 15 +++++---------- 55 files changed, 215 insertions(+), 228 deletions(-) diff --git a/data/scripts/unique/wil0Town01/PopulaceStandard/aistan.lua b/data/scripts/unique/wil0Town01/PopulaceStandard/aistan.lua index 7e54547a..7fd3ef67 100644 --- a/data/scripts/unique/wil0Town01/PopulaceStandard/aistan.lua +++ b/data/scripts/unique/wil0Town01/PopulaceStandard/aistan.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithAistan_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithAistan_001", nil, nil, nil); + player:endEvent(); end - diff --git a/data/scripts/unique/wil0Town01/PopulaceStandard/baterich.lua b/data/scripts/unique/wil0Town01/PopulaceStandard/baterich.lua index d8b32575..76f59996 100644 --- a/data/scripts/unique/wil0Town01/PopulaceStandard/baterich.lua +++ b/data/scripts/unique/wil0Town01/PopulaceStandard/baterich.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithBATERICH_100", nil, nil, nil); -end - + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithBATERICH_100", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01/PopulaceStandard/berndan.lua b/data/scripts/unique/wil0Town01/PopulaceStandard/berndan.lua index 4aad6c06..f6444fe8 100644 --- a/data/scripts/unique/wil0Town01/PopulaceStandard/berndan.lua +++ b/data/scripts/unique/wil0Town01/PopulaceStandard/berndan.lua @@ -1,10 +1,7 @@ -function onEventStarted(player, npc) - defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithBerndan_001", nil, nil, nil); -end +require ("global") -function onEventUpdate(player, npc, blah, menuSelect) - - player:EndEvent(); - +function onEventStarted(player, npc) + defaultWil = GetStaticActor("DftWil"); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithBerndan_001", nil, nil, nil); + player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01/PopulaceStandard/bertram.lua b/data/scripts/unique/wil0Town01/PopulaceStandard/bertram.lua index 5c77c9f5..bf2d205a 100644 --- a/data/scripts/unique/wil0Town01/PopulaceStandard/bertram.lua +++ b/data/scripts/unique/wil0Town01/PopulaceStandard/bertram.lua @@ -1,12 +1,7 @@ -function onEventStarted(player, npc) - defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithBertram_001", nil, nil, nil); - --player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithBertram_002", nil, nil, nil); - --player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithBertram_003", nil, nil, nil); -end +require ("global") -function onEventUpdate(player, npc, blah, menuSelect) - - player:EndEvent(); - +function onEventStarted(player, npc) + defaultWil = GetStaticActor("DftWil"); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithBertram_001", nil, nil, nil); + player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01/PopulaceStandard/claroise.lua b/data/scripts/unique/wil0Town01/PopulaceStandard/claroise.lua index 3d79e22b..db8784f6 100644 --- a/data/scripts/unique/wil0Town01/PopulaceStandard/claroise.lua +++ b/data/scripts/unique/wil0Town01/PopulaceStandard/claroise.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithGuildleveClientU_002", nil, nil, nil); -end - + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithGuildleveClientU_002", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01/PopulaceStandard/drew.lua b/data/scripts/unique/wil0Town01/PopulaceStandard/drew.lua index 1e693a18..411a26ce 100644 --- a/data/scripts/unique/wil0Town01/PopulaceStandard/drew.lua +++ b/data/scripts/unique/wil0Town01/PopulaceStandard/drew.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithDrew_001", nil, nil, nil); -end - + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithDrew_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01/PopulaceStandard/dural_tharal.lua b/data/scripts/unique/wil0Town01/PopulaceStandard/dural_tharal.lua index 2de09225..2e321cb8 100644 --- a/data/scripts/unique/wil0Town01/PopulaceStandard/dural_tharal.lua +++ b/data/scripts/unique/wil0Town01/PopulaceStandard/dural_tharal.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithDuraltharal_001", nil, nil, nil); -end - + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithDuraltharal_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01/PopulaceStandard/flame_lieutenant_somber_meadow.lua b/data/scripts/unique/wil0Town01/PopulaceStandard/flame_lieutenant_somber_meadow.lua index 64fb739b..c8d235d1 100644 --- a/data/scripts/unique/wil0Town01/PopulaceStandard/flame_lieutenant_somber_meadow.lua +++ b/data/scripts/unique/wil0Town01/PopulaceStandard/flame_lieutenant_somber_meadow.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithSomber_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithSomber_001", nil, nil, nil); + player:endEvent(); end - diff --git a/data/scripts/unique/wil0Town01/PopulaceStandard/flame_private_sisimuza_tetemuza.lua b/data/scripts/unique/wil0Town01/PopulaceStandard/flame_private_sisimuza_tetemuza.lua index 198d3841..e8960bd7 100644 --- a/data/scripts/unique/wil0Town01/PopulaceStandard/flame_private_sisimuza_tetemuza.lua +++ b/data/scripts/unique/wil0Town01/PopulaceStandard/flame_private_sisimuza_tetemuza.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithFlameprivatesisimuzatetemuza_001", nil, nil, nil); -end - + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithFlameprivatesisimuzatetemuza_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01/PopulaceStandard/flame_sergeant_mimio_mio.lua b/data/scripts/unique/wil0Town01/PopulaceStandard/flame_sergeant_mimio_mio.lua index 1c544b2e..e0c0dea5 100644 --- a/data/scripts/unique/wil0Town01/PopulaceStandard/flame_sergeant_mimio_mio.lua +++ b/data/scripts/unique/wil0Town01/PopulaceStandard/flame_sergeant_mimio_mio.lua @@ -1,6 +1,8 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithFlamesergeantmimiomio_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithFlamesergeantmimiomio_001", nil, nil, nil); + player:endEvent(); end diff --git a/data/scripts/unique/wil0Town01/PopulaceStandard/gagaruna.lua b/data/scripts/unique/wil0Town01/PopulaceStandard/gagaruna.lua index 16366901..b96eb8c4 100644 --- a/data/scripts/unique/wil0Town01/PopulaceStandard/gagaruna.lua +++ b/data/scripts/unique/wil0Town01/PopulaceStandard/gagaruna.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithGag:Runa_001", nil, nil, nil); -end - + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithGag:Runa_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01/PopulaceStandard/gairbert.lua b/data/scripts/unique/wil0Town01/PopulaceStandard/gairbert.lua index 1003fd90..9d4b7032 100644 --- a/data/scripts/unique/wil0Town01/PopulaceStandard/gairbert.lua +++ b/data/scripts/unique/wil0Town01/PopulaceStandard/gairbert.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithGairbert_001", nil, nil, nil); -end - + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithGairbert_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01/PopulaceStandard/gegeissa.lua b/data/scripts/unique/wil0Town01/PopulaceStandard/gegeissa.lua index 25dae494..02e55bcb 100644 --- a/data/scripts/unique/wil0Town01/PopulaceStandard/gegeissa.lua +++ b/data/scripts/unique/wil0Town01/PopulaceStandard/gegeissa.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithGegeissa_001", nil, nil, nil); -end - + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithGegeissa_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01/PopulaceStandard/guillaunaux.lua b/data/scripts/unique/wil0Town01/PopulaceStandard/guillaunaux.lua index 2047bfda..1c9353d5 100644 --- a/data/scripts/unique/wil0Town01/PopulaceStandard/guillaunaux.lua +++ b/data/scripts/unique/wil0Town01/PopulaceStandard/guillaunaux.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithGuillaunaux_001", nil, nil, nil); -end - + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithGuillaunaux_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01/PopulaceStandard/gunnulf.lua b/data/scripts/unique/wil0Town01/PopulaceStandard/gunnulf.lua index 945fdb9b..d09062b7 100644 --- a/data/scripts/unique/wil0Town01/PopulaceStandard/gunnulf.lua +++ b/data/scripts/unique/wil0Town01/PopulaceStandard/gunnulf.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithMaginfred_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithMaginfred_001", nil, nil, nil); + player:endEvent(); end - diff --git a/data/scripts/unique/wil0Town01/PopulaceStandard/halstein.lua b/data/scripts/unique/wil0Town01/PopulaceStandard/halstein.lua index e3c8ce3f..24801914 100644 --- a/data/scripts/unique/wil0Town01/PopulaceStandard/halstein.lua +++ b/data/scripts/unique/wil0Town01/PopulaceStandard/halstein.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithHalstein_001", nil, nil, nil); -end - + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithHalstein_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01/PopulaceStandard/hehena.lua b/data/scripts/unique/wil0Town01/PopulaceStandard/hehena.lua index 70e49fa4..0cda50a7 100644 --- a/data/scripts/unique/wil0Town01/PopulaceStandard/hehena.lua +++ b/data/scripts/unique/wil0Town01/PopulaceStandard/hehena.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithHehena_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithHehena_001", nil, nil, nil); + player:endEvent(); end - diff --git a/data/scripts/unique/wil0Town01/PopulaceStandard/heibert.lua b/data/scripts/unique/wil0Town01/PopulaceStandard/heibert.lua index 43101095..01b3544d 100644 --- a/data/scripts/unique/wil0Town01/PopulaceStandard/heibert.lua +++ b/data/scripts/unique/wil0Town01/PopulaceStandard/heibert.lua @@ -1,6 +1,8 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithOrisic_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithOrisic_001", nil, nil, nil); + player:endEvent(); end diff --git a/data/scripts/unique/wil0Town01/PopulaceStandard/hildie.lua b/data/scripts/unique/wil0Town01/PopulaceStandard/hildie.lua index ee0c7811..3ddb8f4f 100644 --- a/data/scripts/unique/wil0Town01/PopulaceStandard/hildie.lua +++ b/data/scripts/unique/wil0Town01/PopulaceStandard/hildie.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithHildie_001", nil, nil, nil); -end - + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithHildie_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01/PopulaceStandard/ipaghlo.lua b/data/scripts/unique/wil0Town01/PopulaceStandard/ipaghlo.lua index cc8995dd..ba1d7480 100644 --- a/data/scripts/unique/wil0Town01/PopulaceStandard/ipaghlo.lua +++ b/data/scripts/unique/wil0Town01/PopulaceStandard/ipaghlo.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithKlamahni_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithKlamahni_001", nil, nil, nil); + player:endEvent(); end - diff --git a/data/scripts/unique/wil0Town01/PopulaceStandard/judithe.lua b/data/scripts/unique/wil0Town01/PopulaceStandard/judithe.lua index e54134fc..35476b3b 100644 --- a/data/scripts/unique/wil0Town01/PopulaceStandard/judithe.lua +++ b/data/scripts/unique/wil0Town01/PopulaceStandard/judithe.lua @@ -1,6 +1,8 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithJudithe_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithJudithe_001", nil, nil, nil); + player:endEvent(); end diff --git a/data/scripts/unique/wil0Town01/PopulaceStandard/kiora.lua b/data/scripts/unique/wil0Town01/PopulaceStandard/kiora.lua index 5c6fef9a..1eb82309 100644 --- a/data/scripts/unique/wil0Town01/PopulaceStandard/kiora.lua +++ b/data/scripts/unique/wil0Town01/PopulaceStandard/kiora.lua @@ -1,12 +1,7 @@ -function onEventStarted(player, npc) - defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithKiora_001", nil, nil, nil); - --player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithKiora_002", nil, nil, nil); - --player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithKiora_003", nil, nil, nil); -end +require ("global") -function onEventUpdate(player, npc, blah, menuSelect) - - player:EndEvent(); - +function onEventStarted(player, npc) + defaultWil = GetStaticActor("DftWil"); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithKiora_001", nil, nil, nil); + player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01/PopulaceStandard/kokobi.lua b/data/scripts/unique/wil0Town01/PopulaceStandard/kokobi.lua index 94a0ff1e..ffc2d608 100644 --- a/data/scripts/unique/wil0Town01/PopulaceStandard/kokobi.lua +++ b/data/scripts/unique/wil0Town01/PopulaceStandard/kokobi.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "downTownTalk", nil, nil, nil); -end - + callClientFunction(player, "delegateEvent", player, defaultWil, "downTownTalk", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01/PopulaceStandard/kukumuko.lua b/data/scripts/unique/wil0Town01/PopulaceStandard/kukumuko.lua index dc7b7c2e..e0b9e38c 100644 --- a/data/scripts/unique/wil0Town01/PopulaceStandard/kukumuko.lua +++ b/data/scripts/unique/wil0Town01/PopulaceStandard/kukumuko.lua @@ -1,6 +1,8 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithKukumuko_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithKukumuko_001", nil, nil, nil); + player:endEvent(); end diff --git a/data/scripts/unique/wil0Town01/PopulaceStandard/lettice.lua b/data/scripts/unique/wil0Town01/PopulaceStandard/lettice.lua index 41040f19..61c51ad7 100644 --- a/data/scripts/unique/wil0Town01/PopulaceStandard/lettice.lua +++ b/data/scripts/unique/wil0Town01/PopulaceStandard/lettice.lua @@ -1,12 +1,7 @@ -function onEventStarted(player, npc) - defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithLettice_001", nil, nil, nil); - --player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithLettice_002", nil, nil, nil); - --player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithLettice_003", nil, nil, nil); -end +require ("global") -function onEventUpdate(player, npc, blah, menuSelect) - - player:EndEvent(); - -end \ No newline at end of file +function onEventStarted(player, npc) + defaultWil = GetStaticActor("DftWil"); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithLettice_001", nil, nil, nil); + player:endEvent(); +end diff --git a/data/scripts/unique/wil0Town01/PopulaceStandard/lulumo.lua b/data/scripts/unique/wil0Town01/PopulaceStandard/lulumo.lua index 3eea2f1f..10c12311 100644 --- a/data/scripts/unique/wil0Town01/PopulaceStandard/lulumo.lua +++ b/data/scripts/unique/wil0Town01/PopulaceStandard/lulumo.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithLulumo_001", nil, nil, nil); -end - + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithLulumo_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01/PopulaceStandard/mammet.lua b/data/scripts/unique/wil0Town01/PopulaceStandard/mammet.lua index 8bb041ee..bc8983b9 100644 --- a/data/scripts/unique/wil0Town01/PopulaceStandard/mammet.lua +++ b/data/scripts/unique/wil0Town01/PopulaceStandard/mammet.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithDoll005_001", nil, nil, nil); -end - + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithDoll005_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01/PopulaceStandard/melisie.lua b/data/scripts/unique/wil0Town01/PopulaceStandard/melisie.lua index c8f25e89..09f2ddff 100644 --- a/data/scripts/unique/wil0Town01/PopulaceStandard/melisie.lua +++ b/data/scripts/unique/wil0Town01/PopulaceStandard/melisie.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithMelisie_001", nil, nil, nil); -end - + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithMelisie_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01/PopulaceStandard/mimishu.lua b/data/scripts/unique/wil0Town01/PopulaceStandard/mimishu.lua index 2795c00a..bb561e86 100644 --- a/data/scripts/unique/wil0Town01/PopulaceStandard/mimishu.lua +++ b/data/scripts/unique/wil0Town01/PopulaceStandard/mimishu.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithMimishu_001", nil, nil, nil); -end - + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithMimishu_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01/PopulaceStandard/minerva.lua b/data/scripts/unique/wil0Town01/PopulaceStandard/minerva.lua index c1b8bf46..0c4a11a0 100644 --- a/data/scripts/unique/wil0Town01/PopulaceStandard/minerva.lua +++ b/data/scripts/unique/wil0Town01/PopulaceStandard/minerva.lua @@ -1,12 +1,7 @@ -function onEventStarted(player, npc) - defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithMinerva_001", nil, nil, nil); - --player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithMinerva_002", nil, nil, nil); - --player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithMinerva_003", nil, nil, nil); -end +require ("global") -function onEventUpdate(player, npc, blah, menuSelect) - - player:EndEvent(); - +function onEventStarted(player, npc) + defaultWil = GetStaticActor("DftWil"); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithMinerva_001", nil, nil, nil); + player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01/PopulaceStandard/momodi.lua b/data/scripts/unique/wil0Town01/PopulaceStandard/momodi.lua index 8183e89f..7f3a82fe 100644 --- a/data/scripts/unique/wil0Town01/PopulaceStandard/momodi.lua +++ b/data/scripts/unique/wil0Town01/PopulaceStandard/momodi.lua @@ -1,16 +1,7 @@ -require("global") +require ("global") function onEventStarted(player, npc) - defaultWil = GetStaticActor("DftWil"); - tutorialU1 = GetStaticActor("Trl0u1"); - --callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithMomodi_001", nil, nil, nil); - callClientFunction(player, "switchEvent", defaultWil, tutorialU1, nil, nil, 1, 1, 0x3F1); + defaultWil = GetStaticActor("DftWil"); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithMomodi_001", nil, nil, nil); player:endEvent(); - -end - -function onEventUpdate(player, npc, blah, menuSelect) - - - end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01/PopulaceStandard/naida_zamaida.lua b/data/scripts/unique/wil0Town01/PopulaceStandard/naida_zamaida.lua index 86629e64..6ec4b0a5 100644 --- a/data/scripts/unique/wil0Town01/PopulaceStandard/naida_zamaida.lua +++ b/data/scripts/unique/wil0Town01/PopulaceStandard/naida_zamaida.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithNaidazamaida_001", nil, nil, nil); -end - + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithNaidazamaida_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01/PopulaceStandard/nokksu_shanksu.lua b/data/scripts/unique/wil0Town01/PopulaceStandard/nokksu_shanksu.lua index 3dc0138f..8f07e3a0 100644 --- a/data/scripts/unique/wil0Town01/PopulaceStandard/nokksu_shanksu.lua +++ b/data/scripts/unique/wil0Town01/PopulaceStandard/nokksu_shanksu.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithNokksushanksu_001", nil, nil, nil); -end - + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithNokksushanksu_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01/PopulaceStandard/ococo.lua b/data/scripts/unique/wil0Town01/PopulaceStandard/ococo.lua index c528d8d7..ad0b7b47 100644 --- a/data/scripts/unique/wil0Town01/PopulaceStandard/ococo.lua +++ b/data/scripts/unique/wil0Town01/PopulaceStandard/ococo.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithOcoco_001", nil, nil, nil); -end - + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithOcoco_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01/PopulaceStandard/opondhao.lua b/data/scripts/unique/wil0Town01/PopulaceStandard/opondhao.lua index 31af6599..f6faa1fb 100644 --- a/data/scripts/unique/wil0Town01/PopulaceStandard/opondhao.lua +++ b/data/scripts/unique/wil0Town01/PopulaceStandard/opondhao.lua @@ -1,12 +1,7 @@ -function onEventStarted(player, npc) - defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithOpondhao_001", nil, nil, nil); - --player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithOpondhao_002", nil, nil, nil); - --player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithOpondhao_003", nil, nil, nil); -end +require ("global") -function onEventUpdate(player, npc, blah, menuSelect) - - player:EndEvent(); - +function onEventStarted(player, npc) + defaultWil = GetStaticActor("DftWil"); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithOpondhao_001", nil, nil, nil); + player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01/PopulaceStandard/otopa_pottopa.lua b/data/scripts/unique/wil0Town01/PopulaceStandard/otopa_pottopa.lua index e82811df..ec7bc5d1 100644 --- a/data/scripts/unique/wil0Town01/PopulaceStandard/otopa_pottopa.lua +++ b/data/scripts/unique/wil0Town01/PopulaceStandard/otopa_pottopa.lua @@ -1,11 +1,7 @@ -function onEventStarted(player, npc) - defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithInn_Desk", nil, nil, nil); - -end +require ("global") -function onEventUpdate(player, npc, blah, menuSelect) - - player:EndEvent(); - -end \ No newline at end of file +function onEventStarted(player, npc) + defaultWil = GetStaticActor("DftWil"); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithInn_Desk", nil, nil, nil); + player:endEvent(); +end diff --git a/data/scripts/unique/wil0Town01/PopulaceStandard/popori.lua b/data/scripts/unique/wil0Town01/PopulaceStandard/popori.lua index c42d3f64..7977be00 100644 --- a/data/scripts/unique/wil0Town01/PopulaceStandard/popori.lua +++ b/data/scripts/unique/wil0Town01/PopulaceStandard/popori.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithPopori_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithPopori_001", nil, nil, nil); + player:endEvent(); end - diff --git a/data/scripts/unique/wil0Town01/PopulaceStandard/qaruru.lua b/data/scripts/unique/wil0Town01/PopulaceStandard/qaruru.lua index af03496b..fd8d4ce2 100644 --- a/data/scripts/unique/wil0Town01/PopulaceStandard/qaruru.lua +++ b/data/scripts/unique/wil0Town01/PopulaceStandard/qaruru.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithQaruru_001", nil, nil, nil); -end - + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithQaruru_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01/PopulaceStandard/qata_nelhah.lua b/data/scripts/unique/wil0Town01/PopulaceStandard/qata_nelhah.lua index 42cb39d2..32dc8a2f 100644 --- a/data/scripts/unique/wil0Town01/PopulaceStandard/qata_nelhah.lua +++ b/data/scripts/unique/wil0Town01/PopulaceStandard/qata_nelhah.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithQatanelhah_001", nil, nil, nil); -end - + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithQatanelhah_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01/PopulaceStandard/roarich.lua b/data/scripts/unique/wil0Town01/PopulaceStandard/roarich.lua index e6ab0dd8..112d2075 100644 --- a/data/scripts/unique/wil0Town01/PopulaceStandard/roarich.lua +++ b/data/scripts/unique/wil0Town01/PopulaceStandard/roarich.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithGuildleveClientU_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithGuildleveClientU_001", nil, nil, nil); + player:endEvent(); end - diff --git a/data/scripts/unique/wil0Town01/PopulaceStandard/robyn.lua b/data/scripts/unique/wil0Town01/PopulaceStandard/robyn.lua index 9318249d..dfa72e61 100644 --- a/data/scripts/unique/wil0Town01/PopulaceStandard/robyn.lua +++ b/data/scripts/unique/wil0Town01/PopulaceStandard/robyn.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithRobyn_001", nil, nil, nil); -end - + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithRobyn_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01/PopulaceStandard/rorojaru.lua b/data/scripts/unique/wil0Town01/PopulaceStandard/rorojaru.lua index 07734407..32832998 100644 --- a/data/scripts/unique/wil0Town01/PopulaceStandard/rorojaru.lua +++ b/data/scripts/unique/wil0Town01/PopulaceStandard/rorojaru.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithRorojaru_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithRorojaru_001", nil, nil, nil); + player:endEvent(); end - diff --git a/data/scripts/unique/wil0Town01/PopulaceStandard/rururaji.lua b/data/scripts/unique/wil0Town01/PopulaceStandard/rururaji.lua index f8e6ed8c..b411193e 100644 --- a/data/scripts/unique/wil0Town01/PopulaceStandard/rururaji.lua +++ b/data/scripts/unique/wil0Town01/PopulaceStandard/rururaji.lua @@ -1,6 +1,8 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithRururaji_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithRururaji_001", nil, nil, nil); + player:endEvent(); end diff --git a/data/scripts/unique/wil0Town01/PopulaceStandard/shamani_lohmani.lua b/data/scripts/unique/wil0Town01/PopulaceStandard/shamani_lohmani.lua index 378c09fb..5242f4ff 100644 --- a/data/scripts/unique/wil0Town01/PopulaceStandard/shamani_lohmani.lua +++ b/data/scripts/unique/wil0Town01/PopulaceStandard/shamani_lohmani.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithShamanilohmani_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithShamanilohmani_001", nil, nil, nil); + player:endEvent(); end - diff --git a/data/scripts/unique/wil0Town01/PopulaceStandard/sibold.lua b/data/scripts/unique/wil0Town01/PopulaceStandard/sibold.lua index ae7f7dc6..5964cf9a 100644 --- a/data/scripts/unique/wil0Town01/PopulaceStandard/sibold.lua +++ b/data/scripts/unique/wil0Town01/PopulaceStandard/sibold.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithSIBOLD_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithSIBOLD_001", nil, nil, nil); + player:endEvent(); end - diff --git a/data/scripts/unique/wil0Town01/PopulaceStandard/styrmoeya.lua b/data/scripts/unique/wil0Town01/PopulaceStandard/styrmoeya.lua index a670d79a..cf106041 100644 --- a/data/scripts/unique/wil0Town01/PopulaceStandard/styrmoeya.lua +++ b/data/scripts/unique/wil0Town01/PopulaceStandard/styrmoeya.lua @@ -1,12 +1,7 @@ -function onEventStarted(player, npc) - defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithStyrmoeya_001", nil, nil, nil); - --player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithStyrmoeya_002", nil, nil, nil); - --player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithStyrmoeya_003", nil, nil, nil); -end +require ("global") -function onEventUpdate(player, npc, blah, menuSelect) - - player:EndEvent(); - +function onEventStarted(player, npc) + defaultWil = GetStaticActor("DftWil"); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithStyrmoeya_001", nil, nil, nil); + player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01/PopulaceStandard/thimm.lua b/data/scripts/unique/wil0Town01/PopulaceStandard/thimm.lua index 796cea6b..144051eb 100644 --- a/data/scripts/unique/wil0Town01/PopulaceStandard/thimm.lua +++ b/data/scripts/unique/wil0Town01/PopulaceStandard/thimm.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithThimm_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithThimm_001", nil, nil, nil); + player:endEvent(); end - diff --git a/data/scripts/unique/wil0Town01/PopulaceStandard/titinin.lua b/data/scripts/unique/wil0Town01/PopulaceStandard/titinin.lua index d9c3b8bd..3cabf71c 100644 --- a/data/scripts/unique/wil0Town01/PopulaceStandard/titinin.lua +++ b/data/scripts/unique/wil0Town01/PopulaceStandard/titinin.lua @@ -1,6 +1,8 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithTitinin_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithTitinin_001", nil, nil, nil); + player:endEvent(); end diff --git a/data/scripts/unique/wil0Town01/PopulaceStandard/tyon.lua b/data/scripts/unique/wil0Town01/PopulaceStandard/tyon.lua index 005e2f16..d73fc647 100644 --- a/data/scripts/unique/wil0Town01/PopulaceStandard/tyon.lua +++ b/data/scripts/unique/wil0Town01/PopulaceStandard/tyon.lua @@ -1,12 +1,7 @@ -function onEventStarted(player, npc) - defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithTyon_001", nil, nil, nil); - --player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithTyon_002", nil, nil, nil); - --player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithTyon_003", nil, nil, nil); -end +require ("global") -function onEventUpdate(player, npc, blah, menuSelect) - - player:EndEvent(); - +function onEventStarted(player, npc) + defaultWil = GetStaticActor("DftWil"); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithTyon_001", nil, nil, nil); + player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01/PopulaceStandard/wenefreda.lua b/data/scripts/unique/wil0Town01/PopulaceStandard/wenefreda.lua index 822de440..dc1c9486 100644 --- a/data/scripts/unique/wil0Town01/PopulaceStandard/wenefreda.lua +++ b/data/scripts/unique/wil0Town01/PopulaceStandard/wenefreda.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithWenefreda_001", nil, nil, nil); -end - + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithWenefreda_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01/PopulaceStandard/wracwulf.lua b/data/scripts/unique/wil0Town01/PopulaceStandard/wracwulf.lua index 19bf6780..52ef830a 100644 --- a/data/scripts/unique/wil0Town01/PopulaceStandard/wracwulf.lua +++ b/data/scripts/unique/wil0Town01/PopulaceStandard/wracwulf.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithWracwulf_001", nil, nil, nil); -end - + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithWracwulf_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01/PopulaceStandard/yayatoki.lua b/data/scripts/unique/wil0Town01/PopulaceStandard/yayatoki.lua index 33dfad23..0700f47e 100644 --- a/data/scripts/unique/wil0Town01/PopulaceStandard/yayatoki.lua +++ b/data/scripts/unique/wil0Town01/PopulaceStandard/yayatoki.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithYayatoki_001", nil, nil, nil); -end - + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithYayatoki_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01/PopulaceStandard/yhah_amariyo.lua b/data/scripts/unique/wil0Town01/PopulaceStandard/yhah_amariyo.lua index 57c28be4..79aeafc2 100644 --- a/data/scripts/unique/wil0Town01/PopulaceStandard/yhah_amariyo.lua +++ b/data/scripts/unique/wil0Town01/PopulaceStandard/yhah_amariyo.lua @@ -1,13 +1,7 @@ -function onEventStarted(player, npc) - defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithYhahamariyo_001", nil, nil, nil); - --player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithYhahamariyo_002", nil, nil, nil); - --player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithYhahamariyo_003", nil, nil, nil); - -end +require ("global") -function onEventUpdate(player, npc, blah, menuSelect) - - player:EndEvent(); - +function onEventStarted(player, npc) + defaultWil = GetStaticActor("DftWil"); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithYhahamariyo_001", nil, nil, nil); + player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01/PopulaceStandard/yuyuhase.lua b/data/scripts/unique/wil0Town01/PopulaceStandard/yuyuhase.lua index 188f31a4..2e9abad7 100644 --- a/data/scripts/unique/wil0Town01/PopulaceStandard/yuyuhase.lua +++ b/data/scripts/unique/wil0Town01/PopulaceStandard/yuyuhase.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithYuyuhase_001", nil, nil, nil); -end - + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithYuyuhase_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01/PopulaceStandard/zoengterbin.lua b/data/scripts/unique/wil0Town01/PopulaceStandard/zoengterbin.lua index b5f37613..d8ad2c6b 100644 --- a/data/scripts/unique/wil0Town01/PopulaceStandard/zoengterbin.lua +++ b/data/scripts/unique/wil0Town01/PopulaceStandard/zoengterbin.lua @@ -1,12 +1,7 @@ -function onEventStarted(player, npc) - defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithZoengterbin_001", nil, nil, nil); - --player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithZoengterbin_002", nil, nil, nil); - --player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithZoengterbin_003", nil, nil, nil); -end +require ("global") -function onEventUpdate(player, npc, blah, menuSelect) - - player:EndEvent(); - +function onEventStarted(player, npc) + defaultWil = GetStaticActor("DftWil"); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithZoengterbin_001", nil, nil, nil); + player:endEvent(); end \ No newline at end of file From 3969fff64a77e17882c6773df2a6040655d434e3 Mon Sep 17 00:00:00 2001 From: Filip Maj Date: Tue, 21 Jun 2016 17:48:50 -0400 Subject: [PATCH 09/15] Finished converting over all scripts. --- .../openingStop_fstBtl03_03@0A600.lua | 5 +-- .../pplStd_fst0Btl03_01@0A600.lua | 23 ++++------- .../pplStd_fst0Btl03_02@0A600.lua | 24 ++++------- .../PopulaceStandard/pplStd_01@0C100.lua | 19 ++------- .../PopulaceStandard/pplStd_02@0C100.lua | 19 ++------- .../PopulaceStandard/pplStd_03@0C100.lua | 19 ++------- .../PopulaceStandard/pplStd_04@0C100.lua | 19 ++------- .../PopulaceStandard/pplStd_05@0C100.lua | 19 ++------- .../PopulaceStandard/pplStd_06@0C100.lua | 19 ++------- .../PopulaceStandard/pplStd_07@0C100.lua | 19 ++------- .../PopulaceStandard/pplStd_08@0C100.lua | 19 ++------- .../PopulaceStandard/pplStd_09@0C100.lua | 19 ++------- .../PopulaceStandard/pplStd_0a@0C100.lua | 24 +++-------- .../PopulaceStandard/pplStd_0b@0C100.lua | 20 ++------- .../PopulaceStandard/pplStd_0c@0C100.lua | 17 ++------ .../PopulaceStandard/pplStd_0d@0C100.lua | 17 ++------ .../PopulaceStandard/pplStd_0e@0C100.lua | 19 ++------- .../PopulaceStandard/pplStd_0f@0C100.lua | 25 +++-------- .../PopulaceStandard/pplStd_11@0C100.lua | 30 ++++---------- .../pplStd_wil0Btl01_01@0B800.lua | 19 ++------- .../pplStd_wil0Btl01_02@0B800.lua | 41 ++++++------------- .../pplStd_wil0Btl01_03@0B800.lua | 23 +++-------- .../pplStd_wil0Btl01_04@0B800.lua | 21 ++-------- .../pplStd_wil0Btl01_05@0B800.lua | 21 ++-------- .../pplStd_wil0Btl01_06@0B800.lua | 31 ++++---------- .../pplStd_wil0Btl01_07@0B800.lua | 21 ++-------- .../pplStd_wil0Btl01_08@0B800.lua | 21 ++-------- .../pplStd_wil0Btl01_09@0B800.lua | 14 ++----- .../pplStd_wil0Btl01_0a@0B800.lua | 29 ++++--------- .../pplStd_wil0Btl01_0b@0B800.lua | 14 +------ .../PopulaceStandard/abylgo_hamylgo.lua | 2 +- .../PopulaceStandard/anthoinette.lua | 2 +- .../PopulaceStandard/apacho_naccho.lua | 2 +- .../wil0Town01a/PopulaceStandard/aspipi.lua | 2 +- .../wil0Town01a/PopulaceStandard/babaki.lua | 2 +- .../PopulaceStandard/barnabaix.lua | 2 +- .../wil0Town01a/PopulaceStandard/berthar.lua | 2 +- .../wil0Town01a/PopulaceStandard/bouchard.lua | 2 +- .../PopulaceStandard/cahernaut.lua | 2 +- .../wil0Town01a/PopulaceStandard/chachai.lua | 2 +- .../wil0Town01a/PopulaceStandard/ciceroix.lua | 2 +- .../wil0Town01a/PopulaceStandard/crhabye.lua | 2 +- .../PopulaceStandard/dariustel.lua | 2 +- .../wil0Town01a/PopulaceStandard/deaustie.lua | 2 +- .../wil0Town01a/PopulaceStandard/diriaine.lua | 2 +- .../wil0Town01a/PopulaceStandard/dylise.lua | 2 +- .../wil0Town01a/PopulaceStandard/eara.lua | 2 +- .../wil0Town01a/PopulaceStandard/eleanor.lua | 2 +- .../wil0Town01a/PopulaceStandard/elecotte.lua | 2 +- .../wil0Town01a/PopulaceStandard/fifilo.lua | 2 +- .../PopulaceStandard/fineco_romanecco.lua | 2 +- .../PopulaceStandard/fruhybolg.lua | 2 +- .../PopulaceStandard/fyrilsunn.lua | 2 +- .../wil0Town01a/PopulaceStandard/galeren.lua | 2 +- .../wil0Town01a/PopulaceStandard/gloiucen.lua | 2 +- .../wil0Town01a/PopulaceStandard/gogofu.lua | 2 +- .../wil0Town01a/PopulaceStandard/goodife.lua | 2 +- .../wil0Town01a/PopulaceStandard/guencen.lua | 2 +- .../PopulaceStandard/guillestet.lua | 2 +- .../wil0Town01a/PopulaceStandard/hahayo.lua | 2 +- .../PopulaceStandard/hawazi_zowazi.lua | 2 +- .../wil0Town01a/PopulaceStandard/hcidjaa.lua | 2 +- .../wil0Town01a/PopulaceStandard/holbubu.lua | 2 +- .../wil0Town01a/PopulaceStandard/illofii.lua | 2 +- .../wil0Town01a/PopulaceStandard/isabella.lua | 2 +- .../wil0Town01a/PopulaceStandard/jajanzo.lua | 2 +- .../wil0Town01a/PopulaceStandard/jannie.lua | 2 +- .../wil0Town01a/PopulaceStandard/jeger.lua | 2 +- .../wil0Town01a/PopulaceStandard/jenlyns.lua | 2 +- .../PopulaceStandard/kamlito_halito.lua | 2 +- .../wil0Town01a/PopulaceStandard/kukusi.lua | 2 +- .../wil0Town01a/PopulaceStandard/lefchild.lua | 2 +- .../wil0Town01a/PopulaceStandard/liaime.lua | 2 +- .../wil0Town01a/PopulaceStandard/linette.lua | 2 +- .../wil0Town01a/PopulaceStandard/lohwaeb.lua | 2 +- .../wil0Town01a/PopulaceStandard/lulutsu.lua | 2 +- .../wil0Town01a/PopulaceStandard/lyngwaek.lua | 2 +- .../wil0Town01a/PopulaceStandard/mamaza.lua | 2 +- .../wil0Town01a/PopulaceStandard/mammet.lua | 2 +- .../PopulaceStandard/mammet_alc.lua | 2 +- .../PopulaceStandard/mammet_gsm.lua | 2 +- .../PopulaceStandard/mammet_gsm2.lua | 2 +- .../PopulaceStandard/mammet_wvr.lua | 2 +- .../PopulaceStandard/margarete.lua | 2 +- .../wil0Town01a/PopulaceStandard/martine.lua | 2 +- .../wil0Town01a/PopulaceStandard/milgogo.lua | 2 +- .../wil0Town01a/PopulaceStandard/miyaya.lua | 2 +- .../wil0Town01a/PopulaceStandard/mohtfryd.lua | 2 +- .../wil0Town01a/PopulaceStandard/mumukiya.lua | 2 +- .../wil0Town01a/PopulaceStandard/mumutano.lua | 2 +- .../wil0Town01a/PopulaceStandard/neymumu.lua | 2 +- .../PopulaceStandard/nhagi_amariyo.lua | 2 +- .../wil0Town01a/PopulaceStandard/nogeloix.lua | 2 +- .../PopulaceStandard/obili_tambili.lua | 2 +- .../PopulaceStandard/oefyrblaet.lua | 2 +- .../wil0Town01a/PopulaceStandard/papawa.lua | 2 +- .../PopulaceStandard/peneli_zuneli.lua | 2 +- .../PopulaceStandard/pierriquet.lua | 2 +- .../PopulaceStandard/qhota_nbolo.lua | 2 +- .../wil0Town01a/PopulaceStandard/qmhalawi.lua | 2 +- .../PopulaceStandard/rinh_maimhov.lua | 2 +- .../wil0Town01a/PopulaceStandard/rosalind.lua | 2 +- .../wil0Town01a/PopulaceStandard/safufu.lua | 2 +- .../wil0Town01a/PopulaceStandard/sinette.lua | 2 +- .../PopulaceStandard/singleton.lua | 2 +- .../PopulaceStandard/sungi_kelungi.lua | 2 +- .../PopulaceStandard/swerdahrm.lua | 2 +- .../wil0Town01a/PopulaceStandard/tatasha.lua | 2 +- .../wil0Town01a/PopulaceStandard/totono.lua | 2 +- .../wil0Town01a/PopulaceStandard/tutubuki.lua | 2 +- .../PopulaceStandard/tyago_moui.lua | 2 +- .../wil0Town01a/PopulaceStandard/ubokhn.lua | 2 +- .../wil0Town01a/PopulaceStandard/uwilsyng.lua | 2 +- .../wil0Town01a/PopulaceStandard/vannes.lua | 2 +- .../wil0Town01a/PopulaceStandard/vavaki.lua | 2 +- .../wil0Town01a/PopulaceStandard/wannore.lua | 2 +- .../wil0Town01a/PopulaceStandard/wawaton.lua | 2 +- .../PopulaceStandard/wise_moon.lua | 2 +- .../wil0Town01a/PopulaceStandard/wyznguld.lua | 2 +- .../PopulaceStandard/xau_nbolo.lua | 2 +- .../wil0Town01a/PopulaceStandard/xdhilogo.lua | 2 +- .../wil0Town01a/PopulaceStandard/yayake.lua | 2 +- .../wil0Town01a/PopulaceStandard/yuyubesu.lua | 2 +- 123 files changed, 240 insertions(+), 576 deletions(-) diff --git a/data/scripts/unique/fst0Battle03/openingStop_fstBtl03_03@0A600.lua b/data/scripts/unique/fst0Battle03/openingStop_fstBtl03_03@0A600.lua index 754cfaa6..28521fac 100644 --- a/data/scripts/unique/fst0Battle03/openingStop_fstBtl03_03@0A600.lua +++ b/data/scripts/unique/fst0Battle03/openingStop_fstBtl03_03@0A600.lua @@ -1,6 +1,5 @@ -function init(npc) - return "/Chara/Npc/Object/OpeningStoperF0B1", false, false, false, false, false, npc:GetActorClassId(), false, false, 0, 1, "TEST"; -end +require ("global") +require ("quests/man/man0g0") function onEventStarted(player, npc, triggerName) if (triggerName == "caution") then diff --git a/data/scripts/unique/fst0Battle03/pplStd_fst0Btl03_01@0A600.lua b/data/scripts/unique/fst0Battle03/pplStd_fst0Btl03_01@0A600.lua index b1d2fe67..b40d4247 100644 --- a/data/scripts/unique/fst0Battle03/pplStd_fst0Btl03_01@0A600.lua +++ b/data/scripts/unique/fst0Battle03/pplStd_fst0Btl03_01@0A600.lua @@ -1,24 +1,20 @@ -require("/quests/man/man0g0") - -function init(npc) - return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc:GetActorClassId(), false, false, 0, 1, "TEST"; -end +require ("global") +require ("quests/man/man0g0") function onSpawn(player, npc) npc:SetQuestGraphic(player, 0x2); end function onEventStarted(player, npc, triggerName) - man0g0Quest = player:GetQuest("Man0g0"); if (man0g0Quest ~= nil) then if (triggerName == "pushDefault") then - player:RunEventFunction("delegateEvent", player, man0g0Quest, "processTtrNomal002", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, man0g0Quest, "processTtrNomal002", nil, nil, nil); elseif (triggerName == "talkDefault") then if (man0g0Quest:GetQuestFlag(MAN0G0_FLAG_TUTORIAL1_DONE) == false) then - player:RunEventFunction("delegateEvent", player, man0g0Quest, "processTtrNomal003", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, man0g0Quest, "processTtrNomal003", nil, nil, nil); player:SetEventStatus(npc, "pushDefault", false, 0x2); player:GetDirector():OnTalked(npc); man0g0Quest:SetQuestFlag(MAN0G0_FLAG_TUTORIAL1_DONE, true); @@ -26,18 +22,15 @@ function onEventStarted(player, npc, triggerName) else if (man0g0Quest:GetQuestFlag(MAN0G0_FLAG_MINITUT_DONE1) == true) then man0g0Quest:SetQuestFlag(MAN0G0_FLAG_TUTORIAL2_DONE, true); - player:RunEventFunction("delegateEvent", player, man0g0Quest, "processEvent010_1", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, man0g0Quest, "processEvent010_1", nil, nil, nil); else - player:RunEventFunction("delegateEvent", player, man0g0Quest, "processEvent000_1", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, man0g0Quest, "processEvent000_1", nil, nil, nil); end end - else - player:EndEvent(); - end - else - player:EndEvent(); --Should not be here w.o this quest + end end + player:EndEvent(); end function onEventUpdate(player, npc) diff --git a/data/scripts/unique/fst0Battle03/pplStd_fst0Btl03_02@0A600.lua b/data/scripts/unique/fst0Battle03/pplStd_fst0Btl03_02@0A600.lua index 2a811636..3a6f62f0 100644 --- a/data/scripts/unique/fst0Battle03/pplStd_fst0Btl03_02@0A600.lua +++ b/data/scripts/unique/fst0Battle03/pplStd_fst0Btl03_02@0A600.lua @@ -1,28 +1,18 @@ -require("/quests/man/man0g0") +require ("global") +require ("quests/man/man0g0") -function init(npc) - return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc:GetActorClassId(), false, false, 0, 1, "TEST"; -end - -function onEventStarted(player, npc, triggerName) - +function onEventStarted(player, npc, triggerName) man0g0Quest = player:GetQuest("Man0g0"); if (triggerName == "talkDefault") then if (man0g0Quest:GetQuestFlag(MAN0G0_FLAG_MINITUT_DONE1) == false) then - player:RunEventFunction("delegateEvent", player, man0g0Quest, "processEvent000_2", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, man0g0Quest, "processEvent000_2", nil, nil, nil); man0g0Quest:SetQuestFlag(MAN0G0_FLAG_MINITUT_DONE1, true); man0g0Quest:SaveData(); player:GetDirector():OnTalked(npc); else - player:RunEventFunction("delegateEvent", player, man0g0Quest, "processEvent000_2", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, man0g0Quest, "processEvent000_2", nil, nil, nil); end - else - player:EndEvent(); - end - -end - -function onEventUpdate(player, npc) - player:EndEvent(); + end + player:EndEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_01@0C100.lua b/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_01@0C100.lua index 75ddffb1..b6c7ed83 100644 --- a/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_01@0C100.lua +++ b/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_01@0C100.lua @@ -1,19 +1,8 @@ -function init(npc) - return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc:GetActorClassId(), false, false, 0, 1, "TEST"; -end +require ("global") +require ("quests/man/man0l0") function onEventStarted(player, npc, triggerName) - man0l0Quest = GetStaticActor("Man0l0"); - - if (triggerName == "talkDefault") then - player:RunEventFunction("delegateEvent", player, man0l0Quest, "processEvent000_4", nil, nil, nil); - else - player:EndEvent(); - end - -end - -function onEventUpdate(player, npc) - player:EndEvent(); + callClientFunction(player, "delegateEvent", player, man0l0Quest, "processEvent000_4", nil, nil, nil); + player:EndEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_02@0C100.lua b/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_02@0C100.lua index 1c23175a..fc33febd 100644 --- a/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_02@0C100.lua +++ b/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_02@0C100.lua @@ -1,19 +1,8 @@ -function init(npc) - return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc:GetActorClassId(), false, false, 0, 1, "TEST"; -end +require ("global") +require ("quests/man/man0l0") function onEventStarted(player, npc, triggerName) - man0l0Quest = GetStaticActor("Man0l0"); - - if (triggerName == "talkDefault") then - player:RunEventFunction("delegateEvent", player, man0l0Quest, "processEvent000_5", nil, nil, nil); - else - player:EndEvent(); - end - -end - -function onEventUpdate(player, npc) - player:EndEvent(); + callClientFunction(player, "delegateEvent", player, man0l0Quest, "processEvent000_5", nil, nil, nil); + player:EndEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_03@0C100.lua b/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_03@0C100.lua index e99678f8..2eba3065 100644 --- a/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_03@0C100.lua +++ b/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_03@0C100.lua @@ -1,19 +1,8 @@ -function init(npc) - return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc:GetActorClassId(), false, false, 0, 1, "TEST"; -end +require ("global") +require ("quests/man/man0l0") function onEventStarted(player, npc, triggerName) - man0l0Quest = GetStaticActor("Man0l0"); - - if (triggerName == "talkDefault") then - player:RunEventFunction("delegateEvent", player, man0l0Quest, "processEvent000_6", nil, nil, nil); - else - player:EndEvent(); - end - -end - -function onEventUpdate(player, npc) - player:EndEvent(); + callClientFunction(player, "delegateEvent", player, man0l0Quest, "processEvent000_6", nil, nil, nil); + player:EndEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_04@0C100.lua b/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_04@0C100.lua index 8637a198..ac9db79f 100644 --- a/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_04@0C100.lua +++ b/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_04@0C100.lua @@ -1,19 +1,8 @@ -function init(npc) - return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc:GetActorClassId(), false, false, 0, 1, "TEST"; -end +require ("global") +require ("quests/man/man0l0") function onEventStarted(player, npc, triggerName) - man0l0Quest = GetStaticActor("Man0l0"); - - if (triggerName == "talkDefault") then - player:RunEventFunction("delegateEvent", player, man0l0Quest, "processEvent000_7", nil, nil, nil); - else - player:EndEvent(); - end - -end - -function onEventUpdate(player, npc) - player:EndEvent(); + callClientFunction(player, "delegateEvent", player, man0l0Quest, "processEvent000_7", nil, nil, nil); + player:EndEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_05@0C100.lua b/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_05@0C100.lua index c6ab9164..108e6e95 100644 --- a/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_05@0C100.lua +++ b/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_05@0C100.lua @@ -1,11 +1,7 @@ -require("/quests/man/man0l0") - -function init(npc) - return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc:GetActorClassId(), false, false, 0, 1, "TEST"; -end +require ("global") +require ("quests/man/man0l0") function onSpawn(player, npc) - man0l0Quest = player:GetQuest("man0l0"); if (man0l0Quest ~= nil) then @@ -18,25 +14,18 @@ function onSpawn(player, npc) end function onEventStarted(player, npc, triggerName) - man0l0Quest = player:GetQuest("man0l0"); if (triggerName == "talkDefault") then if (man0l0Quest:GetQuestFlag(MAN0L0_FLAG_MINITUT_DONE3) == false) then - player:RunEventFunction("delegateEvent", player, man0l0Quest, "processTtrMini003", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, man0l0Quest, "processTtrMini003", nil, nil, nil); npc:SetQuestGraphic(player, 0x0); man0l0Quest:SetQuestFlag(MAN0L0_FLAG_MINITUT_DONE3, true); man0l0Quest:SaveData(); player:GetDirector():OnTalked(npc); else - player:RunEventFunction("delegateEvent", player, man0l0Quest, "processEvent000_8", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, man0l0Quest, "processEvent000_8", nil, nil, nil); end - else - player:EndEvent(); end - -end - -function onEventUpdate(player, npc) player:EndEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_06@0C100.lua b/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_06@0C100.lua index abc727a9..861a2859 100644 --- a/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_06@0C100.lua +++ b/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_06@0C100.lua @@ -1,19 +1,8 @@ -function init(npc) - return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc:GetActorClassId(), false, false, 0, 1, "TEST"; -end +require ("global") +require ("quests/man/man0l0") function onEventStarted(player, npc, triggerName) - man0l0Quest = GetStaticActor("Man0l0"); - - if (triggerName == "talkDefault") then - player:RunEventFunction("delegateEvent", player, man0l0Quest, "processEvent000_9", nil, nil, nil); - else - player:EndEvent(); - end - -end - -function onEventUpdate(player, npc) - player:EndEvent(); + callClientFunction(player, "delegateEvent", player, man0l0Quest, "processEvent000_9", nil, nil, nil); + player:EndEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_07@0C100.lua b/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_07@0C100.lua index 89c3769d..5563353b 100644 --- a/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_07@0C100.lua +++ b/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_07@0C100.lua @@ -1,19 +1,8 @@ -function init(npc) - return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc:GetActorClassId(), false, false, 0, 1, "TEST"; -end +require ("global") +require ("quests/man/man0l0") function onEventStarted(player, npc, triggerName) - man0l0Quest = GetStaticActor("Man0l0"); - - if (triggerName == "talkDefault") then - player:RunEventFunction("delegateEvent", player, man0l0Quest, "processEvent000_10", nil, nil, nil); - else - player:EndEvent(); - end - -end - -function onEventUpdate(player, npc) - player:EndEvent(); + callClientFunction(player, "delegateEvent", player, man0l0Quest, "processEvent000_10", nil, nil, nil); + player:EndEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_08@0C100.lua b/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_08@0C100.lua index c327ba9c..6ca917b8 100644 --- a/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_08@0C100.lua +++ b/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_08@0C100.lua @@ -1,19 +1,8 @@ -function init(npc) - return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc:GetActorClassId(), false, false, 0, 1, "TEST"; -end +require ("global") +require ("quests/man/man0l0") function onEventStarted(player, npc, triggerName) - man0l0Quest = GetStaticActor("Man0l0"); - - if (triggerName == "talkDefault") then - player:RunEventFunction("delegateEvent", player, man0l0Quest, "processEvent000_11", nil, nil, nil); - else - player:EndEvent(); - end - -end - -function onEventUpdate(player, npc) - player:EndEvent(); + callClientFunction(player, "delegateEvent", player, man0l0Quest, "processEvent000_11", nil, nil, nil); + player:EndEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_09@0C100.lua b/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_09@0C100.lua index 6d8e0afb..b92ecdba 100644 --- a/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_09@0C100.lua +++ b/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_09@0C100.lua @@ -1,19 +1,8 @@ -function init(npc) - return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc:GetActorClassId(), false, false, 0, 1, "TEST"; -end +require ("global") +require ("quests/man/man0l0") function onEventStarted(player, npc, triggerName) - man0l0Quest = GetStaticActor("Man0l0"); - - if (triggerName == "talkDefault") then - player:RunEventFunction("delegateEvent", player, man0l0Quest, "processEvent000_12", nil, nil, nil); - else - player:EndEvent(); - end - -end - -function onEventUpdate(player, npc) - player:EndEvent(); + callClientFunction(player, "delegateEvent", player, man0l0Quest, "processEvent000_12", nil, nil, nil); + player:EndEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_0a@0C100.lua b/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_0a@0C100.lua index 566fad0b..ef145806 100644 --- a/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_0a@0C100.lua +++ b/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_0a@0C100.lua @@ -1,46 +1,32 @@ -require("/quests/man/man0l0") - -function init(npc) - return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc:GetActorClassId(), false, false, 0, 1, "TEST"; -end +require ("global") +require ("quests/man/man0l0") function onSpawn(player, npc) - man0l0Quest = player:GetQuest("man0l0"); if (man0l0Quest ~= nil) then if (man0l0Quest:GetQuestFlag(MAN0L0_FLAG_MINITUT_DONE2) == false) then npc:SetQuestGraphic(player, 0x2); end - end - + end end function onEventStarted(player, npc, triggerName) - man0l0Quest = player:GetQuest("man0l0"); if (man0l0Quest ~= nil) then if (triggerName == "talkDefault") then if (man0l0Quest:GetQuestFlag(MAN0L0_FLAG_MINITUT_DONE2) == false) then - player:RunEventFunction("delegateEvent", player, man0l0Quest, "processTtrMini002", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, man0l0Quest, "processTtrMini002", nil, nil, nil); npc:SetQuestGraphic(player, 0x0); man0l0Quest:SetQuestFlag(MAN0L0_FLAG_MINITUT_DONE2, true); man0l0Quest:SaveData(); player:GetDirector():OnTalked(npc); else - player:RunEventFunction("delegateEvent", player, man0l0Quest, "processEvent000_13", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, man0l0Quest, "processEvent000_13", nil, nil, nil); end - else - player:EndEvent(); end - else - player:EndEvent(); end - -end - -function onEventUpdate(player, npc) player:EndEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_0b@0C100.lua b/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_0b@0C100.lua index fee18e25..7d8e2a7e 100644 --- a/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_0b@0C100.lua +++ b/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_0b@0C100.lua @@ -1,20 +1,8 @@ -function init(npc) - return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc:GetActorClassId(), false, false, 0, 1, "TEST"; -end +require ("global") +require ("quests/man/man0l0") function onEventStarted(player, npc, triggerName) - man0l0Quest = GetStaticActor("Man0l0"); - - if (triggerName == "talkDefault") then - --player:RunEventFunction("delegateEvent", player, man0l0Quest, "processEvent000_9", nil, nil, nil); - player:RunEventFunction("delegateEvent", player, man0l0Quest, "processEvent000_14", nil, nil, nil); - else - player:EndEvent(); - end - -end - -function onEventUpdate(player, npc) - player:EndEvent(); + callClientFunction(player, "delegateEvent", player, man0l0Quest, "processEvent000_14", nil, nil, nil); + player:EndEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_0c@0C100.lua b/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_0c@0C100.lua index 335702e5..2b3fee3a 100644 --- a/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_0c@0C100.lua +++ b/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_0c@0C100.lua @@ -1,19 +1,10 @@ -function init(npc) - return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc:GetActorClassId(), false, false, 0, 1, "TEST"; -end +require ("global") +require ("quests/man/man0l0") function onEventStarted(player, npc, triggerName) - man0l0Quest = GetStaticActor("Man0l0"); - - if (triggerName == "talkDefault") then - player:RunEventFunction("delegateEvent", player, man0l0Quest, "processEvent000_15", nil, nil, nil); - else - player:EndEvent(); - end -end - -function onEventUpdate(player, npc) + callClientFunction(player, "delegateEvent", player, man0l0Quest, "processEvent000_15", nil, nil, nil, nil); + player:EndEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_0d@0C100.lua b/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_0d@0C100.lua index 006c9d4b..c5f6e688 100644 --- a/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_0d@0C100.lua +++ b/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_0d@0C100.lua @@ -1,19 +1,10 @@ -function init(npc) - return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc:GetActorClassId(), false, false, 0, 1, "TEST"; -end +require ("global") +require ("quests/man/man0l0") function onEventStarted(player, npc, triggerName) - man0l0Quest = GetStaticActor("Man0l0"); - - if (triggerName == "talkDefault") then - player:RunEventFunction("delegateEvent", player, man0l0Quest, "processEvent000_16", nil, nil, nil); - else - player:EndEvent(); - end -end - -function onEventUpdate(player, npc) + callClientFunction(player, "delegateEvent", player, man0l0Quest, "processEvent000_16", nil, nil, nil); + player:EndEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_0e@0C100.lua b/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_0e@0C100.lua index e02c767c..de0b9394 100644 --- a/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_0e@0C100.lua +++ b/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_0e@0C100.lua @@ -1,19 +1,8 @@ -function init(npc) - return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc:GetActorClassId(), false, false, 0, 1, "TEST"; -end +require ("global") +require ("quests/man/man0l0") function onEventStarted(player, npc, triggerName) - man0l0Quest = GetStaticActor("Man0l0"); - - if (triggerName == "talkDefault") then - player:RunEventFunction("delegateEvent", player, man0l0Quest, "processEvent000_17", nil, nil, nil); - else - player:EndEvent(); - end - -end - -function onEventUpdate(player, npc) - player:EndEvent(); + callClientFunction(player, "delegateEvent", player, man0l0Quest, "processEvent000_17", nil, nil, nil); + player:EndEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_0f@0C100.lua b/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_0f@0C100.lua index 7f4ac125..1a13cd2d 100644 --- a/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_0f@0C100.lua +++ b/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_0f@0C100.lua @@ -1,8 +1,5 @@ -require("/quests/man/man0l0") - -function init(npc) - return "/Chara/Npc/Populace/PopulaceTutorial", false, false, false, false, false, npc:GetActorClassId(), false, false, 0, 1, "TEST"; -end +require ("global") +require ("quests/man/man0l0") function onSpawn(player, npc) @@ -21,18 +18,9 @@ function onSpawn(player, npc) end function onEventStarted(player, npc, triggerName) - - if (triggerName == "pushDefault") then - man0l0Quest = GetStaticActor("Man0l0"); - player:RunEventFunction("delegateEvent", player, man0l0Quest, "processEventNewRectAsk", nil); - else - player:EndEvent(); - end + man0l0Quest = GetStaticActor("Man0l0"); + choice = callClientFunction(player, "delegateEvent", player, man0l0Quest, "processEventNewRectAsk", nil); -end - -function onEventUpdate(player, npc, resultId, choice) - if (resultId == 0x2B9EBC42) then player:EndEvent(); player:SetDirector("QuestDirectorMan0l001", true); @@ -46,10 +34,9 @@ function onEventUpdate(player, npc, resultId, choice) else if (choice == 1) then man0l0Quest = player:GetQuest("Man0l0"); - player:RunEventFunction("delegateEvent", player, man0l0Quest, "processEvent000_2", nil, nil, nil, nil); - else - player:EndEvent(); + callClientFunction(player, "delegateEvent", player, man0l0Quest, "processEvent000_2", nil, nil, nil, nil); end end + player:EndEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_11@0C100.lua b/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_11@0C100.lua index 74d2ff08..dca14849 100644 --- a/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_11@0C100.lua +++ b/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_11@0C100.lua @@ -1,11 +1,7 @@ -require("/quests/man/man0l0") - -function init(npc) - return "/Chara/Npc/Populace/PopulaceTutorial", false, false, false, false, false, npc:GetActorClassId(), false, false, 0, 1, "TEST"; -end +require ("global") +require ("quests/man/man0l0") function onSpawn(player, npc) - man0l0Quest = player:GetQuest("Man0l0"); if (man0l0Quest ~= nil) then @@ -17,22 +13,20 @@ function onSpawn(player, npc) player:SetEventStatus(npc, "pushDefault", false, 0x2); end end - end function onEventStarted(player, npc, triggerName) - man0l0Quest = player:GetQuest("Man0l0"); if (man0l0Quest ~= nil) then if (triggerName == "pushDefault") then - player:RunEventFunction("delegateEvent", player, man0l0Quest, "processTtrNomal002", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, man0l0Quest, "processTtrNomal002", nil, nil, nil); elseif (triggerName == "talkDefault") then --Is doing talk tutorial? if (man0l0Quest:GetQuestFlag(MAN0L0_FLAG_TUTORIAL3_DONE) == false) then player:SetEventStatus(npc, "pushDefault", false, 0x2); - player:RunEventFunction("delegateEvent", player, man0l0Quest, "processTtrNomal003", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, man0l0Quest, "processTtrNomal003", nil, nil, nil); man0l0Quest:SetQuestFlag(MAN0L0_FLAG_TUTORIAL3_DONE, true); npc:SetQuestGraphic(player, 0x2); man0l0Quest:SaveData(); @@ -40,7 +34,7 @@ function onEventStarted(player, npc, triggerName) player:GetDirector():OnTalked(npc); --Was he talked to for the mini tutorial? else - player:RunEventFunction("delegateEvent", player, man0l0Quest, "processTtrMini001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, man0l0Quest, "processTtrMini001", nil, nil, nil); if (man0l0Quest:GetQuestFlag(MAN0L0_FLAG_MINITUT_DONE1) == false) then npc:SetQuestGraphic(player, 0x0); @@ -49,17 +43,9 @@ function onEventStarted(player, npc, triggerName) player:GetDirector():OnTalked(npc); end - - end - - else - player:EndEvent(); - end - else - player:EndEvent(); --Should not be here w.o this quest + end + end end -end - -function onEventUpdate(player, npc) + player:EndEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_01@0B800.lua b/data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_01@0B800.lua index 0d7ab846..4c9c8304 100644 --- a/data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_01@0B800.lua +++ b/data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_01@0B800.lua @@ -1,21 +1,8 @@ -require("/quests/man/man0u0") - -function init(npc) - return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc:GetActorClassId(), false, false, 0, 1, "TEST"; -end +require ("global") +require ("quests/man/man0u0") function onEventStarted(player, npc, triggerName) - man0u0Quest = GetStaticActor("Man0u0"); - - if (triggerName == "talkDefault") then - player:RunEventFunction("delegateEvent", player, man0u0Quest, "processEvent000_6", nil, nil, nil); - else - player:EndEvent(); - end - -end - -function onEventUpdate(player, npc) + callClientFunction(player, "delegateEvent", player, man0u0Quest, "defaultTalkWithLady001_001", nil, nil, nil); player:EndEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_02@0B800.lua b/data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_02@0B800.lua index 555a86f7..70924af9 100644 --- a/data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_02@0B800.lua +++ b/data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_02@0B800.lua @@ -1,33 +1,18 @@ -require("/quests/man/man0u0") - -function init(npc) - return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc:GetActorClassId(), false, false, 0, 1, "TEST"; -end - -function onSpawn(player, npc) - npc:SetQuestGraphic(player, 0x2); -end +require ("global") +require ("quests/man/man0u0") function onEventStarted(player, npc, triggerName) - - man0u0Quest = player:GetQuest("man0u0"); - - if (triggerName == "talkDefault") then - if (man0u0Quest:GetQuestFlag(MAN0U0_FLAG_MINITUT_DONE2) == false) then - player:RunEventFunction("delegateEvent", player, man0u0Quest, "processTtrMini002_first", nil, nil, nil); - npc:SetQuestGraphic(player, 0x0); - man0u0Quest:SetQuestFlag(MAN0U0_FLAG_MINITUT_DONE2, true); - man0u0Quest:SaveData(); - player:GetDirector():OnTalked(npc); - else - player:RunEventFunction("delegateEvent", player, man0u0Quest, "processTtrMini002", nil, nil, nil); - end - else - player:EndEvent(); - end + man0u0Quest = GetStaticActor("Man0u0"); -end - -function onEventUpdate(player, npc) + if (man0u0Quest:GetQuestFlag(MAN0U0_FLAG_MINITUT_DONE2) == false) then + callClientFunction(player, "delegateEvent", player, man0u0Quest, "processTtrMini002_first", nil, nil, nil); + npc:SetQuestGraphic(player, 0x0); + man0u0Quest:SetQuestFlag(MAN0U0_FLAG_MINITUT_DONE2, true); + man0u0Quest:SaveData(); + player:GetDirector():OnTalked(npc); + else + callClientFunction(player, "delegateEvent", player, man0u0Quest, "processTtrMini002", nil, nil, nil); + end + player:EndEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_03@0B800.lua b/data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_03@0B800.lua index 3898a86e..0f6c595a 100644 --- a/data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_03@0B800.lua +++ b/data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_03@0B800.lua @@ -1,21 +1,8 @@ -require("/quests/man/man0u0") - -function init(npc) - return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc:GetActorClassId(), false, false, 0, 1, "TEST"; -end +require ("global") +require ("quests/man/man0u0") function onEventStarted(player, npc, triggerName) - - man0u0Quest = GetStaticActor("Man0u0"); - - if (triggerName == "talkDefault") then - player:RunEventFunction("delegateEvent", player, man0u0Quest, "processEvent000_8", nil, nil, nil); - else - player:EndEvent(); - end - -end - -function onEventUpdate(player, npc) + man0u0Quest = GetStaticActor("Man0u0"); + callClientFunction(player, "delegateEvent", player, man0u0Quest, "processEvent000_8", nil, nil, nil); player:EndEvent(); -end \ No newline at end of file +end diff --git a/data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_04@0B800.lua b/data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_04@0B800.lua index 4103e50b..8d61d910 100644 --- a/data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_04@0B800.lua +++ b/data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_04@0B800.lua @@ -1,21 +1,8 @@ -require("/quests/man/man0u0") - -function init(npc) - return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc:GetActorClassId(), false, false, 0, 1, "TEST"; -end +require ("global") +require ("quests/man/man0u0") function onEventStarted(player, npc, triggerName) - - man0u0Quest = GetStaticActor("Man0u0"); - - if (triggerName == "talkDefault") then - player:RunEventFunction("delegateEvent", player, man0u0Quest, "processEvent000_9", nil, nil, nil); - else - player:EndEvent(); - end - -end - -function onEventUpdate(player, npc) + man0u0Quest = GetStaticActor("Man0u0"); + callClientFunction(player, "delegateEvent", player, man0u0Quest, "processEvent000_9", nil, nil, nil); player:EndEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_05@0B800.lua b/data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_05@0B800.lua index 35f98503..bf687f2b 100644 --- a/data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_05@0B800.lua +++ b/data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_05@0B800.lua @@ -1,21 +1,8 @@ -require("/quests/man/man0u0") - -function init(npc) - return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc:GetActorClassId(), false, false, 0, 1, "TEST"; -end +require ("global") +require ("quests/man/man0u0") function onEventStarted(player, npc, triggerName) - - man0u0Quest = GetStaticActor("Man0u0"); - - if (triggerName == "talkDefault") then - player:RunEventFunction("delegateEvent", player, man0u0Quest, "processEvent000_10", nil, nil, nil); - else - player:EndEvent(); - end - -end - -function onEventUpdate(player, npc) + man0u0Quest = GetStaticActor("Man0u0"); + callClientFunction(player, "delegateEvent", player, man0u0Quest, "processEvent000_10", nil, nil, nil); player:EndEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_06@0B800.lua b/data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_06@0B800.lua index 6e1c6a3b..3797253b 100644 --- a/data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_06@0B800.lua +++ b/data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_06@0B800.lua @@ -1,33 +1,18 @@ -require("/quests/man/man0u0") - -function init(npc) - return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc:GetActorClassId(), false, false, 0, 1, "TEST"; -end - -function onSpawn(player, npc) - npc:SetQuestGraphic(player, 0x2); -end +require ("global") +require ("quests/man/man0u0") function onEventStarted(player, npc, triggerName) - - man0u0Quest = player:GetQuest("man0u0"); - - if (triggerName == "talkDefault") then - if (man0u0Quest:GetQuestFlag(MAN0U0_FLAG_MINITUT_DONE3) == false) then - player:RunEventFunction("delegateEvent", player, man0u0Quest, "processTtrMini003_first", nil, nil, nil); + man0u0Quest = GetStaticActor("Man0u0"); + + if (man0u0Quest:GetQuestFlag(MAN0U0_FLAG_MINITUT_DONE3) == false) then + callClientFunction(player, "delegateEvent", player, man0u0Quest, "processTtrMini003_first", nil, nil, nil); npc:SetQuestGraphic(player, 0x0); man0u0Quest:SetQuestFlag(MAN0U0_FLAG_MINITUT_DONE3, true); man0u0Quest:SaveData(); player:GetDirector():OnTalked(npc); else - player:RunEventFunction("delegateEvent", player, man0u0Quest, "processTtrMini003", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, man0u0Quest, "processTtrMini003", nil, nil, nil); end - else - player:EndEvent(); - end - -end - -function onEventUpdate(player, npc) + player:EndEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_07@0B800.lua b/data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_07@0B800.lua index 3c737266..b768cebe 100644 --- a/data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_07@0B800.lua +++ b/data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_07@0B800.lua @@ -1,21 +1,8 @@ -require("/quests/man/man0u0") - -function init(npc) - return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc:GetActorClassId(), false, false, 0, 1, "TEST"; -end +require ("global") +require ("quests/man/man0u0") function onEventStarted(player, npc, triggerName) - - man0u0Quest = GetStaticActor("Man0u0"); - - if (triggerName == "talkDefault") then - player:RunEventFunction("delegateEvent", player, man0u0Quest, "processEvent000_12", nil, nil, nil); - else - player:EndEvent(); - end - -end - -function onEventUpdate(player, npc) + man0u0Quest = GetStaticActor("Man0u0"); + callClientFunction(player, "delegateEvent", player, man0u0Quest, "processEvent000_12", nil, nil, nil); player:EndEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_08@0B800.lua b/data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_08@0B800.lua index a6d41ada..903ca699 100644 --- a/data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_08@0B800.lua +++ b/data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_08@0B800.lua @@ -1,21 +1,8 @@ -require("/quests/man/man0u0") - -function init(npc) - return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc:GetActorClassId(), false, false, 0, 1, "TEST"; -end +require ("global") +require ("quests/man/man0u0") function onEventStarted(player, npc, triggerName) - - man0u0Quest = GetStaticActor("Man0u0"); - - if (triggerName == "talkDefault") then - player:RunEventFunction("delegateEvent", player, man0u0Quest, "processEvent000_13", nil, nil, nil); - else - player:EndEvent(); - end - -end - -function onEventUpdate(player, npc) + man0u0Quest = GetStaticActor("Man0u0"); + callClientFunction(player, "delegateEvent", player, man0u0Quest, "processEvent000_13", nil, nil, nil); player:EndEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_09@0B800.lua b/data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_09@0B800.lua index 0a668de3..d01dfb10 100644 --- a/data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_09@0B800.lua +++ b/data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_09@0B800.lua @@ -1,16 +1,8 @@ -require("/quests/man/man0u0") - -function init(npc) - return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc:GetActorClassId(), false, false, 0, 1, "TEST"; -end +require ("global") +require ("quests/man/man0u0") function onEventStarted(player, npc, triggerName) - + man0u0Quest = GetStaticActor("Man0u0"); -end - -function onEventUpdate(player, npc) - player:EndEvent(); - end \ No newline at end of file diff --git a/data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_0a@0B800.lua b/data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_0a@0B800.lua index 417fac0a..b1260acc 100644 --- a/data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_0a@0B800.lua +++ b/data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_0a@0B800.lua @@ -1,29 +1,25 @@ -require("/quests/man/man0u0") - -function init(npc) - return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc:GetActorClassId(), false, false, 0, 1, "TEST"; -end +require ("global") +require ("quests/man/man0u0") function onSpawn(player, npc) npc:SetQuestGraphic(player, 0x2); end function onEventStarted(player, npc, triggerName) - - man0u0Quest = player:GetQuest("Man0u0"); - if (man0u0Quest ~= nil) then + man0u0Quest = GetStaticActor("Man0u0"); + if (man0u0Quest ~= nil) then if (triggerName == "pushDefault") then - player:RunEventFunction("delegateEvent", player, man0u0Quest, "processTtrNomal002", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, man0u0Quest, "processTtrNomal002", nil, nil, nil); elseif (triggerName == "talkDefault") then if (man0u0Quest:GetQuestFlag(MAN0U0_FLAG_TUTORIAL1_DONE) == false) then - player:RunEventFunction("delegateEvent", player, man0u0Quest, "processTtrNomal003", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, man0u0Quest, "processTtrNomal003", nil, nil, nil); player:SetEventStatus(npc, "pushDefault", false, 0x2); player:GetDirector():OnTalked(npc); man0u0Quest:SetQuestFlag(MAN0U0_FLAG_TUTORIAL1_DONE, true); man0u0Quest:SaveData(); else - player:RunEventFunction("delegateEvent", player, man0u0Quest, "processTtrMini001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, man0u0Quest, "processTtrMini001", nil, nil, nil); if (man0u0Quest:GetQuestFlag(MAN0U0_FLAG_MINITUT_DONE1) == false) then npc:SetQuestGraphic(player, 0x0); @@ -35,14 +31,7 @@ function onEventStarted(player, npc, triggerName) else player:EndEvent(); end - else - player:EndEvent(); --Should not be here w.o this quest - end - -end - -function onEventUpdate(player, npc) - - player:EndEvent(); + end + player:EndEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_0b@0B800.lua b/data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_0b@0B800.lua index 0a668de3..8f6c62a1 100644 --- a/data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_0b@0B800.lua +++ b/data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_0b@0B800.lua @@ -1,16 +1,6 @@ -require("/quests/man/man0u0") - -function init(npc) - return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc:GetActorClassId(), false, false, 0, 1, "TEST"; -end +require ("global") +require ("quests/man/man0u0") function onEventStarted(player, npc, triggerName) - - -end - -function onEventUpdate(player, npc) - player:EndEvent(); - end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/abylgo_hamylgo.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/abylgo_hamylgo.lua index e5fc6dde..dd611f13 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/abylgo_hamylgo.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/abylgo_hamylgo.lua @@ -2,7 +2,7 @@ require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithAbylgohamylgo_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithAbylgohamylgo_001", nil, nil, nil); player:endEvent(); end diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/anthoinette.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/anthoinette.lua index 9b7dc04d..4c30190f 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/anthoinette.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/anthoinette.lua @@ -2,6 +2,6 @@ require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithAnthoinette_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithAnthoinette_001", nil, nil, nil); player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/apacho_naccho.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/apacho_naccho.lua index 2252786c..6b1160d8 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/apacho_naccho.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/apacho_naccho.lua @@ -2,6 +2,6 @@ require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithApachonaccho_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithApachonaccho_001", nil, nil, nil); player:endEvent(); end diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/aspipi.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/aspipi.lua index d48a5793..7a0fc6f4 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/aspipi.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/aspipi.lua @@ -2,6 +2,6 @@ require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithAspipi_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithAspipi_001", nil, nil, nil); player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/babaki.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/babaki.lua index 9bd578bb..51d5af28 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/babaki.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/babaki.lua @@ -2,6 +2,6 @@ require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithBabaki_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithBabaki_001", nil, nil, nil); player:endEvent(); end diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/barnabaix.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/barnabaix.lua index 5e7aebcd..08e3bef4 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/barnabaix.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/barnabaix.lua @@ -2,6 +2,6 @@ require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithBarnabaix_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithBarnabaix_001", nil, nil, nil); player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/berthar.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/berthar.lua index 8d7eccca..dc4dea1e 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/berthar.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/berthar.lua @@ -2,6 +2,6 @@ require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithBerthar_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithBerthar_001", nil, nil, nil); player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/bouchard.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/bouchard.lua index b901c26b..6853d345 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/bouchard.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/bouchard.lua @@ -2,6 +2,6 @@ require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithBouchard_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithBouchard_001", nil, nil, nil); player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/cahernaut.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/cahernaut.lua index 8e8a399e..ceecbf5f 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/cahernaut.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/cahernaut.lua @@ -2,6 +2,6 @@ require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithCahernaut_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithCahernaut_001", nil, nil, nil); player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/chachai.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/chachai.lua index 8ef3b191..3875b05e 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/chachai.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/chachai.lua @@ -2,6 +2,6 @@ require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithChachai_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithChachai_001", nil, nil, nil); player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/ciceroix.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/ciceroix.lua index 8a04b16a..a47830bc 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/ciceroix.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/ciceroix.lua @@ -2,6 +2,6 @@ require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithCiceroix_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithCiceroix_001", nil, nil, nil); player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/crhabye.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/crhabye.lua index 989ef021..8c43b52a 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/crhabye.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/crhabye.lua @@ -2,6 +2,6 @@ require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithCrhabye_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithCrhabye_001", nil, nil, nil); player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/dariustel.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/dariustel.lua index cd462aa9..ce7bbbe5 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/dariustel.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/dariustel.lua @@ -2,7 +2,7 @@ require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithElecotte_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithElecotte_001", nil, nil, nil); player:endEvent(); end diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/deaustie.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/deaustie.lua index ba8537e0..caee5ce2 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/deaustie.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/deaustie.lua @@ -2,6 +2,6 @@ require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithDeaustie_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithDeaustie_001", nil, nil, nil); player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/diriaine.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/diriaine.lua index e25c06fb..9c8fac24 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/diriaine.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/diriaine.lua @@ -2,6 +2,6 @@ require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithDiriaine_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithDiriaine_001", nil, nil, nil); player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/dylise.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/dylise.lua index 2f57b021..7f0d64b3 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/dylise.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/dylise.lua @@ -2,6 +2,6 @@ require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithDylise_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithDylise_001", nil, nil, nil); player:endEvent(); end diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/eara.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/eara.lua index 132cb618..fbf5ee2f 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/eara.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/eara.lua @@ -2,6 +2,6 @@ require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithEara_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithEara_001", nil, nil, nil); player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/eleanor.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/eleanor.lua index 5e412399..5b66a36f 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/eleanor.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/eleanor.lua @@ -2,6 +2,6 @@ require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithEleanor_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithEleanor_001", nil, nil, nil); player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/elecotte.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/elecotte.lua index 08be8891..7087837a 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/elecotte.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/elecotte.lua @@ -2,6 +2,6 @@ require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithElecotte_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithElecotte_001", nil, nil, nil); player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/fifilo.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/fifilo.lua index d483ba32..d90c684a 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/fifilo.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/fifilo.lua @@ -2,6 +2,6 @@ require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithFifilo_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithFifilo_001", nil, nil, nil); player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/fineco_romanecco.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/fineco_romanecco.lua index 2b93d3f1..dcee8d02 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/fineco_romanecco.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/fineco_romanecco.lua @@ -2,6 +2,6 @@ require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithFinecoromanecco_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithFinecoromanecco_001", nil, nil, nil); player:endEvent(); end diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/fruhybolg.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/fruhybolg.lua index 712ceed0..022d26bf 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/fruhybolg.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/fruhybolg.lua @@ -2,6 +2,6 @@ require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithFhruybolg_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithFhruybolg_001", nil, nil, nil); player:endEvent(); end diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/fyrilsunn.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/fyrilsunn.lua index 0b791820..f32739b7 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/fyrilsunn.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/fyrilsunn.lua @@ -2,6 +2,6 @@ require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithFyrilsunn_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithFyrilsunn_001", nil, nil, nil); player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/galeren.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/galeren.lua index 3f11f361..9df61be1 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/galeren.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/galeren.lua @@ -2,6 +2,6 @@ require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithGaleren_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithGaleren_001", nil, nil, nil); player:endEvent(); end diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/gloiucen.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/gloiucen.lua index 1cdf63d9..b60726af 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/gloiucen.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/gloiucen.lua @@ -2,6 +2,6 @@ require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithGloiucen_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithGloiucen_001", nil, nil, nil); player:endEvent(); end diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/gogofu.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/gogofu.lua index 57675414..71732084 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/gogofu.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/gogofu.lua @@ -2,6 +2,6 @@ require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithGogofu_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithGogofu_001", nil, nil, nil); player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/goodife.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/goodife.lua index f6118e16..e2ff3b17 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/goodife.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/goodife.lua @@ -2,6 +2,6 @@ require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithGoodife_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithGoodife_001", nil, nil, nil); player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/guencen.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/guencen.lua index 08be8891..7087837a 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/guencen.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/guencen.lua @@ -2,6 +2,6 @@ require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithElecotte_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithElecotte_001", nil, nil, nil); player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/guillestet.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/guillestet.lua index 38df3460..3bb74afd 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/guillestet.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/guillestet.lua @@ -2,6 +2,6 @@ require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithGuillestet_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithGuillestet_001", nil, nil, nil); player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/hahayo.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/hahayo.lua index 4684e0cf..cc82ca45 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/hahayo.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/hahayo.lua @@ -2,7 +2,7 @@ require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithHahayo_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithHahayo_001", nil, nil, nil); player:endEvent(); end diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/hawazi_zowazi.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/hawazi_zowazi.lua index 14e597a0..7374b32a 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/hawazi_zowazi.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/hawazi_zowazi.lua @@ -2,6 +2,6 @@ require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithHawazizowazi_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithHawazizowazi_001", nil, nil, nil); player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/hcidjaa.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/hcidjaa.lua index 5f8e1a5d..331ab19c 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/hcidjaa.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/hcidjaa.lua @@ -2,6 +2,6 @@ require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithHCidjaa_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithHCidjaa_001", nil, nil, nil); player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/holbubu.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/holbubu.lua index f15eb699..fe031cf5 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/holbubu.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/holbubu.lua @@ -2,6 +2,6 @@ require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithHolbubu_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithHolbubu_001", nil, nil, nil); player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/illofii.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/illofii.lua index 382e9855..2d08e3aa 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/illofii.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/illofii.lua @@ -2,6 +2,6 @@ require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithIllofii_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithIllofii_001", nil, nil, nil); player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/isabella.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/isabella.lua index e9768b32..c8bdb793 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/isabella.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/isabella.lua @@ -2,6 +2,6 @@ require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithIsabella_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithIsabella_001", nil, nil, nil); player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/jajanzo.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/jajanzo.lua index a404cdf0..951589b7 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/jajanzo.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/jajanzo.lua @@ -2,6 +2,6 @@ require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithJajanzo_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithJajanzo_001", nil, nil, nil); player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/jannie.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/jannie.lua index 93e2f5b7..6c2afc12 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/jannie.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/jannie.lua @@ -2,6 +2,6 @@ require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithJannie_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithJannie_001", nil, nil, nil); player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/jeger.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/jeger.lua index a2b3dbb5..fd765481 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/jeger.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/jeger.lua @@ -2,6 +2,6 @@ require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithJeger_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithJeger_001", nil, nil, nil); player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/jenlyns.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/jenlyns.lua index b43e72c0..431406be 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/jenlyns.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/jenlyns.lua @@ -2,6 +2,6 @@ require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithJenlyns_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithJenlyns_001", nil, nil, nil); player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/kamlito_halito.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/kamlito_halito.lua index 8b1652ce..00b8a193 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/kamlito_halito.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/kamlito_halito.lua @@ -2,6 +2,6 @@ require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithKamlitohalito_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithKamlitohalito_001", nil, nil, nil); player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/kukusi.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/kukusi.lua index 0c90bb30..ac7dfc35 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/kukusi.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/kukusi.lua @@ -2,6 +2,6 @@ require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithKukusi_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithKukusi_001", nil, nil, nil); player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/lefchild.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/lefchild.lua index 713f837e..9ff0830d 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/lefchild.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/lefchild.lua @@ -2,6 +2,6 @@ require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithLefchild_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithLefchild_001", nil, nil, nil); player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/liaime.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/liaime.lua index 6624d6cf..49590696 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/liaime.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/liaime.lua @@ -2,6 +2,6 @@ require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithLiaime_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithLiaime_001", nil, nil, nil); player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/linette.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/linette.lua index d5035d3d..f04b584c 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/linette.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/linette.lua @@ -2,6 +2,6 @@ require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithLinette_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithLinette_001", nil, nil, nil); player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/lohwaeb.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/lohwaeb.lua index 30c3756f..d7479bbc 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/lohwaeb.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/lohwaeb.lua @@ -2,6 +2,6 @@ require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithLohwaeb_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithLohwaeb_001", nil, nil, nil); player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/lulutsu.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/lulutsu.lua index 1aecb463..d52f65e8 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/lulutsu.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/lulutsu.lua @@ -2,6 +2,6 @@ require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithLulutsu_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithLulutsu_001", nil, nil, nil); player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/lyngwaek.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/lyngwaek.lua index 0cec3d1a..1f2d430d 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/lyngwaek.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/lyngwaek.lua @@ -2,6 +2,6 @@ require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithLyngwaek_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithLyngwaek_001", nil, nil, nil); player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/mamaza.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/mamaza.lua index c28fdb44..c2eaad38 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/mamaza.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/mamaza.lua @@ -2,6 +2,6 @@ require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithMamaza_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithMamaza_001", nil, nil, nil); player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/mammet.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/mammet.lua index 7a354a56..68bd4de5 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/mammet.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/mammet.lua @@ -2,6 +2,6 @@ require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithMammet_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithMammet_001", nil, nil, nil); player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/mammet_alc.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/mammet_alc.lua index 60b2e98b..9b7c9152 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/mammet_alc.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/mammet_alc.lua @@ -2,7 +2,7 @@ require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithDoll004_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithDoll004_001", nil, nil, nil); player:endEvent(); end diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/mammet_gsm.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/mammet_gsm.lua index 1b02a12a..af0f4052 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/mammet_gsm.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/mammet_gsm.lua @@ -2,6 +2,6 @@ require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithDoll001_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithDoll001_001", nil, nil, nil); player:endEvent(); end diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/mammet_gsm2.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/mammet_gsm2.lua index dbf4b9c5..eb57876e 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/mammet_gsm2.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/mammet_gsm2.lua @@ -2,7 +2,7 @@ require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithDoll002_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithDoll002_001", nil, nil, nil); player:endEvent(); end diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/mammet_wvr.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/mammet_wvr.lua index 9c35aeab..7303ac38 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/mammet_wvr.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/mammet_wvr.lua @@ -2,6 +2,6 @@ require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithDoll003_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithDoll003_001", nil, nil, nil); player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/margarete.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/margarete.lua index 6cfdbbc4..12117cc0 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/margarete.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/margarete.lua @@ -2,6 +2,6 @@ require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithMargarete_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithMargarete_001", nil, nil, nil); player:endEvent(); end diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/martine.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/martine.lua index 7a0c3482..aefe9e62 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/martine.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/martine.lua @@ -2,6 +2,6 @@ require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithMartine_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithMartine_001", nil, nil, nil); player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/milgogo.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/milgogo.lua index 837f4d32..7de2a3fc 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/milgogo.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/milgogo.lua @@ -2,6 +2,6 @@ require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithMilgogo_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithMilgogo_001", nil, nil, nil); player:endEvent(); end diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/miyaya.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/miyaya.lua index 7e54b933..f6ba540f 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/miyaya.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/miyaya.lua @@ -2,6 +2,6 @@ require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithMiyaya_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithMiyaya_001", nil, nil, nil); player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/mohtfryd.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/mohtfryd.lua index 130dcef4..77218e49 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/mohtfryd.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/mohtfryd.lua @@ -2,7 +2,7 @@ require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithMohtfryd_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithMohtfryd_001", nil, nil, nil); player:endEvent(); end diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/mumukiya.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/mumukiya.lua index 18fcda6e..72ee8b1d 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/mumukiya.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/mumukiya.lua @@ -2,7 +2,7 @@ require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithMumukiya_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithMumukiya_001", nil, nil, nil); player:endEvent(); end diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/mumutano.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/mumutano.lua index 64c52909..cf954d86 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/mumutano.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/mumutano.lua @@ -2,7 +2,7 @@ require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithMumutano_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithMumutano_001", nil, nil, nil); player:endEvent(); end diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/neymumu.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/neymumu.lua index 67853b8d..54a489a7 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/neymumu.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/neymumu.lua @@ -2,6 +2,6 @@ require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithNeymumu_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithNeymumu_001", nil, nil, nil); player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/nhagi_amariyo.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/nhagi_amariyo.lua index a68cc0fb..2d460bd4 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/nhagi_amariyo.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/nhagi_amariyo.lua @@ -2,6 +2,6 @@ require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithNhagiamariyo_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithNhagiamariyo_001", nil, nil, nil); player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/nogeloix.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/nogeloix.lua index ad971020..3a2686e8 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/nogeloix.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/nogeloix.lua @@ -2,6 +2,6 @@ require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithNogeloix_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithNogeloix_001", nil, nil, nil); player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/obili_tambili.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/obili_tambili.lua index 3fbfa19e..00b81bf8 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/obili_tambili.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/obili_tambili.lua @@ -2,6 +2,6 @@ require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithObilitambili_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithObilitambili_001", nil, nil, nil); player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/oefyrblaet.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/oefyrblaet.lua index 87a679d1..be6f1aa0 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/oefyrblaet.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/oefyrblaet.lua @@ -2,6 +2,6 @@ require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithOefyrblaet_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithOefyrblaet_001", nil, nil, nil); player:endEvent(); end diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/papawa.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/papawa.lua index 70f7aca3..3ef40e8e 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/papawa.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/papawa.lua @@ -2,6 +2,6 @@ require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithPapawa_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithPapawa_001", nil, nil, nil); player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/peneli_zuneli.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/peneli_zuneli.lua index fa2901a3..c895491f 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/peneli_zuneli.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/peneli_zuneli.lua @@ -2,6 +2,6 @@ require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithPenelizuneli_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithPenelizuneli_001", nil, nil, nil); player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/pierriquet.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/pierriquet.lua index 1e2a9261..bd690177 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/pierriquet.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/pierriquet.lua @@ -2,6 +2,6 @@ require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithPierriquet_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithPierriquet_001", nil, nil, nil); player:endEvent(); end diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/qhota_nbolo.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/qhota_nbolo.lua index 568b38df..caeca082 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/qhota_nbolo.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/qhota_nbolo.lua @@ -2,6 +2,6 @@ require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithQhotanbolo_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithQhotanbolo_001", nil, nil, nil); player:endEvent(); end diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/qmhalawi.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/qmhalawi.lua index 80434c9c..a0bbd13a 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/qmhalawi.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/qmhalawi.lua @@ -2,6 +2,6 @@ require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithQmhalawi_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithQmhalawi_001", nil, nil, nil); player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/rinh_maimhov.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/rinh_maimhov.lua index 408dfe2a..164f26cd 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/rinh_maimhov.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/rinh_maimhov.lua @@ -2,6 +2,6 @@ require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithRinhmaimhov_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithRinhmaimhov_001", nil, nil, nil); player:endEvent(); end diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/rosalind.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/rosalind.lua index 4bcb5a85..8895493b 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/rosalind.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/rosalind.lua @@ -2,6 +2,6 @@ require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithRosalind_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithRosalind_001", nil, nil, nil); player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/safufu.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/safufu.lua index 1da5f2f1..1dbae420 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/safufu.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/safufu.lua @@ -2,6 +2,6 @@ require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithSafufu_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithSafufu_001", nil, nil, nil); player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/sinette.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/sinette.lua index 7afcd3f4..6c8b2c61 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/sinette.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/sinette.lua @@ -2,6 +2,6 @@ require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithSinette_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithSinette_001", nil, nil, nil); player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/singleton.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/singleton.lua index 4083d6e1..e0b43613 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/singleton.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/singleton.lua @@ -2,6 +2,6 @@ require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithSingleton_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithSingleton_001", nil, nil, nil); player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/sungi_kelungi.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/sungi_kelungi.lua index 51d56875..cc53dceb 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/sungi_kelungi.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/sungi_kelungi.lua @@ -2,6 +2,6 @@ require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithSungikelungi_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithSungikelungi_001", nil, nil, nil); player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/swerdahrm.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/swerdahrm.lua index a707fc99..f0b631c1 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/swerdahrm.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/swerdahrm.lua @@ -2,6 +2,6 @@ require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithSwerdahrm_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithSwerdahrm_001", nil, nil, nil); player:endEvent(); end diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/tatasha.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/tatasha.lua index b819b23e..6743bcb5 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/tatasha.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/tatasha.lua @@ -2,6 +2,6 @@ require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithTatasha_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithTatasha_001", nil, nil, nil); player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/totono.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/totono.lua index d16eeef0..7098f7f0 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/totono.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/totono.lua @@ -2,6 +2,6 @@ require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithTotono_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithTotono_001", nil, nil, nil); player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/tutubuki.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/tutubuki.lua index 726ecb4a..cfefd5da 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/tutubuki.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/tutubuki.lua @@ -2,6 +2,6 @@ require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithTutubuki_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithTutubuki_001", nil, nil, nil); player:endEvent(); end diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/tyago_moui.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/tyago_moui.lua index 2f22296f..59e90497 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/tyago_moui.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/tyago_moui.lua @@ -2,6 +2,6 @@ require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithTyagomoui_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithTyagomoui_001", nil, nil, nil); player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/ubokhn.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/ubokhn.lua index 7fb8ff38..e76f64a6 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/ubokhn.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/ubokhn.lua @@ -2,6 +2,6 @@ require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithUbokhn_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithUbokhn_001", nil, nil, nil); player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/uwilsyng.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/uwilsyng.lua index 04c6a8e3..e829f021 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/uwilsyng.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/uwilsyng.lua @@ -2,6 +2,6 @@ require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithGuildleveClientU_003", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithGuildleveClientU_003", nil, nil, nil); player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/vannes.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/vannes.lua index d9fddde6..3f6af3b0 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/vannes.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/vannes.lua @@ -2,6 +2,6 @@ require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithVannes_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithVannes_001", nil, nil, nil); player:endEvent(); end diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/vavaki.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/vavaki.lua index 51caccb4..daf87100 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/vavaki.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/vavaki.lua @@ -2,6 +2,6 @@ require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultSea, "tribeTalk", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "tribeTalk", nil, nil, nil); player:endEvent(); end diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/wannore.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/wannore.lua index 93b6cb81..d1a87754 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/wannore.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/wannore.lua @@ -2,6 +2,6 @@ require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithWannore_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithWannore_001", nil, nil, nil); player:endEvent(); end diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/wawaton.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/wawaton.lua index 47639679..8192c7b6 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/wawaton.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/wawaton.lua @@ -2,7 +2,7 @@ require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithWawaton_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithWawaton_001", nil, nil, nil); player:endEvent(); end diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/wise_moon.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/wise_moon.lua index 51d0ae24..e84de6ed 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/wise_moon.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/wise_moon.lua @@ -2,6 +2,6 @@ require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithWisemoon_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithWisemoon_001", nil, nil, nil); player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/wyznguld.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/wyznguld.lua index f6dbcda1..1d570a08 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/wyznguld.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/wyznguld.lua @@ -2,6 +2,6 @@ require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithWyznguld_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithWyznguld_001", nil, nil, nil); player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/xau_nbolo.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/xau_nbolo.lua index 682a17ff..8eed1c50 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/xau_nbolo.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/xau_nbolo.lua @@ -2,6 +2,6 @@ require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithXaunbolo_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithXaunbolo_001", nil, nil, nil); player:endEvent(); end diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/xdhilogo.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/xdhilogo.lua index 83a554cc..1e77cef8 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/xdhilogo.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/xdhilogo.lua @@ -2,6 +2,6 @@ require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithXdhilogo_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithXdhilogo_001", nil, nil, nil); player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/yayake.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/yayake.lua index 8033c077..11b464e3 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/yayake.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/yayake.lua @@ -2,6 +2,6 @@ require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithYayake_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithYayake_001", nil, nil, nil); player:endEvent(); end diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/yuyubesu.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/yuyubesu.lua index 4ef931f7..06990eff 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/yuyubesu.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/yuyubesu.lua @@ -2,6 +2,6 @@ require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithYuyubesu_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithYuyubesu_001", nil, nil, nil); player:endEvent(); end \ No newline at end of file From d06bf5499f0e836759c2c4ba7e1d0d4d0907a393 Mon Sep 17 00:00:00 2001 From: Filip Maj Date: Tue, 21 Jun 2016 17:56:38 -0400 Subject: [PATCH 10/15] Set Ansgor to correct talk. --- data/scripts/unique/sea0Town01a/PopulaceStandard/ansgor.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/ansgor.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/ansgor.lua index f71e01a3..541b09b3 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/ansgor.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/ansgor.lua @@ -1,6 +1,6 @@ function onEventStarted(player, npc) defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithAnsgor_001", nil, nil, nil); + player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithANSGOR_100", nil, nil, nil); end From 44acee7e6db8ca6cde072037f97a67f17481a724 Mon Sep 17 00:00:00 2001 From: Filip Maj Date: Tue, 21 Jun 2016 18:01:12 -0400 Subject: [PATCH 11/15] Made a note that Guencen is unreachable and has no real script. --- data/scripts/unique/wil0Town01a/PopulaceStandard/guencen.lua | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/guencen.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/guencen.lua index 7087837a..1a512aa0 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/guencen.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/guencen.lua @@ -1,7 +1,6 @@ require ("global") function onEventStarted(player, npc) - defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithElecotte_001", nil, nil, nil); + --THIS NPC IS NOT REACHABLE player:endEvent(); end \ No newline at end of file From 4c7316702d0382d2f0d80e4c76c9757e48ba0137 Mon Sep 17 00:00:00 2001 From: Filip Maj Date: Tue, 21 Jun 2016 19:54:52 -0400 Subject: [PATCH 12/15] Limsa Town npcs ported over. --- .../unique/sea0Town01a/PopulaceStandard/aentfoet.lua | 9 +++++---- .../unique/sea0Town01a/PopulaceStandard/aergwynt.lua | 3 +++ .../unique/sea0Town01a/PopulaceStandard/ahldskyf.lua | 3 +++ .../sea0Town01a/PopulaceStandard/angry_river.lua | 3 +++ .../unique/sea0Town01a/PopulaceStandard/ansgor.lua | 10 ++++++---- .../unique/sea0Town01a/PopulaceStandard/arnegis.lua | 10 ++++++---- .../unique/sea0Town01a/PopulaceStandard/arthurioux.lua | 10 ++++++---- .../unique/sea0Town01a/PopulaceStandard/astrid.lua | 3 +++ .../unique/sea0Town01a/PopulaceStandard/audaine.lua | 3 +++ .../sea0Town01a/PopulaceStandard/bango_zango.lua | 10 ++++++---- .../unique/sea0Town01a/PopulaceStandard/bayard.lua | 10 ++++++---- .../unique/sea0Town01a/PopulaceStandard/bloemerl.lua | 3 +++ .../unique/sea0Town01a/PopulaceStandard/bmallpa.lua | 10 ++++++---- .../unique/sea0Town01a/PopulaceStandard/bnhapla.lua | 10 ++++++---- .../unique/sea0Town01a/PopulaceStandard/bodenolf.lua | 10 ++++++---- .../unique/sea0Town01a/PopulaceStandard/brictt.lua | 10 ++++++---- .../unique/sea0Town01a/PopulaceStandard/buburoon.lua | 10 ++++++---- .../unique/sea0Town01a/PopulaceStandard/carrilaut.lua | 10 ++++++---- .../unique/sea0Town01a/PopulaceStandard/ceadda.lua | 3 +++ .../unique/sea0Town01a/PopulaceStandard/charlys.lua | 10 ++++++---- .../unique/sea0Town01a/PopulaceStandard/chaunollet.lua | 10 ++++++---- .../unique/sea0Town01a/PopulaceStandard/chichiroon.lua | 10 ++++++---- .../unique/sea0Town01a/PopulaceStandard/clifton.lua | 3 +++ .../unique/sea0Town01a/PopulaceStandard/colson.lua | 10 ++++++---- .../sea0Town01a/PopulaceStandard/daca_jinjahl.lua | 3 +++ .../sea0Town01a/PopulaceStandard/delado_madalado.lua | 3 +++ .../unique/sea0Town01a/PopulaceStandard/dhemsunn.lua | 10 ++++++---- .../unique/sea0Town01a/PopulaceStandard/dodoroba.lua | 3 +++ .../PopulaceStandard/drowsy-eyed_adventurer.lua | 3 +++ .../unique/sea0Town01a/PopulaceStandard/dympna.lua | 10 ++++++---- .../unique/sea0Town01a/PopulaceStandard/elilwaen.lua | 3 +++ .../PopulaceStandard/enraptured_traveler.lua | 10 ++++++---- .../unique/sea0Town01a/PopulaceStandard/eugennoix.lua | 10 ++++++---- .../unique/sea0Town01a/PopulaceStandard/fabodji.lua | 3 +++ .../unique/sea0Town01a/PopulaceStandard/ferdillaix.lua | 10 ++++++---- .../sea0Town01a/PopulaceStandard/fickle_beggar.lua | 10 ++++++---- .../unique/sea0Town01a/PopulaceStandard/frailoise.lua | 10 ++++++---- .../unique/sea0Town01a/PopulaceStandard/fufuna.lua | 10 ++++++---- .../sea0Town01a/PopulaceStandard/fuzak_anzak.lua | 10 ++++++---- .../unique/sea0Town01a/PopulaceStandard/gautzelin.lua | 10 ++++++---- .../unique/sea0Town01a/PopulaceStandard/gert.lua | 3 +++ .../unique/sea0Town01a/PopulaceStandard/gerulf.lua | 10 ++++++---- .../unique/sea0Town01a/PopulaceStandard/ginnade.lua | 10 ++++++---- .../sea0Town01a/PopulaceStandard/glowing_goodwife.lua | 3 +++ .../unique/sea0Town01a/PopulaceStandard/gnanghal.lua | 10 ++++++---- .../unique/sea0Town01a/PopulaceStandard/gnibnpha.lua | 10 ++++++---- .../unique/sea0Town01a/PopulaceStandard/haldberk.lua | 3 +++ .../unique/sea0Town01a/PopulaceStandard/hasthwab.lua | 10 ++++++---- .../unique/sea0Town01a/PopulaceStandard/hihine.lua | 10 ++++++---- .../unique/sea0Town01a/PopulaceStandard/hlahono.lua | 8 +++++--- .../unique/sea0Town01a/PopulaceStandard/hob.lua | 10 ++++++---- .../unique/sea0Town01a/PopulaceStandard/hobriaut.lua | 10 ++++++---- .../unique/sea0Town01a/PopulaceStandard/hrhanbolo.lua | 3 +++ .../unique/sea0Town01a/PopulaceStandard/ighii_moui.lua | 10 ++++++---- .../unique/sea0Town01a/PopulaceStandard/imania.lua | 10 ++++++---- .../unique/sea0Town01a/PopulaceStandard/iofa.lua | 8 +++++--- .../unique/sea0Town01a/PopulaceStandard/isaudorel.lua | 10 ++++++---- .../unique/sea0Town01a/PopulaceStandard/ivan.lua | 3 +++ .../unique/sea0Town01a/PopulaceStandard/jainelette.lua | 10 ++++++---- .../unique/sea0Town01a/PopulaceStandard/jghonako.lua | 10 ++++++---- .../unique/sea0Town01a/PopulaceStandard/jojoroon.lua | 10 ++++++---- .../sea0Town01a/PopulaceStandard/kehda_mujuuk.lua | 3 +++ .../unique/sea0Town01a/PopulaceStandard/kikichua.lua | 10 ++++++---- .../unique/sea0Town01a/PopulaceStandard/laniaitte.lua | 3 +++ .../unique/sea0Town01a/PopulaceStandard/leveridge.lua | 3 +++ .../unique/sea0Town01a/PopulaceStandard/liautroix.lua | 10 ++++++---- .../unique/sea0Town01a/PopulaceStandard/lilina.lua | 3 +++ .../unique/sea0Town01a/PopulaceStandard/lorhzant.lua | 3 +++ .../unique/sea0Town01a/PopulaceStandard/maetistym.lua | 3 +++ .../unique/sea0Town01a/PopulaceStandard/maisie.lua | 3 +++ .../unique/sea0Town01a/PopulaceStandard/mareillie.lua | 3 +++ .../sea0Town01a/PopulaceStandard/martiallais.lua | 10 ++++++---- .../unique/sea0Town01a/PopulaceStandard/merlzirn.lua | 10 ++++++---- .../unique/sea0Town01a/PopulaceStandard/mharelak.lua | 10 ++++++---- .../unique/sea0Town01a/PopulaceStandard/mimiroon.lua | 10 ++++++---- .../PopulaceStandard/muscle-bound_deckhand.lua | 10 ++++++---- .../unique/sea0Town01a/PopulaceStandard/mynadaeg.lua | 10 ++++++---- .../unique/sea0Town01a/PopulaceStandard/mzimzizi.lua | 10 ++++++---- .../unique/sea0Town01a/PopulaceStandard/nanapiri.lua | 10 ++++++---- .../unique/sea0Town01a/PopulaceStandard/neale.lua | 10 ++++++---- .../sea0Town01a/PopulaceStandard/nheu_jawantal.lua | 8 +++++--- .../unique/sea0Town01a/PopulaceStandard/ninianne.lua | 10 ++++++---- .../unique/sea0Town01a/PopulaceStandard/nnmulika.lua | 3 +++ .../unique/sea0Town01a/PopulaceStandard/nunuba.lua | 10 ++++++---- .../unique/sea0Town01a/PopulaceStandard/ortolf.lua | 3 +++ .../unique/sea0Town01a/PopulaceStandard/ositha.lua | 10 ++++++---- .../sea0Town01a/PopulaceStandard/overweening_woman.lua | 10 ++++++---- .../PopulaceStandard/pasty-faced_adventurer.lua | 10 ++++++---- .../PopulaceStandard/pearly-toothed_porter.lua | 10 ++++++---- .../unique/sea0Town01a/PopulaceStandard/pfynhaemr.lua | 7 +++++-- .../sea0Town01a/PopulaceStandard/pissed_pirate.lua | 10 ++++++---- .../PopulaceStandard/positively_pungent_pirate.lua | 3 +++ .../unique/sea0Town01a/PopulaceStandard/prudentia.lua | 10 ++++++---- .../unique/sea0Town01a/PopulaceStandard/ptahjha.lua | 3 +++ .../unique/sea0Town01a/PopulaceStandard/pulmia.lua | 8 +++++--- .../unique/sea0Town01a/PopulaceStandard/raragun.lua | 10 ++++++---- .../unique/sea0Town01a/PopulaceStandard/rbaharra.lua | 3 +++ .../unique/sea0Town01a/PopulaceStandard/rerenasu.lua | 3 +++ .../unique/sea0Town01a/PopulaceStandard/robairlain.lua | 3 +++ .../sea0Town01a/PopulaceStandard/roosting_crow.lua | 10 ++++++---- .../unique/sea0Town01a/PopulaceStandard/rsushmo.lua | 10 ++++++---- .../sea0Town01a/PopulaceStandard/rubh_epocan.lua | 3 +++ .../unique/sea0Town01a/PopulaceStandard/rubh_hob.lua | 3 +++ .../unique/sea0Town01a/PopulaceStandard/sathzant.lua | 10 ++++++---- .../sea0Town01a/PopulaceStandard/satiated_shopkeep.lua | 10 ++++++---- .../unique/sea0Town01a/PopulaceStandard/shoshoma.lua | 3 +++ .../unique/sea0Town01a/PopulaceStandard/skarnwaen.lua | 3 +++ .../unique/sea0Town01a/PopulaceStandard/skoefmynd.lua | 3 +++ .../unique/sea0Town01a/PopulaceStandard/slaiboli.lua | 8 +++++--- .../unique/sea0Town01a/PopulaceStandard/sosoze.lua | 10 ++++++---- .../unique/sea0Town01a/PopulaceStandard/sundhimal.lua | 10 ++++++---- .../PopulaceStandard/sure-voiced_barracuda_knight.lua | 3 +++ .../PopulaceStandard/suspicious-looking_traveler.lua | 10 ++++++---- .../unique/sea0Town01a/PopulaceStandard/syhrdaeg.lua | 10 ++++++---- .../unique/sea0Town01a/PopulaceStandard/syngsmyd.lua | 10 ++++++---- .../unique/sea0Town01a/PopulaceStandard/tatasako.lua | 3 +++ .../sea0Town01a/PopulaceStandard/tefh_moshroca.lua | 7 +++++-- .../sea0Town01a/PopulaceStandard/thata_khamazom.lua | 10 ++++++---- .../unique/sea0Town01a/PopulaceStandard/thosinbaen.lua | 3 +++ .../PopulaceStandard/tittering_traveler.lua | 10 ++++++---- .../unique/sea0Town01a/PopulaceStandard/totoruto.lua | 10 ++++++---- .../unique/sea0Town01a/PopulaceStandard/triaine.lua | 10 ++++++---- .../unique/sea0Town01a/PopulaceStandard/trinne.lua | 10 ++++++---- .../PopulaceStandard/unconscious_adventurer.lua | 3 +++ .../unique/sea0Town01a/PopulaceStandard/undsatz.lua | 3 +++ .../unique/sea0Town01a/PopulaceStandard/vhynho.lua | 10 ++++++---- .../unique/sea0Town01a/PopulaceStandard/waekbyrt.lua | 10 ++++++---- .../unique/sea0Town01a/PopulaceStandard/whahtoa.lua | 10 ++++++---- .../sea0Town01a/PopulaceStandard/wyra_khamazom.lua | 10 ++++++---- .../unique/sea0Town01a/PopulaceStandard/wyrstmann.lua | 7 +++++-- .../unique/sea0Town01a/PopulaceStandard/xavalien.lua | 3 +++ .../unique/sea0Town01a/PopulaceStandard/zonggo.lua | 3 +++ .../unique/sea0Town01a/PopulaceStandard/zuzule.lua | 10 ++++++---- 133 files changed, 651 insertions(+), 337 deletions(-) diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/aentfoet.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/aentfoet.lua index 49283a74..2fad9898 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/aentfoet.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/aentfoet.lua @@ -1,6 +1,7 @@ +require ("global") function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithAentfoet_001", nil, nil, nil); -end - + defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, "defaultTalkWithAentfoet_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/aergwynt.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/aergwynt.lua index c2508de5..69c03912 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/aergwynt.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/aergwynt.lua @@ -1,5 +1,8 @@ +require ("global") function onEventStarted(player, npc) defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithAergwynt_001", nil, nil, nil); + player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/ahldskyf.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/ahldskyf.lua index 585c00d8..d2e17ec3 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/ahldskyf.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/ahldskyf.lua @@ -1,5 +1,8 @@ +require ("global") function onEventStarted(player, npc) defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithAhldskyff_001", nil, nil, nil); + player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/angry_river.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/angry_river.lua index e34418a0..69b5a158 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/angry_river.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/angry_river.lua @@ -1,5 +1,8 @@ +require ("global") function onEventStarted(player, npc) defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithAngryriver_001", nil, nil, nil); + player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/ansgor.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/ansgor.lua index 541b09b3..e5906df4 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/ansgor.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/ansgor.lua @@ -1,6 +1,8 @@ +require ("global") function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithANSGOR_100", nil, nil, nil); -end - + defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " + player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithAnsgor_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/arnegis.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/arnegis.lua index 12d0f7a5..40e6b664 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/arnegis.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/arnegis.lua @@ -1,6 +1,8 @@ +require ("global") function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithArnegis_001", nil, nil, nil); -end - + defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " + player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithArnegis_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/arthurioux.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/arthurioux.lua index dd5b728d..6b3d6462 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/arthurioux.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/arthurioux.lua @@ -1,6 +1,8 @@ +require ("global") function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithArthurioux_001", nil, nil, nil); -end - + defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " + player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithArthurioux_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/astrid.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/astrid.lua index a365e908..7309a215 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/astrid.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/astrid.lua @@ -1,5 +1,8 @@ +require ("global") function onEventStarted(player, npc) defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithAstrid_001", nil, nil, nil); + player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/audaine.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/audaine.lua index 0780e64d..07a4597c 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/audaine.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/audaine.lua @@ -1,5 +1,8 @@ +require ("global") function onEventStarted(player, npc) defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithAudaine_001", nil, nil, nil); + player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/bango_zango.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/bango_zango.lua index 7fb43429..dc5a3f76 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/bango_zango.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/bango_zango.lua @@ -1,6 +1,8 @@ +require ("global") function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithKakalan_001", nil, nil, nil); -end - + defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " + player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithKakalan_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/bayard.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/bayard.lua index cebda24e..ca3a0554 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/bayard.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/bayard.lua @@ -1,6 +1,8 @@ +require ("global") function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithBayard_001", nil, nil, nil); -end - + defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " + player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithBayard_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/bloemerl.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/bloemerl.lua index 7d790468..5e946825 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/bloemerl.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/bloemerl.lua @@ -1,5 +1,8 @@ +require ("global") function onEventStarted(player, npc) defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithBloemerl_001", nil, nil, nil); + player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/bmallpa.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/bmallpa.lua index 705ae4d8..70691b3b 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/bmallpa.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/bmallpa.lua @@ -1,6 +1,8 @@ +require ("global") function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithBmallpa_001", nil, nil, nil); -end - + defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " + player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithBmallpa_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/bnhapla.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/bnhapla.lua index 8e47a9da..45736c53 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/bnhapla.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/bnhapla.lua @@ -1,6 +1,8 @@ +require ("global") function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithBnhapla_001", nil, nil, nil); -end - + defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " + player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithBnhapla_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/bodenolf.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/bodenolf.lua index af823e81..4231c0a3 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/bodenolf.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/bodenolf.lua @@ -1,6 +1,8 @@ +require ("global") function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithBodenolf_001", nil, nil, nil); -end - + defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " + player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithBodenolf_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/brictt.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/brictt.lua index 781a34b2..a61ef19d 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/brictt.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/brictt.lua @@ -1,6 +1,8 @@ +require ("global") function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithBrictt_001", nil, nil, nil); -end - + defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " + player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithBrictt_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/buburoon.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/buburoon.lua index 66f317d4..be3391d6 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/buburoon.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/buburoon.lua @@ -1,6 +1,8 @@ +require ("global") function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithBuburoon_001", nil, nil, nil); -end - + defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " + player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithBuburoon_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/carrilaut.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/carrilaut.lua index 20e18cc5..ac9254f7 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/carrilaut.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/carrilaut.lua @@ -1,6 +1,8 @@ +require ("global") function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithCarrilaut_001", nil, nil, nil); -end - + defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " + player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithCarrilaut_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/ceadda.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/ceadda.lua index a687aaa8..aef6dbb7 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/ceadda.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/ceadda.lua @@ -1,5 +1,8 @@ +require ("global") function onEventStarted(player, npc) defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithCeadda_001", nil, nil, nil); + player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/charlys.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/charlys.lua index 385111e0..e9a13896 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/charlys.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/charlys.lua @@ -1,6 +1,8 @@ +require ("global") function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithCharlys_001", nil, nil, nil); -end - + defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " + player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithCharlys_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/chaunollet.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/chaunollet.lua index df808b1d..f38fbdda 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/chaunollet.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/chaunollet.lua @@ -1,6 +1,8 @@ +require ("global") function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithChaunollet_001", nil, nil, nil); -end - + defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " + player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithChaunollet_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/chichiroon.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/chichiroon.lua index 94c053bd..29f9b4b3 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/chichiroon.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/chichiroon.lua @@ -1,6 +1,8 @@ +require ("global") function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithChichiroon_001", nil, nil, nil); -end - + defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " + player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithChichiroon_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/clifton.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/clifton.lua index 54182d1a..7d333312 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/clifton.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/clifton.lua @@ -1,5 +1,8 @@ +require ("global") function onEventStarted(player, npc) defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithClifton_001", nil, nil, nil); + player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/colson.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/colson.lua index b875181d..343ebe93 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/colson.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/colson.lua @@ -1,6 +1,8 @@ +require ("global") function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithColson_001", nil, nil, nil); -end - + defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " + player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithColson_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/daca_jinjahl.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/daca_jinjahl.lua index 360e89a4..7cfb056e 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/daca_jinjahl.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/daca_jinjahl.lua @@ -1,5 +1,8 @@ +require ("global") function onEventStarted(player, npc) defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithDacajinjahl_001", nil, nil, nil); + player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/delado_madalado.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/delado_madalado.lua index e4821167..4a9c2d51 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/delado_madalado.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/delado_madalado.lua @@ -1,5 +1,8 @@ +require ("global") function onEventStarted(player, npc) defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithDeladomadalado_001", nil, nil, nil); + player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/dhemsunn.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/dhemsunn.lua index 2bbb7c5e..e90801e4 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/dhemsunn.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/dhemsunn.lua @@ -1,6 +1,8 @@ +require ("global") function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithDhemsunn_001", nil, nil, nil); -end - + defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " + player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithDhemsunn_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/dodoroba.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/dodoroba.lua index 25e6ccb4..08a66bbb 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/dodoroba.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/dodoroba.lua @@ -1,5 +1,8 @@ +require ("global") function onEventStarted(player, npc) defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithDodoroba_001", nil, nil, nil); + player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/drowsy-eyed_adventurer.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/drowsy-eyed_adventurer.lua index 7d958fbd..b95f5453 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/drowsy-eyed_adventurer.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/drowsy-eyed_adventurer.lua @@ -1,5 +1,8 @@ +require ("global") function onEventStarted(player, npc) defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithAdventurer031_001", nil, nil, nil); + player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/dympna.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/dympna.lua index f6276ecc..70b6aa4b 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/dympna.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/dympna.lua @@ -1,6 +1,8 @@ +require ("global") function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithDympna_001", nil, nil, nil); -end - + defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " + player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithDympna_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/elilwaen.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/elilwaen.lua index 90f63c99..af7b59aa 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/elilwaen.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/elilwaen.lua @@ -1,5 +1,8 @@ +require ("global") function onEventStarted(player, npc) defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithElilwaen_001", nil, nil, nil); + player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/enraptured_traveler.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/enraptured_traveler.lua index 54ad6374..f3748449 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/enraptured_traveler.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/enraptured_traveler.lua @@ -1,6 +1,8 @@ +require ("global") function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithTraveler032_001", nil, nil, nil); -end - + defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " + player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithTraveler032_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/eugennoix.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/eugennoix.lua index 887b6fae..e2f53ac2 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/eugennoix.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/eugennoix.lua @@ -1,6 +1,8 @@ +require ("global") function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithEugennoix_001", nil, nil, nil); -end - + defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " + player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithEugennoix_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/fabodji.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/fabodji.lua index 810fbc2e..bfc65fcf 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/fabodji.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/fabodji.lua @@ -1,5 +1,8 @@ +require ("global") function onEventStarted(player, npc) defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithFabodji_001", nil, nil, nil); + player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/ferdillaix.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/ferdillaix.lua index fd3d86bd..66d3163d 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/ferdillaix.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/ferdillaix.lua @@ -1,6 +1,8 @@ +require ("global") function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithFerdillaix_001", nil, nil, nil); -end - + defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " + player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithFerdillaix_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/fickle_beggar.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/fickle_beggar.lua index df3ba084..3bddc90e 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/fickle_beggar.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/fickle_beggar.lua @@ -1,6 +1,8 @@ +require ("global") function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithYouty001_001", nil, nil, nil); -end - + defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " + player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithYouty001_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/frailoise.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/frailoise.lua index f2fbda0a..c5215ee6 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/frailoise.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/frailoise.lua @@ -1,6 +1,8 @@ +require ("global") function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithFrailoise_001", nil, nil, nil); -end - + defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " + player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithFrailoise_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/fufuna.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/fufuna.lua index e4280f1a..539bc247 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/fufuna.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/fufuna.lua @@ -1,6 +1,8 @@ +require ("global") function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithFufuna_001", nil, nil, nil); -end - + defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " + player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithFufuna_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/fuzak_anzak.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/fuzak_anzak.lua index 08fe6b96..46b569f1 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/fuzak_anzak.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/fuzak_anzak.lua @@ -1,6 +1,8 @@ +require ("global") function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithFuzakanzak_001", nil, nil, nil); -end - + defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " + player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithFuzakanzak_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/gautzelin.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/gautzelin.lua index 620aeca8..bc00c22e 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/gautzelin.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/gautzelin.lua @@ -1,6 +1,8 @@ +require ("global") function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithGautzelin_001", nil, nil, nil); -end - + defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " + player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithGautzelin_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/gert.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/gert.lua index d99c5d9e..f71d3620 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/gert.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/gert.lua @@ -1,5 +1,8 @@ +require ("global") function onEventStarted(player, npc) defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithGert_001", nil, nil, nil); + player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/gerulf.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/gerulf.lua index c1623196..49354275 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/gerulf.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/gerulf.lua @@ -1,6 +1,8 @@ +require ("global") function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithGerulf_001", nil, nil, nil); -end - + defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " + player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithGerulf_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/ginnade.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/ginnade.lua index 000bc1f7..884b2424 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/ginnade.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/ginnade.lua @@ -1,6 +1,8 @@ +require ("global") function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithGinnade_001", nil, nil, nil); -end - + defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " + player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithGinnade_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/glowing_goodwife.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/glowing_goodwife.lua index 9453a4d5..01015b0d 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/glowing_goodwife.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/glowing_goodwife.lua @@ -1,5 +1,8 @@ +require ("global") function onEventStarted(player, npc) defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithLady001_001", nil, nil, nil); + player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/gnanghal.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/gnanghal.lua index 91b5f963..de07be66 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/gnanghal.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/gnanghal.lua @@ -1,6 +1,8 @@ +require ("global") function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithGnanghal_001", nil, nil, nil); -end - + defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " + player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithGnanghal_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/gnibnpha.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/gnibnpha.lua index 181d5d5c..2cda4fef 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/gnibnpha.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/gnibnpha.lua @@ -1,6 +1,8 @@ +require ("global") function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithGnibnpha_001", nil, nil, nil); -end - + defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " + player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithGnibnpha_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/haldberk.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/haldberk.lua index 3975f1b2..b0a13f0d 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/haldberk.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/haldberk.lua @@ -1,5 +1,8 @@ +require ("global") function onEventStarted(player, npc) defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithHaldberk_001", nil, nil, nil); + player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/hasthwab.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/hasthwab.lua index bc32b0f6..10c31736 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/hasthwab.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/hasthwab.lua @@ -1,6 +1,8 @@ +require ("global") function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithHasthwab_001", nil, nil, nil); -end - + defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " + player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithHasthwab_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/hihine.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/hihine.lua index b22747b8..d6d4c781 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/hihine.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/hihine.lua @@ -1,6 +1,8 @@ +require ("global") function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithHihine_001", nil, nil, nil); -end - + defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " + player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithHihine_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/hlahono.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/hlahono.lua index f56afe3a..64e95af6 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/hlahono.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/hlahono.lua @@ -1,6 +1,8 @@ +require ("global") function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithH_lahono_001", nil, nil, nil); + defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " + player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithH_lahono_001", nil, nil, nil); + player:endEvent(); end - diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/hob.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/hob.lua index a5169df4..75efe920 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/hob.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/hob.lua @@ -1,6 +1,8 @@ +require ("global") function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithHob_001", nil, nil, nil); -end - + defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " + player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithHob_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/hobriaut.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/hobriaut.lua index cd60138b..fac4443a 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/hobriaut.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/hobriaut.lua @@ -1,6 +1,8 @@ +require ("global") function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithHobriaut_001", nil, nil, nil); -end - + defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " + player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithHobriaut_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/hrhanbolo.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/hrhanbolo.lua index e7adff8e..8bae06f2 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/hrhanbolo.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/hrhanbolo.lua @@ -1,5 +1,8 @@ +require ("global") function onEventStarted(player, npc) defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithNnagali_001", nil, nil, nil); + player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/ighii_moui.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/ighii_moui.lua index 52aa6625..73a30d91 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/ighii_moui.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/ighii_moui.lua @@ -1,6 +1,8 @@ +require ("global") function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithIghiimoui_001", nil, nil, nil); -end - + defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " + player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithIghiimoui_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/imania.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/imania.lua index b8283091..5a4f3221 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/imania.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/imania.lua @@ -1,6 +1,8 @@ +require ("global") function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithImania_001", nil, nil, nil); -end - + defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " + player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithImania_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/iofa.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/iofa.lua index cfbd2d31..dcf3dc42 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/iofa.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/iofa.lua @@ -1,6 +1,8 @@ +require ("global") function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithIofa_001", nil, nil, nil); + defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " + player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithIofa_001", nil, nil, nil); + player:endEvent(); end - diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/isaudorel.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/isaudorel.lua index 19f9db32..e03273d7 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/isaudorel.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/isaudorel.lua @@ -1,6 +1,8 @@ +require ("global") function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithIsaudorel_001", nil, nil, nil); -end - + defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " + player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithIsaudorel_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/ivan.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/ivan.lua index 1a915171..22099859 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/ivan.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/ivan.lua @@ -1,5 +1,8 @@ +require ("global") function onEventStarted(player, npc) defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithIvan_001", nil, nil, nil); + player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/jainelette.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/jainelette.lua index dedd9446..a147e696 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/jainelette.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/jainelette.lua @@ -1,6 +1,8 @@ +require ("global") function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithJainelette_001", nil, nil, nil); -end - + defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " + player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithJainelette_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/jghonako.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/jghonako.lua index 6dd95623..7094ff13 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/jghonako.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/jghonako.lua @@ -1,6 +1,8 @@ +require ("global") function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithJghonako_001", nil, nil, nil); -end - + defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " + player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithJghonako_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/jojoroon.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/jojoroon.lua index 58cc13cd..6ab90848 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/jojoroon.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/jojoroon.lua @@ -1,6 +1,8 @@ +require ("global") function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithJojoroon_001", nil, nil, nil); -end - + defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " + player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithJojoroon_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/kehda_mujuuk.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/kehda_mujuuk.lua index 590aeeb3..d72c3841 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/kehda_mujuuk.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/kehda_mujuuk.lua @@ -1,5 +1,8 @@ +require ("global") function onEventStarted(player, npc) defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithKehdamujuuk_001", nil, nil, nil); + player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/kikichua.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/kikichua.lua index bc74b2bd..4cb67f31 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/kikichua.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/kikichua.lua @@ -1,6 +1,8 @@ +require ("global") function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithKikichua_001", nil, nil, nil); -end - + defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " + player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithKikichua_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/laniaitte.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/laniaitte.lua index d02c6e66..9a5c18e4 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/laniaitte.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/laniaitte.lua @@ -1,5 +1,8 @@ +require ("global") function onEventStarted(player, npc) defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithLaniaitte_001", nil, nil, nil); + player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/leveridge.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/leveridge.lua index 45480ae6..3cc35cee 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/leveridge.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/leveridge.lua @@ -1,5 +1,8 @@ +require ("global") function onEventStarted(player, npc) defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithDavyd_001", nil, nil, nil); + player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/liautroix.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/liautroix.lua index 419171ba..d7fa2e1b 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/liautroix.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/liautroix.lua @@ -1,6 +1,8 @@ +require ("global") function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithLiautroix_001", nil, nil, nil); -end - + defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " + player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithLiautroix_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/lilina.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/lilina.lua index b88a041c..d8775f58 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/lilina.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/lilina.lua @@ -1,5 +1,8 @@ +require ("global") function onEventStarted(player, npc) defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithLilina_001", nil, nil, nil); + player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/lorhzant.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/lorhzant.lua index 42bcfecc..5864dd00 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/lorhzant.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/lorhzant.lua @@ -1,5 +1,8 @@ +require ("global") function onEventStarted(player, npc) defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithLorhzant_001", nil, nil, nil); + player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/maetistym.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/maetistym.lua index 3b03eb5a..28fa6f03 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/maetistym.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/maetistym.lua @@ -1,5 +1,8 @@ +require ("global") function onEventStarted(player, npc) defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithMaetistym_001", nil, nil, nil); + player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/maisie.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/maisie.lua index be574c9c..1d8213bc 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/maisie.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/maisie.lua @@ -1,5 +1,8 @@ +require ("global") function onEventStarted(player, npc) defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithMaisie_001", nil, nil, nil); + player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/mareillie.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/mareillie.lua index cc83e1e6..5208a80f 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/mareillie.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/mareillie.lua @@ -1,5 +1,8 @@ +require ("global") function onEventStarted(player, npc) defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithMareillie_001", nil, nil, nil); + player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/martiallais.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/martiallais.lua index 0f85eaca..2efb8eb7 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/martiallais.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/martiallais.lua @@ -1,6 +1,8 @@ +require ("global") function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithMartiallais_001", nil, nil, nil); -end - + defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " + player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithMartiallais_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/merlzirn.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/merlzirn.lua index c060f0ea..705af553 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/merlzirn.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/merlzirn.lua @@ -1,6 +1,8 @@ +require ("global") function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithMerlzirn_001", nil, nil, nil); -end - + defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " + player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithMerlzirn_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/mharelak.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/mharelak.lua index 9bd90307..5a0ab58a 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/mharelak.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/mharelak.lua @@ -1,6 +1,8 @@ +require ("global") function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithMharelak_001", nil, nil, nil); -end - + defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " + player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithMharelak_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/mimiroon.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/mimiroon.lua index 9228ab8a..c814e0ec 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/mimiroon.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/mimiroon.lua @@ -1,6 +1,8 @@ +require ("global") function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithMimiroon_001", nil, nil, nil); -end - + defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " + player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithMimiroon_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/muscle-bound_deckhand.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/muscle-bound_deckhand.lua index da65a99b..5031e26f 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/muscle-bound_deckhand.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/muscle-bound_deckhand.lua @@ -1,6 +1,8 @@ +require ("global") function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithMuscle-bounddeckhand_001", nil, nil, nil); -end - + defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " + player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithMuscle-bounddeckhand_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/mynadaeg.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/mynadaeg.lua index 5f47c3c0..31e65e0b 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/mynadaeg.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/mynadaeg.lua @@ -1,6 +1,8 @@ +require ("global") function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithMynadaeg_001", nil, nil, nil); -end - + defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " + player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithMynadaeg_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/mzimzizi.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/mzimzizi.lua index d9f32121..94a259cb 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/mzimzizi.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/mzimzizi.lua @@ -1,6 +1,8 @@ +require ("global") function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithMzimzizi_001", nil, nil, nil); -end - + defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " + player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithMzimzizi_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/nanapiri.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/nanapiri.lua index 31400d53..6cc4c1b4 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/nanapiri.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/nanapiri.lua @@ -1,6 +1,8 @@ +require ("global") function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithNanapiri_001", nil, nil, nil); -end - + defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " + player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithNanapiri_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/neale.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/neale.lua index e23c2681..bde853d2 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/neale.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/neale.lua @@ -1,6 +1,8 @@ +require ("global") function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithNeale_001", nil, nil, nil); -end - + defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " + player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithNeale_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/nheu_jawantal.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/nheu_jawantal.lua index d7cfcfb4..cc439fdd 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/nheu_jawantal.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/nheu_jawantal.lua @@ -1,6 +1,8 @@ +require ("global") function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithNheujawantal_001", nil, nil, nil); + defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " + player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithNheujawantal_001", nil, nil, nil); + player:endEvent(); end - diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/ninianne.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/ninianne.lua index 9b17f584..bac8a42c 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/ninianne.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/ninianne.lua @@ -1,6 +1,8 @@ +require ("global") function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithNinianne_001", nil, nil, nil); -end - + defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " + player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithNinianne_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/nnmulika.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/nnmulika.lua index d60eedad..d8d1e6ce 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/nnmulika.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/nnmulika.lua @@ -1,5 +1,8 @@ +require ("global") function onEventStarted(player, npc) defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithNnmulika_001", nil, nil, nil); + player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/nunuba.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/nunuba.lua index d71a61ba..06f2cc01 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/nunuba.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/nunuba.lua @@ -1,6 +1,8 @@ +require ("global") function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithNunuba_001", nil, nil, nil); -end - + defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " + player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithNunuba_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/ortolf.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/ortolf.lua index 5753171c..bbf4c7fb 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/ortolf.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/ortolf.lua @@ -1,5 +1,8 @@ +require ("global") function onEventStarted(player, npc) defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithOrtolf_001", nil, nil, nil); + player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/ositha.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/ositha.lua index a273b98b..99c86e4a 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/ositha.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/ositha.lua @@ -1,6 +1,8 @@ +require ("global") function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithOsitha_001", nil, nil, nil); -end - + defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " + player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithOsitha_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/overweening_woman.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/overweening_woman.lua index f6b407ad..f76e9e5d 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/overweening_woman.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/overweening_woman.lua @@ -1,6 +1,8 @@ +require ("global") function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithLady002_001", nil, nil, nil); -end - + defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " + player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithLady002_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/pasty-faced_adventurer.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/pasty-faced_adventurer.lua index 74c48db8..5efac428 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/pasty-faced_adventurer.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/pasty-faced_adventurer.lua @@ -1,6 +1,8 @@ +require ("global") function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithPasty-facedadventurer_001", nil, nil, nil); -end - + defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " + player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithPasty-facedadventurer_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/pearly-toothed_porter.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/pearly-toothed_porter.lua index 910b8d66..4c2bfbe3 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/pearly-toothed_porter.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/pearly-toothed_porter.lua @@ -1,6 +1,8 @@ +require ("global") function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithPearly-toothedporter_001", nil, nil, nil); -end - + defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " + player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithPearly-toothedporter_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/pfynhaemr.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/pfynhaemr.lua index 34fc20cd..7c7c65f9 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/pfynhaemr.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/pfynhaemr.lua @@ -1,6 +1,9 @@ +require ("global") function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithPfynhaemr_001", nil, nil, nil); + defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " + player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithPfynhaemr_001", nil, nil, nil); + player:endEvent(); end diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/pissed_pirate.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/pissed_pirate.lua index 9c2c838d..2c279dc7 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/pissed_pirate.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/pissed_pirate.lua @@ -1,6 +1,8 @@ +require ("global") function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithPirate030_001", nil, nil, nil); -end - + defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " + player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithPirate030_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/positively_pungent_pirate.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/positively_pungent_pirate.lua index beaad4da..aa35333b 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/positively_pungent_pirate.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/positively_pungent_pirate.lua @@ -1,5 +1,8 @@ +require ("global") function onEventStarted(player, npc) defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithPirate031_001", nil, nil, nil); + player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/prudentia.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/prudentia.lua index 6c1b8018..34020aed 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/prudentia.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/prudentia.lua @@ -1,6 +1,8 @@ +require ("global") function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithPrudentia_001", nil, nil, nil); -end - + defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " + player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithPrudentia_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/ptahjha.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/ptahjha.lua index 8b6697fa..2026691a 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/ptahjha.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/ptahjha.lua @@ -1,5 +1,8 @@ +require ("global") function onEventStarted(player, npc) defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithSkarnwaen_001", nil, nil, nil); + player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/pulmia.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/pulmia.lua index 4bcb59f0..86aaef4a 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/pulmia.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/pulmia.lua @@ -1,6 +1,8 @@ +require ("global") function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithPulmia_001", nil, nil, nil); + defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " + player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithPulmia_001", nil, nil, nil); + player:endEvent(); end - diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/raragun.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/raragun.lua index d8b10e1a..1f0259bd 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/raragun.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/raragun.lua @@ -1,6 +1,8 @@ +require ("global") function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithRaragun_001", nil, nil, nil); -end - + defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " + player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithRaragun_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/rbaharra.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/rbaharra.lua index 54aa9edd..9f96e3de 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/rbaharra.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/rbaharra.lua @@ -1,5 +1,8 @@ +require ("global") function onEventStarted(player, npc) defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithRbaharra_001", nil, nil, nil); + player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/rerenasu.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/rerenasu.lua index 9aa4ea27..eac7d22e 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/rerenasu.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/rerenasu.lua @@ -1,5 +1,8 @@ +require ("global") function onEventStarted(player, npc) defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithRerenasu_001", nil, nil, nil); + player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/robairlain.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/robairlain.lua index 3cd19703..99b8a839 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/robairlain.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/robairlain.lua @@ -1,5 +1,8 @@ +require ("global") function onEventStarted(player, npc) defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithRobairlain_001", nil, nil, nil); + player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/roosting_crow.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/roosting_crow.lua index cc04c069..4bdded1e 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/roosting_crow.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/roosting_crow.lua @@ -1,6 +1,8 @@ +require ("global") function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithRoostingcrow_001", nil, nil, nil); -end - + defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " + player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithRoostingcrow_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/rsushmo.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/rsushmo.lua index 8629072d..75df54a3 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/rsushmo.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/rsushmo.lua @@ -1,6 +1,8 @@ +require ("global") function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithRsushmo_001", nil, nil, nil); -end - + defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " + player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithRsushmo_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/rubh_epocan.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/rubh_epocan.lua index 1da0f05c..db574fc7 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/rubh_epocan.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/rubh_epocan.lua @@ -1,5 +1,8 @@ +require ("global") function onEventStarted(player, npc) defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithRubh_epocan_001", nil, nil, nil); + player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/rubh_hob.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/rubh_hob.lua index b2baad64..460fa396 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/rubh_hob.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/rubh_hob.lua @@ -1,5 +1,8 @@ +require ("global") function onEventStarted(player, npc) defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithRubh_hob_001", nil, nil, nil); + player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/sathzant.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/sathzant.lua index eebd5d6a..aa69be3a 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/sathzant.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/sathzant.lua @@ -1,6 +1,8 @@ +require ("global") function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithSathzant_001", nil, nil, nil); -end - + defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " + player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithSathzant_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/satiated_shopkeep.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/satiated_shopkeep.lua index bab76e66..4fdf7156 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/satiated_shopkeep.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/satiated_shopkeep.lua @@ -1,6 +1,8 @@ +require ("global") function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithMerchant002_001", nil, nil, nil); -end - + defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " + player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithMerchant002_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/shoshoma.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/shoshoma.lua index df21045b..37e46072 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/shoshoma.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/shoshoma.lua @@ -1,5 +1,8 @@ +require ("global") function onEventStarted(player, npc) defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithShoshoma_001", nil, nil, nil); + player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/skarnwaen.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/skarnwaen.lua index 8b6697fa..2026691a 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/skarnwaen.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/skarnwaen.lua @@ -1,5 +1,8 @@ +require ("global") function onEventStarted(player, npc) defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithSkarnwaen_001", nil, nil, nil); + player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/skoefmynd.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/skoefmynd.lua index d0448474..a00679ea 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/skoefmynd.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/skoefmynd.lua @@ -1,5 +1,8 @@ +require ("global") function onEventStarted(player, npc) defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithSkoefmynd_001", nil, nil, nil); + player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/slaiboli.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/slaiboli.lua index 24ecaa58..0529e96d 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/slaiboli.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/slaiboli.lua @@ -1,6 +1,8 @@ +require ("global") function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithSlaiboli_001", nil, nil, nil); + defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " + player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithSlaiboli_001", nil, nil, nil); + player:endEvent(); end - diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/sosoze.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/sosoze.lua index 266e7900..fa2f69f3 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/sosoze.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/sosoze.lua @@ -1,6 +1,8 @@ +require ("global") function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithSosoze_001", nil, nil, nil); -end - + defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " + player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithSosoze_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/sundhimal.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/sundhimal.lua index 6f86ae9a..d004d786 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/sundhimal.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/sundhimal.lua @@ -1,6 +1,8 @@ +require ("global") function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithSundhimal_001", nil, nil, nil); -end - + defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " + player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithSundhimal_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/sure-voiced_barracuda_knight.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/sure-voiced_barracuda_knight.lua index 0909e21a..1fb3bb81 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/sure-voiced_barracuda_knight.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/sure-voiced_barracuda_knight.lua @@ -1,5 +1,8 @@ +require ("global") function onEventStarted(player, npc) defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithKob031_001", nil, nil, nil); + player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/suspicious-looking_traveler.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/suspicious-looking_traveler.lua index 232de96b..c5094881 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/suspicious-looking_traveler.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/suspicious-looking_traveler.lua @@ -1,6 +1,8 @@ +require ("global") function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithTraveler031_001", nil, nil, nil); -end - + defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " + player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithTraveler031_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/syhrdaeg.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/syhrdaeg.lua index 570160a3..b262bbfa 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/syhrdaeg.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/syhrdaeg.lua @@ -1,6 +1,8 @@ +require ("global") function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithSyhrdaeg_001", nil, nil, nil); -end - + defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " + player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithSyhrdaeg_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/syngsmyd.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/syngsmyd.lua index c2d1c29a..2ac6e3df 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/syngsmyd.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/syngsmyd.lua @@ -1,6 +1,8 @@ +require ("global") function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithSyngsmyd_001", nil, nil, nil); -end - + defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " + player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithSyngsmyd_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/tatasako.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/tatasako.lua index bd6d4ed5..fd966784 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/tatasako.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/tatasako.lua @@ -1,5 +1,8 @@ +require ("global") function onEventStarted(player, npc) defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithTatasako_001", nil, nil, nil); + player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/tefh_moshroca.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/tefh_moshroca.lua index 2f722cd8..eea8fd66 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/tefh_moshroca.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/tefh_moshroca.lua @@ -1,6 +1,9 @@ +require ("global") function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithTefhmoshroca_001", nil, nil, nil); + defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " + player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithTefhmoshroca_001", nil, nil, nil); + player:endEvent(); end diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/thata_khamazom.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/thata_khamazom.lua index 6633f670..98cdb515 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/thata_khamazom.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/thata_khamazom.lua @@ -1,6 +1,8 @@ +require ("global") function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithThatakhamazom_001", nil, nil, nil); -end - + defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " + player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithThatakhamazom_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/thosinbaen.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/thosinbaen.lua index 8b6697fa..2026691a 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/thosinbaen.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/thosinbaen.lua @@ -1,5 +1,8 @@ +require ("global") function onEventStarted(player, npc) defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithSkarnwaen_001", nil, nil, nil); + player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/tittering_traveler.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/tittering_traveler.lua index 87a7f811..3f7d57c6 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/tittering_traveler.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/tittering_traveler.lua @@ -1,6 +1,8 @@ +require ("global") function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithTraveler030_001", nil, nil, nil); -end - + defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " + player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithTraveler030_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/totoruto.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/totoruto.lua index 74e19644..33c4f3b7 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/totoruto.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/totoruto.lua @@ -1,6 +1,8 @@ +require ("global") function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithTotoruto_001", nil, nil, nil); -end - + defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " + player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithTotoruto_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/triaine.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/triaine.lua index 7f1e9257..a297f16e 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/triaine.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/triaine.lua @@ -1,6 +1,8 @@ +require ("global") function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithTriaine_001", nil, nil, nil); -end - + defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " + player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithTriaine_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/trinne.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/trinne.lua index 07fde9c0..2ef918cd 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/trinne.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/trinne.lua @@ -1,6 +1,8 @@ +require ("global") function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithTrinne_001", nil, nil, nil); -end - + defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " + player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithTrinne_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/unconscious_adventurer.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/unconscious_adventurer.lua index ea45cbd8..99ccd1b0 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/unconscious_adventurer.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/unconscious_adventurer.lua @@ -1,5 +1,8 @@ +require ("global") function onEventStarted(player, npc) defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithAdventurer032_001", nil, nil, nil); + player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/undsatz.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/undsatz.lua index 6ee9eba2..8b426ea3 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/undsatz.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/undsatz.lua @@ -1,5 +1,8 @@ +require ("global") function onEventStarted(player, npc) defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithUndsatz_001", nil, nil, nil); + player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/vhynho.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/vhynho.lua index cca97f06..12c378cd 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/vhynho.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/vhynho.lua @@ -1,6 +1,8 @@ +require ("global") function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithVhynho_001", nil, nil, nil); -end - + defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " + player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithVhynho_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/waekbyrt.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/waekbyrt.lua index 96ae1526..77400002 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/waekbyrt.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/waekbyrt.lua @@ -1,6 +1,8 @@ +require ("global") function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithWaekbyrt_001", nil, nil, nil); -end - + defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " + player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithWaekbyrt_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/whahtoa.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/whahtoa.lua index fa2e9898..2f61be72 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/whahtoa.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/whahtoa.lua @@ -1,6 +1,8 @@ +require ("global") function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithWhahtoa_001", nil, nil, nil); -end - + defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " + player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithWhahtoa_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/wyra_khamazom.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/wyra_khamazom.lua index 82320927..b63b6fbc 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/wyra_khamazom.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/wyra_khamazom.lua @@ -1,6 +1,8 @@ +require ("global") function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithWyrakhamazom_001", nil, nil, nil); -end - + defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " + player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithWyrakhamazom_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/wyrstmann.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/wyrstmann.lua index 84845794..56523476 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/wyrstmann.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/wyrstmann.lua @@ -1,6 +1,9 @@ +require ("global") function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithWyrstmann_001", nil, nil, nil); + defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " + player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithWyrstmann_001", nil, nil, nil); + player:endEvent(); end diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/xavalien.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/xavalien.lua index f179b709..794738a5 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/xavalien.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/xavalien.lua @@ -1,5 +1,8 @@ +require ("global") function onEventStarted(player, npc) defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithXavalien_001", nil, nil, nil); + player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/zonggo.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/zonggo.lua index ef89064a..684dc73b 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/zonggo.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/zonggo.lua @@ -1,5 +1,8 @@ +require ("global") function onEventStarted(player, npc) defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithZonggo_001", nil, nil, nil); + player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/sea0Town01a/PopulaceStandard/zuzule.lua b/data/scripts/unique/sea0Town01a/PopulaceStandard/zuzule.lua index 46c0c9f3..dc9a39ad 100644 --- a/data/scripts/unique/sea0Town01a/PopulaceStandard/zuzule.lua +++ b/data/scripts/unique/sea0Town01a/PopulaceStandard/zuzule.lua @@ -1,6 +1,8 @@ +require ("global") function onEventStarted(player, npc) - defaultSea = GetStaticActor("DftSea"); - player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithZuzule_001", nil, nil, nil); -end - + defaultSea = GetStaticActor("DftSea"); + callClientFunction(player, "delegateEvent", player, defaultSea, " + player:RunEventFunction("delegateEvent", player, defaultSea, "defaultTalkWithZuzule_001", nil, nil, nil); + player:endEvent(); +end \ No newline at end of file From 926e9146e2cc39eb18c9d02d36db57a64b096f72 Mon Sep 17 00:00:00 2001 From: Filip Maj Date: Tue, 21 Jun 2016 20:07:02 -0400 Subject: [PATCH 13/15] Fixed a few scripts. Jellyfish init script was built so it didn't crash boat zone. --- .../npc/monster/Jellyfish/JellyfishScenarioLimsaLv00.lua | 5 +++++ data/scripts/unique/wil0Town01/PopulaceStandard/gagaruna.lua | 2 +- .../unique/wil0Town01a/PopulaceStandard/dariustel.lua | 3 +-- 3 files changed, 7 insertions(+), 3 deletions(-) create mode 100644 data/scripts/base/chara/npc/monster/Jellyfish/JellyfishScenarioLimsaLv00.lua diff --git a/data/scripts/base/chara/npc/monster/Jellyfish/JellyfishScenarioLimsaLv00.lua b/data/scripts/base/chara/npc/monster/Jellyfish/JellyfishScenarioLimsaLv00.lua new file mode 100644 index 00000000..525bb8fc --- /dev/null +++ b/data/scripts/base/chara/npc/monster/Jellyfish/JellyfishScenarioLimsaLv00.lua @@ -0,0 +1,5 @@ +require ("global") + +function init(npc) + return true, true, 10, 0, 1, true, false, false, false, false, false, false, false, 0; +end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01/PopulaceStandard/gagaruna.lua b/data/scripts/unique/wil0Town01/PopulaceStandard/gagaruna.lua index b96eb8c4..197ffd31 100644 --- a/data/scripts/unique/wil0Town01/PopulaceStandard/gagaruna.lua +++ b/data/scripts/unique/wil0Town01/PopulaceStandard/gagaruna.lua @@ -2,6 +2,6 @@ require ("global") function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithGag:Runa_001", nil, nil, nil); + callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithGagaruna_001", nil, nil, nil); player:endEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/dariustel.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/dariustel.lua index ce7bbbe5..cc0dda55 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/dariustel.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/dariustel.lua @@ -1,8 +1,7 @@ require ("global") function onEventStarted(player, npc) - defaultWil = GetStaticActor("DftWil"); - callClientFunction(player, "delegateEvent", player, defaultWil, "defaultTalkWithElecotte_001", nil, nil, nil); + --NOT TALKABLE player:endEvent(); end From 3cd181f5da309f62bfdd93a759029d5020febe09 Mon Sep 17 00:00:00 2001 From: Filip Maj Date: Tue, 21 Jun 2016 22:50:30 -0400 Subject: [PATCH 14/15] Ported over the Limsa/Uldah opening zone scripts. Still not 100% done. --- ...td_04@0C100.lua => anxious_adventurer.lua} | 0 ...plStd_09@0C100.lua => astute_merchant.lua} | 0 ...td_06@0C100.lua => austere_adventurer.lua} | 0 ...05@0C100.lua => baby-faced_adventurer.lua} | 0 ...Std_03@0C100.lua => cultivated_tender.lua} | 0 .../{pplStd_0f@0C100.lua => exit_door.lua} | 14 ++-- ...d_0e@0C100.lua => grinning_adventurer.lua} | 0 ..._0b@0C100.lua => indifferent_passerby.lua} | 0 .../jellyfishSc_ocn0Btl02_04@0C196.lua | 3 - ...pplStd_0d@0C100.lua => lanky_traveler.lua} | 0 ..._0c@0C100.lua => prattling_adventurer.lua} | 0 .../{pplStd_11@0C100.lua => rostnsthal.lua} | 0 ...lStd_08@0C100.lua => shadowy_traveler.lua} | 0 ...lStd_02@0C100.lua => tipsy_adventurer.lua} | 0 ...7@0C100.lua => undignified_adventurer.lua} | 0 ...lStd_0a@0C100.lua => voluptuous_vixen.lua} | 0 ...1@0C100.lua => well-traveled_merchant.lua} | 0 .../wil0Battle01/DoorStandard/door1.lua | 3 + .../wil0Battle01/DoorStandard/door2.lua | 3 + .../ascilia.lua} | 2 +- .../big-bellied_barker.lua} | 2 +- .../dapper_dan.lua} | 0 .../debauched_demoness.lua} | 0 .../PopulaceStandard/fretful_farmhand.lua | 20 ++++++ .../gil-digging_mistress.lua} | 7 +- .../loutish_lad.lua} | 0 .../pplStd_wil0Btl01_01@0B800.lua | 0 .../rururaji.lua} | 0 .../PopulaceStandard/stocky_stranger.lua | 8 +++ .../twittering_tomboy.lua} | 0 .../warburton.lua} | 0 .../pplStd_wil0Btl01_02@0B800.lua | 18 ------ sql/gamedata_actor_class.sql | 36 +++++------ sql/server_spawn_locations.sql | 64 ++++++++++--------- sql/server_zones_spawnlocations.sql | 4 +- 35 files changed, 99 insertions(+), 85 deletions(-) rename data/scripts/unique/ocn0Battle02/PopulaceStandard/{pplStd_04@0C100.lua => anxious_adventurer.lua} (100%) rename data/scripts/unique/ocn0Battle02/PopulaceStandard/{pplStd_09@0C100.lua => astute_merchant.lua} (100%) rename data/scripts/unique/ocn0Battle02/PopulaceStandard/{pplStd_06@0C100.lua => austere_adventurer.lua} (100%) rename data/scripts/unique/ocn0Battle02/PopulaceStandard/{pplStd_05@0C100.lua => baby-faced_adventurer.lua} (100%) rename data/scripts/unique/ocn0Battle02/PopulaceStandard/{pplStd_03@0C100.lua => cultivated_tender.lua} (100%) rename data/scripts/unique/ocn0Battle02/PopulaceStandard/{pplStd_0f@0C100.lua => exit_door.lua} (77%) rename data/scripts/unique/ocn0Battle02/PopulaceStandard/{pplStd_0e@0C100.lua => grinning_adventurer.lua} (100%) rename data/scripts/unique/ocn0Battle02/PopulaceStandard/{pplStd_0b@0C100.lua => indifferent_passerby.lua} (100%) delete mode 100644 data/scripts/unique/ocn0Battle02/PopulaceStandard/jellyfishSc_ocn0Btl02_04@0C196.lua rename data/scripts/unique/ocn0Battle02/PopulaceStandard/{pplStd_0d@0C100.lua => lanky_traveler.lua} (100%) rename data/scripts/unique/ocn0Battle02/PopulaceStandard/{pplStd_0c@0C100.lua => prattling_adventurer.lua} (100%) rename data/scripts/unique/ocn0Battle02/PopulaceStandard/{pplStd_11@0C100.lua => rostnsthal.lua} (100%) rename data/scripts/unique/ocn0Battle02/PopulaceStandard/{pplStd_08@0C100.lua => shadowy_traveler.lua} (100%) rename data/scripts/unique/ocn0Battle02/PopulaceStandard/{pplStd_02@0C100.lua => tipsy_adventurer.lua} (100%) rename data/scripts/unique/ocn0Battle02/PopulaceStandard/{pplStd_07@0C100.lua => undignified_adventurer.lua} (100%) rename data/scripts/unique/ocn0Battle02/PopulaceStandard/{pplStd_0a@0C100.lua => voluptuous_vixen.lua} (100%) rename data/scripts/unique/ocn0Battle02/PopulaceStandard/{pplStd_01@0C100.lua => well-traveled_merchant.lua} (100%) create mode 100644 data/scripts/unique/wil0Battle01/DoorStandard/door1.lua create mode 100644 data/scripts/unique/wil0Battle01/DoorStandard/door2.lua rename data/scripts/unique/wil0Battle01/{pplStd_wil0Btl01_0a@0B800.lua => PopulaceStandard/ascilia.lua} (96%) rename data/scripts/unique/wil0Battle01/{pplStd_wil0Btl01_09@0B800.lua => PopulaceStandard/big-bellied_barker.lua} (61%) rename data/scripts/unique/wil0Battle01/{pplStd_wil0Btl01_04@0B800.lua => PopulaceStandard/dapper_dan.lua} (100%) rename data/scripts/unique/wil0Battle01/{pplStd_wil0Btl01_03@0B800.lua => PopulaceStandard/debauched_demoness.lua} (100%) create mode 100644 data/scripts/unique/wil0Battle01/PopulaceStandard/fretful_farmhand.lua rename data/scripts/unique/wil0Battle01/{pplStd_wil0Btl01_06@0B800.lua => PopulaceStandard/gil-digging_mistress.lua} (77%) rename data/scripts/unique/wil0Battle01/{pplStd_wil0Btl01_05@0B800.lua => PopulaceStandard/loutish_lad.lua} (100%) rename data/scripts/unique/wil0Battle01/{ => PopulaceStandard}/pplStd_wil0Btl01_01@0B800.lua (100%) rename data/scripts/unique/wil0Battle01/{pplStd_wil0Btl01_08@0B800.lua => PopulaceStandard/rururaji.lua} (100%) create mode 100644 data/scripts/unique/wil0Battle01/PopulaceStandard/stocky_stranger.lua rename data/scripts/unique/wil0Battle01/{pplStd_wil0Btl01_07@0B800.lua => PopulaceStandard/twittering_tomboy.lua} (100%) rename data/scripts/unique/wil0Battle01/{pplStd_wil0Btl01_0b@0B800.lua => PopulaceStandard/warburton.lua} (100%) delete mode 100644 data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_02@0B800.lua diff --git a/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_04@0C100.lua b/data/scripts/unique/ocn0Battle02/PopulaceStandard/anxious_adventurer.lua similarity index 100% rename from data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_04@0C100.lua rename to data/scripts/unique/ocn0Battle02/PopulaceStandard/anxious_adventurer.lua diff --git a/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_09@0C100.lua b/data/scripts/unique/ocn0Battle02/PopulaceStandard/astute_merchant.lua similarity index 100% rename from data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_09@0C100.lua rename to data/scripts/unique/ocn0Battle02/PopulaceStandard/astute_merchant.lua diff --git a/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_06@0C100.lua b/data/scripts/unique/ocn0Battle02/PopulaceStandard/austere_adventurer.lua similarity index 100% rename from data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_06@0C100.lua rename to data/scripts/unique/ocn0Battle02/PopulaceStandard/austere_adventurer.lua diff --git a/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_05@0C100.lua b/data/scripts/unique/ocn0Battle02/PopulaceStandard/baby-faced_adventurer.lua similarity index 100% rename from data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_05@0C100.lua rename to data/scripts/unique/ocn0Battle02/PopulaceStandard/baby-faced_adventurer.lua diff --git a/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_03@0C100.lua b/data/scripts/unique/ocn0Battle02/PopulaceStandard/cultivated_tender.lua similarity index 100% rename from data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_03@0C100.lua rename to data/scripts/unique/ocn0Battle02/PopulaceStandard/cultivated_tender.lua diff --git a/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_0f@0C100.lua b/data/scripts/unique/ocn0Battle02/PopulaceStandard/exit_door.lua similarity index 77% rename from data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_0f@0C100.lua rename to data/scripts/unique/ocn0Battle02/PopulaceStandard/exit_door.lua index 1a13cd2d..54f0513a 100644 --- a/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_0f@0C100.lua +++ b/data/scripts/unique/ocn0Battle02/PopulaceStandard/exit_door.lua @@ -21,7 +21,8 @@ function onEventStarted(player, npc, triggerName) man0l0Quest = GetStaticActor("Man0l0"); choice = callClientFunction(player, "delegateEvent", player, man0l0Quest, "processEventNewRectAsk", nil); - if (resultId == 0x2B9EBC42) then + if (choice == 1) then + callClientFunction(player, "delegateEvent", player, man0l0Quest, "processEvent000_2", nil, nil, nil, nil); player:EndEvent(); player:SetDirector("QuestDirectorMan0l001", true); @@ -30,13 +31,8 @@ function onEventStarted(player, npc, triggerName) player:SendGameMessage(player, worldMaster, 50011, 0x20); GetWorldManager():DoPlayerMoveInZone(player, 9); - player:KickEvent(player:GetDirector(), "noticeEvent", true); + player:KickEvent(player:GetDirector(), "noticeEvent", true); else - if (choice == 1) then - man0l0Quest = player:GetQuest("Man0l0"); - callClientFunction(player, "delegateEvent", player, man0l0Quest, "processEvent000_2", nil, nil, nil, nil); - end - end - - player:EndEvent(); + player:EndEvent(); + end end \ No newline at end of file diff --git a/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_0e@0C100.lua b/data/scripts/unique/ocn0Battle02/PopulaceStandard/grinning_adventurer.lua similarity index 100% rename from data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_0e@0C100.lua rename to data/scripts/unique/ocn0Battle02/PopulaceStandard/grinning_adventurer.lua diff --git a/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_0b@0C100.lua b/data/scripts/unique/ocn0Battle02/PopulaceStandard/indifferent_passerby.lua similarity index 100% rename from data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_0b@0C100.lua rename to data/scripts/unique/ocn0Battle02/PopulaceStandard/indifferent_passerby.lua diff --git a/data/scripts/unique/ocn0Battle02/PopulaceStandard/jellyfishSc_ocn0Btl02_04@0C196.lua b/data/scripts/unique/ocn0Battle02/PopulaceStandard/jellyfishSc_ocn0Btl02_04@0C196.lua deleted file mode 100644 index 2bcc1e57..00000000 --- a/data/scripts/unique/ocn0Battle02/PopulaceStandard/jellyfishSc_ocn0Btl02_04@0C196.lua +++ /dev/null @@ -1,3 +0,0 @@ -function init(npc) - return "/Chara/Npc/Monster/Jellyfish/JellyfishScenarioLimsaLv00", false, false, false, false, false, npc:GetActorClassId(), true, true, 10, 0, 4, false, false, false, false, false, false, false, false, 2; -end \ No newline at end of file diff --git a/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_0d@0C100.lua b/data/scripts/unique/ocn0Battle02/PopulaceStandard/lanky_traveler.lua similarity index 100% rename from data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_0d@0C100.lua rename to data/scripts/unique/ocn0Battle02/PopulaceStandard/lanky_traveler.lua diff --git a/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_0c@0C100.lua b/data/scripts/unique/ocn0Battle02/PopulaceStandard/prattling_adventurer.lua similarity index 100% rename from data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_0c@0C100.lua rename to data/scripts/unique/ocn0Battle02/PopulaceStandard/prattling_adventurer.lua diff --git a/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_11@0C100.lua b/data/scripts/unique/ocn0Battle02/PopulaceStandard/rostnsthal.lua similarity index 100% rename from data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_11@0C100.lua rename to data/scripts/unique/ocn0Battle02/PopulaceStandard/rostnsthal.lua diff --git a/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_08@0C100.lua b/data/scripts/unique/ocn0Battle02/PopulaceStandard/shadowy_traveler.lua similarity index 100% rename from data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_08@0C100.lua rename to data/scripts/unique/ocn0Battle02/PopulaceStandard/shadowy_traveler.lua diff --git a/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_02@0C100.lua b/data/scripts/unique/ocn0Battle02/PopulaceStandard/tipsy_adventurer.lua similarity index 100% rename from data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_02@0C100.lua rename to data/scripts/unique/ocn0Battle02/PopulaceStandard/tipsy_adventurer.lua diff --git a/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_07@0C100.lua b/data/scripts/unique/ocn0Battle02/PopulaceStandard/undignified_adventurer.lua similarity index 100% rename from data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_07@0C100.lua rename to data/scripts/unique/ocn0Battle02/PopulaceStandard/undignified_adventurer.lua diff --git a/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_0a@0C100.lua b/data/scripts/unique/ocn0Battle02/PopulaceStandard/voluptuous_vixen.lua similarity index 100% rename from data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_0a@0C100.lua rename to data/scripts/unique/ocn0Battle02/PopulaceStandard/voluptuous_vixen.lua diff --git a/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_01@0C100.lua b/data/scripts/unique/ocn0Battle02/PopulaceStandard/well-traveled_merchant.lua similarity index 100% rename from data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_01@0C100.lua rename to data/scripts/unique/ocn0Battle02/PopulaceStandard/well-traveled_merchant.lua diff --git a/data/scripts/unique/wil0Battle01/DoorStandard/door1.lua b/data/scripts/unique/wil0Battle01/DoorStandard/door1.lua new file mode 100644 index 00000000..df61cfa6 --- /dev/null +++ b/data/scripts/unique/wil0Battle01/DoorStandard/door1.lua @@ -0,0 +1,3 @@ +function init(npc) + return false, false, 0, 0, 0x1A5, 0xB0D; +end \ No newline at end of file diff --git a/data/scripts/unique/wil0Battle01/DoorStandard/door2.lua b/data/scripts/unique/wil0Battle01/DoorStandard/door2.lua new file mode 100644 index 00000000..c433fb29 --- /dev/null +++ b/data/scripts/unique/wil0Battle01/DoorStandard/door2.lua @@ -0,0 +1,3 @@ +function init(npc) + return false, false, 0, 0, 0x1A5, 0xB09; +end \ No newline at end of file diff --git a/data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_0a@0B800.lua b/data/scripts/unique/wil0Battle01/PopulaceStandard/ascilia.lua similarity index 96% rename from data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_0a@0B800.lua rename to data/scripts/unique/wil0Battle01/PopulaceStandard/ascilia.lua index b1260acc..9ad27c11 100644 --- a/data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_0a@0B800.lua +++ b/data/scripts/unique/wil0Battle01/PopulaceStandard/ascilia.lua @@ -6,7 +6,7 @@ function onSpawn(player, npc) end function onEventStarted(player, npc, triggerName) - man0u0Quest = GetStaticActor("Man0u0"); + man0u0Quest = player:GetQuest("Man0u0"); if (man0u0Quest ~= nil) then if (triggerName == "pushDefault") then diff --git a/data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_09@0B800.lua b/data/scripts/unique/wil0Battle01/PopulaceStandard/big-bellied_barker.lua similarity index 61% rename from data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_09@0B800.lua rename to data/scripts/unique/wil0Battle01/PopulaceStandard/big-bellied_barker.lua index d01dfb10..a179ee3e 100644 --- a/data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_09@0B800.lua +++ b/data/scripts/unique/wil0Battle01/PopulaceStandard/big-bellied_barker.lua @@ -3,6 +3,6 @@ require ("quests/man/man0u0") function onEventStarted(player, npc, triggerName) man0u0Quest = GetStaticActor("Man0u0"); - + callClientFunction(player, "delegateEvent", player, man0u0Quest, "processEvent000_6", nil, nil, nil); player:EndEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_04@0B800.lua b/data/scripts/unique/wil0Battle01/PopulaceStandard/dapper_dan.lua similarity index 100% rename from data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_04@0B800.lua rename to data/scripts/unique/wil0Battle01/PopulaceStandard/dapper_dan.lua diff --git a/data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_03@0B800.lua b/data/scripts/unique/wil0Battle01/PopulaceStandard/debauched_demoness.lua similarity index 100% rename from data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_03@0B800.lua rename to data/scripts/unique/wil0Battle01/PopulaceStandard/debauched_demoness.lua diff --git a/data/scripts/unique/wil0Battle01/PopulaceStandard/fretful_farmhand.lua b/data/scripts/unique/wil0Battle01/PopulaceStandard/fretful_farmhand.lua new file mode 100644 index 00000000..395d9d76 --- /dev/null +++ b/data/scripts/unique/wil0Battle01/PopulaceStandard/fretful_farmhand.lua @@ -0,0 +1,20 @@ +require ("global") +require ("quests/man/man0u0") + +function onEventStarted(player, npc, triggerName) + man0u0Quest = player:GetQuest("Man0u0"); + + if (man0u0Quest != nil) + if (man0u0Quest:GetQuestFlag(MAN0U0_FLAG_MINITUT_DONE2) == false) then + callClientFunction(player, "delegateEvent", player, man0u0Quest, "processTtrMini002_first", nil, nil, nil); + npc:SetQuestGraphic(player, 0x0); + man0u0Quest:SetQuestFlag(MAN0U0_FLAG_MINITUT_DONE2, true); + man0u0Quest:SaveData(); + player:GetDirector():OnTalked(npc); + else + callClientFunction(player, "delegateEvent", player, man0u0Quest, "processTtrMini002", nil, nil, nil); + end + end + + player:EndEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_06@0B800.lua b/data/scripts/unique/wil0Battle01/PopulaceStandard/gil-digging_mistress.lua similarity index 77% rename from data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_06@0B800.lua rename to data/scripts/unique/wil0Battle01/PopulaceStandard/gil-digging_mistress.lua index 3797253b..687f9c09 100644 --- a/data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_06@0B800.lua +++ b/data/scripts/unique/wil0Battle01/PopulaceStandard/gil-digging_mistress.lua @@ -2,9 +2,11 @@ require ("global") require ("quests/man/man0u0") function onEventStarted(player, npc, triggerName) - man0u0Quest = GetStaticActor("Man0u0"); + man0u0Quest = player:GetQuest("Man0u0"); - if (man0u0Quest:GetQuestFlag(MAN0U0_FLAG_MINITUT_DONE3) == false) then + if (man0u0Quest ~= nil) then + + if (man0u0Quest:GetQuestFlag(MAN0U0_FLAG_MINITUT_DONE3) == false) then callClientFunction(player, "delegateEvent", player, man0u0Quest, "processTtrMini003_first", nil, nil, nil); npc:SetQuestGraphic(player, 0x0); man0u0Quest:SetQuestFlag(MAN0U0_FLAG_MINITUT_DONE3, true); @@ -14,5 +16,6 @@ function onEventStarted(player, npc, triggerName) callClientFunction(player, "delegateEvent", player, man0u0Quest, "processTtrMini003", nil, nil, nil); end + end player:EndEvent(); end \ No newline at end of file diff --git a/data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_05@0B800.lua b/data/scripts/unique/wil0Battle01/PopulaceStandard/loutish_lad.lua similarity index 100% rename from data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_05@0B800.lua rename to data/scripts/unique/wil0Battle01/PopulaceStandard/loutish_lad.lua diff --git a/data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_01@0B800.lua b/data/scripts/unique/wil0Battle01/PopulaceStandard/pplStd_wil0Btl01_01@0B800.lua similarity index 100% rename from data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_01@0B800.lua rename to data/scripts/unique/wil0Battle01/PopulaceStandard/pplStd_wil0Btl01_01@0B800.lua diff --git a/data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_08@0B800.lua b/data/scripts/unique/wil0Battle01/PopulaceStandard/rururaji.lua similarity index 100% rename from data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_08@0B800.lua rename to data/scripts/unique/wil0Battle01/PopulaceStandard/rururaji.lua diff --git a/data/scripts/unique/wil0Battle01/PopulaceStandard/stocky_stranger.lua b/data/scripts/unique/wil0Battle01/PopulaceStandard/stocky_stranger.lua new file mode 100644 index 00000000..f8182940 --- /dev/null +++ b/data/scripts/unique/wil0Battle01/PopulaceStandard/stocky_stranger.lua @@ -0,0 +1,8 @@ +require ("global") +require ("quests/man/man0u0") + +function onEventStarted(player, npc, triggerName) + man0u0Quest = GetStaticActor("Man0u0"); + callClientFunction(player, "delegateEvent", player, man0u0Quest, "processEvent000_6_2", nil, nil, nil); + player:EndEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_07@0B800.lua b/data/scripts/unique/wil0Battle01/PopulaceStandard/twittering_tomboy.lua similarity index 100% rename from data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_07@0B800.lua rename to data/scripts/unique/wil0Battle01/PopulaceStandard/twittering_tomboy.lua diff --git a/data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_0b@0B800.lua b/data/scripts/unique/wil0Battle01/PopulaceStandard/warburton.lua similarity index 100% rename from data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_0b@0B800.lua rename to data/scripts/unique/wil0Battle01/PopulaceStandard/warburton.lua diff --git a/data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_02@0B800.lua b/data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_02@0B800.lua deleted file mode 100644 index 70924af9..00000000 --- a/data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_02@0B800.lua +++ /dev/null @@ -1,18 +0,0 @@ -require ("global") -require ("quests/man/man0u0") - -function onEventStarted(player, npc, triggerName) - man0u0Quest = GetStaticActor("Man0u0"); - - if (man0u0Quest:GetQuestFlag(MAN0U0_FLAG_MINITUT_DONE2) == false) then - callClientFunction(player, "delegateEvent", player, man0u0Quest, "processTtrMini002_first", nil, nil, nil); - npc:SetQuestGraphic(player, 0x0); - man0u0Quest:SetQuestFlag(MAN0U0_FLAG_MINITUT_DONE2, true); - man0u0Quest:SaveData(); - player:GetDirector():OnTalked(npc); - else - callClientFunction(player, "delegateEvent", player, man0u0Quest, "processTtrMini002", nil, nil, nil); - end - - player:EndEvent(); -end \ No newline at end of file diff --git a/sql/gamedata_actor_class.sql b/sql/gamedata_actor_class.sql index 1c6cfb97..7348e548 100644 --- a/sql/gamedata_actor_class.sql +++ b/sql/gamedata_actor_class.sql @@ -4,7 +4,7 @@ Source Host: localhost Source Database: ffxiv_server Target Host: localhost Target Database: ffxiv_server -Date: 6/19/2016 11:23:44 PM +Date: 6/21/2016 10:49:37 PM */ SET FOREIGN_KEY_CHECKS=0; @@ -2752,7 +2752,7 @@ INSERT INTO `gamedata_actor_class` VALUES ('1090368', '', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1090369', '', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1090370', '', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1090371', '', '0', null); -INSERT INTO `gamedata_actor_class` VALUES ('1090372', '/Chara/Npc/Populace/PopulaceStandard', '0', '{\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 ('1090372', '/Chara/Npc/Populace/PopulaceStandard', '0', '{\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\": \"20.0\",\r\n \"outwards\": \"false\",\r\n \"silent\": \"true\",\r\n \"conditionName\": \"pushDefault\"\r\n }\r\n ]\r\n}'); INSERT INTO `gamedata_actor_class` VALUES ('1090373', '', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1090374', '', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1090375', '/Chara/Npc/Populace/PopulaceStandard', '0', '{\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}'); @@ -2764,7 +2764,7 @@ INSERT INTO `gamedata_actor_class` VALUES ('1090380', '', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1090381', '', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1090382', '', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1090383', '', '0', null); -INSERT INTO `gamedata_actor_class` VALUES ('1090384', '/Chara/Npc/Object/OpeningStoperF0B1', '0', '{\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\": 40.0,\r\n \"silent\": true,\r\n \"outwards\": true\r\n },\r\n {\r\n \"conditionName\": \"caution\",\r\n \"radius\": 30.0,\r\n \"silent\": true,\r\n \"outwards\": true\r\n }\r\n ],\r\n \"pushWithBoxEventConditions\": []\r\n}'); +INSERT INTO `gamedata_actor_class` VALUES ('1090384', '/Chara/Npc/Object/OpeningStoperF0B1', '0', '{\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\": 40.0,\r\n \"silent\": true,\r\n \"outwards\": true\r\n },\r\n {\r\n \"conditionName\": \"caution\",\r\n \"radius\": 30.0,\r\n \"silent\": true,\r\n \"outwards\": true\r\n }\r\n ]\r\n}'); INSERT INTO `gamedata_actor_class` VALUES ('1090385', '', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1090386', '/Chara/Npc/Populace/PopulaceStandard', '0', '{\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 ('1090387', '/Chara/Npc/Populace/PopulaceStandard', '0', '{\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}'); @@ -3527,7 +3527,7 @@ INSERT INTO `gamedata_actor_class` VALUES ('1280125', '', '4010015', null); INSERT INTO `gamedata_actor_class` VALUES ('1280126', '', '4010014', null); INSERT INTO `gamedata_actor_class` VALUES ('1280127', '', '4010014', null); INSERT INTO `gamedata_actor_class` VALUES ('1290001', '', '0', null); -INSERT INTO `gamedata_actor_class` VALUES ('1290002', '/Chara/Npc/Object/PrivateAreaMasterExit', '0', null); +INSERT INTO `gamedata_actor_class` VALUES ('1290002', '/Chara/Npc/Object/PrivateAreaMasterExit', '0', '{\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 \"emoteEventConditions\": [],\r\n \"pushWithCircleEventConditions\": [\r\n {\r\n \"conditionName\": \"exit\",\r\n \"radius\": 30.0,\r\n \"silent\": true,\r\n \"outwards\": true\r\n },\r\n {\r\n \"conditionName\": \"caution\",\r\n \"radius\": 20.0,\r\n \"silent\": true,\r\n \"outwards\": true\r\n }\r\n ]\r\n}'); INSERT INTO `gamedata_actor_class` VALUES ('1290003', '', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1290004', '/Chara/Npc/Object/BgKeepout', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('1290005', '', '0', null); @@ -7175,24 +7175,24 @@ INSERT INTO `gamedata_actor_class` VALUES ('5000119', '', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('5000120', '', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('5000121', '', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('5900001', '/Chara/Npc/MapObj/DoorStandard', '0', '{ \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 ('5900002', '', '0', null); -INSERT INTO `gamedata_actor_class` VALUES ('5900003', '', '0', null); -INSERT INTO `gamedata_actor_class` VALUES ('5900004', '', '0', null); +INSERT INTO `gamedata_actor_class` VALUES ('5900002', '/Chara/Npc/MapObj/DoorStandard', '0', '{ \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 ('5900003', '/Chara/Npc/MapObj/DoorStandard', '0', '{ \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 ('5900004', '/Chara/Npc/MapObj/DoorStandard', '0', '{ \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 ('5900005', '', '0', null); -INSERT INTO `gamedata_actor_class` VALUES ('5900006', '', '0', null); +INSERT INTO `gamedata_actor_class` VALUES ('5900006', '/Chara/Npc/MapObj/MapObjOnlyShowHide', '0', '{ \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 ('5900007', '', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('5900008', '', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('5900009', '', '0', null); -INSERT INTO `gamedata_actor_class` VALUES ('5900010', '/Chara/Npc/MapObj/MapObjPortDoor', '0', null); -INSERT INTO `gamedata_actor_class` VALUES ('5900011', '/Chara/Npc/MapObj/MapObjShipPort', '0', null); -INSERT INTO `gamedata_actor_class` VALUES ('5900012', '/Chara/Npc/MapObj/MapObjPortDoor', '0', null); -INSERT INTO `gamedata_actor_class` VALUES ('5900013', '', '0', null); -INSERT INTO `gamedata_actor_class` VALUES ('5900014', '', '0', null); -INSERT INTO `gamedata_actor_class` VALUES ('5900015', '', '0', null); -INSERT INTO `gamedata_actor_class` VALUES ('5900016', '', '0', null); -INSERT INTO `gamedata_actor_class` VALUES ('5900017', '', '0', null); -INSERT INTO `gamedata_actor_class` VALUES ('5900018', '', '0', null); -INSERT INTO `gamedata_actor_class` VALUES ('5900019', '', '0', null); +INSERT INTO `gamedata_actor_class` VALUES ('5900010', '/Chara/Npc/MapObj/MapObjPortDoor', '0', '{ \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 ('5900011', '/Chara/Npc/MapObj/MapObjShipPort', '0', '{ \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 ('5900012', '/Chara/Npc/MapObj/MapObjPortDoor', '0', '{ \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 ('5900013', '/Chara/Npc/MapObj/MapObjShipRouteLand', '0', '{ \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 ('5900014', '/Chara/Npc/MapObj/MapObjShipRouteLand', '0', '{ \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 ('5900015', '/Chara/Npc/MapObj/DoorServer', '0', '{ \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 ('5900016', '/Chara/Npc/MapObj/DoorServer', '0', '{ \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 ('5900017', '/Chara/Npc/MapObj/MapObjTutorial', '0', '{ \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 ('5900018', '/Chara/Npc/MapObj/MapObjTutorial', '0', '{ \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 ('5900019', '/Chara/Npc/MapObj/MapObjTutorial', '0', '{ \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 ('5900020', '', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('5900021', '', '0', null); INSERT INTO `gamedata_actor_class` VALUES ('5900022', '', '0', null); diff --git a/sql/server_spawn_locations.sql b/sql/server_spawn_locations.sql index 5395a991..e6fd020b 100644 --- a/sql/server_spawn_locations.sql +++ b/sql/server_spawn_locations.sql @@ -4,7 +4,7 @@ Source Host: localhost Source Database: ffxiv_server Target Host: localhost Target Database: ffxiv_server -Date: 6/19/2016 11:23:52 PM +Date: 6/21/2016 10:49:44 PM */ 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=628 DEFAULT CHARSET=latin1; +) ENGINE=InnoDB AUTO_INCREMENT=630 DEFAULT CHARSET=latin1; -- ---------------------------- -- Records @@ -531,35 +531,35 @@ INSERT INTO `server_spawn_locations` VALUES ('497', '5900001', 'marketward', '23 INSERT INTO `server_spawn_locations` VALUES ('498', '5900010', '', '230', '', '0', '-811.176', '8.03', '234.815', '0', '0', '0', null); INSERT INTO `server_spawn_locations` VALUES ('499', '5900012', '', '230', '', '0', '-806.893', '8.03', '240.885', '0', '0', '0', null); INSERT INTO `server_spawn_locations` VALUES ('500', '5900011', '', '230', '', '0', '-846.89', '5', '240', '0', '0', '0', null); -INSERT INTO `server_spawn_locations` VALUES ('501', '1000042', '', '184', '', '0', '-1.5', '196', '124.5', '1.8', '0', '0', null); -INSERT INTO `server_spawn_locations` VALUES ('502', '1000186', '', '184', '', '0', '-0.2', '196', '123.26', '-0.8', '0', '0', null); -INSERT INTO `server_spawn_locations` VALUES ('503', '1001644', '', '184', '', '0', '12.18', '196', '133.42', '-1.26', '0', '1017', null); -INSERT INTO `server_spawn_locations` VALUES ('504', '1000840', '', '184', '', '0', '9.07', '196', '126.69', '-1.26', '0', '1017', null); -INSERT INTO `server_spawn_locations` VALUES ('505', '1001490', '', '184', '', '0', '-19.7', '196', '79.93', '-0.38', '0', '1009', null); -INSERT INTO `server_spawn_locations` VALUES ('506', '1001491', '', '184', '', '0', '3.4', '196', '115.5', '2.7', '0', '1021', null); -INSERT INTO `server_spawn_locations` VALUES ('507', '1001492', '', '184', '', '0', '0.8', '196', '103.18', '-1.13', '0', '1015', null); -INSERT INTO `server_spawn_locations` VALUES ('508', '1001493', '', '184', '', '0', '-33.57', '196', '82.42', '1.63', '0', '1013', null); -INSERT INTO `server_spawn_locations` VALUES ('509', '1001494', '', '184', '', '0', '-9.13', '196', '114.84', '2.33', '0', '1031', null); -INSERT INTO `server_spawn_locations` VALUES ('510', '1001495', '', '184', '', '0', '-19.11', '196', '95.09', '2.13', '0', '1037', null); -INSERT INTO `server_spawn_locations` VALUES ('511', '1001496', '', '184', '', '0', '-32.37', '196', '80.75', '-0.74', '0', '1101', null); -INSERT INTO `server_spawn_locations` VALUES ('512', '1290002', '', '184', '', '0', '-22.81', '196', '87.82', '0', '0', '0', null); -INSERT INTO `server_spawn_locations` VALUES ('513', '1090372', '', '184', '', '0', '-13', '194.91', '76.75', '-2.72', '0', '0', null); -INSERT INTO `server_spawn_locations` VALUES ('514', '1000438', '', '193', '', '0', '-0.71', '10.35', '-40.51', '0.3', '0', '1035', null); -INSERT INTO `server_spawn_locations` VALUES ('515', '1000439', '', '193', '', '0', '-1.87', '9.15', '-30.67', '2.44', '0', '1032', null); -INSERT INTO `server_spawn_locations` VALUES ('516', '1000440', '', '193', '', '0', '7.06', '9.15', '-28.62', '-1.54', '0', '1041', null); -INSERT INTO `server_spawn_locations` VALUES ('517', '1000441', '', '193', '', '0', '2.63', '9.15', '-33.91', '-0.16', '0', '1041', null); -INSERT INTO `server_spawn_locations` VALUES ('518', '1000442', '', '193', '', '0', '4.2', '10.35', '-21.98', '3.11', '0', '1015', null); -INSERT INTO `server_spawn_locations` VALUES ('519', '1000443', '', '193', '', '0', '4.06', '10.35', '-35.24', '2.52', '0', '1036', null); -INSERT INTO `server_spawn_locations` VALUES ('520', '1000444', '', '193', '', '0', '-4.72', '10.35', '-22.56', '2.06', '0', '1041', null); -INSERT INTO `server_spawn_locations` VALUES ('521', '1000445', '', '193', '', '0', '-4.09', '9.15', '-24.55', '2.09', '0', '1035', null); -INSERT INTO `server_spawn_locations` VALUES ('522', '1000446', '', '193', '', '0', '-0.72', '9.15', '-31.81', '-1.18', '0', '1041', null); -INSERT INTO `server_spawn_locations` VALUES ('523', '1000447', '', '193', '', '0', '-2.16', '9.15', '-26.18', '0.09', '0', '1016', null); -INSERT INTO `server_spawn_locations` VALUES ('524', '1000448', '', '193', '', '0', '5.93', '10.35', '-25.09', '-2.01', '0', '1037', null); -INSERT INTO `server_spawn_locations` VALUES ('525', '1000449', '', '193', '', '0', '-1.92', '9.15', '-34.19', '0.82', '0', '1013', null); -INSERT INTO `server_spawn_locations` VALUES ('526', '1000450', '', '193', '', '0', '4.88', '9.15', '-29.5', '0.65', '0', '1271', null); -INSERT INTO `server_spawn_locations` VALUES ('527', '1000451', '', '193', '', '0', '-1.1', '9.85', '-33.62', '-0.82', '0', '1026', null); -INSERT INTO `server_spawn_locations` VALUES ('528', '1001652', '', '193', '', '0', '-7.73', '9.967', '-27.44', '1.6', '0', '1041', null); -INSERT INTO `server_spawn_locations` VALUES ('529', '1090025', '', '193', '', '0', '0', '10', '-18', '0', '0', '0', null); +INSERT INTO `server_spawn_locations` VALUES ('501', '1000042', 'ascilia', '184', '', '0', '-1.5', '196', '124.5', '1.8', '0', '0', null); +INSERT INTO `server_spawn_locations` VALUES ('502', '1000186', 'warburton', '184', '', '0', '-0.2', '196', '123.26', '-0.8', '0', '0', null); +INSERT INTO `server_spawn_locations` VALUES ('503', '1001644', 'stocky_stranger', '184', '', '0', '12.18', '196', '133.42', '-1.26', '0', '1017', null); +INSERT INTO `server_spawn_locations` VALUES ('504', '1000840', 'rururaji', '184', '', '0', '9.07', '196', '126.69', '-1.26', '0', '1017', null); +INSERT INTO `server_spawn_locations` VALUES ('505', '1001490', 'big-bellied_barker', '184', '', '0', '-19.7', '196', '79.93', '-0.38', '0', '1009', null); +INSERT INTO `server_spawn_locations` VALUES ('506', '1001491', 'fretful_farmhand', '184', '', '0', '3.4', '196', '115.5', '2.7', '0', '1021', null); +INSERT INTO `server_spawn_locations` VALUES ('507', '1001492', 'debauched_demoness', '184', '', '0', '0.8', '196', '103.18', '-1.13', '0', '1015', null); +INSERT INTO `server_spawn_locations` VALUES ('508', '1001493', 'dapper_dan', '184', '', '0', '-33.57', '196', '82.42', '1.63', '0', '1013', null); +INSERT INTO `server_spawn_locations` VALUES ('509', '1001494', 'loutish_lad', '184', '', '0', '-9.13', '196', '114.84', '2.33', '0', '1031', null); +INSERT INTO `server_spawn_locations` VALUES ('510', '1001495', 'gil-digging_mistress', '184', '', '0', '-19.11', '196', '95.09', '2.13', '0', '1037', null); +INSERT INTO `server_spawn_locations` VALUES ('511', '1001496', 'twittering_tomboy', '184', '', '0', '-32.37', '196', '80.75', '-0.74', '0', '1101', null); +INSERT INTO `server_spawn_locations` VALUES ('512', '1290002', 'priv_areapast_exit', '184', '', '0', '-22.81', '196', '87.82', '0', '0', '0', null); +INSERT INTO `server_spawn_locations` VALUES ('513', '1090372', 'exit_trigger', '184', '', '0', '-13', '194.91', '76.75', '-2.72', '0', '0', null); +INSERT INTO `server_spawn_locations` VALUES ('514', '1000438', 'well-traveled_merchant', '193', '', '0', '-0.71', '10.35', '-40.51', '0.3', '0', '1035', null); +INSERT INTO `server_spawn_locations` VALUES ('515', '1000439', 'tipsy_adventurer', '193', '', '0', '-1.87', '9.15', '-30.67', '2.44', '0', '1032', null); +INSERT INTO `server_spawn_locations` VALUES ('516', '1000440', 'cultivated_tender', '193', '', '0', '7.06', '9.15', '-28.62', '-1.54', '0', '1041', null); +INSERT INTO `server_spawn_locations` VALUES ('517', '1000441', 'anxious_adventurer', '193', '', '0', '2.63', '9.15', '-33.91', '-0.16', '0', '1041', null); +INSERT INTO `server_spawn_locations` VALUES ('518', '1000442', 'baby-faced_adventurer', '193', '', '0', '4.2', '10.35', '-21.98', '3.11', '0', '1015', null); +INSERT INTO `server_spawn_locations` VALUES ('519', '1000443', 'austere_adventurer', '193', '', '0', '4.06', '10.35', '-35.24', '2.52', '0', '1036', null); +INSERT INTO `server_spawn_locations` VALUES ('520', '1000444', 'undignified_adventurer', '193', '', '0', '-4.72', '10.35', '-22.56', '2.06', '0', '1041', null); +INSERT INTO `server_spawn_locations` VALUES ('521', '1000445', 'shadowy_traveler', '193', '', '0', '-4.09', '9.15', '-24.55', '2.09', '0', '1035', null); +INSERT INTO `server_spawn_locations` VALUES ('522', '1000446', 'astute_merchant', '193', '', '0', '-0.72', '9.15', '-31.81', '-1.18', '0', '1041', null); +INSERT INTO `server_spawn_locations` VALUES ('523', '1000447', 'voluptuous_vixen', '193', '', '0', '-2.16', '9.15', '-26.18', '0.09', '0', '1016', null); +INSERT INTO `server_spawn_locations` VALUES ('524', '1000448', 'indifferent_passerby', '193', '', '0', '5.93', '10.35', '-25.09', '-2.01', '0', '1037', null); +INSERT INTO `server_spawn_locations` VALUES ('525', '1000449', 'prattling_adventurer', '193', '', '0', '-1.92', '9.15', '-34.19', '0.82', '0', '1013', null); +INSERT INTO `server_spawn_locations` VALUES ('526', '1000450', 'lanky_traveler', '193', '', '0', '4.88', '9.15', '-29.5', '0.65', '0', '1271', null); +INSERT INTO `server_spawn_locations` VALUES ('527', '1000451', 'grinning_adventurer', '193', '', '0', '-1.1', '9.85', '-33.62', '-0.82', '0', '1026', null); +INSERT INTO `server_spawn_locations` VALUES ('528', '1001652', 'rostnsthal', '193', '', '0', '-7.73', '9.967', '-27.44', '1.6', '0', '1041', null); +INSERT INTO `server_spawn_locations` VALUES ('529', '1090025', 'exit_door', '193', '', '0', '0', '10', '-18', '0', '0', '0', null); INSERT INTO `server_spawn_locations` VALUES ('530', '2205403', '', '193', '', '0', '-3.02', '17.35', '14.24', '-2.81', '0', '0', null); INSERT INTO `server_spawn_locations` VALUES ('531', '2290001', '', '193', '', '0', '-8', '16.35', '6', '0.5', '0', '0', null); INSERT INTO `server_spawn_locations` VALUES ('532', '2290002', '', '193', '', '0', '0', '16.35', '22', '3', '0', '0', null); @@ -658,3 +658,5 @@ INSERT INTO `server_spawn_locations` VALUES ('624', '5900001', 'centaurs_eye', ' INSERT INTO `server_spawn_locations` VALUES ('625', '5900001', 'guild_lnc', '206', '', '0', '172', '28', '-1576', '0', '0', '0', null); INSERT INTO `server_spawn_locations` VALUES ('626', '5900001', 'guild_arc', '206', '', '0', '227', '12', '-1264', '0', '0', '0', null); INSERT INTO `server_spawn_locations` VALUES ('627', '5900001', 'guild_cnj', '206', '', '0', '-325', '8', '-1669', '0', '0', '0', null); +INSERT INTO `server_spawn_locations` VALUES ('628', '5900004', 'door1', '184', '', '0', '-14', '196', '112', '0', '0', '0', null); +INSERT INTO `server_spawn_locations` VALUES ('629', '5900004', 'door2', '184', '\r\n', '0', '12', '196', '184', '0', '0', '0', null); diff --git a/sql/server_zones_spawnlocations.sql b/sql/server_zones_spawnlocations.sql index 72e4fad9..f3299cbb 100644 --- a/sql/server_zones_spawnlocations.sql +++ b/sql/server_zones_spawnlocations.sql @@ -4,7 +4,7 @@ Source Host: localhost Source Database: ffxiv_server Target Host: localhost Target Database: ffxiv_server -Date: 6/12/2016 9:25:16 PM +Date: 6/21/2016 10:49:49 PM */ SET FOREIGN_KEY_CHECKS=0; @@ -31,7 +31,7 @@ INSERT INTO `server_zones_spawnlocations` VALUES ('2', '133', null, '15', '-444. INSERT INTO `server_zones_spawnlocations` VALUES ('3', '175', null, '15', '-110.157', '202', '171.345', '0'); INSERT INTO `server_zones_spawnlocations` VALUES ('4', '193', null, '15', '0.016', '10.35', '-36.91', '0.025'); INSERT INTO `server_zones_spawnlocations` VALUES ('5', '166', null, '15', '356.09', '3.74', '-701.62', '-1.4'); -INSERT INTO `server_zones_spawnlocations` VALUES ('6', '175', 'PrivateAreaMasterPast', '15', '12.63', '196.05', '131.01', '-1.34'); +INSERT INTO `server_zones_spawnlocations` VALUES ('6', '184', 'PrivateAreaMasterPast', '15', '12.63', '196.05', '131.01', '-1.34'); INSERT INTO `server_zones_spawnlocations` VALUES ('7', '128', null, '15', '-8.48', '45.36', '139.5', '2.02'); INSERT INTO `server_zones_spawnlocations` VALUES ('8', '230', 'PrivateAreaMasterPast', '15', '-838.1', '6', '231.94', '1.1'); INSERT INTO `server_zones_spawnlocations` VALUES ('9', '193', null, '16', '-5', '16.35', '6', '0.5'); From 110cfbccc2875a1a4ec592fc8792a8b5a619a0f0 Mon Sep 17 00:00:00 2001 From: Filip Maj Date: Tue, 21 Jun 2016 23:00:39 -0400 Subject: [PATCH 15/15] Fixed errors in the spawn location tables. --- sql/server_spawn_locations.sql | 4 ++-- sql/server_zones_spawnlocations.sql | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sql/server_spawn_locations.sql b/sql/server_spawn_locations.sql index e6fd020b..4569c4c2 100644 --- a/sql/server_spawn_locations.sql +++ b/sql/server_spawn_locations.sql @@ -4,7 +4,7 @@ Source Host: localhost Source Database: ffxiv_server Target Host: localhost Target Database: ffxiv_server -Date: 6/21/2016 10:49:44 PM +Date: 6/21/2016 11:00:17 PM */ SET FOREIGN_KEY_CHECKS=0; @@ -659,4 +659,4 @@ INSERT INTO `server_spawn_locations` VALUES ('625', '5900001', 'guild_lnc', '206 INSERT INTO `server_spawn_locations` VALUES ('626', '5900001', 'guild_arc', '206', '', '0', '227', '12', '-1264', '0', '0', '0', null); INSERT INTO `server_spawn_locations` VALUES ('627', '5900001', 'guild_cnj', '206', '', '0', '-325', '8', '-1669', '0', '0', '0', null); INSERT INTO `server_spawn_locations` VALUES ('628', '5900004', 'door1', '184', '', '0', '-14', '196', '112', '0', '0', '0', null); -INSERT INTO `server_spawn_locations` VALUES ('629', '5900004', 'door2', '184', '\r\n', '0', '12', '196', '184', '0', '0', '0', null); +INSERT INTO `server_spawn_locations` VALUES ('629', '5900004', 'door2', '184', '', '0', '12', '196', '184', '0', '0', '0', null); diff --git a/sql/server_zones_spawnlocations.sql b/sql/server_zones_spawnlocations.sql index f3299cbb..75d86a18 100644 --- a/sql/server_zones_spawnlocations.sql +++ b/sql/server_zones_spawnlocations.sql @@ -4,7 +4,7 @@ Source Host: localhost Source Database: ffxiv_server Target Host: localhost Target Database: ffxiv_server -Date: 6/21/2016 10:49:49 PM +Date: 6/21/2016 11:00:04 PM */ SET FOREIGN_KEY_CHECKS=0; @@ -31,7 +31,7 @@ INSERT INTO `server_zones_spawnlocations` VALUES ('2', '133', null, '15', '-444. INSERT INTO `server_zones_spawnlocations` VALUES ('3', '175', null, '15', '-110.157', '202', '171.345', '0'); INSERT INTO `server_zones_spawnlocations` VALUES ('4', '193', null, '15', '0.016', '10.35', '-36.91', '0.025'); INSERT INTO `server_zones_spawnlocations` VALUES ('5', '166', null, '15', '356.09', '3.74', '-701.62', '-1.4'); -INSERT INTO `server_zones_spawnlocations` VALUES ('6', '184', 'PrivateAreaMasterPast', '15', '12.63', '196.05', '131.01', '-1.34'); +INSERT INTO `server_zones_spawnlocations` VALUES ('6', '184', null, '15', '12.63', '196.05', '131.01', '-1.34'); INSERT INTO `server_zones_spawnlocations` VALUES ('7', '128', null, '15', '-8.48', '45.36', '139.5', '2.02'); INSERT INTO `server_zones_spawnlocations` VALUES ('8', '230', 'PrivateAreaMasterPast', '15', '-838.1', '6', '231.94', '1.1'); INSERT INTO `server_zones_spawnlocations` VALUES ('9', '193', null, '16', '-5', '16.35', '6', '0.5');