Bug fixes.

- Fixed guild names for payg_cas02 and payg_cas04. (bugreport:8763)
http://rathena.org/board/tracker/issue-8763-castle-db-wrong-castle-names/
- Fixed OnTouch issues in Old Glast Heim instance. (bugreport:8738)
http://rathena.org/board/tracker/issue-8738-oldglastheim/
- Fixed a minor documentation issue with 'pcblockmove'. (bugreport:8706)
http://rathena.org/board/tracker/issue-8706-pcblockmove-description-incorrect/

Signed-off-by: Euphy <euphy.raliel@rathena.org>

doc/script_commands.txt

@@ -974,13 +974,10 @@ player groups, for instance.
 
 OnWhisperGlobal:
 
-This special label triggers when a player whispers the NPC by its name
-and would execute all the scripts under this event label. This is similar to the
-'donpcevent' and 'goto' command but can only be trigged manually by whispering.
-It can accept up to ten parameters, which will be stored into separate temporary
-character string variables.
-
-See the sample in 'doc/whisper_sys.txt'.
+This special label triggers when a player whispers the NPC, and will run with the
+player's RID attached. It can accept up to ten parameters, which will be stored
+into separate temporary character string variables @whispervar0$ to @whispervar9$.
+See 'doc/whisper_sys.txt' for further documentation.
 
 Only the special labels which are not associated with any script command are 
 listed here. There are other kinds of labels which may be triggered in a similar 
@@ -5365,31 +5362,30 @@ players, telling them they are now divorced.
 *pcfollow <id>,<target id>;
 *pcstopfollow <id>;
 
-Makes a character follow or stop following someone. This command does the same as the @follow command.
-The main difference is that @follow can use character names, and this commands needs the Account ID for the target.
+Makes a character follow or stop following someone. This command does the same
+as the @follow command. The main difference is that @follow can use character
+names, and this commands needs the account ID for the target.
 
 Examples:
+	// This will make Aaron follow Bullah, when both of these characters are online.
+	pcfollow getCharID(3,"Aaron"),getCharID(3,"Bullah");
 
-// This will make Aaron follow Bullah, when both of these characters are online.
-	PCFollow getCharID(3,"Aaron"),getCharID(3,"Bullah");
-	
-// Makes Aaron stop following whoever he is following.
-	PCStopFollow getCharID(3,"Aaron");
+	// Makes Aaron stop following whoever he is following.
+	pcstopfollow getCharID(3,"Aaron");
 	
 ---------------------------------------
 
 *pcblockmove <id>,<option>;
 
-Prevents the given ID from moving when the option != 0, and 0 enables the ID to
-move again. The ID can either be the GID of a monster/NPC or account ID of a
-character, and will run for the attached player if zero is supplied.
+Prevents the given GID from moving when the option is 1, and enables the ID to
+move again when the option is 0. This command will run for the attached player
+if the given GID is zero.
 
 Examples:
-
-// Prevents the current char from moving away.
+	// Prevents the current char from moving away.
 	pcblockmove getcharid(3),1;
-	
-// Enables the current char to move again.
+
+	// Enables the current char to move again.
 	pcblockmove getcharid(3),0;
 
 --------------------------------------- 

npc/guild/agit_main.txt

@@ -7,7 +7,7 @@
 //===== Compatible With: =====================================
 //= rAthena Project
 //===== Description: =========================================
-//= [ Official Conversion]
+//= [Official Conversion]
 //= ----------------------------------------------------------
 //= - THIS FILE IS REQUIRED FOR GUILD CASTLES TO FUNCTION.
 //= ----------------------------------------------------------

npc/guild/aldeg_cas01.txt

@@ -1,5 +1,5 @@
 //===== rAthena Script =======================================
-//= War of Emperium (Al De Baran)
+//= War of Emperium (Al De Baran) - Neuschwanstein
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
@@ -115,7 +115,6 @@ aldeg_cas01,218,175,0	duplicate(cm)	Alfredo#aldeg_cas01	55
 // Treasure Room Exit
 //============================================================
 aldeg_cas01,123,223,0	script	#lever_A01	111,{
-
 	mes " ";
 	mes "There's a small lever. Will you pull it?";
 	next;

npc/guild/aldeg_cas02.txt

@@ -1,5 +1,5 @@
 //===== rAthena Script =======================================
-//= War of Emperium (Al De Baran)
+//= War of Emperium (Al De Baran) - Hohenschwangau
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
@@ -109,7 +109,6 @@ aldeg_cas02,78,74,0	duplicate(cm)	Chenchenlie#aldeg_cas02	55
 // Treasure Room Lever
 //============================================================
 aldeg_cas02,139,234,0	script	#lever_A02	111,{
-
 	mes " ";
 	mes "There's a small lever. Will you pull it?";
 	next;

npc/guild/aldeg_cas03.txt

@@ -1,5 +1,5 @@
 //===== rAthena Script =======================================
-//= War of Emperium (Al De Baran)
+//= War of Emperium (Al De Baran) - Nuernberg
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
@@ -112,7 +112,6 @@ aldeg_cas03,110,118,0	duplicate(cm)	Nahzarf#aldeg_cas03	55
 // Treasure Room Exit
 //============================================================
 aldeg_cas03,229,267,0	script	#lever_A03	111,{
-
 	mes " ";
 	mes "There's a small lever. Will you pull it?";
 	next;

