* Updated 2006 headgear quests to semi-official dialog.

* Various updates to the various guild Castle scripts.
- Added Guild Master Room protection. Further security so only the master of the current castle can enter the treasure room.
- Updated Guild Castle Flags  again. Updated remaining dialogs to official.
- Updated a couple announces for when the Emperium breaks. Both are now up to par with iRO.
- Moved nguild to the events folder and commented it out, as it was a kRO event that was used twice. Updated .confs to reflect this change.
* Added the first class skill resetter into Prontera. She resets players under base level 40 who are first or expanded class.


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

1 files changed, 17 insertions, 1 deletions

diff --git a/npc/guild/gldfunc_treasure.txt b/npc/guild/gldfunc_treasure.txt
index 5ae24ddfd..8841fbb01 100644
--- a/npc/guild/gldfunc_treasure.txt
+++ b/npc/guild/gldfunc_treasure.txt
@@ -3,12 +3,13 @@
 //===== By: ==================================================
 //= holyAngelX (1.0) Akaru and ho|yAnge|X (1.1)
 //===== Current Version: =====================================
-//= 1.8
+//= 1.9
 //===== Compatible With: =====================================
 //= eAthena 1+; RO Episode 4+
 //===== Description: =========================================
 //= F_GldTreas spawns treasure chests used by the guild master.
 //= F_GldTreasSw allows the player to get out of the treasure room.
+//= F_TreasProtect removes non-guild master players from treasure room.
 //==============================================
 //= Break down of arguments used in the F_GldTreas:
 //=   arg(0): name of guild castle
@@ -26,6 +27,12 @@
 //=   arg(0): name of guild castle.
 //=   arg(1): x1 coordinate for warp back to guild castle
 //=   arg(2): y1 coordinate for warp back to guild castle
+//
+//= Break down of arguments used in the F_TreasProtect:
+//=   arg(0): name of guild castle.
+//=   arg(1): name of warp-to city 
+//=   arg(2): x1 coordinate for warp-to city
+//=   arg(3): y1 coordinate for warp-to city
 //===== Additional Comments: =================================
 //= 1.2 Treasure room Spawn, and Treasure room Switch scripts now use these functions.[kobra_k88]
 //= 1.2a Function now returns to script that called it.  Removed TreasureSpawn2.
@@ -38,6 +45,7 @@
 //= 1.6 to Aegis X.2 formula 4..24 Treasure Chests [Lupus]
 //= 1.7 Box Count fix by Zoc. Now it spawns 1st/2nd Treasure Chest 50%/50% [Lupus]
 //= 1.8 Official Treasure Spawn in Novice Castles. Had to add +1 in odd/even formula to leave correct ID of NG Treasure Box 8) [Lupus]
+//= 1.9 Added F_TreasProtect to remove players who are not guild master from treasure room. [L0ne_W0lf]
 //============================================================
 
 
@@ -83,3 +91,11 @@ function	script	F_GldTreasSw	{
 		warp getarg(0),getarg(1),getarg(2);
 		return;
 }
+
+//==============================================================
+//  Treasure Room Protrection
+//===============================================================
+function	script	F_TreasProtect	{
+	set @GID, GetCastleData(getarg(0),1);
+	if (strcharinfo(0) != getguildmaster(@GID)) warp getarg(1),getarg(2),getarg(3);
+}