- Guild folder update.

* Partially rewrote all castle files and updated all Castle flags, NPC's and warp coordinations to latest available official file.
* Renamed agit_template to agit_main and also updated it to latest available official file.
* Removed the Treasure Room Protection from agit_template and separated it into another file which will now be known as trs_rp.txt
- trs_rp.txt will allow that only the Guildleader can be in the Treasure Room, if you want to disable this protection just set an // in scripts_guild.conf before npc: npc/guild/trs_rp.txt .
- Moved payon castle map warps from warps/cities/payon.txt to warps/guild/guildcastles.txt .

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15923 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 64 insertions, 66 deletions

diff --git a/npc/guild/gefg_cas04.txt b/npc/guild/gefg_cas04.txt
index d77826f5e..21157c9ae 100644
--- a/npc/guild/gefg_cas04.txt
+++ b/npc/guild/gefg_cas04.txt
@@ -10,28 +10,20 @@
 //= NPCs that relate to Geffen Guild Castle 4
 //===== Additional Comments: =================================
 //= 1.0 First Version. No longer uses functions. [L0ne_W0lf]
-//= 1.1 Corrected treasure room switch coordinates. [L0ne_W0lf]
-//= 1.2 Removed dialog from interior flags. [L0ne_W0lf]
+//= 1.1 Removed dialog from interior flags. [L0ne_W0lf]
+//= 1.2 Partially rewrote Script. [Masao]
 //============================================================
 
-// Guild Flag (Town)
-//============================================================
-geffen,127,130,7	script	Bergel#g4-1::Bergel	722,{
-	end;
-
-OnRecvCastleG04:
-	FlagEmblem GetCastleData("gefg_cas04",1);
-	end;
-}
-
 // Guild Flag (Outside Castle)
 //============================================================
-gef_fild13,190,283,3	script	Bergel#g4-2::Bergel2	722,{
+-	script	Bergel#1::OutsideFlagsG4	722,{
+
 	set .@GID, GetCastleData("gefg_cas04",1);
+
 	if (.@GID == 0) {
-		mes " [ Edict of the Divine Rune Midgard Kingdom ]";
+		mes "[ Edict of the Divine Rune-Midgarts Kingdom ]";
 		mes " ";
-		mes "1. Follow the ordinance of The Divine Rune Midgard Kingdom, ";
+		mes "1. Follow the ordinance of The Divine Rune-Midgarts Kingdom, ";
 		mes "We declare that";
 		mes "there is no formal master of this castle.";
 		mes " ";
@@ -40,33 +32,33 @@ gef_fild13,190,283,3	script	Bergel#g4-2::Bergel2	722,{
 		mes "and destroy the Emperium,";
 		mes "the king will endow the one with";
 		mes "ownership of this castle.";
+		close;
 	}