npc/guild/aldeg_cas04.txt

@@ -1,5 +1,5 @@
 //===== rAthena Script =======================================
-//= War of Emperium (Al De Baran)
+//= War of Emperium (Al De Baran) - Wuerzburg
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
@@ -112,7 +112,6 @@ aldeg_cas04,67,116,0	duplicate(cm)	Brymhensen#aldeg_cas04	55
 // Treasure Room Exit
 //============================================================
 aldeg_cas04,83,17,0	script	#lever_A04	111,{
-
 	mes " ";
 	mes "There's a small lever. Will you pull it?";
 	next;

npc/guild/aldeg_cas05.txt

@@ -1,5 +1,5 @@
 //===== rAthena Script =======================================
-//= War of Emperium (Al De Baran)
+//= War of Emperium (Al De Baran) - Rothenburg
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
@@ -111,7 +111,6 @@ aldeg_cas05,51,179,0	duplicate(cm)	Esmarehk#aldeg_cas05	55
 // Treasure Room Exit
 //============================================================
 aldeg_cas05,64,8,0	script	#lever_A05	111,{
-
 	mes " ";
 	mes "There's a small lever. Will you pull it?";
 	next;

npc/guild/gefg_cas01.txt

@@ -1,5 +1,5 @@
 //===== rAthena Script =======================================
-//= War of Emperium (Geffen)
+//= War of Emperium (Geffen) - Repherion
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
@@ -103,7 +103,6 @@ gefg_cas01,40,48,5	duplicate(cm)	Gnahcher#gefg_cas01	55
 // Treasure Room Exit
 //============================================================
 gefg_cas01,152,117,0	script	#lever_G01	111,{
-
 	mes " ";
 	mes "There's a small lever. Will you pull it?";
 	next;

npc/guild/gefg_cas02.txt

@@ -1,5 +1,5 @@
 //===== rAthena Script =======================================
-//= War of Emperium (Geffen)
+//= War of Emperium (Geffen) - Eeyorbriggar
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
@@ -104,7 +104,6 @@ gefg_cas02,12,66,5	duplicate(cm)	Esmarehk#gefg_cas02	55
 // Treasure Room Exit
 //============================================================
 gefg_cas02,145,114,0	script	#lever_G02	111,{
-
 	mes " ";
 	mes "There's a small lever. Will you pull it?";
 	next;

npc/guild/gefg_cas03.txt

@@ -1,5 +1,5 @@
 //===== rAthena Script =======================================
-//= War of Emperium (Geffen)
+//= War of Emperium (Geffen) - Yesnelph
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
@@ -107,7 +107,6 @@ gefg_cas03,106,23,5	duplicate(cm)	Jyang#gefg_cas03	55
 // Treasure Room Exit
 //============================================================
 gefg_cas03,275,289,0	script	#lever_G03	111,{
-
 	mes " ";
 	mes "There's a small lever. Will you pull it?";
 	next;

npc/guild/gefg_cas04.txt

@@ -1,5 +1,5 @@
 //===== rAthena Script =======================================
-//= War of Emperium (Geffen)
+//= War of Emperium (Geffen) - Bergel
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
@@ -103,7 +103,6 @@ gefg_cas04,73,46,3	duplicate(cm)	Kellvahni#gefg_cas04	55
 // Treasure Room Exit
 //============================================================
 gefg_cas04,116,123,0	script	#lever_G04	111,{
-
 	mes " ";
 	mes "There's a small lever. Will you pull it?";
 	next;

npc/guild/gefg_cas05.txt

@@ -1,5 +1,5 @@
 //===== rAthena Script =======================================
-//= War of Emperium (Geffen)
+//= War of Emperium (Geffen) - Mersetzdeitz
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
@@ -103,7 +103,6 @@ gefg_cas05,70,52,3	duplicate(cm)	Byohre#gefg_cas05	55
 // Treasure Room Exit
 //============================================================
 gefg_cas05,149,107,0	script	#lever_G05	111,{
-
 	mes " ";
 	mes "There's a small lever. Will you pull it?";
 	next;

npc/guild/payg_cas01.txt

@@ -1,5 +1,5 @@
 //===== rAthena Script =======================================
-//= War of Emperium (Payon)
+//= War of Emperium (Payon) - Bright Arbor
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
@@ -106,7 +106,6 @@ payg_cas01,120,58,4	duplicate(cm)	Kurunnadi#payg_cas01	55
 // Treasure Room Exit
 //============================================================
 payg_cas01,295,8,0	script	#lever_PA01	111,{
-
 	mes " ";
 	mes "There's a small lever. Will you pull it?";
 	next;

npc/guild/payg_cas02.txt

@@ -1,24 +1,25 @@
 //===== rAthena Script =======================================
-//= War of Emperium (Payon)
+//= War of Emperium (Payon) - Scarlet Palace
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
-//= 1.3
+//= 1.4
 //===== Compatible With: =====================================
 //= rAthena Project
 //===== Description: =========================================
-//= NPCs that relate to Payon Guild Castle 1
+//= NPCs that relate to Payon Guild Castle 2
 //===== Additional Comments: =================================
 //= 1.0 First Version. No longer uses functions. [L0ne_W0lf]
 //= 1.1 Corrected flag-in spawn point. [L0ne_W0lf]
 //= 1.2 Removed dialog from interior flags. [L0ne_W0lf]
 //=     Fixed position of Guild dungeon switch.
 //= 1.3 Partially rewrote Script. [Masao]
