From 97c1fb06cfefdaf58fb8d15727fd6ed099634e5f Mon Sep 17 00:00:00 2001 From: Filip Maj Date: Sun, 19 Jun 2016 23:16:31 -0400 Subject: [PATCH] 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