cassidy/project-meteor-server
1
0
Fork 0
mirror of https://bitbucket.org/Ioncannon/project-meteor-server.git synced 2025-04-02 19:42:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

Removed automatic Left Instance msg, as it only happens when running out of a PrivateArea_Exit. More M0l1 work.

Browse Source
This commit is contained in:
Filip Maj 2022-03-05 01:28:28 -05:00
parent 49c6fdbd51
commit ebba56602c
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Data/scripts/quests/man/man0l1.lua
View File

@ -105,7 +105,7 @@ CNTR_LS_MSG = 4;
NPCLS_MSGS = { NPCLS_MSGS = {
{339}, {339},
{80, 81, 82}, {80, 81, 82},
{248, 249}, {131, 326, 132},
{161, 162, 163, 164} {161, 162, 163, 164}
}; };
@ -147,20 +147,16 @@ function onStateChange(player, quest, sequence)
elseif (sequence == SEQ_007) then elseif (sequence == SEQ_007) then
local subseqCUL = data:GetCounter(CNTR_SEQ7_CUL); local subseqCUL = data:GetCounter(CNTR_SEQ7_CUL);
local subseqMSK = data:GetCounter(CNTR_SEQ7_MSK); local subseqMSK = data:GetCounter(CNTR_SEQ7_MSK);
-- Always active in this seqence -- Always active in this seqence
quest:SetENpc(BADERON); quest:SetENpc(BADERON);
quest:SetENpc(CHARLYS, subseqCUL == 0 and QFLAG_PLATE or QFLAG_NONE); quest:SetENpc(CHARLYS, subseqCUL == 0 and QFLAG_PLATE or QFLAG_NONE);
-- Down and Up the MSK guild -- Down and Up the MSK guild
quest:SetENpc(ISANDOREL, (subseqMSK == 0 or subseqMSK == 2) and QFLAG_PLATE or QFLAG_NONE); quest:SetENpc(ISANDOREL, (subseqMSK == 0 or subseqMSK == 2) and QFLAG_PLATE or QFLAG_NONE);
if (subseqMSK == 1) then if (subseqMSK == 1) then
quest:SetENpc(MSK_TRIGGER, QFLAG_MAP, false, true); quest:SetENpc(MSK_TRIGGER, QFLAG_MAP, false, true);
elseif (subseqMSK == 2) then elseif (subseqMSK == 2) then
quest:SetENpc(MERLZIRN); quest:SetENpc(MERLZIRN);
end end
-- In Echo -- In Echo
quest:SetENpc(NERVOUS_BARRACUDA); quest:SetENpc(NERVOUS_BARRACUDA);
quest:SetENpc(INTIMIDATING_BARRACUDA); quest:SetENpc(INTIMIDATING_BARRACUDA);
@ -532,6 +528,8 @@ function onPush(player, quest, npc)
if (classId == ECHO_EXIT_TRIGGER2) then if (classId == ECHO_EXIT_TRIGGER2) then
callClientFunction(player, "delegateEvent", player, quest, "processEvent635"); callClientFunction(player, "delegateEvent", player, quest, "processEvent635");
player:EndEvent(); player:EndEvent();
quest:NewNpcLsMsg(1);
quest:StartSequence(SEQ_090);
quest:UpdateENPCs(); quest:UpdateENPCs();
GetWorldManager():WarpToPublicArea(player); GetWorldManager():WarpToPublicArea(player);
end end

4
Map Server/WorldManager.cs
View File

@ -884,10 +884,6 @@ namespace Meteor.Map
player.playerSession.LockUpdates(false); player.playerSession.LockUpdates(false);
//Send "You have left the instance" if old area is a Private Area
if (oldArea is PrivateArea)
player.SendGameMessage(GetActor(), 34110, 0x20);
//Send "You have entered an instance" if it's a Private Area //Send "You have entered an instance" if it's a Private Area
if (newArea is PrivateArea) if (newArea is PrivateArea)
player.SendGameMessage(GetActor(), 34108, 0x20); player.SendGameMessage(GetActor(), 34108, 0x20);