+//= 1.4 Corrected guild name. [Euphy]
 //============================================================
 
 // Guild Flags (Outside Castle)
 //============================================================
--	script	Sacred Palace#1::OutsideFlagsPA2	722,{
+-	script	Scarlet Palace#1::OutsideFlagsPA2	722,{
 
 	set .@GID, GetCastleData("payg_cas02",1);
 
@@ -68,14 +69,14 @@ OnRecvCastlePy02:
 	end;
 }
 
-pay_gld,292,112,6	duplicate(OutsideFlagsPA2)	Sacred Palace#1-2	722
-pay_gld,292,120,6	duplicate(OutsideFlagsPA2)	Sacred Palace#2	722
-pay_gld,291,135,6	duplicate(OutsideFlagsPA2)	Sacred Palace#3	722
-pay_gld,271,163,0	duplicate(OutsideFlagsPA2)	Sacred Palace#4	722
+pay_gld,292,112,6	duplicate(OutsideFlagsPA2)	Scarlet Palace#1-2	722
+pay_gld,292,120,6	duplicate(OutsideFlagsPA2)	Scarlet Palace#2	722
+pay_gld,291,135,6	duplicate(OutsideFlagsPA2)	Scarlet Palace#3	722
+pay_gld,271,163,0	duplicate(OutsideFlagsPA2)	Scarlet Palace#4	722
 
 // Guild Flags (Inside Castle)
 //============================================================
--	script	Sacred Palace#5::InsideFlagsPA2	722,{
+-	script	Scarlet Palace#5::InsideFlagsPA2	722,{
 	end;
 
 OnRecvCastlePy02:
@@ -83,17 +84,17 @@ OnRecvCastlePy02:
 	end;
 }
 
-payg_cas02,254,40,6	duplicate(InsideFlagsPA2)	Sacred Palace#5-2	722
-payg_cas02,254,48,6	duplicate(InsideFlagsPA2)	Sacred Palace#6	722
-payg_cas02,202,49,0	duplicate(InsideFlagsPA2)	Sacred Palace#7	722
-payg_cas02,209,49,0	duplicate(InsideFlagsPA2)	Sacred Palace#8	722
-payg_cas02,59,282,4	duplicate(InsideFlagsPA2)	Sacred Palace#9	722
-payg_cas02,70,282,4	duplicate(InsideFlagsPA2)	Sacred Palace#10	722
+payg_cas02,254,40,6	duplicate(InsideFlagsPA2)	Scarlet Palace#5-2	722
+payg_cas02,254,48,6	duplicate(InsideFlagsPA2)	Scarlet Palace#6	722
+payg_cas02,202,49,0	duplicate(InsideFlagsPA2)	Scarlet Palace#7	722
+payg_cas02,209,49,0	duplicate(InsideFlagsPA2)	Scarlet Palace#8	722
+payg_cas02,59,282,4	duplicate(InsideFlagsPA2)	Scarlet Palace#9	722
+payg_cas02,70,282,4	duplicate(InsideFlagsPA2)	Scarlet Palace#10	722
 
 // Guild Flag (Town)
 //============================================================
-payon,97,322,4	duplicate(InsideFlagsPA2)	Sacred Altar#11	722
-payon,166,173,3	duplicate(InsideFlagsPA2)	Sacred Altar#12	722
+payon,97,322,4	duplicate(InsideFlagsPA2)	Scarlet Palace#11	722
+payon,166,173,3	duplicate(InsideFlagsPA2)	Scarlet Palace#12	722
 
 // Kafra Employee
 //============================================================
@@ -106,7 +107,6 @@ payg_cas02,22,260,7	duplicate(cm)	Cherieos#payg_cas02	55
 // Treasure Room Exit
 //============================================================
 payg_cas02,149,149,0	script	#lever_PA02	111,{
-
 	mes " ";
 	mes "There's a small lever. Will you pull it?";
 	next;

npc/guild/payg_cas03.txt

@@ -1,5 +1,5 @@
 //===== rAthena Script =======================================
-//= War of Emperium (Payon)
+//= War of Emperium (Payon) - Holy Shadow
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
@@ -7,7 +7,7 @@
 //===== Compatible With: =====================================
 //= rAthena Project
 //===== Description: =========================================
-//= NPCs that relate to Payon Guild Castle 1
+//= NPCs that relate to Payon Guild Castle 3
 //===== Additional Comments: =================================
 //= 1.0 First Version. No longer uses functions. [L0ne_W0lf]
 //= 1.1 Corrected flag-in spawn point. [L0ne_W0lf]
@@ -106,7 +106,6 @@ payg_cas03,50,261,3	duplicate(cm)	Gheriot#payg_cas03	55
 // Treasure Room Exit
 //============================================================
 payg_cas03,163,167,0	script	#lever_PA03	111,{
-
 	mes " ";
 	mes "There's a small lever. Will you pull it?";
 	next;

npc/guild/payg_cas04.txt

@@ -1,24 +1,25 @@
 //===== rAthena Script =======================================
-//= War of Emperium (Payon)
+//= War of Emperium (Payon) - Sacred Altar
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
-//= 1.3
+//= 1.4
 //===== Compatible With: =====================================
 //= rAthena Project
 //===== Description: =========================================
-//= NPCs that relate to Payon Guild Castle 1
+//= NPCs that relate to Payon Guild Castle 4
 //===== Additional Comments: =================================
 //= 1.0 First Version. No longer uses functions. [L0ne_W0lf]
 //= 1.1 Corrected flag-in spawn point. [L0ne_W0lf]
 //= 1.2 Removed dialog from interior flags. [L0ne_W0lf]
 //=     Fixed position of Guild dungeon switch.
 //= 1.3 Partially rewrote Script. [Masao]
+//= 1.4 Corrected guild name. [Euphy]
 //============================================================
 
 // Guild Flags (Outside Castle)
 //============================================================
--	script	Scarlet Palace#1::OutsideFlagsPA4	722,{
+-	script	Sacred Altar#1::OutsideFlagsPA4	722,{
 
 	set .@GID, GetCastleData("payg_cas04",1);
 
@@ -68,14 +69,14 @@ OnRecvCastlePy04:
 	end;
 }
 
-pay_gld,137,160,0	duplicate(OutsideFlagsPA4)	Scarlet Palace#1-2	722
-pay_gld,143,160,0	duplicate(OutsideFlagsPA4)	Scarlet Palace#2	722
-pay_gld,133,151,2	duplicate(OutsideFlagsPA4)	Scarlet Palace#3	722
-pay_gld,153,166,1	duplicate(OutsideFlagsPA4)	Scarlet Palace#4	722
+pay_gld,137,160,0	duplicate(OutsideFlagsPA4)	Sacred Altar#1-2	722
+pay_gld,143,160,0	duplicate(OutsideFlagsPA4)	Sacred Altar#2	722
+pay_gld,133,151,2	duplicate(OutsideFlagsPA4)	Sacred Altar#3	722
+pay_gld,153,166,1	duplicate(OutsideFlagsPA4)	Sacred Altar#4	722
 
 // Guild Flags (Inside Castle)
 //============================================================
--	script	Scarlet Palace#5::InsideFlagsPA4	722,{
+-	script	Sacred Altar#5::InsideFlagsPA4	722,{
 	end;
 
 OnRecvCastlePy04:
@@ -83,17 +84,17 @@ OnRecvCastlePy04:
 	end;
 }
 
-payg_cas04,255,259,0	duplicate(InsideFlagsPA4)	Scarlet Palace#5-2	722
-payg_cas04,248,259,0	duplicate(InsideFlagsPA4)	Scarlet Palace#6	722
-payg_cas04,248,168,6	duplicate(InsideFlagsPA4)	Scarlet Palace#7	722
-payg_cas04,248,160,6	duplicate(InsideFlagsPA4)	Scarlet Palace#8	722
-payg_cas04,232,181,4	duplicate(InsideFlagsPA4)	Scarlet Palace#9	722
-payg_cas04,239,181,4	duplicate(InsideFlagsPA4)	Scarlet Palace#10	722
+payg_cas04,255,259,0	duplicate(InsideFlagsPA4)	Sacred Altar#5-2	722
+payg_cas04,248,259,0	duplicate(InsideFlagsPA4)	Sacred Altar#6	722
+payg_cas04,248,168,6	duplicate(InsideFlagsPA4)	Sacred Altar#7	722
+payg_cas04,248,160,6	duplicate(InsideFlagsPA4)	Sacred Altar#8	722
+payg_cas04,232,181,4	duplicate(InsideFlagsPA4)	Sacred Altar#9	722
+payg_cas04,239,181,4	duplicate(InsideFlagsPA4)	Sacred Altar#10	722
 
 // Guild Flag (Town)
 //============================================================
-payon,118,322,4	duplicate(InsideFlagsPA4)	Scarlet Palace#11	722
-payon,166,165,3	duplicate(InsideFlagsPA4)	Scarlet Palace#12	722
+payon,118,322,4	duplicate(InsideFlagsPA4)	Sacred Altar#11	722
+payon,166,165,3	duplicate(InsideFlagsPA4)	Sacred Altar#12	722
 
 // Kafra Employee
 //============================================================
@@ -106,7 +107,6 @@ payg_cas04,38,284,3	duplicate(cm)	DJ#payg_cas04	55
 // Treasure Room Exit
 //============================================================
 payg_cas04,151,47,0	script	#lever_PA04	111,{
-
 	mes " ";
 	mes "There's a small lever. Will you pull it?";
 	next;

npc/guild/payg_cas05.txt

@@ -1,5 +1,5 @@
 //===== rAthena Script =======================================
-//= War of Emperium (Payon)
+//= War of Emperium (Payon) - Bamboo Grove Hill
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
@@ -7,7 +7,7 @@
 //===== Compatible With: =====================================
 //= rAthena Project
 //===== Description: =========================================
-//= NPCs that relate to Payon Guild Castle 1
+//= NPCs that relate to Payon Guild Castle 5
 //===== Additional Comments: =================================
 //= 1.0 First Version. No longer uses functions. [L0ne_W0lf]
 //= 1.1 Corrected flag-in spawn point. [L0ne_W0lf]
@@ -106,7 +106,6 @@ payg_cas05,277,249,3	duplicate(cm)	Nahzarf#payg_cas05	55
 // Treasure Room Exit
 //============================================================
 payg_cas05,161,136,0	script	#lever_PA05	111,{
-
 	mes " ";
 	mes "There's a small lever. Will you pull it?";
 	next;

npc/guild/prtg_cas01.txt

@@ -1,5 +1,5 @@
 //===== rAthena Script =======================================
-//= War of Emperium (Prontera)
+//= War of Emperium (Prontera) - Kriemhild
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
@@ -109,7 +109,6 @@ prtg_cas01,112,181,0	duplicate(cm)	Ahvray#prtg_cas01	55
 // Treasure Room Exit
 //============================================================
 prtg_cas01,15,208,0	script	#Lever_PR01	111,{
-
 	mes " ";
 	mes "There's a small lever. Will you pull it?";
 	next;

npc/guild/prtg_cas02.txt

@@ -1,5 +1,5 @@
 //===== rAthena Script =======================================
-//= War of Emperium (Prontera)
+//= War of Emperium (Prontera) - Swanhild
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
@@ -111,7 +111,6 @@ prtg_cas02,94,61,4	duplicate(cm)	Roy#prtg_cas02	55
 // Treasure Room Exit
 //============================================================
 prtg_cas02,207,228,0	script	#Lever_PR02	111,{
-
 	mes " ";
 	mes "There's a small lever. Will you pull it?";
 	next;

npc/guild/prtg_cas03.txt

@@ -1,5 +1,5 @@
 //===== rAthena Script =======================================
-//= War of Emperium (Prontera)
+//= War of Emperium (Prontera) - Fadhgridh
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
@@ -109,7 +109,6 @@ prtg_cas03,51,100,4	duplicate(cm)	Sttick#prtg_cas03	55
 // Treasure Room Exit
 //============================================================
 prtg_cas03,193,130,0	script	#Lever_PR03	111,{
-
 	mes " ";
 	mes "There's a small lever. Will you pull it?";
 	next;

npc/guild/prtg_cas04.txt

@@ -1,5 +1,5 @@
 //===== rAthena Script =======================================
-//= War of Emperium (Prontera)
+//= War of Emperium (Prontera) - Skoegul
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
@@ -109,7 +109,6 @@ prtg_cas04,259,265,4	duplicate(cm)	Van Dreth#prtg_cas04	55
 // Treasure Room Exit
 //============================================================
 prtg_cas04,275,160,0	script	#Lever_PR04	111,{
-
 	mes " ";
 	mes "There's a small lever. Will you pull it?";
 	next;

npc/guild/prtg_cas05.txt

@@ -1,5 +1,5 @@
 //===== rAthena Script =======================================
-//= War of Emperium (Prontera)
+//= War of Emperium (Prontera) - Gondul
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
@@ -107,7 +107,6 @@ prtg_cas05,36,37,4	duplicate(cm)	Raynor#prtg_cas05	55
 // Treasure Room Exit
 //============================================================
 prtg_cas05,281,176,0	script	#Lever_PR05	111,{
-
 	mes " ";
 	mes "There's a small lever. Will you pull it?";
 	next;

npc/guild/trs_rp.txt

@@ -7,28 +7,29 @@
 //===== Compatible With: ===================================== 
 //= rAthena Project
 //===== Description: ========================================= 
-//= Warps every Player out of the Treasure Room except for the
-//= Guildleader.
+//= [Official Conversion]
+//= Restricts Treasure Room entry to Guild Masters only.
 //===== Additional Comments: ================================= 
 //= 1.0 Converted from the official script.
 //= 1.1 Reverted back and optimized. [Daegaladh]
 //============================================================ 
 
+// Main NPC :: ban_stealer
+//============================================================
 -	script	Gld_Trea_Protect::Gld_Trea_Protect	-1,{
-
+	end;
 OnTouch:
-	// Store the Guild ID of castle occupant.
 	set .@GID, getcastledata(strnpcinfo(2),1);
-		if (strcharinfo(0) != getguildmaster(.@GID)) {
-			if (compare(strnpcinfo(2),"aldeg"))
-				warp "aldebaran",143,112;
-			else if (compare(strnpcinfo(2),"gefg"))
-				warp "geffen",120,38;
-			else if (compare(strnpcinfo(2),"payg"))
-				warp "payon",100,100;
-			else if (compare(strnpcinfo(2),"prtg"))
-				warp "prontera",119,64;
-		}
+	if (strcharinfo(0) != getguildmaster(.@GID)) {
+		if (compare(strnpcinfo(2),"aldeg"))
+			warp "aldebaran",143,112;
+		else if (compare(strnpcinfo(2),"gefg"))
+			warp "geffen",120,38;
+		else if (compare(strnpcinfo(2),"payg"))
+			warp "payon",100,100;
+		else if (compare(strnpcinfo(2),"prtg"))
+			warp "prontera",119,64;
+	}
 	end;
 }
 

npc/re/instances/OldGlastHeim.txt

@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= Ziu, Heris (translation)
 //===== Current Version: ===================================== 
-//= 1.0
+//= 1.1
 //===== Compatible With: ===================================== 
 //= rAthena Project
 //===== Description: ========================================= 
@@ -11,6 +11,8 @@
 //= Glast Heim castle and how it ended up in ruins.
 //===== Additional Comments: ================================= 
 //= 1.0 First version. [Euphy]
