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

5 files changed, 31 insertions, 13 deletions

diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index a2128c9b5..2988591ca 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -32,6 +32,13 @@ Playtester
 

 Date		Added

 ======

+08/27

+	* After big discussion at the board, by default we decided to disable CUSTOM

+	  Guild Storage option in Guild Kafras. You can uncomment it in functions_kafras.txt [Lupus]

+	- Also made Novice Castles Event close to the original: 1st classes over 60 Base Level

+	  can't take part. Novice Castles also manufacture not more than

+	  1 Treasure Chest despite of the Economic invest.

+	- Fixed custom Bandit's Beard quest. Thanks to Vhan Morthis for pointing it out.

 08/26

 	* Added official effects to the Socket Enchant NPC [Playtester]

 08/25

diff --git a/npc/custom/quests/bandit_beard.txt b/npc/custom/quests/bandit_beard.txt
index 8efb0243a..609a7fe14 100644
--- a/npc/custom/quests/bandit_beard.txt
+++ b/npc/custom/quests/bandit_beard.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 

 //= Mega Man Expert & Lupus

 //===== Current Version: ===================================== 

-//= 1.1b

+//= 1.2

 //===== Compatible With: ===================================== 

 //= eAthena 0.5.2 +

 //===== Description: ========================================= 

@@ -13,6 +13,7 @@
 //= 1.0 First release

 //= 1.1 Fixed some exploits, bugs and typos. Optimized 8) [Lupus]

 //= 1.1b fixed some typos

+//= 1.2 fixed donpcevent label [Lupus]

 //============================================================

 

 umbala.gat,126,129,4	script	Bearded Man	120,{

@@ -183,7 +184,7 @@ alberta.gat,65,123,6	script	Man	85,{
 	mes "[Thread Merchant]";

 	mes "Oh NO! Here they come!!";

 	emotion 19;

-	donpcevent "BRDQ_MOBS";

+	donpcevent "BRDQ_MOBS::OnStart";

 	close;

 

 L_KILLED:

@@ -208,6 +209,7 @@ M_NO:
 

 //mobsummons -------

 alberta.gat,1,1,1	script	BRDQ_MOBS	-1,{

+OnStart:

 	set $@beardMob,10;

 	set $@beardMobD,0;

 	monster "alberta.gat",65,120,"Thef Bug Male",1054,1,"BRDQ_MOBS::OnDie";

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:

diff --git a/npc/kafras/functions_kafras.txt b/npc/kafras/functions_kafras.txt
index d147a3f65..f17497469 100644
--- a/npc/kafras/functions_kafras.txt
+++ b/npc/kafras/functions_kafras.txt
@@ -5,7 +5,7 @@
 //= eAthena Dev Team

 //= Darlskies, Darkchild, Syrus22, Lupus, kobra_k88 (2.0)

 //===== Current Version: ===================================== 

-//= 5.1

+//= 5.2

 //===== Compatible With: ===================================== 

 //= eAthena 1.0

 //===== Description: =========================================

@@ -34,6 +34,7 @@
 //=	  Also, the kafra upon warp was giving back the zeny. Removed. [erKURITA]

 //= 5.1 Optimized a little, added no tele/save arg's [Evera]

 //= 5.1a Temporary? Added F_ClearGarbage to clear unused/outdated variables [Lupus]

+//= 5.2 By default commented out custom Guilds Kafra's "Guild Storage". [Lupus]

 //============================================================ 

 

 

@@ -109,7 +110,9 @@ function	script	F_Kafra	{
 	if(getarg(0)==2) {

 	//Guilds Kafra

 		cleararray @K_Menu0$[0],"",7;

-		setarray @K_Menu0$[0],"-Use Storage","-Use Guild Storage","-Rent a Cart","-Use Teleport Service","-Cancel";

+		setarray @K_Menu0$[0],"-Use Storage","-Use Teleport Service","-Rent a Cart","-Cancel";

+		//cleararray @K_Menu0$[0],"",7;

+		//setarray @K_Menu0$[0],"-Use Storage","-Use Guild Storage","-Rent a Cart","-Use Teleport Service","-Cancel";

 	}

 	menu 	@K_Menu0$[0],K_Menu0,@K_Menu0$[1],K_Menu1,@K_Menu0$[2],K_Menu2,

 		@K_Menu0$[3],K_Menu3,@K_Menu0$[4],K_Menu4,@K_Menu0$[5],K_Menu5,