- Fixed Header in Mechanic Job change quest.

- Updated Paradise Groups "Goods Cabinet" (Storage).
- Fixed 'specialeffect EF_WIND;' not showing when talking to the Strange Device NPC in Nydhoggrs Quest. bugreport:5149

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

3 files changed, 65 insertions, 97 deletions

diff --git a/npc/jobs/3-1/mechanic.txt b/npc/jobs/3-1/mechanic.txt
index 0c255b593..029b723e4 100644
--- a/npc/jobs/3-1/mechanic.txt
+++ b/npc/jobs/3-1/mechanic.txt
@@ -24,7 +24,7 @@ yuno,129,156,3	script	Chainheart	923,{
 		next;

 		mes "[Chainheart]";

 		mes "Truth or technology?";

-		mes "Perhaps you children should next;";

+		mes "Perhaps you children should wait";

 		mes "till you are a little older.";

 		close;

 	}

@@ -183,7 +183,7 @@ yuno,129,156,3	script	Chainheart	923,{
 			mes "[Chainheart]";

 			mes "Find out the knowledge";

 			mes "for yourself like we did.";

-			mes "Don't just next; around for someone to teach it to you. Show the passion that you claim to have.";

+			mes "Don't just wait around for someone to teach it to you. Show the passion that you claim to have.";

 			next;

 			set job_mechanic,3;

 			changequest 10091,10092;

@@ -773,7 +773,7 @@ OnDoorClose:
 

 OnDoorOpen:

 	enablenpc "Door";

-	specialeffect EF_MAPPILLAR,AREA,"Door";

+	specialeffect EF_MAPPILLAR;

 	initnpctimer;

 	end;

 

@@ -839,7 +839,7 @@ OnTouch:
 		next;

 		set job_mechanic,10;

 		changequest 10099,10100;

-		specialeffect EF_POTION_CON,AREA,"Acquiring Knowledge";

+		specialeffect EF_POTION_CON;

 		mes "-This amount of-";

 		mes "-knowledge is enough-";

 		mes "-and find a way out.-";

@@ -866,7 +866,7 @@ OnTouch:
 		next;

 		set job_mechanic,10;

 		changequest 10099,10100;

-		specialeffect EF_POTION_CON,AREA,"Acquiring Knowledge#2";

+		specialeffect EF_POTION_CON;

 		mes "-This amount of-";

 		mes "-knowledge is enough-";

 		mes "-and find a way out.-";

@@ -874,4 +874,4 @@ OnTouch:
 	}

 }

 

-jupe_core2,0,0,0,0	monster	Dimik	1669,100,0,0,0

+jupe_core2,0,0,0,0	monster	Dimik	1669,100,0,0,0
\ No newline at end of file
diff --git a/npc/quests/eden/eden_service.txt b/npc/quests/eden/eden_service.txt
index cbfbc5a74..feacf0199 100644
--- a/npc/quests/eden/eden_service.txt
+++ b/npc/quests/eden/eden_service.txt
@@ -1,66 +1,20 @@
 //===== rAthena Script ======================================= 
-// Eden Group Quests - Service NPCs
+// Eden Group - Goods Cabinet
 //===== By: ================================================== 
-//= L0ne_W0lf
+//= Masao
 //===== Current Version: ===================================== 
 //= 1.0
 //===== Compatible With: ===================================== 
-//= rAthena 1.0
+//= Any rAthena SVN
 //===== Description: ========================================= 
 //= [AEGIS Conversion]
+//= Paradise Group storage access.
 //===== Additional Comments: ================================= 
 //= 1.0 First Version.
 //============================================================
 
-moc_para01,172,120,0	script	Goods Cabinet#01	111,{
-	mes "It is a Goods Storage Cabinet.";
-	mes "A message is written on a piece of paper.";
-	next;
-	mes "+ Cabinet is exclusively +";
-	mes "+ for the Eden group +";
-	mes "If you want to use this";
-	mes "cabinet please check";
-	mes "the following:";
-	next;
-	mes "1.Are you a member";
-	mes "   of Eden group?";
-	mes "2.Have you learned";
-	mes "   enough basic skills?";
-	mes "3.Cabinet fee is";
-	mes "  ^4d4dff500 zeny^000000!";
-	next;
-	if (countitem(6219) > 0) {
-		mes "You need to insert zeny to use the cabinet.";
-		mes "Cost : 500 Zeny ";
-		mes "Would you like to use it?";
-		next;
-		switch(select("Use the Cabinet.:Cancel.")) {
-		case 1:
-			if (Zeny > 499) {
-				if(basicskillcheck() && getskilllv("NV_BASIC") < 6){
-					mes "The cabinet is not working for me.";
-					mes "Maybe I am not yet qualified to use Cabinet.";
-				}
-				else {
-					set zeny,zeny-500;
-					openstorage;
-				}
-			}
-			else {
-				mes "I don't have enough zeny.";
-				mes "I need at least 500 zeny to use the Cabinet.";
-			}
-			break;
-		case 2:
-			mes "I will use it next time.";
-		}
-	}
-	else
-		mes "I need an Eden Group Mark to use this Cabinet.";
-	close;
-}
+moc_para01,173,120,0	script	Goods Cabinet#01::goodsc	139,{
 