+//=     This is a custom version, and may contain bugs.
+//= 1.1 Bug fixes; removed redundant OnInstanceInit scripts.
 //============================================================ 
 
 glast_01,204,273,6	script	Hugin#ghinstance	755,{
@@ -183,8 +185,6 @@ OnEnable:
 	}
 	close;
 OnInstanceInit:
-	donpcevent instance_npcname(strnpcinfo(0))+"::OnDisable";
-	end;
 OnDisable:
 	hideonnpc instance_npcname(strnpcinfo(0));
 	end;
@@ -281,8 +281,6 @@ OnEnable:
 		end;
 	}
 OnInstanceInit:
-	donpcevent instance_npcname("Heinrich#ghinstance1")+"::OnDisable";
-	end;
 OnDisable:
 	hideonnpc instance_npcname("Heinrich#ghinstance1");
 	end;
@@ -294,8 +292,6 @@ OnEnable:
 1@gl_k,152,97,3	script	Varmunt#ghinstance2	654,{
 	end;
 OnInstanceInit:
-	donpcevent instance_npcname("Varmunt#ghinstance2")+"::OnDisable";
-	end;
 OnDisable:
 	hideonnpc instance_npcname("Varmunt#ghinstance2");
 	end;
@@ -328,8 +324,6 @@ OnTalk7:
 1@gl_k,149,97,6	script	Heinrich#ghinstance2	652,{
 	end;
 OnInstanceInit:
-	donpcevent instance_npcname("Heinrich#ghinstance2")+"::OnDisable";
-	end;
 OnDisable:
 	hideonnpc instance_npcname("Heinrich#ghinstance2");
 	end;
@@ -371,8 +365,6 @@ OnTalk10:
 1@gl_k,149,100,6	script	Heinrich#ghinstance3	652,{
 	end;
 OnInstanceInit:
-	donpcevent instance_npcname("Heinrich#ghinstance3")+"::OnDisable";
-	end;
 OnDisable:
 	hideonnpc instance_npcname("Heinrich#ghinstance3");
 	end;
@@ -408,8 +400,6 @@ OnTalk8:
 1@gl_k,149,89,1	script	Himmelmez#ghinstance1	650,{
 	end;
 OnInstanceInit:
-	donpcevent instance_npcname("Himmelmez#ghinstance1")+"::OnDisable";
-	end;
 OnDisable:
 	hideonnpc instance_npcname("Himmelmez#ghinstance1");
 	end;
@@ -446,8 +436,6 @@ OnTalk8:
 //============================================================
 1@gl_k,0,0,0	script	#talkinstance1	-1,{
 OnInstanceInit:
-	donpcevent instance_npcname("#talkinstance1")+"::OnDisable";
-	end;
 OnDisable:
 	disablenpc instance_npcname("#talkinstance1");
 	end;
@@ -703,8 +691,6 @@ OnMyMobDead:
 1@gl_k,145,54,6	script	.#ghinstance1	2471,{
 	end;
 OnInstanceInit:
-	donpcevent instance_npcname(strnpcinfo(0))+"::OnDisable";
-	end;
 OnDisable:
 	hideonnpc instance_npcname(strnpcinfo(0));
 	end;
@@ -747,8 +733,6 @@ OnTalkK:
 1@gl_k,145,59,6	script	.#ghinstance3	111,{
 	end;
 OnInstanceInit:
-	donpcevent instance_npcname(strnpcinfo(0))+"::OnDisable";
-	end;
 OnDisable:
 	hideonnpc instance_npcname(strnpcinfo(0));
 	end;
@@ -773,8 +757,6 @@ OnEffect1:
 1@gl_k,96,80,0	script	#ghinstancewarp1	45,1,2,{
 	end;
 OnInstanceInit:
-	donpcevent instance_npcname(strnpcinfo(0))+"::OnDisable";
-	end;
 OnDisable:
 	disablenpc instance_npcname(strnpcinfo(0));
 	end;
@@ -817,8 +799,6 @@ OnTouch:
 //============================================================
 1@gl_k,0,0,0	script	#ghmemorialmob01	-1,{
 OnInstanceInit:
-	donpcevent instance_npcname("#ghmemorialmob01")+"::OnDisable";
-	end;
 OnDisable:
 	disablenpc instance_npcname("#ghmemorialmob01");
 	end;
@@ -889,8 +869,6 @@ OnMyMobDead:
 		close;
 	}
 OnInstanceInit:
-	donpcevent instance_npcname("Aspiring Butcher#clearGH")+"::OnDisable";
-	end;
 OnDisable:
 	hideonnpc instance_npcname("Aspiring Butcher#clearGH");
 	end;
@@ -943,8 +921,6 @@ OnEnable:
 		close;
 	}
 OnInstanceInit:
-	donpcevent instance_npcname("Hollgrehenn Destroyer")+"::OnDisable";
-	end;
 OnDisable:
 	hideonnpc instance_npcname("Hollgrehenn Destroyer");
 	end;
@@ -955,8 +931,6 @@ OnEnable:
 
 1@gl_k,0,0,0	script	#ghmemorialmob02	-1,{
 OnInstanceInit:
-	donpcevent instance_npcname("#ghmemorialmob02")+"::OnDisable";
-	end;
 OnDisable:
 	disablenpc instance_npcname("#ghmemorialmob02");
 	end;
@@ -1004,8 +978,6 @@ OnTouch:
 OnMyMobDead:
 	end;
 OnInstanceInit:
