offical novice Castles restrictions, treasure spawns, manager. Onlly entranse + mob spawns are custom

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

2 files changed, 12 insertions, 13 deletions

diff --git a/npc/guild/nguild/nguild_treas.txt b/npc/guild/nguild/nguild_treas.txt
index 5c16e71a0..27e3ff228 100644
--- a/npc/guild/nguild/nguild_treas.txt
+++ b/npc/guild/nguild/nguild_treas.txt
@@ -3,13 +3,14 @@
 //===== By: ==================================================

 //= kobra_k88

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

-//= 1.1

+//= 1.2

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

 //= eAthena 0.1+; RO Episode 4+

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

 //=

 //===== Additional Comments: =================================

 //= Based off existing guild scripts.  Do not know if it is accurate.[kobra_k88]

+//= 1.2 Official treasure spawn [Lupus]

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

 

 

@@ -23,7 +24,7 @@ OnRecvCastleN01:
 OnInit:

 	if($boxNumN01 == 0) end;

 	set $@bxN01, $boxNumN01;

-	callfunc "F_GldTreas","nguild_alde","N01",$boxNumN01,$@bxN01,$@boxIdN01,1324,114,218,123,227,1;

+	callfunc "F_GldTreas","nguild_alde","N01",$boxNumN01,$@bxN01,$@boxIdN01,1324+rand(10),114,218,123,227,1;

 	end;

 

 OnDied:

@@ -49,7 +50,7 @@ OnRecvCastleN02:
 OnInit:

 	if($boxNumN02 == 0) end;

 	set $@bxN02, $boxNumN02;

-	callfunc "F_GldTreas","nguild_gef","N02",$boxNumN02,$@bxN02,$@boxIdN02,1334,150,108,158,114,1;

+	callfunc "F_GldTreas","nguild_gef","N02",$boxNumN02,$@bxN02,$@boxIdN02,1334+rand(10),150,108,158,114,1;

 	end;

 

 OnDied:

@@ -74,7 +75,7 @@ OnRecvCastleN03:
 OnInit:

 	if($boxNumN03 == 0) end;

 	set $@bxN03, $boxNumN03;

-	callfunc "F_GldTreas","nguild_pay","N03",$boxNumN03,$@bxN03,$@boxIdN03,1344,286,4,295,13,1;

+	callfunc "F_GldTreas","nguild_pay","N03",$boxNumN03,$@bxN03,$@boxIdN03,1344+rand(10),286,4,295,13,1;

 	end;

 

 OnDied:

@@ -99,7 +100,7 @@ OnRecvCastleN04:
 OnInit:

 	if($boxNumN04 == 0) end;

 	set $@bxN04, $boxNumN04;

-	callfunc "F_GldTreas","nguild_prt","N04",$boxNumN04,$@bxN04,$@boxIdN04,1354,6,204,15,213,1;

+	callfunc "F_GldTreas","nguild_prt","N04",$boxNumN04,$@bxN04,$@boxIdN04,1354+rand(10),6,204,15,213,1;

 	end;

 

 OnDied:

diff --git a/npc/guild/nguild/nguild_warper.txt b/npc/guild/nguild/nguild_warper.txt
index 37638129a..860a8eafc 100644
--- a/npc/guild/nguild/nguild_warper.txt
+++ b/npc/guild/nguild/nguild_warper.txt
@@ -3,9 +3,9 @@
 //===== By: ==================================================

 //= Lupus

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

-//= 1.5

+//= 1.6

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

-//= eAthena 1+; RO Episode 4+

+//= eAthena 1+ with eaclass(); RO Episode 4+

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

 //=

 //===== Additional Comments: =================================

@@ -22,7 +22,8 @@
 //= 	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.

+//= 1.6 Only 1st Class < 60 BaseLevel Players can participate

+//=	TODO: The official entrance is in Izlude.

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

 

 

@@ -30,11 +31,8 @@ prontera.gat,146,163,6	script	Novice Castles	729,{
 	mes "[Cita]";

 	mes "Hey! I'm a new usher of Novice Castles.";

 	next;

-	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",-;

+	if( !(eaclass()&(EAJL_2|EAJL_UPPER)) && BaseLevel<60 )

+		menu "Warp me to Novice Castles",M_WARP,"Cancel",-;

 

 	mes "[Cita]";

 	mes "I'm sorry, you can't enter the sacred Novice Castles place.";