-moc_para01,170,120,0	script	Goods Cabinet#02	111,{
 	mes "It is a Goods Storage Cabinet.";
 	mes "A message is written on a piece of paper.";
 	next;
@@ -77,33 +31,38 @@ moc_para01,170,120,0	script	Goods Cabinet#02	111,{
 	mes "3.Cabinet fee is";
 	mes "  ^4d4dff500 zeny^000000!";
 	next;
-	if (countitem(6219) > 0) {
-		mes "You need to insert zeny to use the cabinet.";
+	if (countitem(6219) > 0)
+	{
+		mes "You need to insert Zeny to use the Cabinet.";
 		mes "Cost : 500 Zeny ";
 		mes "Would you like to use it?";
 		next;
-		switch(select("Use the Cabinet.:Cancel.")) {
+		switch(select("Use the Cabinet.:Cancel."))
+		{
 		case 1:
-			if (Zeny > 499) {
-				if(basicskillcheck() && getskilllv("NV_BASIC") < 6){
+			if (Zeny > 499)
+			{
+				if(getskilllv("NV_BASIC") < 6)
+				{
 					mes "The cabinet is not working for me.";
 					mes "Maybe I am not yet qualified to use Cabinet.";
+					close;
 				}
-				else {
-					set zeny,zeny-500;
-					openstorage;
-				}
+				set Zeny,Zeny - 500;
+				close2;
+				openstorage;
+				end;
 			}
-			else {
-				mes "I don't have enough zeny.";
-				mes "I need at least 500 zeny to use the Cabinet.";
-			}
-			break;
+			mes "I don't have enough zeny.";
+			mes "I need at least 500 zeny to use the Cabinet.";
+			close;
 		case 2:
 			mes "I will use it next time.";
+			close;
 		}
 	}
-	else
-		mes "I need an Eden Group Mark to use this Cabinet.";
+	mes "I need an Eden Group Mark to use this Cabinet.";
 	close;
 }
+
+moc_para01,170,120,0	duplicate(goodsc)	Goods Cabinet#02	139
\ No newline at end of file
diff --git a/npc/quests/quests_13_2.txt b/npc/quests/quests_13_2.txt
index 49ba15f24..b3c510bfa 100644
--- a/npc/quests/quests_13_2.txt
+++ b/npc/quests/quests_13_2.txt
@@ -40,6 +40,7 @@
 //=     line. [Gepard]
 //= 2.1 Fixed Myterious Rock 31, and Cart Hand Agents.
 //= 2.2 Added a missing close. (bugreport:4520) [L0ne_W0lf]
+//= 2.3 Fixed EF_Wind not showing. (bugreport:5149) [Masao]
 //============================================================ 
 
 // Cat Hand Addition.
@@ -11542,12 +11543,13 @@ nyd_dun02,143,272,0	script	ep13_warp_s1	139,1,1,{
 
 OnEnable:
 	enablenpc "ep13_warp_s1";
+	specialeffect EF_WIND;
+	initnpctimer;
 	end;
 
 OnDisable:
-	disablenpc "ep13_warp_s1";
-	initnpctimer;
 	specialeffect EF_WIND;
+	disablenpc "ep13_warp_s1";
 	end;
 
 OnTouch:
@@ -11571,7 +11573,7 @@ OnTimer8000:
 	end;
 
 OnTimer10000:
-	enablenpc "ep13_warp_s1";
+	disablenpc "ep13_warp_s1";
 	end;
 }
 
@@ -11585,12 +11587,13 @@ nyd_dun02,143,266,0	script	ep13_warp_s3	139,1,1,{
 
 OnEnable:
 	enablenpc "ep13_warp_s3";
+	specialeffect EF_WIND;
+	initnpctimer;
 	end;
 
 OnDisable:
-	disablenpc "ep13_warp_s3";
-	initnpctimer;
 	specialeffect EF_WIND;
+	disablenpc "ep13_warp_s3";
 	end;
 
 OnTouch:
@@ -11614,7 +11617,7 @@ OnTimer8000:
 	end;
 
 OnTimer10000:
-	enablenpc "ep13_warp_s3";
+	disablenpc "ep13_warp_s3";
 	end;
 }
 
@@ -11628,12 +11631,13 @@ nyd_dun02,146,272,0	script	ep13_warp_11	139,1,1,{
 
 OnEnable:
 	enablenpc "ep13_warp_11";
+	specialeffect EF_WIND;
+	initnpctimer;
 	end;
 
 OnDisable:
-	disablenpc "ep13_warp_11";
-	initnpctimer;
 	specialeffect EF_WIND;
+	disablenpc "ep13_warp_11";
 	end;
 
 OnTouch:
@@ -11657,7 +11661,7 @@ OnTimer8000:
 	end;
 
 OnTimer10000:
-	enablenpc "ep13_warp_11";
+	disablenpc "ep13_warp_11";
 	end;
 }
 
@@ -11671,12 +11675,13 @@ nyd_dun02,146,266,0	script	ep13_warp_13	139,1,1,{
 
 OnEnable:
 	enablenpc "ep13_warp_13";
+	specialeffect EF_WIND;
+	initnpctimer;
 	end;
 
 OnDisable:
-	disablenpc "ep13_warp_13";
-	initnpctimer;
 	specialeffect EF_WIND;
+	disablenpc "ep13_warp_13";
 	end;
 
 OnTouch:
@@ -11700,7 +11705,7 @@ OnTimer8000:
 	end;
 
 OnTimer10000:
-	enablenpc "ep13_warp_13";
+	disablenpc "ep13_warp_13";
 	end;
 }
 
@@ -11708,12 +11713,13 @@ nyd_dun02,146,263,0	script	ep13_warp_14	139,1,1,{
 
 OnEnable:
 	enablenpc "ep13_warp_14";
+	specialeffect EF_WIND;
+	initnpctimer;
 	end;
 
 OnDisable:
-	disablenpc "ep13_warp_14";
-	initnpctimer;
 	specialeffect EF_WIND;
+	disablenpc "ep13_warp_14";
 	end;
 
 OnTouch:
@@ -11741,7 +11747,7 @@ OnTimer10000:
 	end;
 
 OnTimer12000:
-	enablenpc "ep13_warp_14";
+	disablenpc "ep13_warp_14";
 	end;
 }
 
@@ -11755,12 +11761,13 @@ nyd_dun02,149,272,0	script	ep13_warp_21	139,1,1,{
 
 OnEnable:
 	enablenpc "ep13_warp_21";
+	specialeffect EF_WIND;
+	initnpctimer;
 	end;
 
 OnDisable:
-	disablenpc "ep13_warp_21";
-	initnpctimer;
 	specialeffect EF_WIND;
+	disablenpc "ep13_warp_21";
 	end;
 
 OnTouch:
@@ -11788,7 +11795,7 @@ OnTimer10000:
 	end;
 
 OnTimer12000:
-	enablenpc "ep13_warp_21";
+	disablenpc "ep13_warp_21";
 	end;
 }
 
@@ -11796,12 +11803,13 @@ nyd_dun02,149,269,0	script	ep13_warp_22	139,1,1,{
 
 OnEnable:
 	enablenpc "ep13_warp_22";
+	specialeffect EF_WIND;
+	initnpctimer;
 	end;
 
 OnDisable:
-	disablenpc "ep13_warp_22";
-	initnpctimer;
 	specialeffect EF_WIND;
+	disablenpc "ep13_warp_22";
 	end;
 
 OnTouch:
@@ -11833,7 +11841,7 @@ OnTimer12000:
 	end;
 
 OnTimer15000:
-	enablenpc "ep13_warp_22";
+	disablenpc "ep13_warp_22";
 	end;
 }
 
@@ -11871,12 +11879,13 @@ nyd_dun02,149,263,0	script	ep13_warp_24	139,1,1,{
 
 OnEnable:
 	enablenpc "ep13_warp_24";
+	specialeffect EF_WIND;
+	initnpctimer;
 	end;
 
 OnDisable:
-	disablenpc "ep13_warp_24";
-	initnpctimer;
 	specialeffect EF_WIND;
+	disablenpc "ep13_warp_24";
 	end;
 
 OnTouch:
@@ -11908,7 +11917,7 @@ OnTimer12000:
 	end;
 
 OnTimer15000:
-	enablenpc "ep13_warp_24";
+	disablenpc "ep13_warp_24";
 	end;
 }