summaryrefslogtreecommitdiff
path: root/npc/pre-re
diff options
context:
space:
mode:
authordaegaladh <daegaladh@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-07-21 04:08:44 +0000
committerdaegaladh <daegaladh@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-07-21 04:08:44 +0000
commit576b80efa1c556796c13f195467e0dd1cea5631b (patch)
tree38438982c5f54d1666eba94809c2fb6c60518224 /npc/pre-re
parent1dea49c7f44dc9c33f8d204809a830be58a75ba2 (diff)
downloadhercules-576b80efa1c556796c13f195467e0dd1cea5631b.tar.gz
hercules-576b80efa1c556796c13f195467e0dd1cea5631b.tar.bz2
hercules-576b80efa1c556796c13f195467e0dd1cea5631b.tar.xz
hercules-576b80efa1c556796c13f195467e0dd1cea5631b.zip
Fixed an old bug in waitingroom where NPCs weren't appearing into their chatrooms.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16461 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc/pre-re')
-rw-r--r--npc/pre-re/battleground/flavius/flavius01.txt4
-rw-r--r--npc/pre-re/battleground/flavius/flavius02.txt4
-rw-r--r--npc/pre-re/battleground/kvm/kvm01.txt4
-rw-r--r--npc/pre-re/battleground/kvm/kvm02.txt4
-rw-r--r--npc/pre-re/battleground/kvm/kvm03.txt4
-rw-r--r--npc/pre-re/battleground/tierra/tierra01.txt4
-rw-r--r--npc/pre-re/battleground/tierra/tierra02.txt4
-rw-r--r--npc/pre-re/other/poring_war.txt6
8 files changed, 17 insertions, 17 deletions
diff --git a/npc/pre-re/battleground/flavius/flavius01.txt b/npc/pre-re/battleground/flavius/flavius01.txt
index 0827719b3..fedea3680 100644
--- a/npc/pre-re/battleground/flavius/flavius01.txt
+++ b/npc/pre-re/battleground/flavius/flavius01.txt
@@ -23,7 +23,7 @@
bat_room,86,227,4 script Lieutenant Ator 418,{
end;
OnInit:
- waitingroom "Battle Station",10,"start#bat_b01::OnReadyCheck",1,0,80;
+ waitingroom "Battle Station",11,"start#bat_b01::OnReadyCheck",1,0,80;
end;
OnEnterBG:
set $@FlaviusBG1_id1, waitingroom2bg("bat_b01",10,290,"start#bat_b01::OnGuillaumeQuit","");
@@ -33,7 +33,7 @@ OnEnterBG:
bat_room,85,204,0 script Lieutenant Thelokus 414,{
end;
OnInit:
- waitingroom "Battle Station",10,"start#bat_b01::OnReadyCheck",1,0,80;
+ waitingroom "Battle Station",11,"start#bat_b01::OnReadyCheck",1,0,80;
end;
OnEnterBG:
set $@FlaviusBG1_id2, waitingroom2bg("bat_b01",390,10,"start#bat_b01::OnCroixQuit","");
diff --git a/npc/pre-re/battleground/flavius/flavius02.txt b/npc/pre-re/battleground/flavius/flavius02.txt
index 2dfb22b6f..bc9645029 100644
--- a/npc/pre-re/battleground/flavius/flavius02.txt
+++ b/npc/pre-re/battleground/flavius/flavius02.txt
@@ -24,7 +24,7 @@
bat_room,142,227,4 script Lieutenant Huvas 418,{
end;
OnInit:
- waitingroom "Battle Station",10,"start#bat_b02::OnReadyCheck",1,0,80;
+ waitingroom "Battle Station",11,"start#bat_b02::OnReadyCheck",1,0,80;
end;
OnEnterBG:
set $@FlaviusBG2_id1, waitingroom2bg("bat_b02",10,290,"start#bat_b02::OnGuillaumeQuit","");
@@ -34,7 +34,7 @@ OnEnterBG:
bat_room,142,204,0 script Lieutenant Yukon 414,{
end;
OnInit:
- waitingroom "Battle Station",10,"start#bat_b02::OnReadyCheck",1,0,80;
+ waitingroom "Battle Station",11,"start#bat_b02::OnReadyCheck",1,0,80;
end;
OnEnterBG:
set $@FlaviusBG2_id2, waitingroom2bg("bat_b02",390,10,"start#bat_b02::OnCroixQuit","");
diff --git a/npc/pre-re/battleground/kvm/kvm01.txt b/npc/pre-re/battleground/kvm/kvm01.txt
index 684df0e71..b69649944 100644
--- a/npc/pre-re/battleground/kvm/kvm01.txt
+++ b/npc/pre-re/battleground/kvm/kvm01.txt
@@ -25,7 +25,7 @@ bat_room,169,226,5 script KVM Waiting Room#a::KvM01R_Guillaume 418,{
end;
OnInit:
- waitingroom "Battle Station 5 Players",5,"KvM01_BG::OnGuillaumeJoin",1;
+ waitingroom "Battle Station 5 Players",6,"KvM01_BG::OnGuillaumeJoin",1;
end;
OnEnterBG:
@@ -39,7 +39,7 @@ bat_room,169,205,3 script KVM Waiting Room#b::KvM01R_Croix 414,{
end;
OnInit:
- waitingroom "Battle Station 5 Players",5,"KvM01_BG::OnCroixJoin",1;
+ waitingroom "Battle Station 5 Players",6,"KvM01_BG::OnCroixJoin",1;
end;
OnEnterBG:
diff --git a/npc/pre-re/battleground/kvm/kvm02.txt b/npc/pre-re/battleground/kvm/kvm02.txt
index 5f6c118d3..d99741834 100644
--- a/npc/pre-re/battleground/kvm/kvm02.txt
+++ b/npc/pre-re/battleground/kvm/kvm02.txt
@@ -27,7 +27,7 @@ bat_room,197,226,5 script KVM Waiting Room#a2::KvM02R_Guillaume 418,{
end;
OnInit:
- waitingroom "Battle Station 5 Players",5,"KvM02_BG::OnGuillaumeJoin",1;
+ waitingroom "Battle Station 5 Players",6,"KvM02_BG::OnGuillaumeJoin",1;
end;
OnEnterBG:
@@ -41,7 +41,7 @@ bat_room,197,205,3 script KVM Waiting Room#b2::KvM02R_Croix 414,{
end;
OnInit:
- waitingroom "Battle Station 5 Players",5,"KvM02_BG::OnCroixJoin",1;
+ waitingroom "Battle Station 5 Players",6,"KvM02_BG::OnCroixJoin",1;
end;
OnEnterBG:
diff --git a/npc/pre-re/battleground/kvm/kvm03.txt b/npc/pre-re/battleground/kvm/kvm03.txt
index 4b685be55..8cc26dc93 100644
--- a/npc/pre-re/battleground/kvm/kvm03.txt
+++ b/npc/pre-re/battleground/kvm/kvm03.txt
@@ -26,7 +26,7 @@ bat_room,225,226,5 script KVM Waiting Room#a3::KvM03R_Guillaume 418,{
end;
OnInit:
- waitingroom "Battle Station 5 Players",5,"KvM03_BG::OnGuillaumeJoin",1;
+ waitingroom "Battle Station 5 Players",6,"KvM03_BG::OnGuillaumeJoin",1;
end;
OnEnterBG:
@@ -40,7 +40,7 @@ bat_room,225,205,3 script KVM Waiting Room#b3::KvM03R_Croix 414,{
end;
OnInit:
- waitingroom "Battle Station 5 Players",5,"KvM03_BG::OnCroixJoin",1;
+ waitingroom "Battle Station 5 Players",6,"KvM03_BG::OnCroixJoin",1;
end;
OnEnterBG:
diff --git a/npc/pre-re/battleground/tierra/tierra01.txt b/npc/pre-re/battleground/tierra/tierra01.txt
index 1723c8a8a..b6b3e4354 100644
--- a/npc/pre-re/battleground/tierra/tierra01.txt
+++ b/npc/pre-re/battleground/tierra/tierra01.txt
@@ -24,7 +24,7 @@ bat_room,57,227,5 script Lieutenant Kalos 418,{
end;
OnInit:
- waitingroom "Battle Station",10,"start#bat_a01::OnReadyCheck",1,0,80;
+ waitingroom "Battle Station",11,"start#bat_a01::OnReadyCheck",1,0,80;
end;
OnEnterBG:
@@ -36,7 +36,7 @@ bat_room,58,204,1 script Lieutenant Eyor 414,{
end;
OnInit:
- waitingroom "Battle Station",10,"start#bat_a01::OnReadyCheck",1,0,80;
+ waitingroom "Battle Station",11,"start#bat_a01::OnReadyCheck",1,0,80;
end;
OnEnterBG:
diff --git a/npc/pre-re/battleground/tierra/tierra02.txt b/npc/pre-re/battleground/tierra/tierra02.txt
index aaa3b1722..867946181 100644
--- a/npc/pre-re/battleground/tierra/tierra02.txt
+++ b/npc/pre-re/battleground/tierra/tierra02.txt
@@ -23,7 +23,7 @@ bat_room,114,227,5 script Lieutenant Rundel 418,{
end;
OnInit:
- waitingroom "Battle Station",10,"start#bat_a02::OnReadyCheck",1,0,80;
+ waitingroom "Battle Station",11,"start#bat_a02::OnReadyCheck",1,0,80;
end;
OnEnterBG:
@@ -35,7 +35,7 @@ bat_room,114,204,1 script Lieutenant Guerrit 414,{
end;
OnInit:
- waitingroom "Battle Station",10,"start#bat_a02::OnReadyCheck",1,0,80;
+ waitingroom "Battle Station",11,"start#bat_a02::OnReadyCheck",1,0,80;
end;
OnEnterBG:
diff --git a/npc/pre-re/other/poring_war.txt b/npc/pre-re/other/poring_war.txt
index 3df83e5a1..16cc55790 100644
--- a/npc/pre-re/other/poring_war.txt
+++ b/npc/pre-re/other/poring_war.txt
@@ -358,7 +358,7 @@ poring_w01,91,97,3 script Poring#wop_door_all 1002,{
end;
OnInit:
- waitingroom "[Recruiting 10 Battle Participants]",10,"Poring#wop_door_all::OnStartArena",10,500,9;
+ waitingroom "[Recruiting 10 Battle Participants]",11,"Poring#wop_door_all::OnStartArena",10,500,9;
enablewaitingroomevent;
end;
@@ -381,7 +381,7 @@ poring_w01,91,68,5 script Poring#wop_door_a 1002,{
end;
OnInit:
- waitingroom "[Angeling Team Recruiter]",5,"Poring#wop_door_a::OnStartArena",5,0,9;
+ waitingroom "[Angeling Team Recruiter]",6,"Poring#wop_door_a::OnStartArena",5,0,9;
enablewaitingroomevent;
end;
@@ -473,7 +473,7 @@ poring_w01,112,68,3 script Poring#wop_door_d 1002,{
end;
OnInit:
- waitingroom "[Deviling Team Recruiter]",5,"Poring#wop_door_d::OnStartArena",5,0,9;
+ waitingroom "[Deviling Team Recruiter]",6,"Poring#wop_door_d::OnStartArena",5,0,9;
enablewaitingroomevent;
end;