-	donpcevent instance_npcname(strnpcinfo(0))+"::OnEnable";
-	end;
 OnEnable:
 	enablenpc instance_npcname(strnpcinfo(0));
 	end;
@@ -1049,8 +1021,6 @@ OnDisable:
 //============================================================
 1@gl_k,0,0,0	script	#ghmemorialmob03	-1,{
 OnInstanceInit:
-	donpcevent instance_npcname("#ghmemorialmob03")+"::OnDisable";
-	end;
 OnDisable:
 	disablenpc instance_npcname("#ghmemorialmob03");
 	end;
@@ -1090,8 +1060,6 @@ OnMyMobDead:
 //============================================================
 1@gl_k,0,0,0	script	#ghmemorialmob04	-1,{
 OnInstanceInit:
-	donpcevent instance_npcname("#ghmemorialmob04")+"::OnDisable";
-	end;
 OnDisable:
 	disablenpc instance_npcname("#ghmemorialmob04");
 	end;
@@ -1121,8 +1089,6 @@ OnTouch:
 	donpcevent instance_npcname("#GHMclear3")+"::OnDisable";
 	end;
 OnInstanceInit:
-	donpcevent instance_npcname("#GHMclear3")+"::OnDisable";
-	end;
 OnDisable:
 	disablenpc instance_npcname("#GHMclear3");
 	end;
@@ -1138,8 +1104,6 @@ OnTimer2000:
 
 1@gl_k,0,0,0	script	#controlGH3	-1,{
 OnInstanceInit:
-	donpcevent instance_npcname("#controlGH3")+"::OnDisable";
-	end;
 OnDisable:
 	disablenpc instance_npcname("#controlGH3");
 	end;
@@ -1201,8 +1165,6 @@ OnTimer38000:
 	cutin "gl_heinrich1",255;
 	end;
 OnInstanceInit:
-	donpcevent instance_npcname("Heinrich#ghinstance4")+"::OnDisable";
-	end;
 OnDisable:
 	hideonnpc instance_npcname("Heinrich#ghinstance4");
 	end;
@@ -1228,8 +1190,6 @@ OnTalk3:
 	cutin "gl_himel2",255;
 	end;
 OnInstanceInit:
-	donpcevent instance_npcname("Himmelmez#ghinstance2")+"::OnDisable";
-	end;
 OnDisable:
 	hideonnpc instance_npcname("Himmelmez#ghinstance2");
 	end;
@@ -1276,8 +1236,6 @@ OnTalk6:
 	cutin "gl_barmund2",255;
 	end;
 OnInstanceInit:
-	donpcevent instance_npcname("Varmunt#ghinstance3")+"::OnDisable";
-	end;
 OnDisable:
 	hideonnpc instance_npcname("Varmunt#ghinstance3");
 	end;
@@ -1303,8 +1261,6 @@ OnTalk2:
 	cutin "gl_heinrich1",255;
 	end;
 OnInstanceInit:
-	donpcevent instance_npcname("Heinrich#ghinstance5")+"::OnDisable";
-	end;
 OnDisable:
 	hideonnpc instance_npcname("Heinrich#ghinstance5");
 	end;
@@ -1336,8 +1292,6 @@ OnTalk5:
 	cutin "gl_barmund1",255;
 	end;
 OnInstanceInit:
-	donpcevent instance_npcname("Varmunt#ghinstance4")+"::OnDisable";
-	end;
 OnDisable:
 	hideonnpc instance_npcname("Varmunt#ghinstance4");
 	end;
@@ -1397,28 +1351,27 @@ OnTalk17:
 2@gl_k,150,67,0	script	#effectGH01	111,10,10,{
 	end;
 OnTouch:
-	specialeffect EF_BASH;
-	donpcevent instance_npcname("#controlGH4")+"::OnEnable";
-	donpcevent instance_npcname("#effectGH01")+"::OnDisable";
+	if (.touch) {
+		set .touch,0;
+		specialeffect EF_BASH;
+		donpcevent instance_npcname("#controlGH4")+"::OnEnable";
+	}
 	end;
 OnEffect:
 	specialeffect EF_LORD;
 	end;
 OnInstanceInit:
-	donpcevent instance_npcname("#effectGH01")+"::OnDisable";
-	end;
 OnDisable:
 	disablenpc instance_npcname("#effectGH01");
 	end;
 OnEnable:
 	enablenpc instance_npcname("#effectGH01");
+	set .touch,1;	// only activate OnTouch once
 	end;
 }
 
 2@gl_k,0,0,0	script	#controlGH4	-1,{
 OnInstanceInit:
-	donpcevent instance_npcname("#controlGH4")+"::OnDisable";
-	end;
 OnDisable:
 	disablenpc instance_npcname("#controlGH4");
 	end;
@@ -1440,7 +1393,6 @@ OnTimer12000:
 	donpcevent instance_npcname("Varmunt#ghinstance4")+"::OnTalk3";
 	end;
 OnTimer15000:
-	donpcevent instance_npcname("#effectGH01")+"::OnEnable";
 	donpcevent instance_npcname("#effectGH01")+"::OnEffect";
 	end;
 OnTimer18000:
@@ -1511,8 +1463,6 @@ OnTimer70000:
 
 2@gl_k,0,0,0	script	#ghmemorialmob05	-1,{
 OnInstanceInit:
-	donpcevent instance_npcname("#ghmemorialmob05")+"::OnDisable";
-	end;
 OnDisable:
 	disablenpc instance_npcname("#ghmemorialmob05");
 	end;
@@ -1560,8 +1510,6 @@ OnMyMobDead:
 
 2@gl_k,0,0,0	script	#ghmemorialmob06	-1,{
 OnInstanceInit:
-	donpcevent instance_npcname("#ghmemorialmob06")+"::OnDisable";
-	end;
 OnDisable:
 	disablenpc instance_npcname("#ghmemorialmob06");
 	end;
@@ -1603,8 +1551,6 @@ OnTimer92000:
 
 2@gl_k,0,0,0	script	#ghmemorialmob07	-1,{
 OnInstanceInit:
-	donpcevent instance_npcname("#ghmemorialmob07")+"::OnDisable";
-	end;
 OnDisable:
 	disablenpc instance_npcname("#ghmemorialmob07");
 	end;
@@ -1626,8 +1572,6 @@ OnMyMobDead:
 
 2@gl_k,0,0,0	script	#ghmemorialmob08	-1,{
 OnInstanceInit:
-	donpcevent instance_npcname("#ghmemorialmob08")+"::OnDisable";
-	end;
 OnDisable:
 	disablenpc instance_npcname("#ghmemorialmob08");
 	end;
@@ -1674,8 +1618,6 @@ OnMyMobDead:
 
 2@gl_k,0,0,0	script	#ghmemorialmob09	-1,{
 OnInstanceInit:
-	donpcevent instance_npcname("#ghmemorialmob09")+"::OnDisable";
-	end;
 OnDisable:
 	disablenpc instance_npcname("#ghmemorialmob09");
 	end;
@@ -1697,8 +1639,6 @@ OnMyMobDead:
 
 2@gl_k,0,0,0	script	#ghmemorialmob10	-1,{
 OnInstanceInit:
-	donpcevent instance_npcname("#ghmemorialmob10")+"::OnDisable";
-	end;
 OnDisable:
 	disablenpc instance_npcname("#ghmemorialmob10");
 	end;
@@ -1718,8 +1658,6 @@ OnMyMobDead:
 2@gl_k,155,250,7	script	Heinrich#ghinstance6	652,{
 	end;
 OnInstanceInit:
-	donpcevent instance_npcname("Heinrich#ghinstance6")+"::OnDisable";
-	end;
 OnDisable:
 	hideonnpc instance_npcname("Heinrich#ghinstance6");
 	end;
@@ -1755,8 +1693,6 @@ OnTalk6:
 	cutin "gl_barmund2",255;
 	end;
 OnInstanceInit:
-	donpcevent instance_npcname("Varmunt#ghinstance5")+"::OnDisable";
-	end;
 OnDisable:
 	hideonnpc instance_npcname("Varmunt#ghinstance5");
 	end;
@@ -1771,8 +1707,6 @@ OnTalk1:
 2@gl_k,158,252,3	script	Himmelmez#ghinstance4	650,4,4,{
 	end;	
 OnInstanceInit:
-	donpcevent instance_npcname("Himmelmez#ghinstance4")+"::OnDisable";
-	end;
 OnDisable:
 	hideonnpc instance_npcname("Himmelmez#ghinstance4");
 	end;
@@ -1826,13 +1760,11 @@ OnTouch:
 	donpcevent instance_npcname("#controlGH6")+"::OnDisable";
 	end;
 OnInstanceInit:
-	donpcevent instance_npcname("#controlGH6")+"::OnDisable";
-	end;
 OnDisable:
-	hideonnpc instance_npcname("#controlGH6");
+	disablenpc instance_npcname("#controlGH6");
 	end;
 OnEnable:
-	hideoffnpc instance_npcname("#controlGH6");
+	enablenpc instance_npcname("#controlGH6");
 	end;
 }
 
@@ -1845,8 +1777,6 @@ OnTouch:
 	donpcevent instance_npcname("Himmelmez#ghinstance3")+"::OnDisable";
 	end;
 OnInstanceInit:
-	donpcevent instance_npcname("Himmelmez#ghinstance3")+"::OnDisable";
-	end;
 OnDisable:
 	disablenpc instance_npcname("Himmelmez#ghinstance3");
 	end;
@@ -1858,8 +1788,6 @@ OnEnable:
 2@gl_k,158,255,3	script	Gerhard#ghinstance1	651,{
 	end;
 OnInstanceInit:
-	donpcevent instance_npcname("Gerhard#ghinstance1")+"::OnDisable";
-	end;
 OnDisable:
 	hideonnpc instance_npcname("Gerhard#ghinstance1");
 	end;
@@ -1894,8 +1822,6 @@ OnEffect5:
 
 2@gl_k,0,0,0	script	#controlGH5	-1,{
 OnInstanceInit:
-	donpcevent instance_npcname("#controlGH5")+"::OnDisable";
-	end;
 OnDisable:
 	disablenpc instance_npcname("#controlGH5");
 	end;
@@ -2046,8 +1972,6 @@ OnTimer80000:
 		}
 	}
 OnInstanceInit:
-	donpcevent instance_npcname("Hugin#ghinstance1")+"::OnDisable";
-	end;
 OnDisable:
 	disablenpc instance_npcname("Hugin#ghinstance1");
 	end;