From bc0cf0471276101770cb08b34ecb58dd7d65fd8d Mon Sep 17 00:00:00 2001
From: Lupus <Lupus@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Sun, 27 Aug 2006 06:07:26 +0000
Subject: fixed bandits beard quest. disabled guild storage by default. changed
 novices castles warper and treasure chests count to 1

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8496 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
 npc/guild/gldfunc_treasure.txt     |  7 ++++++-
 npc/guild/nguild/nguild_warper.txt | 17 +++++++++--------
 2 files changed, 15 insertions(+), 9 deletions(-)

(limited to 'npc/guild')

diff --git a/npc/guild/gldfunc_treasure.txt b/npc/guild/gldfunc_treasure.txt
index d296397ff..2b3a97ae3 100644
--- a/npc/guild/gldfunc_treasure.txt
+++ b/npc/guild/gldfunc_treasure.txt
@@ -50,7 +50,12 @@ function	script	F_GldTreas	{
 	killmonster getarg(0)+".gat","Treasure_"+getarg(1)+"::OnDied";
 	if(GetCastleData(getarg(0)+".gat",2) > 100 || GetCastleData(getarg(0)+".gat",1) == 0) return;
 	//sets the counter variable = to the box number amount
-	set $@n,GetCastleData(getarg(0)+".gat",2)/5+4;
+	if(getarg(0) == "nguild_prt" || getarg(0) == "nguild_alde" || getarg(0) == "nguild_gef" || getarg(0) == "nguild_pay" ) {
+		//Novice Castles can't have more than 1
+		set $@n,1;
+	}else{
+		set $@n,GetCastleData(getarg(0)+".gat",2)/5+4;
+	}
 L_SPAWN:
 	areamonster getarg(0)+".gat",getarg(6),getarg(7),getarg(8),getarg(9),"Treasure Chest",getarg(5)+($@n & 1),1,"Treasure_"+getarg(1)+"::OnDied";
 	set $@n, $@n - 1;
diff --git a/npc/guild/nguild/nguild_warper.txt b/npc/guild/nguild/nguild_warper.txt
index e39f62d3d..5391c8ba8 100644
--- a/npc/guild/nguild/nguild_warper.txt
+++ b/npc/guild/nguild/nguild_warper.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= Lupus
 //===== Current Version: =====================================
-//= 1.4
+//= 1.5
 //===== Compatible With: =====================================
 //= eAthena 1+; RO Episode 4+
 //===== Description: =========================================
@@ -21,6 +21,8 @@
 //= 1.3 Restricted TK,High classes >=90 BaseLevel,
 //= 	updated list of unallowed buffs [Lupus]
 //= 1.4 Restricted it to 80 Base Level [Lupus]
+//= 1.5 According to official info: 1 Treasure Chest per Castle
+//=		TODO: The official entrance is in Izlude.
 //============================================================
 
 
@@ -28,16 +30,15 @@ prontera.gat,146,163,6	script	Novice Castles	729,{
 	mes "[Cita]";
 	mes "Hey! I'm a new usher of Novice Castles.";
 	next;
-	if( (Class>=Job_Novice && Class<=Job_Thief)
-		|| (Class==Job_Taekwon && BaseLevel<80) || Class==Job_SuperNovice || Class==Job_Super_Baby
-		|| (Class>=Job_Baby && Class<=Job_Baby_Thief)
-		|| (Class>=Job_Novice_High && Class<=Job_Thief_High && BaseLevel<80)
+	if( BaseJob == Job_SuperNovice || BaseJob == Job_Novice 
+			|| (Class==Job_Taekwon && BaseLevel<60)
+			|| (Class==Job_Gunslinger && BaseLevel<60)
+			|| (BaseJob>=Job_Novice && BaseJob<=Job_Thief && BaseLevel<60) )
 	) menu "Warp me to Novice Castles",M_WARP,"Cancel",-;
 
 	mes "[Cita]";
-	mes "All the 2nd classes aren't allowed to enter the sacred Novice Castles place.";
-	mes "As well as Teakwons and High Classes from 80 Base Level.";
-	emotion 0;
+	mes "I'm sorry, you can't enter the sacred Novice Castles place.";
+	emotion e_sry;
 	close;
 
 M_WARP:
-- 
cgit v1.2.3-70-g09d2