From fd148a678347033c064675c7f7a211f86d34a3fe Mon Sep 17 00:00:00 2001 From: Aleos Date: Fri, 7 Aug 2020 20:35:36 -0400 Subject: [PATCH] Adjusts disabled NPC with waiting rooms (#5289) * Fixes #5288. * Follow up to 1c6270f. * Changes NPC that have waiting rooms to not be disabled, but be hidden. Thanks to @Forte22! Co-authored-by: Atemo --- npc/jobs/2-1/assassin.txt | 3 ++- npc/jobs/2-1/knight.txt | 3 ++- npc/jobs/2-2/crusader.txt | 3 ++- npc/jobs/2-2/sage.txt | 3 ++- npc/re/jobs/3-1/warlock.txt | 3 ++- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/npc/jobs/2-1/assassin.txt b/npc/jobs/2-1/assassin.txt index 5ee1fd00f2..03b2b09a03 100644 --- a/npc/jobs/2-1/assassin.txt +++ b/npc/jobs/2-1/assassin.txt @@ -1102,7 +1102,8 @@ in_moc_16,21,165,2 script Standby Room#ASNTEST 725,{ end; OnInit: - disablenpc "Standby Room#ASNTEST"; + //disablenpc "Standby Room#ASNTEST"; + hideonnpc "Standby Room#ASNTEST"; waitingroom "Standby Room",10,"Standby Room#ASNTEST::OnStartArena",1; enablewaitingroomevent; end; diff --git a/npc/jobs/2-1/knight.txt b/npc/jobs/2-1/knight.txt index 4285e9b4c8..3c9c19b418 100644 --- a/npc/jobs/2-1/knight.txt +++ b/npc/jobs/2-1/knight.txt @@ -1227,7 +1227,8 @@ job_knt,89,106,4 script Windsor Benedict#knt 733,{ end; OnInit: - disablenpc "Windsor Benedict#knt"; + //disablenpc "Windsor Benedict#knt"; + hideonnpc "Windsor Benedict#knt"; waitingroom "Waiting Room",20,"Windsor Benedict#knt::OnStartArena",1; enablewaitingroomevent; end; diff --git a/npc/jobs/2-2/crusader.txt b/npc/jobs/2-2/crusader.txt index 766c98dd41..4a3a690320 100644 --- a/npc/jobs/2-2/crusader.txt +++ b/npc/jobs/2-2/crusader.txt @@ -1228,7 +1228,8 @@ job_cru,24,187,2 script Waiting Room#cr1 700,{ end; OnInit: - disablenpc "Waiting Room#cr1"; + //disablenpc "Waiting Room#cr1"; + hideonnpc "Waiting Room#cr1"; waitingroom "Waiting Room",20,"Waiting Room#cr1::OnStartArena",1; enablewaitingroomevent; end; diff --git a/npc/jobs/2-2/sage.txt b/npc/jobs/2-2/sage.txt index 3e65183c4f..4a59b2ad9e 100644 --- a/npc/jobs/2-2/sage.txt +++ b/npc/jobs/2-2/sage.txt @@ -2563,7 +2563,8 @@ job_sage,50,165,4 script Waiting Room#sg 700,{ end; OnInit: - disablenpc "Waiting Room#sg"; + //disablenpc "Waiting Room#sg"; + hideonnpc "Waiting Room#sg"; waitingroom "Waiting Room",20,"Waiting Room#sg::OnStartArena",1; enablewaitingroomevent; end; diff --git a/npc/re/jobs/3-1/warlock.txt b/npc/re/jobs/3-1/warlock.txt index 35758570c1..7c0787bba6 100644 --- a/npc/re/jobs/3-1/warlock.txt +++ b/npc/re/jobs/3-1/warlock.txt @@ -760,7 +760,8 @@ job3_war01,29,25,0 script Ebein#WRR 437,{ job3_war01,29,25,5 script The chamber of magic#1 437,{ end; OnInit: - disablenpc "The chamber of magic#1"; + //disablenpc "The chamber of magic#1"; + hideonnpc "The chamber of magic#1"; waitingroom "The chamber of magic",20,"The chamber of magic#1::OnStartArena",1; enablewaitingroomevent; end;