-	else {
-		if (getcharid(2) == .@GID) {
-			mes "Brave ones...";
-			mes "Do you wish to return to your honorable place?";
-			next;
-			if (select("Return to the guild castle.:Quit.") == 1) {
-				if (getcharid(2) == GetCastleData("gefg_cas04",1)) {
-					warp "gefg_cas04",59,70;
-					//warp "gefg_cas04",168 43;
-					end;
-				}
+	if (getcharid(2) == .@GID) {
+		mes "[ Echoing Voice ]";
+		mes "Brave ones...";
+		mes "Do you wish to return to your honorable place?";
+		next;
+		if(select("Return to the guild castle.:Quit.") == 1) {
+			close2;
+			if (getcharid(2) == GetCastleData("gefg_cas04",1)) {
+				warp "gefg_cas04",168,43;
+				end;
 			}
-			close;
+			end;
 		}
-		mes "[ Edict of the Divine Rune Midgard Kingdom ]";
-		mes " ";
-		mes "1. Following the ordinance of the";
-		mes "Divine Rune Midgard Kingdom,";
-		mes "we approve that this place is in";
-		mes "the private possession of ^ff0000" + GetGuildName(.@GID) + "^000000 Guild.";
-		mes " ";
-		mes "2. The guild Master of ^ff0000"+ GetGuildName(.@GID) + "^000000 Guild is";
-		mes "^FF0000" + GetGuildMaster(.@GID) + "^000000";
-		mes "If there is anyone who objects to this,";
-		mes " prove your strength and honor with a steel blade in your hand.";
+		close;
 	}
+	mes "[ Edict of the Divine Rune-Midgarts Kingdom ]";
+	mes " ";
+	mes "1. Follow the ordinance of The Divine Rune-Midgarts Kingdom, ";
+	mes "we approve that this place is in";
+	mes "the private prossession of ^ff0000"+GetGuildName(.@GID)+"^000000 Guild.";
+	mes " ";
+	mes "2. The guild Master of ^ff0000"+GetGuildName(.@GID)+"^000000 Guild is";
+	mes "^ff0000"+GetGuildMaster(.@GID)+"^000000";
+	mes "If there is anyone who objects to this,";
+	mes "prove your strength and honor with a steel blade in your hand.";
 	close;
 
 OnRecvCastleG04:
@@ -74,11 +66,12 @@ OnRecvCastleG04:
 	end;
 }
 
-gef_fild13,199,274,3	duplicate(Bergel2)	Bergel#g4-3	722
+gef_fild13,190,283,3	duplicate(OutsideFlagsG4)	Bergel#1-2	722
+gef_fild13,199,274,3	duplicate(OutsideFlagsG4)	Bergel#2	722
 
 // Guild Flag (Inside Castle)
 //============================================================
-gefg_cas04,24,157,4	script	Bergel#g4-4::Bergel3	722,{
+-	script	Bergel#3::InsideFlagsG4	722,{
 	end;
 
 OnRecvCastleG04:
@@ -86,49 +79,54 @@ OnRecvCastleG04:
 	end;
 }
 
-gefg_cas04,35,158,4	duplicate(Bergel3)	Bergel#g4-5	722
-gefg_cas04,44,184,4	duplicate(Bergel3)	Bergel#g4-6	722
-gefg_cas04,51,184,4	duplicate(Bergel3)	Bergel#g4-7	722
-gefg_cas04,39,212,7	duplicate(Bergel3)	Bergel#g4-8	722
-gefg_cas04,29,212,1	duplicate(Bergel3)	Bergel#g4-9	722
-gefg_cas04,24,73,1	duplicate(Bergel3)	Bergel#g4-10	722
-gefg_cas04,35,73,4	duplicate(Bergel3)	Bergel#g4-11	722
+gefg_cas04,24,157,4	duplicate(InsideFlagsG4)	Bergel#3-2	722
+gefg_cas04,35,158,4	duplicate(InsideFlagsG4)	Bergel#4	722
+gefg_cas04,44,184,4	duplicate(InsideFlagsG4)	Bergel#5	722
+gefg_cas04,51,184,4	duplicate(InsideFlagsG4)	Bergel#6	722
+gefg_cas04,39,212,7	duplicate(InsideFlagsG4)	Bergel#7	722
+gefg_cas04,29,212,1	duplicate(InsideFlagsG4)	Bergel#8	722
+gefg_cas04,24,73,1	duplicate(InsideFlagsG4)	Bergel#9	722
+gefg_cas04,35,73,4	duplicate(InsideFlagsG4)	Bergel#10	722
 
-// AGIT Manager
+// Guild Flag (Town)
 //============================================================
-gefg_cas04,174,178,0	duplicate(Gld_Agit_Manager)	Agit#gefg_cas04	-1
+geffen,127,130,7	duplicate(InsideFlagsG4)	Bergel#11	722
 
-// Steward
+// Kafra Employee
 //============================================================
-gefg_cas04,73,46,3	duplicate(Gld_Mngr_Template)	Kellvahni#gefg_cas04	55
+gefg_cas04,59,70,3	duplicate(guildkafra)	Kafra Staff#gefg_cas04	117
 
-// Guardians
+// Steward
 //============================================================
-gefg_cas04,73,46,3	duplicate(Gld_Guard_Template)	Guardian#gefg_cas04	-1
+gefg_cas04,73,46,3	duplicate(cm)	Kellvahni#gefg_cas04	55
 
-// Kafra Staff
+// Treasure Room Exit
 //============================================================
-gefg_cas04,59,70,3	duplicate(Gld_Kafra_Template)	Kafra Staff#gefg_cas04	117
+gefg_cas04,116,123,0	script	#lever_G04	111,{
 
-// Master's Room Exit
-//============================================================
-gefg_cas04,117,123,0	script	#switch_G04	111,{
 	mes " ";
-	mes "There's a small lever. Will you pull it? ";
+	mes "There's a small lever. Will you pull it?";
 	next;
-	if(select("Pull.:Do not.") == 2) close;
-	warp "gefg_cas04",73,47;
-	end;
+	if(select("Pull.:Do not.") == 1) {
+		close2;
+		warp "gefg_cas04",73,47;
+		end;
+	}
+	close;
 }
 
-// Guild Treasure Protection
+// Guild Dungeon Switch
 //============================================================
-gefg_cas04,116,119,0	duplicate(Gld_Trea_Protect)	ban_warp#gefg_cas04	-1,6,6
+gefg_cas04,58,75,0	duplicate(gdlever)	#gefg_cas04	111
 
 // Guild Treasure Spawns
 //============================================================
 gefg_cas04,116,119,0	duplicate(Gld_Trea_Spawn)	Treasure#gefg_cas04	-1
 
-// Guild Dungeon Switch
+// AGIT Manager
+//============================================================
+gefg_cas04,174,178,0	duplicate(Gld_Agit_Manager)	Agit#gefg_cas04	-1
+
+// Guardians
 //============================================================
-gefg_cas04,58,75,0	duplicate(Gld_Dun_Template)	#gefg_cas04	111
+gefg_cas04,73,46,3	duplicate(Gld_Guard_Template)	Guardian#gefg_cas04	-1
\ No newline at end of file