fixed disappearing treasure chests, updated NWoE

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

2 files changed, 28 insertions, 8 deletions

diff --git a/npc/guild/nguild/nguild_treas.txt b/npc/guild/nguild/nguild_treas.txt
index 7c4a219d3..5c16e71a0 100644
--- a/npc/guild/nguild/nguild_treas.txt
+++ b/npc/guild/nguild/nguild_treas.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================

 //= kobra_k88

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

-//= 1.0

+//= 1.1

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

 //= eAthena 0.1+; RO Episode 4+

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

@@ -19,9 +19,11 @@
 nguild_alde.gat,1,1,1	script	Treasure_N01	-1,{

 

 OnRecvCastleN01:

+	end;

+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,114,218,123,227,1;

 	end;

 

 OnDied:

@@ -43,9 +45,11 @@ nguild_alde.gat,123,223,0	script	Switch#TresN01	111,{
 nguild_gef.gat,1,1,1	script	Treasure_N02	-1,{

 

 OnRecvCastleN02:

+	end;

+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,150,108,158,114,1;

 	end;

 

 OnDied:

@@ -66,9 +70,11 @@ nguild_gef.gat,152,117,0	script	Switch#TresN02	111,{
 // Treasure Spawn ---------------------------

 nguild_pay.gat,1,1,0	script	Treasure_N03	-1,{

 OnRecvCastleN03:

+	end;

+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,286,4,295,13,1;

 	end;

 

 OnDied:

@@ -89,9 +95,11 @@ nguild_pay.gat,295,8,0	script	Switch#TresN03	111,{
 // Treasure Spawn -------------------------------

 nguild_prt.gat,1,1,0	script	Treasure_N04	-1,{

 OnRecvCastleN04:

+	end;

+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,6,204,15,213,1;

 	end;

 

 OnDied:

diff --git a/npc/guild/nguild/nguild_warper.txt b/npc/guild/nguild/nguild_warper.txt
index baa78bc2f..0c6c5b41a 100644
--- a/npc/guild/nguild/nguild_warper.txt
+++ b/npc/guild/nguild/nguild_warper.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================

 //= Lupus

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

-//= 1.2

+//= 1.3

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

 //= eAthena 1+; RO Episode 4+

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

@@ -18,6 +18,8 @@
 //= 1.1 Now 2nd classes can't enter NC place at all

 //= 1.2 Restricted access of SG/SL. On warp clear some 

 //=	unallowed buffs [Lupus]

+//= 1.3 Restricted TK,High classes >=90 BaseLevel,

+//= 	updated list of unallowed buffs [Lupus]

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

 

 

@@ -26,9 +28,9 @@ prontera.gat,146,163,6	script	Novice Castles	729,{
 	mes "Hey! I'm a new usher of Novice Castles.";

 	next;

 	if( (Class>=Job_Novice && Class<=Job_Thief)

-		|| Class==Job_Taekwon || Class==Job_SuperNovice || Class==Job_Super_Baby

+		|| (Class==Job_Taekwon && BaseLevel<90) || Class==Job_SuperNovice || Class==Job_Super_Baby

 		|| (Class>=Job_Baby && Class<=Job_Baby_Thief)

-		|| (Class>=Job_Novice_High && Class<=Job_Thief_High)

+		|| (Class>=Job_Novice_High && Class<=Job_Thief_High && BaseLevel<90)

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

 

 	mes "[Cita]";

@@ -42,6 +44,16 @@ M_WARP:
 	sc_end SC_IMPOSITIO;

 	sc_end SC_SUFFRAGIUM;

 	sc_end SC_MAGNIFICAT;

+	sc_end SC_WEAPONPERFECTION;

+	sc_end SC_GOSPEL;

+	sc_end SC_BASILICA;

+	sc_end SC_MAGICPOWER;

+	sc_end SC_MARIONETTE;

+	sc_end SC_MARIONETTE2;

+	sc_end SC_DEVOTION;

+	sc_end SC_SACRIFICE;

+	sc_end SC_MAXOVERTHRUST;

+	sc_end SC_SPIRIT;

 	warp "n_castle.gat",102,93+rand(14);

 	close;

 }