diff --git a/data/scripts/base/chara/npc/object/BookShelf.lua b/data/scripts/base/chara/npc/object/BookShelf.lua new file mode 100644 index 00000000..5d43890a --- /dev/null +++ b/data/scripts/base/chara/npc/object/BookShelf.lua @@ -0,0 +1,11 @@ +function init(npc) + return false, false, 0, 0; +end + +function onEventStarted(player, npc, triggerName) + player:RunEventFunction("bookTalk"); +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/MateriaBook.lua b/data/scripts/base/chara/npc/object/MateriaBook.lua new file mode 100644 index 00000000..6bf00e7a --- /dev/null +++ b/data/scripts/base/chara/npc/object/MateriaBook.lua @@ -0,0 +1,11 @@ +function init(npc) + return false, false, 0, 0; +end + +function onEventStarted(player, npc, triggerName) + player:RunEventFunction("materiabookTalk"); +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/TaskBoard.lua b/data/scripts/base/chara/npc/object/TaskBoard.lua index 05ecaa3b..c31277ee 100644 --- a/data/scripts/base/chara/npc/object/TaskBoard.lua +++ b/data/scripts/base/chara/npc/object/TaskBoard.lua @@ -11,8 +11,7 @@ function onEventStarted(player, npc, triggerName) player:RunEventFunction("delegateEvent", player, questNOC, "pETaskBoardAskUldah", nil, nil, nil); else player:RunEventFunction("delegateEvent", player, questNOC, "pETaskBoardAskGridania", nil, nil, nil); - end - + end end function onEventUpdate(player, npc, step, menuOptionSelected) diff --git a/data/scripts/player.lua b/data/scripts/player.lua index 84a42bfa..b5d6167d 100644 --- a/data/scripts/player.lua +++ b/data/scripts/player.lua @@ -48,7 +48,7 @@ function onBeginLogin(player) end function onLogin(player) - player:SendMessage(0x1D,"",">Callback \"onLogin\" for player script running."); + player:SendMessage(0x1D,"",">Callback \"onLogin\" for player script:Running."); if (player:GetPlayTime(false) == 0) then player:SendMessage(0x1D,"",">PlayTime == 0, new player!"); diff --git a/data/scripts/unique/fst0Battle03/openingStop_fstBtl03_03@0A600.lua b/data/scripts/unique/fst0Battle03/openingStop_fstBtl03_03@0A600.lua index 4592dee9..754cfaa6 100644 --- a/data/scripts/unique/fst0Battle03/openingStop_fstBtl03_03@0A600.lua +++ b/data/scripts/unique/fst0Battle03/openingStop_fstBtl03_03@0A600.lua @@ -1,5 +1,5 @@ function init(npc) - return "/Chara/Npc/Object/OpeningStoperF0B1", false, false, false, false, false, npc.GetActorClassId(), false, false, 0, 1, "TEST"; + return "/Chara/Npc/Object/OpeningStoperF0B1", false, false, false, false, false, npc:GetActorClassId(), false, false, 0, 1, "TEST"; end function onEventStarted(player, npc, triggerName) diff --git a/data/scripts/unique/fst0Battle03/pplStd_fst0Btl03_01@0A600.lua b/data/scripts/unique/fst0Battle03/pplStd_fst0Btl03_01@0A600.lua index 474e97bd..b1d2fe67 100644 --- a/data/scripts/unique/fst0Battle03/pplStd_fst0Btl03_01@0A600.lua +++ b/data/scripts/unique/fst0Battle03/pplStd_fst0Btl03_01@0A600.lua @@ -1,7 +1,7 @@ require("/quests/man/man0g0") function init(npc) - return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc.GetActorClassId(), false, false, 0, 1, "TEST"; + return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc:GetActorClassId(), false, false, 0, 1, "TEST"; end function onSpawn(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 0d9768cd..2a811636 100644 --- a/data/scripts/unique/fst0Battle03/pplStd_fst0Btl03_02@0A600.lua +++ b/data/scripts/unique/fst0Battle03/pplStd_fst0Btl03_02@0A600.lua @@ -1,7 +1,7 @@ require("/quests/man/man0g0") function init(npc) - return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc.GetActorClassId(), false, false, 0, 1, "TEST"; + return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc:GetActorClassId(), false, false, 0, 1, "TEST"; end function onEventStarted(player, npc, triggerName) diff --git a/data/scripts/unique/ocn0Battle02/PopulaceStandard/fighterAlly_ocn0Btl02_02@0C196.lua b/data/scripts/unique/ocn0Battle02/PopulaceStandard/fighterAlly_ocn0Btl02_02@0C196.lua index 37614f6d..c1e8d1d6 100644 --- a/data/scripts/unique/ocn0Battle02/PopulaceStandard/fighterAlly_ocn0Btl02_02@0C196.lua +++ b/data/scripts/unique/ocn0Battle02/PopulaceStandard/fighterAlly_ocn0Btl02_02@0C196.lua @@ -1,3 +1,3 @@ function init(npc) - return "/Chara/Npc/Monster/Fighter/FighterAllyOpeningHealer", false, false, false, false, false, npc.GetActorClassId(), false, false, 10, 1, 4, false, false, false, false, false, false, false, false, 2; + return "/Chara/Npc/Monster/Fighter/FighterAllyOpeningHealer", false, false, false, false, false, npc:GetActorClassId(), false, false, 10, 1, 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/fighterAlly_ocn0Btl02_03@0C196.lua b/data/scripts/unique/ocn0Battle02/PopulaceStandard/fighterAlly_ocn0Btl02_03@0C196.lua index 34b9ab17..886bdaca 100644 --- a/data/scripts/unique/ocn0Battle02/PopulaceStandard/fighterAlly_ocn0Btl02_03@0C196.lua +++ b/data/scripts/unique/ocn0Battle02/PopulaceStandard/fighterAlly_ocn0Btl02_03@0C196.lua @@ -1,3 +1,3 @@ function init(npc) - return "/Chara/Npc/Monster/Fighter/FighterAllyOpeningAttacker", false, false, false, false, false, npc.GetActorClassId(), false, false, 10, 1, 4, false, false, false, false, false, false, false, false, 2; + return "/Chara/Npc/Monster/Fighter/FighterAllyOpeningAttacker", false, false, false, false, false, npc:GetActorClassId(), false, false, 10, 1, 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/jellyfishSc_ocn0Btl02_04@0C196.lua b/data/scripts/unique/ocn0Battle02/PopulaceStandard/jellyfishSc_ocn0Btl02_04@0C196.lua index 418262de..2bcc1e57 100644 --- a/data/scripts/unique/ocn0Battle02/PopulaceStandard/jellyfishSc_ocn0Btl02_04@0C196.lua +++ b/data/scripts/unique/ocn0Battle02/PopulaceStandard/jellyfishSc_ocn0Btl02_04@0C196.lua @@ -1,3 +1,3 @@ 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; + 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_01@0C100.lua b/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_01@0C100.lua index 1de68eaf..75ddffb1 100644 --- a/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_01@0C100.lua +++ b/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_01@0C100.lua @@ -1,5 +1,5 @@ function init(npc) - return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc.GetActorClassId(), false, false, 0, 1, "TEST"; + return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc:GetActorClassId(), false, false, 0, 1, "TEST"; end function onEventStarted(player, npc, triggerName) diff --git a/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_02@0C100.lua b/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_02@0C100.lua index 395783d1..1c23175a 100644 --- a/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_02@0C100.lua +++ b/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_02@0C100.lua @@ -1,5 +1,5 @@ function init(npc) - return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc.GetActorClassId(), false, false, 0, 1, "TEST"; + return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc:GetActorClassId(), false, false, 0, 1, "TEST"; end function onEventStarted(player, npc, triggerName) diff --git a/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_03@0C100.lua b/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_03@0C100.lua index e181651d..e99678f8 100644 --- a/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_03@0C100.lua +++ b/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_03@0C100.lua @@ -1,5 +1,5 @@ function init(npc) - return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc.GetActorClassId(), false, false, 0, 1, "TEST"; + return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc:GetActorClassId(), false, false, 0, 1, "TEST"; end function onEventStarted(player, npc, triggerName) diff --git a/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_04@0C100.lua b/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_04@0C100.lua index cd3546d2..8637a198 100644 --- a/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_04@0C100.lua +++ b/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_04@0C100.lua @@ -1,5 +1,5 @@ function init(npc) - return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc.GetActorClassId(), false, false, 0, 1, "TEST"; + return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc:GetActorClassId(), false, false, 0, 1, "TEST"; end function onEventStarted(player, npc, triggerName) diff --git a/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_05@0C100.lua b/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_05@0C100.lua index d5b8d6b7..c6ab9164 100644 --- a/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_05@0C100.lua +++ b/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_05@0C100.lua @@ -1,7 +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"; + return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc:GetActorClassId(), false, false, 0, 1, "TEST"; end function onSpawn(player, npc) diff --git a/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_06@0C100.lua b/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_06@0C100.lua index b99aa89d..abc727a9 100644 --- a/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_06@0C100.lua +++ b/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_06@0C100.lua @@ -1,5 +1,5 @@ function init(npc) - return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc.GetActorClassId(), false, false, 0, 1, "TEST"; + return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc:GetActorClassId(), false, false, 0, 1, "TEST"; end function onEventStarted(player, npc, triggerName) diff --git a/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_07@0C100.lua b/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_07@0C100.lua index b9e93f9f..89c3769d 100644 --- a/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_07@0C100.lua +++ b/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_07@0C100.lua @@ -1,5 +1,5 @@ function init(npc) - return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc.GetActorClassId(), false, false, 0, 1, "TEST"; + return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc:GetActorClassId(), false, false, 0, 1, "TEST"; end function onEventStarted(player, npc, triggerName) diff --git a/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_08@0C100.lua b/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_08@0C100.lua index 81946f31..c327ba9c 100644 --- a/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_08@0C100.lua +++ b/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_08@0C100.lua @@ -1,5 +1,5 @@ function init(npc) - return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc.GetActorClassId(), false, false, 0, 1, "TEST"; + return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc:GetActorClassId(), false, false, 0, 1, "TEST"; end function onEventStarted(player, npc, triggerName) diff --git a/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_09@0C100.lua b/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_09@0C100.lua index e0284433..6d8e0afb 100644 --- a/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_09@0C100.lua +++ b/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_09@0C100.lua @@ -1,5 +1,5 @@ function init(npc) - return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc.GetActorClassId(), false, false, 0, 1, "TEST"; + return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc:GetActorClassId(), false, false, 0, 1, "TEST"; end function onEventStarted(player, npc, triggerName) diff --git a/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_0a@0C100.lua b/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_0a@0C100.lua index cccd1046..566fad0b 100644 --- a/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_0a@0C100.lua +++ b/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_0a@0C100.lua @@ -1,7 +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"; + return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc:GetActorClassId(), false, false, 0, 1, "TEST"; end function onSpawn(player, npc) diff --git a/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_0b@0C100.lua b/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_0b@0C100.lua index 189ac039..fee18e25 100644 --- a/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_0b@0C100.lua +++ b/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_0b@0C100.lua @@ -1,5 +1,5 @@ function init(npc) - return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc.GetActorClassId(), false, false, 0, 1, "TEST"; + return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc:GetActorClassId(), false, false, 0, 1, "TEST"; end function onEventStarted(player, npc, triggerName) diff --git a/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_0c@0C100.lua b/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_0c@0C100.lua index d5f80f2f..335702e5 100644 --- a/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_0c@0C100.lua +++ b/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_0c@0C100.lua @@ -1,5 +1,5 @@ function init(npc) - return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc.GetActorClassId(), false, false, 0, 1, "TEST"; + return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc:GetActorClassId(), false, false, 0, 1, "TEST"; end function onEventStarted(player, npc, triggerName) diff --git a/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_0d@0C100.lua b/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_0d@0C100.lua index 1e88f684..006c9d4b 100644 --- a/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_0d@0C100.lua +++ b/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_0d@0C100.lua @@ -1,5 +1,5 @@ function init(npc) - return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc.GetActorClassId(), false, false, 0, 1, "TEST"; + return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc:GetActorClassId(), false, false, 0, 1, "TEST"; end function onEventStarted(player, npc, triggerName) diff --git a/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_0e@0C100.lua b/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_0e@0C100.lua index bf4bd8cb..e02c767c 100644 --- a/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_0e@0C100.lua +++ b/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_0e@0C100.lua @@ -1,5 +1,5 @@ function init(npc) - return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc.GetActorClassId(), false, false, 0, 1, "TEST"; + return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc:GetActorClassId(), false, false, 0, 1, "TEST"; end function onEventStarted(player, npc, triggerName) diff --git a/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_0f@0C100.lua b/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_0f@0C100.lua index 9e5e6466..7f4ac125 100644 --- a/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_0f@0C100.lua +++ b/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_0f@0C100.lua @@ -1,7 +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"; + return "/Chara/Npc/Populace/PopulaceTutorial", false, false, false, false, false, npc:GetActorClassId(), false, false, 0, 1, "TEST"; end function onSpawn(player, npc) diff --git a/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_11@0C100.lua b/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_11@0C100.lua index 21832393..74d2ff08 100644 --- a/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_11@0C100.lua +++ b/data/scripts/unique/ocn0Battle02/PopulaceStandard/pplStd_11@0C100.lua @@ -1,7 +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"; + return "/Chara/Npc/Populace/PopulaceTutorial", false, false, false, false, false, npc:GetActorClassId(), false, false, 0, 1, "TEST"; end function onSpawn(player, npc) diff --git a/data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_01@0B800.lua b/data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_01@0B800.lua index 27a47505..0d7ab846 100644 --- a/data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_01@0B800.lua +++ b/data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_01@0B800.lua @@ -1,7 +1,7 @@ require("/quests/man/man0u0") function init(npc) - return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc.GetActorClassId(), false, false, 0, 1, "TEST"; + return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc:GetActorClassId(), false, false, 0, 1, "TEST"; end function onEventStarted(player, npc, triggerName) diff --git a/data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_02@0B800.lua b/data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_02@0B800.lua index 8f5c6af1..555a86f7 100644 --- a/data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_02@0B800.lua +++ b/data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_02@0B800.lua @@ -1,7 +1,7 @@ require("/quests/man/man0u0") function init(npc) - return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc.GetActorClassId(), false, false, 0, 1, "TEST"; + return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc:GetActorClassId(), false, false, 0, 1, "TEST"; end function onSpawn(player, npc) diff --git a/data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_03@0B800.lua b/data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_03@0B800.lua index ab0b827b..3898a86e 100644 --- a/data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_03@0B800.lua +++ b/data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_03@0B800.lua @@ -1,7 +1,7 @@ require("/quests/man/man0u0") function init(npc) - return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc.GetActorClassId(), false, false, 0, 1, "TEST"; + return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc:GetActorClassId(), false, false, 0, 1, "TEST"; end function onEventStarted(player, npc, triggerName) diff --git a/data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_04@0B800.lua b/data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_04@0B800.lua index c2cc7507..4103e50b 100644 --- a/data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_04@0B800.lua +++ b/data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_04@0B800.lua @@ -1,7 +1,7 @@ require("/quests/man/man0u0") function init(npc) - return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc.GetActorClassId(), false, false, 0, 1, "TEST"; + return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc:GetActorClassId(), false, false, 0, 1, "TEST"; end function onEventStarted(player, npc, triggerName) diff --git a/data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_05@0B800.lua b/data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_05@0B800.lua index 514f37a2..35f98503 100644 --- a/data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_05@0B800.lua +++ b/data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_05@0B800.lua @@ -1,7 +1,7 @@ require("/quests/man/man0u0") function init(npc) - return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc.GetActorClassId(), false, false, 0, 1, "TEST"; + return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc:GetActorClassId(), false, false, 0, 1, "TEST"; end function onEventStarted(player, npc, triggerName) diff --git a/data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_06@0B800.lua b/data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_06@0B800.lua index 95b6cd33..6e1c6a3b 100644 --- a/data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_06@0B800.lua +++ b/data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_06@0B800.lua @@ -1,7 +1,7 @@ require("/quests/man/man0u0") function init(npc) - return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc.GetActorClassId(), false, false, 0, 1, "TEST"; + return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc:GetActorClassId(), false, false, 0, 1, "TEST"; end function onSpawn(player, npc) diff --git a/data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_07@0B800.lua b/data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_07@0B800.lua index 5b018c3a..3c737266 100644 --- a/data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_07@0B800.lua +++ b/data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_07@0B800.lua @@ -1,7 +1,7 @@ require("/quests/man/man0u0") function init(npc) - return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc.GetActorClassId(), false, false, 0, 1, "TEST"; + return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc:GetActorClassId(), false, false, 0, 1, "TEST"; end function onEventStarted(player, npc, triggerName) diff --git a/data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_08@0B800.lua b/data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_08@0B800.lua index 07e03729..a6d41ada 100644 --- a/data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_08@0B800.lua +++ b/data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_08@0B800.lua @@ -1,7 +1,7 @@ require("/quests/man/man0u0") function init(npc) - return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc.GetActorClassId(), false, false, 0, 1, "TEST"; + return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc:GetActorClassId(), false, false, 0, 1, "TEST"; end function onEventStarted(player, npc, triggerName) diff --git a/data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_09@0B800.lua b/data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_09@0B800.lua index b08689db..0a668de3 100644 --- a/data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_09@0B800.lua +++ b/data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_09@0B800.lua @@ -1,7 +1,7 @@ require("/quests/man/man0u0") function init(npc) - return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc.GetActorClassId(), false, false, 0, 1, "TEST"; + return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc:GetActorClassId(), false, false, 0, 1, "TEST"; end function onEventStarted(player, npc, triggerName) diff --git a/data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_0a@0B800.lua b/data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_0a@0B800.lua index 938d1aeb..417fac0a 100644 --- a/data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_0a@0B800.lua +++ b/data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_0a@0B800.lua @@ -1,7 +1,7 @@ require("/quests/man/man0u0") function init(npc) - return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc.GetActorClassId(), false, false, 0, 1, "TEST"; + return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc:GetActorClassId(), false, false, 0, 1, "TEST"; end function onSpawn(player, npc) diff --git a/data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_0b@0B800.lua b/data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_0b@0B800.lua index b08689db..0a668de3 100644 --- a/data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_0b@0B800.lua +++ b/data/scripts/unique/wil0Battle01/pplStd_wil0Btl01_0b@0B800.lua @@ -1,7 +1,7 @@ require("/quests/man/man0u0") function init(npc) - return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc.GetActorClassId(), false, false, 0, 1, "TEST"; + return "/Chara/Npc/Populace/PopulaceStandard", false, false, false, false, false, npc:GetActorClassId(), false, false, 0, 1, "TEST"; end function onEventStarted(player, npc, triggerName) diff --git a/data/scripts/unique/wil0Town01/PopulaceStandard/baterich.lua b/data/scripts/unique/wil0Town01/PopulaceStandard/baterich.lua index 18109081..d8b32575 100644 --- a/data/scripts/unique/wil0Town01/PopulaceStandard/baterich.lua +++ b/data/scripts/unique/wil0Town01/PopulaceStandard/baterich.lua @@ -1,6 +1,6 @@ function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithBaterich_001", nil, nil, nil); + player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithBATERICH_100", nil, nil, nil); end diff --git a/data/scripts/unique/wil0Town01/PopulaceStandard/claroise.lua b/data/scripts/unique/wil0Town01/PopulaceStandard/claroise.lua index 044656e5..3d79e22b 100644 --- a/data/scripts/unique/wil0Town01/PopulaceStandard/claroise.lua +++ b/data/scripts/unique/wil0Town01/PopulaceStandard/claroise.lua @@ -1,6 +1,6 @@ function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithClaroise_001", nil, nil, nil); + player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithGuildleveClientU_002", nil, nil, nil); end 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 52560608..64fb739b 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,6 @@ function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithFlamelieutenantsombermeadow_001", nil, nil, nil); + player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithSomber_001", nil, nil, nil); end diff --git a/data/scripts/unique/wil0Town01/PopulaceStandard/gagaruna.lua b/data/scripts/unique/wil0Town01/PopulaceStandard/gagaruna.lua index 645930bf..16366901 100644 --- a/data/scripts/unique/wil0Town01/PopulaceStandard/gagaruna.lua +++ b/data/scripts/unique/wil0Town01/PopulaceStandard/gagaruna.lua @@ -1,6 +1,6 @@ function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithGagaruna_001", nil, nil, nil); + player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithGag:Runa_001", nil, nil, nil); end diff --git a/data/scripts/unique/wil0Town01/PopulaceStandard/gunnulf.lua b/data/scripts/unique/wil0Town01/PopulaceStandard/gunnulf.lua index 53a3f0c1..945fdb9b 100644 --- a/data/scripts/unique/wil0Town01/PopulaceStandard/gunnulf.lua +++ b/data/scripts/unique/wil0Town01/PopulaceStandard/gunnulf.lua @@ -1,6 +1,6 @@ function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithGunnulf_001", nil, nil, nil); + player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithMaginfred_001", nil, nil, nil); end diff --git a/data/scripts/unique/wil0Town01/PopulaceStandard/heibert.lua b/data/scripts/unique/wil0Town01/PopulaceStandard/heibert.lua index ed534d85..43101095 100644 --- a/data/scripts/unique/wil0Town01/PopulaceStandard/heibert.lua +++ b/data/scripts/unique/wil0Town01/PopulaceStandard/heibert.lua @@ -1,6 +1,6 @@ function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithHeibert_001", nil, nil, nil); + player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithOrisic_001", nil, nil, nil); end diff --git a/data/scripts/unique/wil0Town01/PopulaceStandard/ipaghlo.lua b/data/scripts/unique/wil0Town01/PopulaceStandard/ipaghlo.lua index 00aa4585..cc8995dd 100644 --- a/data/scripts/unique/wil0Town01/PopulaceStandard/ipaghlo.lua +++ b/data/scripts/unique/wil0Town01/PopulaceStandard/ipaghlo.lua @@ -1,6 +1,6 @@ function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithIpaghlo_001", nil, nil, nil); + player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithKlamahni_001", nil, nil, nil); end diff --git a/data/scripts/unique/wil0Town01/PopulaceStandard/kokobi.lua b/data/scripts/unique/wil0Town01/PopulaceStandard/kokobi.lua index 1e9d24a9..94a0ff1e 100644 --- a/data/scripts/unique/wil0Town01/PopulaceStandard/kokobi.lua +++ b/data/scripts/unique/wil0Town01/PopulaceStandard/kokobi.lua @@ -1,6 +1,6 @@ function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithKokobi_001", nil, nil, nil); + player:RunEventFunction("delegateEvent", player, defaultWil, "downTownTalk", nil, nil, nil); end diff --git a/data/scripts/unique/wil0Town01/PopulaceStandard/mammet.lua b/data/scripts/unique/wil0Town01/PopulaceStandard/mammet.lua index 5dd2e432..8bb041ee 100644 --- a/data/scripts/unique/wil0Town01/PopulaceStandard/mammet.lua +++ b/data/scripts/unique/wil0Town01/PopulaceStandard/mammet.lua @@ -1,6 +1,6 @@ function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithMammet_001", nil, nil, nil); + player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithDoll005_001", nil, nil, nil); end diff --git a/data/scripts/unique/wil0Town01/PopulaceStandard/roarich.lua b/data/scripts/unique/wil0Town01/PopulaceStandard/roarich.lua index e11cbf44..e6ab0dd8 100644 --- a/data/scripts/unique/wil0Town01/PopulaceStandard/roarich.lua +++ b/data/scripts/unique/wil0Town01/PopulaceStandard/roarich.lua @@ -1,6 +1,6 @@ function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithRoarich_001", nil, nil, nil); + player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithGuildleveClientU_001", nil, nil, nil); end diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/dariustel.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/dariustel.lua index 62daaa77..348f39ce 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/dariustel.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/dariustel.lua @@ -1,6 +1,7 @@ function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithDariustel_001", nil, nil, nil); + player:SendMessage(0x20, "", "This Actorhas no dialog. Actor Class Id: " .. tostring(npc:GetActorClassId())); + player:EndEvent(); end diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/fruhybolg.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/fruhybolg.lua index 285edabc..7d359f07 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/fruhybolg.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/fruhybolg.lua @@ -1,6 +1,6 @@ function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithFruhybolg_001", nil, nil, nil); + player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithFhruybolg_001", nil, nil, nil); end diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/guencen.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/guencen.lua index eb37c8f4..8c816886 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/guencen.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/guencen.lua @@ -1,6 +1,7 @@ function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithGuencen_001", nil, nil, nil); + player:SendMessage(0x20, "", "This Actorhas no dialog. Actor Class Id: " .. tostring(npc:GetActorClassId())); + player:EndEvent(); end diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/hcidjaa.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/hcidjaa.lua index dd73663a..618837c1 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/hcidjaa.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/hcidjaa.lua @@ -1,6 +1,6 @@ function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithHcidjaa_001", nil, nil, nil); + player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithHCidjaa_001", nil, nil, nil); end diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/mammet_alc.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/mammet_alc.lua new file mode 100644 index 00000000..c158c310 --- /dev/null +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/mammet_alc.lua @@ -0,0 +1,6 @@ + +function onEventStarted(player, npc) + defaultWil = GetStaticActor("DftWil"); + player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithDoll004_001", nil, nil, nil); +end + diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/mammet_gsm.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/mammet_gsm.lua new file mode 100644 index 00000000..db173809 --- /dev/null +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/mammet_gsm.lua @@ -0,0 +1,6 @@ + +function onEventStarted(player, npc) + defaultWil = GetStaticActor("DftWil"); + player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithDoll001_001", nil, nil, nil); +end + diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/mammet_gsm2.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/mammet_gsm2.lua new file mode 100644 index 00000000..d34d0c5f --- /dev/null +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/mammet_gsm2.lua @@ -0,0 +1,6 @@ + +function onEventStarted(player, npc) + defaultWil = GetStaticActor("DftWil"); + player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithDoll002_001", nil, nil, nil); +end + diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/mammet_wvr.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/mammet_wvr.lua new file mode 100644 index 00000000..bad853bb --- /dev/null +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/mammet_wvr.lua @@ -0,0 +1,6 @@ + +function onEventStarted(player, npc) + defaultWil = GetStaticActor("DftWil"); + player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithDoll003_001", nil, nil, nil); +end + diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/uwilsyng.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/uwilsyng.lua index 13715238..77688433 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/uwilsyng.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/uwilsyng.lua @@ -1,6 +1,6 @@ function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithUwilsyng_001", nil, nil, nil); + player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithGuildleveClientU_003", nil, nil, nil); end diff --git a/data/scripts/unique/wil0Town01a/PopulaceStandard/vavaki.lua b/data/scripts/unique/wil0Town01a/PopulaceStandard/vavaki.lua index 77b9457a..1dd62ed7 100644 --- a/data/scripts/unique/wil0Town01a/PopulaceStandard/vavaki.lua +++ b/data/scripts/unique/wil0Town01a/PopulaceStandard/vavaki.lua @@ -1,6 +1,6 @@ function onEventStarted(player, npc) defaultWil = GetStaticActor("DftWil"); - player:RunEventFunction("delegateEvent", player, defaultWil, "defaultTalkWithVavaki_001", nil, nil, nil); + player:RunEventFunction("delegateEvent", player, defaultWil, "tribeTalk", nil, nil, nil); end