From 8b44d90114e453bc80815cc985489e3f9ca5f33b Mon Sep 17 00:00:00 2001 From: Filip Maj Date: Tue, 21 Jun 2016 15:48:16 -0400 Subject: [PATCH] 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