From 3693a0d24526fb8035a6a93b2e95685aed96f088 Mon Sep 17 00:00:00 2001 From: Chris Miles Date: Sun, 6 Aug 2023 03:30:06 -0500 Subject: [PATCH 1/2] Dragons of Norrath Release changes --- guildhall/player.pl | 5 +---- guildlobby/player.pl | 12 ------------ poknowledge/player.pl | 7 +------ 3 files changed, 2 insertions(+), 22 deletions(-) diff --git a/guildhall/player.pl b/guildhall/player.pl index 3ee57b649..64afe3761 100644 --- a/guildhall/player.pl +++ b/guildhall/player.pl @@ -85,10 +85,7 @@ sub EVENT_CLICKDOOR # This will move RoF clients to their instance, the rest are handled in the DB if (($client->GetClientVersionBit() & 4294967264) != 0) { if ($doorid == 2 || $doorid == 5) { -# Do we really need the check here? -# if ($client->CalculateDistance(-3.4, -162.9, 6.9) <= 30) { - quest::MovePCInstance(344, 5, 0, 588, 1.75, 260); # Zone: guildlobby -# } + quest::MovePCInstance(344, 0, 0, 588, 1.75, 260); # Zone: guildlobby } } } diff --git a/guildlobby/player.pl b/guildlobby/player.pl index 18ea0c51e..897a04f3c 100644 --- a/guildlobby/player.pl +++ b/guildlobby/player.pl @@ -19,18 +19,6 @@ sub EVENT_ENTERZONE { #if I am idle for more than xx seconds, auto-afk and go invisible/don't draw model quest::settimer("afk_check", 1200); #20 minutes - - if(($client->GetClientVersionBit() & 4294967264)!= 0) { - if($client->GetInstanceID() != 5) { - quest::settimer(1,10); - $client->Message(0,"Invalid Zone(344:0): You will be redirected to the proper instance in 10 seconds."); - } - } else { - if($client->GetInstanceID() == 5) { - quest::settimer(2,10); - $client->Message(0,"Invalid Zone(344:5): You will be redirected to the proper zone in 10 seconds."); - } - } } sub EVENT_SIGNAL { diff --git a/poknowledge/player.pl b/poknowledge/player.pl index 37798248d..04358b946 100644 --- a/poknowledge/player.pl +++ b/poknowledge/player.pl @@ -14,12 +14,7 @@ sub EVENT_CLICKDOOR { if ($doorid == 138) #guild lobby { if ($client->CalculateDistance(1408, -377, -113) <= 30) { - if (($client->GetClientVersionBit() & 4294967264) != 0) { - quest::MovePCInstance(344, 5, 18, -46, 6, 450); # Zone: guildlobby - } - else { - quest::movepc(344, 18, -46, 6, 492); # Zone: guildlobby - } + quest::movepc(344, 18, -46, 6, 492); } } if ($doorid == 139) #bazaar From 63e6ecda11a55ba13266e9d71577c211ac9de411 Mon Sep 17 00:00:00 2001 From: Chris Miles Date: Sun, 6 Aug 2023 03:36:45 -0500 Subject: [PATCH 2/2] Update player.pl --- guildhall/player.pl | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/guildhall/player.pl b/guildhall/player.pl index 64afe3761..313b95b89 100644 --- a/guildhall/player.pl +++ b/guildhall/player.pl @@ -79,13 +79,3 @@ sub EVENT_POPUPRESPONSE { #quest::movepc(480,-23,-619,36); } } - -sub EVENT_CLICKDOOR -{ -# This will move RoF clients to their instance, the rest are handled in the DB - if (($client->GetClientVersionBit() & 4294967264) != 0) { - if ($doorid == 2 || $doorid == 5) { - quest::MovePCInstance(344, 0, 0, 588, 1.75, 260); # Zone: guildlobby - } - } -}