Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adjusts disabled NPC with waiting rooms (#5289)

Browse Source 
* 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 <Atemo@users.noreply.github.com>
This commit is contained in:
Aleos 2020-08-07 20:35:36 -04:00 committed by GitHub
parent c86a5a4536
commit fd148a6783
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
npc/jobs/2-1/assassin.txt
View File

@ -1102,7 +1102,8 @@ in_moc_16,21,165,2 script Standby Room#ASNTEST 725,{
end; end;
OnInit: OnInit:
disablenpc "Standby Room#ASNTEST"; //disablenpc "Standby Room#ASNTEST";
hideonnpc "Standby Room#ASNTEST";
waitingroom "Standby Room",10,"Standby Room#ASNTEST::OnStartArena",1; waitingroom "Standby Room",10,"Standby Room#ASNTEST::OnStartArena",1;
enablewaitingroomevent; enablewaitingroomevent;
end; end;

3
npc/jobs/2-1/knight.txt
View File

@ -1227,7 +1227,8 @@ job_knt,89,106,4 script Windsor Benedict#knt 733,{
end; end;
OnInit: OnInit:
disablenpc "Windsor Benedict#knt"; //disablenpc "Windsor Benedict#knt";
hideonnpc "Windsor Benedict#knt";
waitingroom "Waiting Room",20,"Windsor Benedict#knt::OnStartArena",1; waitingroom "Waiting Room",20,"Windsor Benedict#knt::OnStartArena",1;
enablewaitingroomevent; enablewaitingroomevent;
end; end;

3
npc/jobs/2-2/crusader.txt
View File

@ -1228,7 +1228,8 @@ job_cru,24,187,2 script Waiting Room#cr1 700,{
end; end;
OnInit: OnInit:
disablenpc "Waiting Room#cr1"; //disablenpc "Waiting Room#cr1";
hideonnpc "Waiting Room#cr1";
waitingroom "Waiting Room",20,"Waiting Room#cr1::OnStartArena",1; waitingroom "Waiting Room",20,"Waiting Room#cr1::OnStartArena",1;
enablewaitingroomevent; enablewaitingroomevent;
end; end;

3
npc/jobs/2-2/sage.txt
View File

@ -2563,7 +2563,8 @@ job_sage,50,165,4 script Waiting Room#sg 700,{
end; end;
OnInit: OnInit:
disablenpc "Waiting Room#sg"; //disablenpc "Waiting Room#sg";
hideonnpc "Waiting Room#sg";
waitingroom "Waiting Room",20,"Waiting Room#sg::OnStartArena",1; waitingroom "Waiting Room",20,"Waiting Room#sg::OnStartArena",1;
enablewaitingroomevent; enablewaitingroomevent;
end; end;

3
npc/re/jobs/3-1/warlock.txt
View File

@ -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,{ job3_war01,29,25,5 script The chamber of magic#1 437,{
end; end;
OnInit: 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; waitingroom "The chamber of magic",20,"The chamber of magic#1::OnStartArena",1;
enablewaitingroomevent; enablewaitingroomevent;
end; end;