zydronium/project-meteor-server
1
0
Fork 0
mirror of https://bitbucket.org/Ioncannon/project-meteor-server.git synced 2025-06-09 14:04:41 +02:00
Code Issues Projects Releases Packages Wiki Activity

Minor fixes

Browse source 
- InstanceRaid Guide : Added DefaultTalk handling for the npcs we have currently.  Included a couple commented-out client functions for two of the raids.
- EmoteSitCommand : Added eventType to the function so sitting on environment objects works again.
- Man0u0 : SourceTree added hunk-change garbage during a conflict resolving during the last merge. I just replaced it with the raw of that commit so it matches what it should have been.
- DftFst : Added the Gridania InstanceRaidGuide NPCs to the list for documentation sake, even though it'd never be called from that script with how things are currently set up.
This commit is contained in:
CuriousJorge 2022-03-04 23:12:28 -05:00
parent 02fe9e070d
commit 08557f41fb
4 changed files with 46 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

41
Data/scripts/base/chara/npc/populace/instanceraidguide/InstanceRaidGuide.lua
View file

@ -3,15 +3,54 @@
InstanceRaidGuide Script
Functions;
askEnterInstanceRaid(arg1) -- Opens a widget asking to enter the given Raid id.
--]]
require ("global")
function init(npc)
return false, false, 0, 0;
if ((npc == 1002090) or (npc == 1002091)) then
-- This won't work due to how init() works, but old scripts had it, keeping it here for now
return false, false, 0, 0, 491, 2;
else
return false, false, 0, 0;
end
end
function onEventStarted(player, npc, eventType, eventName)
npcId = npc:GetActorClassId()
if (npcId == 1002090) then -- Serpent Private Hodder (Stewart) : Gcl107
callClientFunction(player, "delegateEvent", player, GetStaticActor("DftFst"), "defaultTalkWithStewart_001"); -- "defaultTalkWithStewart_002" -- Post-Raid dialog?
--[[
choice = callClientFunction(player, "delegateEvent", player, GetStaticActor("Gcl107"), "processEventStewart", 15);
if (choice == 1) then
callClientFunction(player, "askEnterInstanceRaid", 15); -- Rivenroad
end
--]]
elseif (npcId == 1002091) then -- Serpent Private Dauremant (Trisselle) : Sum6w0
callClientFunction(player, "delegateEvent", player, GetStaticActor("DftFst"), "defaultTalkWithTrisselle_001"); -- "defaultTalkWithTrisselle_002" -- No idea for context.
--[[
choice = callClientFunction(player, "delegateEvent", player, GetStaticActor("Sum6w0"), "processEventTrisselle", 16)
if (choice == 1) then
callClientFunction(player, "askEnterInstanceRaid", 16); -- Rivenroad (Hard)
end
--]]
elseif (npcId == 1060022) then -- Louisoix
callClientFunction(player, "delegateEvent", player, GetStaticActor("DftFst"), "defaultTalkLouisoix_001");
end
player:EndEvent();
end