From 926e9146e2cc39eb18c9d02d36db57a64b096f72 Mon Sep 17 00:00:00 2001 From: Filip Maj Date: Tue, 21 Jun 2016 20:07:02 -0400 Subject: [PATCH] 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