From 546908acdec70ddfe2e4d8e50165e24a0a3aec57 Mon Sep 17 00:00:00 2001 From: Filip Maj Date: Sat, 26 Aug 2017 10:23:13 -0400 Subject: [PATCH] Some fixes and missing scripts. --- .../actors/chara/player/Player.cs | 8 ++++---- FFXIVClassic Map Server/lua/LuaEngine.cs | 2 +- .../PopulaceStandard/disreputable_midlander.lua | 8 ++++++++ .../PopulaceStandard/full-lipped_fille.lua | 8 ++++++++ .../PopulaceStandard/high-spirited_fellow.lua | 8 ++++++++ .../PopulaceStandard/keen-eyed_merchant.lua | 8 ++++++++ .../PopulaceStandard/large-lunged_laborer.lua | 8 ++++++++ .../PopulaceStandard/long-legged_lady.lua | 8 ++++++++ .../PopulaceStandard/mumpish_miqote.lua | 8 ++++++++ .../PopulaceStandard/rururaji.lua | 8 ++++++++ .../PopulaceStandard/tooth-grinding_traveler.lua | 8 ++++++++ .../PopulaceStandard/yayatoki.lua | 13 +++++++++++++ 12 files changed, 90 insertions(+), 5 deletions(-) create mode 100644 data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/disreputable_midlander.lua create mode 100644 data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/full-lipped_fille.lua create mode 100644 data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/high-spirited_fellow.lua create mode 100644 data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/keen-eyed_merchant.lua create mode 100644 data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/large-lunged_laborer.lua create mode 100644 data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/long-legged_lady.lua create mode 100644 data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/mumpish_miqote.lua create mode 100644 data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/rururaji.lua create mode 100644 data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/tooth-grinding_traveler.lua create mode 100644 data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/yayatoki.lua diff --git a/FFXIVClassic Map Server/actors/chara/player/Player.cs b/FFXIVClassic Map Server/actors/chara/player/Player.cs index 7801edac..c940fbe6 100644 --- a/FFXIVClassic Map Server/actors/chara/player/Player.cs +++ b/FFXIVClassic Map Server/actors/chara/player/Player.cs @@ -613,10 +613,10 @@ namespace FFXIVClassic_Map_Server.Actors { try { - // BasePacket packet = new BasePacket(path); - - //packet.ReplaceActorID(actorId); - //QueuePacket(packet); + BasePacket packet = new BasePacket(path); + packet.ReplaceActorID(actorId); + foreach (SubPacket p in packet.GetSubpackets()) + playerSession.QueuePacket(p); } catch (Exception e) { diff --git a/FFXIVClassic Map Server/lua/LuaEngine.cs b/FFXIVClassic Map Server/lua/LuaEngine.cs index fb382518..6108d7e8 100644 --- a/FFXIVClassic Map Server/lua/LuaEngine.cs +++ b/FFXIVClassic Map Server/lua/LuaEngine.cs @@ -427,7 +427,7 @@ namespace FFXIVClassic_Map_Server.lua public static void RunGMCommand(Player player, String cmd, string[] param, bool help = false) { bool playerNull = player == null; - if (playerNull && param.Length >= 2) + if (playerNull && param.Length >= 3) player = Server.GetWorldManager().GetPCInWorld(param[1] + " " + param[2]); // load from scripts/commands/gm/ directory diff --git a/data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/disreputable_midlander.lua b/data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/disreputable_midlander.lua new file mode 100644 index 00000000..3c895bb5 --- /dev/null +++ b/data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/disreputable_midlander.lua @@ -0,0 +1,8 @@ +require ("global") +require ("quests/man/man0u0") + +function onEventStarted(player, npc, triggerName) + man0u0Quest = GetStaticActor("Man0u0"); + callClientFunction(player, "delegateEvent", player, man0u0Quest, "processEvent020_4"); + player:EndEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/full-lipped_fille.lua b/data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/full-lipped_fille.lua new file mode 100644 index 00000000..7858c31a --- /dev/null +++ b/data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/full-lipped_fille.lua @@ -0,0 +1,8 @@ +require ("global") +require ("quests/man/man0u0") + +function onEventStarted(player, npc, triggerName) + man0u0Quest = GetStaticActor("Man0u0"); + callClientFunction(player, "delegateEvent", player, man0u0Quest, "processEtc002"); + player:EndEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/high-spirited_fellow.lua b/data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/high-spirited_fellow.lua new file mode 100644 index 00000000..a6182b5f --- /dev/null +++ b/data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/high-spirited_fellow.lua @@ -0,0 +1,8 @@ +require ("global") +require ("quests/man/man0u0") + +function onEventStarted(player, npc, triggerName) + man0u0Quest = GetStaticActor("Man0u0"); + callClientFunction(player, "delegateEvent", player, man0u0Quest, "processEvent020_3"); + player:EndEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/keen-eyed_merchant.lua b/data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/keen-eyed_merchant.lua new file mode 100644 index 00000000..c0fd4106 --- /dev/null +++ b/data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/keen-eyed_merchant.lua @@ -0,0 +1,8 @@ +require ("global") +require ("quests/man/man0u0") + +function onEventStarted(player, npc, triggerName) + man0u0Quest = GetStaticActor("Man0u0"); + callClientFunction(player, "delegateEvent", player, man0u0Quest, "processEvent020_2"); + player:EndEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/large-lunged_laborer.lua b/data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/large-lunged_laborer.lua new file mode 100644 index 00000000..8a6c0029 --- /dev/null +++ b/data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/large-lunged_laborer.lua @@ -0,0 +1,8 @@ +require ("global") +require ("quests/man/man0u0") + +function onEventStarted(player, npc, triggerName) + man0u0Quest = GetStaticActor("Man0u0"); + callClientFunction(player, "delegateEvent", player, man0u0Quest, "processEtc003"); + player:EndEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/long-legged_lady.lua b/data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/long-legged_lady.lua new file mode 100644 index 00000000..9335baad --- /dev/null +++ b/data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/long-legged_lady.lua @@ -0,0 +1,8 @@ +require ("global") +require ("quests/man/man0u0") + +function onEventStarted(player, npc, triggerName) + man0u0Quest = GetStaticActor("Man0u0"); + callClientFunction(player, "delegateEvent", player, man0u0Quest, "processEvent000_14"); + player:EndEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/mumpish_miqote.lua b/data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/mumpish_miqote.lua new file mode 100644 index 00000000..b4512aaa --- /dev/null +++ b/data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/mumpish_miqote.lua @@ -0,0 +1,8 @@ +require ("global") +require ("quests/man/man0u0") + +function onEventStarted(player, npc, triggerName) + man0u0Quest = GetStaticActor("Man0u0"); + callClientFunction(player, "delegateEvent", player, man0u0Quest, "processEvent020_6"); + player:EndEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/rururaji.lua b/data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/rururaji.lua new file mode 100644 index 00000000..397e1461 --- /dev/null +++ b/data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/rururaji.lua @@ -0,0 +1,8 @@ +require ("global") +require ("quests/man/man0u0") + +function onEventStarted(player, npc, triggerName) + man0u0Quest = GetStaticActor("Man0u0"); + callClientFunction(player, "delegateEvent", player, man0u0Quest, "processEvent020_7"); + player:EndEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/tooth-grinding_traveler.lua b/data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/tooth-grinding_traveler.lua new file mode 100644 index 00000000..18a3d88f --- /dev/null +++ b/data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/tooth-grinding_traveler.lua @@ -0,0 +1,8 @@ +require ("global") +require ("quests/man/man0u0") + +function onEventStarted(player, npc, triggerName) + man0u0Quest = GetStaticActor("Man0u0"); + callClientFunction(player, "delegateEvent", player, man0u0Quest, "processEtc001"); + player:EndEvent(); +end \ No newline at end of file diff --git a/data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/yayatoki.lua b/data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/yayatoki.lua new file mode 100644 index 00000000..1f2fc5a1 --- /dev/null +++ b/data/scripts/unique/wil0Town01/PrivateArea/PrivateAreaMasterPast_3/PopulaceStandard/yayatoki.lua @@ -0,0 +1,13 @@ +require ("global") +require ("quests/man/man0u0") + +function onSpawn(player, npc) + npc:SetQuestGraphic(player, 0x2); +end + +function onEventStarted(player, npc, triggerName) + man0u0Quest = GetStaticActor("Man0u0"); + callClientFunction(player, "delegateEvent", player, man0u0Quest, "processEvent020_8"); + npc:SetQuestGraphic(player, 0x0); + player:EndEvent(); +end \ No newline at end of file