diff --git a/data/scripts/base/chara/npc/monster/Jellyfish/JellyfishScenarioLimsaLv00.lua b/data/scripts/base/chara/npc/monster/Jellyfish/JellyfishScenarioLimsaLv00.lua index 525bb8fc..337dc187 100644 --- a/data/scripts/base/chara/npc/monster/Jellyfish/JellyfishScenarioLimsaLv00.lua +++ b/data/scripts/base/chara/npc/monster/Jellyfish/JellyfishScenarioLimsaLv00.lua @@ -1,5 +1,5 @@ require ("global") function init(npc) - return true, true, 10, 0, 1, true, false, false, false, false, false, false, false, 0; + return true, true, 10, 0, 1, false, false, false, false, false, false, false, false, 0; end \ No newline at end of file diff --git a/data/scripts/base/chara/npc/monster/Lemming/LemmingStandard.lua b/data/scripts/base/chara/npc/monster/Lemming/LemmingStandard.lua new file mode 100644 index 00000000..525bb8fc --- /dev/null +++ b/data/scripts/base/chara/npc/monster/Lemming/LemmingStandard.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/base/chara/npc/monster/Mole/MoleMoleStandard.lua b/data/scripts/base/chara/npc/monster/Mole/MoleMoleStandard.lua new file mode 100644 index 00000000..525bb8fc --- /dev/null +++ b/data/scripts/base/chara/npc/monster/Mole/MoleMoleStandard.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/commands/gm/spawn.lua b/data/scripts/commands/gm/spawn.lua new file mode 100644 index 00000000..1ff4d900 --- /dev/null +++ b/data/scripts/commands/gm/spawn.lua @@ -0,0 +1,34 @@ +require("global"); + +properties = { + permissions = 0, + parameters = "d", + description = "Spawns a actor", +} + +function onTrigger(player, argc, actorClassId) + + if (actorClassId == nil) then + player:SendMessage(0x20, "", "No actor class id provided."); + return; + end + + local pos = player:GetPos(); + local x = pos[0]; + local y = pos[1]; + local z = pos[2]; + local rot = pos[3]; + local zone = pos[4]; + + actorClassId = tonumber(actorClassId); + + if (actorClassId ~= nil) then + zone = player:GetZone(); + actor = zone:SpawnActor(actorClassId, "test", pos[0], pos[1], pos[2], pos[3]); + end + + if (actor == nil) then + player:SendMessage(0x20, "", "This actor class id cannot be spawned."); + end + +end; \ No newline at end of file diff --git a/data/scripts/directors/Quest/QuestDirectorMan0l001.lua b/data/scripts/directors/Quest/QuestDirectorMan0l001.lua index e5f10112..8a1748f9 100644 --- a/data/scripts/directors/Quest/QuestDirectorMan0l001.lua +++ b/data/scripts/directors/Quest/QuestDirectorMan0l001.lua @@ -11,6 +11,13 @@ end function onEventStarted(player, actor, triggerName) + contentGroup = GetWorldManager():CreateContentGroup(actor); + contentGroup:AddMember(director); + contentGroup:AddMember(GetWorldManager():GetActorInWorldByUniqueId("opening_jelly")); + contentGroup:AddMember(GetWorldManager():GetActorInWorldByUniqueId("opening_yshtola")); + contentGroup:AddMember(GetWorldManager():GetActorInWorldByUniqueId("opening_stahlmann")); + contentGroup:AddMember(player); + man0l0Quest = player:GetQuest("Man0l0"); startTutorialMode(player); callClientFunction(player, "delegateEvent", player, man0l0Quest, "processTtrBtl001", nil, nil, nil); diff --git a/data/scripts/global.lua b/data/scripts/global.lua index 57d415d3..2fe572bb 100644 --- a/data/scripts/global.lua +++ b/data/scripts/global.lua @@ -51,6 +51,12 @@ INVENTORY_KEYITEMS = 0x0064; --Max 0x500 INVENTORY_EQUIPMENT = 0x00FE; --Max 0x23 INVENTORY_EQUIPMENT_OTHERPLAYER = 0x00F9; --Max 0x23 +-- NPC LS +NPCLS_GONE = 0; +NPCLS_INACTIVE = 1; +NPCLS_ACTIVE = 2; +NPCLS_ALERT = 3; + --UTILS function kickEventContinue(player, actor, trigger, ...) diff --git a/data/scripts/unique/fst0Town01/PrivateArea/PrivateAreaMasterPast_2/PopulaceStandard/vkorolon.lua b/data/scripts/unique/fst0Town01/PrivateArea/PrivateAreaMasterPast_2/PopulaceStandard/vkorolon.lua index 079aae45..7d4b1bf9 100644 --- a/data/scripts/unique/fst0Town01/PrivateArea/PrivateAreaMasterPast_2/PopulaceStandard/vkorolon.lua +++ b/data/scripts/unique/fst0Town01/PrivateArea/PrivateAreaMasterPast_2/PopulaceStandard/vkorolon.lua @@ -1,15 +1,8 @@ require ("global") function onEventStarted(player, npc, triggerName) - man0g1Quest = player:GetQuest("Man0g0"); - - if (man0g1Quest ~= nil) then - if (triggerName == "talkDefault") then - callClientFunction(player, "delegateEvent", player, man0g1Quest, "processEvent020_2"); - - end - end - + defaultFst = GetStaticActor("DftFst"); + callClientFunction(player, "delegateEvent", player, defaultFst, "defaultTalkWithVkorolon_001"); player:EndEvent(); end \ No newline at end of file