fixed disappearing treasure chests, updated NWoE

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

7 files changed, 96 insertions, 32 deletions

diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 74efc80ea..2798f78a2 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -27,6 +27,10 @@ Nexon
 

 Date		Added

 ======

+04/03

+	* Fixed Treasure Chest bug (They used to disappear on each reboot) [Lupus]

+	- Updated Novices Castles Warper restrictions: TK,High Classes over 89 lvl;

+		Added more buffs restrictions

 04/02

 	* Added missing kafra in Lighthalzen, thanks to Muad_Dib [Vicious]

 	* Fixed baby job change, thanks to Larry [Vicious]

diff --git a/npc/guild/aldeg/aldeg_treas.txt b/npc/guild/aldeg/aldeg_treas.txt
index 0e5925e50..e273a8171 100644
--- a/npc/guild/aldeg/aldeg_treas.txt
+++ b/npc/guild/aldeg/aldeg_treas.txt
@@ -4,7 +4,7 @@
 //= jAthena - kalen (1.0)

 //= 1.1 by Akaru, ho|yAnge|X, and Valaris

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

-//= 1.2

+//= 1.3

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

 //= eAthena 0.1+; RO Episode 4+

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

@@ -20,9 +20,11 @@
 aldeg_cas01.gat,1,1,1	script	Treasure_A01	-1,{

 

 OnRecvCastleA01:

+	end;

+OnInit:

 	if($boxNumA01 == 0) end;

 	set $@bxA01, $boxNumA01;

-//	callfunc "F_GldTreas","aldeg_cas01","A01",$boxNumA01,$@bxA01,$@boxIdA01,1324,114,218,123,227,1;

+	callfunc "F_GldTreas","aldeg_cas01","A01",$boxNumA01,$@bxA01,$@boxIdA01,1324,114,218,123,227,1;

 	end;

 

 OnDied:

@@ -44,9 +46,11 @@ aldeg_cas01.gat,123,223,0	script	Switch#TresA01	111,{
 aldeg_cas02.gat,1,1,1	script	Treasure_A02	-1,{

 

 OnRecvCastleA02:

+	end;

+OnInit:

 	if($boxNumA02 == 0) end;

 	set $@bxA02, $boxNumA02;

-//	callfunc "F_GldTreas","aldeg_cas02","A02",$boxNumA02,$@bxA02,$@boxIdA02,1326,130,226,138,235,1;

+	callfunc "F_GldTreas","aldeg_cas02","A02",$boxNumA02,$@bxA02,$@boxIdA02,1326,130,226,138,235,1;

 	end;

 

 OnDied:

@@ -67,9 +71,11 @@ aldeg_cas02.gat,139,235,0	script	Switch#TresA02	111,{
 aldeg_cas03.gat,1,1,1	script	Treasure_A03	-1,{

 

 OnRecvCastleA03:

+	end;

+OnInit:

 	if($boxNumA03 == 0) end;

 	set $@bxA03, $boxNumA03;

-//	callfunc "F_GldTreas","aldeg_cas03","A03",$boxNumA03,$@bxA03,$@boxIdA03,1328,220,264,229,273,1;

+	callfunc "F_GldTreas","aldeg_cas03","A03",$boxNumA03,$@bxA03,$@boxIdA03,1328,220,264,229,273,1;

 	end;

 

 OnDied:

@@ -90,9 +96,11 @@ aldeg_cas03.gat,229,267,0	script	Switch#TresA03	111,{
 aldeg_cas04.gat,1,1,1	script	Treasure_A04	-1,{

 

 OnRecvCastleA04:

+	end;

+OnInit:

 	if($boxNumA04 == 0) end;

 	set $@bxA04, $boxNumA04;

-//	callfunc "F_GldTreas","aldeg_cas04","A04",$boxNumA04,$@bxA04,$@boxIdA04,1330,80,8,89,17,1;

+	callfunc "F_GldTreas","aldeg_cas04","A04",$boxNumA04,$@bxA04,$@boxIdA04,1330,80,8,89,17,1;

 	end;

 

 OnDied:

@@ -113,9 +121,11 @@ aldeg_cas04.gat,83,17,0	script	Switch#TresA04	111,{
 aldeg_cas05.gat,1,1,1	script	Treasure_A05	-1,{

 

 OnRecvCastleA05:

+	end;

+OnInit:

 	if($boxNumA05 == 0) end;

 	set $@bxA05, $boxNumA05;

-//	callfunc "F_GldTreas","aldeg_cas05","A05",$boxNumA05,$@bxA05,$@boxIdA05,1332,58,8,65,15,1;

+	callfunc "F_GldTreas","aldeg_cas05","A05",$boxNumA05,$@bxA05,$@boxIdA05,1332,58,8,65,15,1;

 	end;

 

 OnDied:

diff --git a/npc/guild/gefg/gefg_treas.txt b/npc/guild/gefg/gefg_treas.txt
index 84e2c6dca..6261578e2 100644
--- a/npc/guild/gefg/gefg_treas.txt
+++ b/npc/guild/gefg/gefg_treas.txt
@@ -4,7 +4,7 @@
 //= jAthena - kalen (1.0)

 //= 1.1 by Akaru, ho|yAnge|X, and Valaris

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

-//= 1.2

+//= 1.3

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

 //= eAthena 0.1+; RO Episode 4+

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

@@ -20,9 +20,11 @@
 gefg_cas01.gat,1,1,1	script	Treasure_G01	-1,{

 

 OnRecvCastleG01:

+	end;

+OnInit:

 	if($boxNumG01 == 0) end;

 	set $@bxG01, $boxNumG01;

-//	callfunc "F_GldTreas","gefg_cas01","G01",$boxNumG01,$@bxG01,$@boxIdG01,1334,150,108,158,114,1;

+	callfunc "F_GldTreas","gefg_cas01","G01",$boxNumG01,$@bxG01,$@boxIdG01,1334,150,108,158,114,1;

 	end;

 

 OnDied:

@@ -45,9 +47,11 @@ gefg_cas01.gat,152,117,0	script	Switch#TresG01	111,{
 gefg_cas02.gat,1,1,1	script	Treasure_G02	-1,{

 

 OnRecvCastleG02:

+	end;

+OnInit:

 	if($boxNumG02 == 0) end;

 	set $@bxG02, $boxNumG02;

-//	callfunc "F_GldTreas","gefg_cas02","G02",$boxNumG02,$@bxG02,$@boxIdG02,1336,136,112,145,118,1;

+	callfunc "F_GldTreas","gefg_cas02","G02",$boxNumG02,$@bxG02,$@boxIdG02,1336,136,112,145,118,1;

 	end;

 

 OnDied:

@@ -69,9 +73,11 @@ gefg_cas02.gat,145,115,0	script	Switch#TresG02	111,{
 gefg_cas03.gat,1,1,1	script	Treasure_G03	-1,{

 

 OnRecvCastleG03:

+	end;

+OnInit:

 	if($boxNumG03 == 0) end;

 	set $@bxG03, $boxNumG03;

-//	callfunc "F_GldTreas","gefg_cas03","G03",$boxNumG03,$@bxG03,$@boxIdG03,1338,266,286,275,293,1;

+	callfunc "F_GldTreas","gefg_cas03","G03",$boxNumG03,$@bxG03,$@boxIdG03,1338,266,286,275,293,1;

 	end;

 

 OnDied:

@@ -94,9 +100,11 @@ gefg_cas03.gat,275,289,0	script	Switch#TresG03	111,{
 gefg_cas04.gat,1,1,1	script	Treasure_G04	-1,{

 

 OnRecvCastleG04:

+	end;

+OnInit:

 	if($boxNumG04 == 0) end;

 	set $@bxG04, $boxNumG04;

-//	callfunc "F_GldTreas","gefg_cas04","G04",$boxNumG04,$@bxG04,$@boxIdG04,1340,112,114,119,123,1;

+	callfunc "F_GldTreas","gefg_cas04","G04",$boxNumG04,$@bxG04,$@boxIdG04,1340,112,114,119,123,1;

 	end;

 

 OnDied:

@@ -119,9 +127,11 @@ gefg_cas04.gat,117,123,0	script	Switch#TresG04	111,{
 gefg_cas05.gat,1,1,1	script	Treasure_G05	-1,{

 

 OnRecvCastleG05:

+	end;

+OnInit:

 	if($boxNumG05 == 0) end;

 	set $@bxG05, $boxNumG05;

-//	callfunc "F_GldTreas","gefg_cas05","G05",$boxNumG05,$@bxG05,$@boxIdG05,1342,140,106,147,113,1;

+	callfunc "F_GldTreas","gefg_cas05","G05",$boxNumG05,$@bxG05,$@boxIdG05,1342,140,106,147,113,1;

 	end;

 

 OnDied:

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;

 }

diff --git a/npc/guild/payg/payg_treas.txt b/npc/guild/payg/payg_treas.txt
index b0532f9ac..d5ca867c9 100644
--- a/npc/guild/payg/payg_treas.txt
+++ b/npc/guild/payg/payg_treas.txt
@@ -4,7 +4,7 @@
 //= jAthena - kalen (1.0)

 //= 1.1 by Akaru, ho|yAnge|X, and Valaris

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

-//= 1.2

+//= 1.3

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

 //= eAthena 0.1+; RO Episode 4+

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

@@ -19,9 +19,11 @@
 // Treasure Spawn ----------------------------------------------------------

 payg_cas01.gat,1,1,0	script	Treasure_Py01	-1,{

 OnRecvCastlePy01:

+	end;

+OnInit:

 	if($boxNumPy01 == 0) end;

 	set $@bxPy01, $boxNumPy01;

-//	callfunc "F_GldTreas","payg_cas01","Py01",$boxNumPy01,$@bxPy01,$@boxIdPy01,1344,286,4,295,13,1;

+	callfunc "F_GldTreas","payg_cas01","Py01",$boxNumPy01,$@bxPy01,$@boxIdPy01,1344,286,4,295,13,1;

 	end;

 

 OnDied:

@@ -42,9 +44,11 @@ payg_cas01.gat,295,8,0	script	Switch#TresPy01	111,{
 // Treasure Spawn ----------------------------------------------------------

 payg_cas02.gat,1,1,0	script	Treasure_Py02	-1,{

 OnRecvCastlePy02:

+	end;

+OnInit:

 	if($boxNumPy02 == 0) end;

 	set $@bxPy02, $boxNumPy02;

-//	callfunc "F_GldTreas","payg_cas02","Py02",$boxNumPy02,$@bxPy02,$@boxIdPy02,1346,140,140,148,149,1;

+	callfunc "F_GldTreas","payg_cas02","Py02",$boxNumPy02,$@bxPy02,$@boxIdPy02,1346,140,140,148,149,1;

 	end;

 

 OnDied:

@@ -65,9 +69,11 @@ payg_cas02.gat,149,148,0	script	Switch#TresPy02	111,{
 // Treasure Spawn ----------------------------------------------------------

 payg_cas03.gat,158,168,0	script	Treasure_Py03	-1,{

 OnRecvCastlePy03:

+	end;

+OnInit:

 	if($boxNumPy03 == 0) end;

 	set $@bxPy03, $boxNumPy03;

-//	callfunc "F_GldTreas","payg_cas03","Py03",$boxNumPy03,$@bxPy03,$@boxIdPy03,1348,154,164,162,173,1;

+	callfunc "F_GldTreas","payg_cas03","Py03",$boxNumPy03,$@bxPy03,$@boxIdPy03,1348,154,164,162,173,1;

 	end;

 

 OnDied:

@@ -88,9 +94,11 @@ payg_cas03.gat,163,167,0	script	Switch#TresPy03	111,{
 // Treasure Spawn ----------------------------------------------------------

 payg_cas04.gat,146,48,0	script	Treasure_Py04	-1,{

 OnRecvCastlePy04:

+	end;

+OnInit:

 	if($boxNumPy04 == 0) end;

 	set $@bxPy04, $boxNumPy04;

-//	callfunc "F_GldTreas","payg_cas04","Py04",$boxNumPy04,$@bxPy04,$@boxIdPy04,1350,142,44,151,51,1;

+	callfunc "F_GldTreas","payg_cas04","Py04",$boxNumPy04,$@bxPy04,$@boxIdPy04,1350,142,44,151,51,1;

 	end;

 

 OnDied:

@@ -111,9 +119,11 @@ payg_cas04.gat,151,47,0	script	Switch#TresPy04	111,{
 // Treasure Spawn ----------------------------------------------------------

 payg_cas05.gat,156,131,0	script	Treasure_Py05	-1,{

 OnRecvCastlePy05:

+	end;

+OnInit:

 	if($boxNumPy05 == 0) end;

 	set $@bxPy05, $boxNumPy05;

-//	callfunc "F_GldTreas","payg_cas05","Py05",$boxNumPy05,$@bxPy05,$@boxIdPy05,1352,152,128,160,135,1;

+	callfunc "F_GldTreas","payg_cas05","Py05",$boxNumPy05,$@bxPy05,$@boxIdPy05,1352,152,128,160,135,1;

 	end;

 

 OnDied:

diff --git a/npc/guild/prtg/prtg_treas.txt b/npc/guild/prtg/prtg_treas.txt
index 10b27567c..dc9206c92 100644
--- a/npc/guild/prtg/prtg_treas.txt
+++ b/npc/guild/prtg/prtg_treas.txt
@@ -4,7 +4,7 @@
 //= jAthena - kalen (1.0)

 //= 1.1 by Akaru, ho|yAnge|X, and Valaris

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

-//= 1.2

+//= 1.3

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

 //= eAthena 0.1+; RO Episode 4+

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

@@ -19,9 +19,11 @@
 // Treasure Spawn ----------------------------------------------------------

 prtg_cas01.gat,1,1,0	script	Treasure_Pt01	-1,{

 OnRecvCastlePt01:

+	end;

+OnInit:

 	if($boxNumPt01 == 0) end;

 	set $@bxPt01, $boxNumPt01;

-//	callfunc "F_GldTreas","prtg_cas01","Pt01",$boxNumPt01,$@bxPt01,$@boxIdPt01,1354,6,204,15,213,1;

+	callfunc "F_GldTreas","prtg_cas01","Pt01",$boxNumPt01,$@bxPt01,$@boxIdPt01,1354,6,204,15,213,1;

 	end;

 

 OnDied:

@@ -43,9 +45,11 @@ prtg_cas01.gat,15,209,0	script	Switch#TresPt01	111,{
 // Treasure Spawn ----------------------------------------------------------

 prtg_cas02.gat,1,1,0	script	Treasure_Pt02	-1,{

 OnRecvCastlePt02:

+	end;

+OnInit:

 	if($boxNumPt02 == 0) end;

 	set $@bxPt02, $boxNumPt02;

-//	callfunc "F_GldTreas","prtg_cas02","Pt02",$boxNumPt02,$@bxPt02,$@boxIdPt02,1356,198,224,207,233,1;

+	callfunc "F_GldTreas","prtg_cas02","Pt02",$boxNumPt02,$@bxPt02,$@boxIdPt02,1356,198,224,207,233,1;

 	end;

 

 OnDied:

@@ -67,9 +71,11 @@ prtg_cas02.gat,207,228,0	script	Switch#TresPt02	111,{
 // Treasure Spawn ----------------------------------------------------------

 prtg_cas03.gat,1,1,0	script	Treasure_Pt03	-1,{

 OnRecvCastlePt03:

+	end;

+OnInit:

 	if($boxNumPt03 == 0) end;

 	set $@bxPt03, $boxNumPt03;

-//	callfunc "F_GldTreas","prtg_cas03","Pt03",$boxNumPt03,$@bxPt03,$@boxIdPt03,1358,184,128,193,135,1;

+	callfunc "F_GldTreas","prtg_cas03","Pt03",$boxNumPt03,$@bxPt03,$@boxIdPt03,1358,184,128,193,135,1;

 	end;

 

 OnDied:

@@ -91,9 +97,11 @@ prtg_cas03.gat,193,130,0	script	Switch#TresPt03	111,{
 // Treasure Spawn ----------------------------------------------------------

 prtg_cas04.gat,1,1,0	script	Treasure_Pt04	-1,{

 OnRecvCastlePt04:

+	end;

+OnInit:

 	if($boxNumPt04 == 0) end;

 	set $@bxPt04, $boxNumPt04;

-//	callfunc "F_GldTreas","prtg_cas04","Pt04",$boxNumPt04,$@bxPt04,$@boxIdPt04,1360,266,158,275,167,1;

+	callfunc "F_GldTreas","prtg_cas04","Pt04",$boxNumPt04,$@bxPt04,$@boxIdPt04,1360,266,158,275,167,1;

 	end;

 

 OnDied:

@@ -115,9 +123,11 @@ prtg_cas04.gat,275,160,0	script	Switch#TresPt04	111,{
 // Treasure Spawn ----------------------------------------------------------

 prtg_cas05.gat,1,1,0	script	Treasure_Pt05	-1,{

 OnRecvCastlePt05:

+	end;

+OnInit:

 	if($boxNumPt05 == 0) end;

 	set $@bxPt05, $boxNumPt05;

-//	callfunc "F_GldTreas","prtg_cas05","Pt05",$boxNumPt05,$@bxPt05,$@boxIdPt05,1362,272,174,279,181,1;

+	callfunc "F_GldTreas","prtg_cas05","Pt05",$boxNumPt05,$@bxPt05,$@boxIdPt05,1362,272,174,279,181,1;

 	end;

 

 OnDied: