fixed storage access w/o password trough Cool Corp. Staff. Yup. We don't have packet/client based Storage password yet. So fixed it due to many complains.

Also added cutins into Cool Evnt.Staff NPC

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

1 files changed, 83 insertions, 25 deletions

diff --git a/npc/kafras/cool_event_corp.txt b/npc/kafras/cool_event_corp.txt
index e94b7d3ff..5124b0ffb 100644
--- a/npc/kafras/cool_event_corp.txt
+++ b/npc/kafras/cool_event_corp.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= Gepard
 //===== Current Version: ===================================== 
-//= 1.2
+//= 1.3
 //===== Compatible With: ===================================== 
 //= eAthena
 //===== Description: ========================================= 
@@ -14,10 +14,13 @@
 //= 1.1 Optimized, fixed a conditional bug [Lupus]
 //= 1.1a Redo back. It wasn't a bug [Lupus]
 //= 1.2 Added Rachel Cool Event Corp. Staff [Playtester]
+//= 1.3 Added cutins, closed Kafra Password exploit
+//=		until we got a client/packet based password support [Lupus]
 //============================================================ 
 
 hugel,88,168,4	script	Cool Event Corp. Staff::CoolEventCorpStaffHugel	874,{
 
+	cutin "zonda_01",2;
 	mes "[Cool Event Corp. Staff]";
 	mes "Welcome to Cool Event Corp.";
 	mes "Our staff is always working";
@@ -26,7 +29,7 @@ hugel,88,168,4	script	Cool Event Corp. Staff::CoolEventCorpStaffHugel	874,{
 	mes "may I assist you today?";
 	next;
 
-	switch(select("Save:Use Storage:Rent a Pushcart:Cancel")){
+	switch(select("Save:Use Storage:Rent a Pushcart:Storage Password Service:Cancel")){
 	case 1:
 		mes "[Cool Event Corp. Staff]";
 		mes "Your Respawn Point";
@@ -36,7 +39,9 @@ hugel,88,168,4	script	Cool Event Corp. Staff::CoolEventCorpStaffHugel	874,{
 		mes "Cool Event Corp. service~";
 		emotion e_thx;
 		savepoint "hugel",96,155;
-		close;
+		close2;
+		cutin "", 255;
+		end;
 	case 2:
 		mes "[Cool Event Corp. Staff]";
 		if(basicskillcheck() && getskilllv(1) < 6){
@@ -45,7 +50,9 @@ hugel,88,168,4	script	Cool Event Corp. Staff::CoolEventCorpStaffHugel	874,{
 			mes "Basic Skill Level 6 to";
 			mes "use the Storage Service.";
 			emotion e_sry;
-			close;
+			close2;
+			cutin "", 255;
+			end;
 		}
 		if(Zeny < 40){
 			mes "I'm sorry, but you don't";
@@ -53,7 +60,9 @@ hugel,88,168,4	script	Cool Event Corp. Staff::CoolEventCorpStaffHugel	874,{
 			mes "the Storage Service. Our";
 			mes "Storage access fee is 40 Zeny.";
 			emotion e_cash;
-			close;
+			close2;
+			cutin "", 255;
+			end;
 		}
 		set Zeny, Zeny - 40;
 		set RESRVPTS, RESRVPTS + 4;
@@ -62,9 +71,13 @@ hugel,88,168,4	script	Cool Event Corp. Staff::CoolEventCorpStaffHugel	874,{
 		mes "Thanks for supporting Cool";
 		mes "Event Corp. by using our";
 		mes "services. Have a good day~";
+
+		callfunc("F_CheckKafCode");	//check your storage password, if set
 		close2;
 		openstorage;
+		cutin "", 255;
 		end;
+
 	case 3:
 		mes "[Cool Event Corp. Staff]";
 		if(BaseClass != Job_Merchant){
@@ -74,12 +87,16 @@ hugel,88,168,4	script	Cool Event Corp. Staff::CoolEventCorpStaffHugel	874,{
 			mes "Blacksmiths, White Smiths,";
 			mes "Alchemists and Creators.";
 			emotion e_sry;
-			close;
+			close2;
+			cutin "", 255;
+			end;
 		}
 		if(getskilllv(39) == 0){
 			mes "You can only rent a cart after";
 			mes "learning the Pushcart Skill.";
-			close;
+			close2;
+			cutin "", 255;
+			end;
 		}
 		if(checkcart() == 1){
 			mes "You already have";
@@ -87,12 +104,16 @@ hugel,88,168,4	script	Cool Event Corp. Staff::CoolEventCorpStaffHugel	874,{
 			mes "Unfortunately, we can't";
 			mes "rent more than one to";
 			mes "each customer at a time.";
-			close;
+			close2;
+			cutin "", 255;
+			end;
 		}
 		if(countitem(7061)){
 			delitem 7061,1;
 			setcart;
-			close;
+			close2;
+			cutin "", 255;
+			end;
 		}
 		mes "The Pushcart rental";
 		mes "fee is 800 Zeny. Would";
@@ -106,16 +127,25 @@ hugel,88,168,4	script	Cool Event Corp. Staff::CoolEventCorpStaffHugel	874,{
 				mes "Zeny to pay the Pushcart";
 				mes "rental fee of 800 Zeny.";
 				emotion e_cash;
-				close;
+				close2;
+				cutin "", 255;
+				end;
 			} else {
 				set Zeny, Zeny - 800;
 				set RESRVPTS, RESRVPTS + 80;
 				setcart;
-				close;
+				close2;
+				cutin "", 255;
+				end;
 			}
 		}
-		close;
+		close2;
+		cutin "", 255;
+		end;
 	case 4:
+		callfunc("F_SetKafCode","[Cool Event Corp. Staff]","Cool Event Corp.");
+		//the function closes msg and remoes cutins
+	case 5:
 	default:
 		mes "[Cool Event Corp. Staff]";
 		mes "Cool Event Corp. is always";
@@ -124,12 +154,15 @@ hugel,88,168,4	script	Cool Event Corp. Staff::CoolEventCorpStaffHugel	874,{
 		mes "Help us become the best by";
 		mes "providing us with your opinions";
 		mes "and honest feedback. Thank you.";
-		close;
+		close2;
+		cutin "", 255;
+		end;
 	}
 }
 
 rachel,109,138,5	script	Cool Event Corp. Staff::CoolEventCorpStaffRachel	874,{
 
+	cutin "zonda_01",2;
 	mes "[Cool Event Corp. Staff]";
 	mes "Welcome to Cool Event Corp.";
 	mes "Our staff is always working";
@@ -138,7 +171,7 @@ rachel,109,138,5	script	Cool Event Corp. Staff::CoolEventCorpStaffRachel	874,{
 	mes "may I assist you today?";
 	next;
 
-	switch(select("Save:Use Storage:Rent a Pushcart:Cancel")){
+	switch(select("Save:Use Storage:Rent a Pushcart:Storage Password Service:Cancel")){
 	case 1:
 		mes "[Cool Event Corp. Staff]";
 		mes "Your Respawn Point";
@@ -148,7 +181,9 @@ rachel,109,138,5	script	Cool Event Corp. Staff::CoolEventCorpStaffRachel	874,{
 		mes "Cool Event Corp. service~";
 		emotion e_thx;
 		savepoint "rachel",113,137;
-		close;
+		close2;
+		cutin "", 255;
+		end;
 	case 2:
 		mes "[Cool Event Corp. Staff]";
 		if(basicskillcheck() && getskilllv(1) < 6){
@@ -157,7 +192,9 @@ rachel,109,138,5	script	Cool Event Corp. Staff::CoolEventCorpStaffRachel	874,{
 			mes "Basic Skill Level 6 to";
 			mes "use the Storage Service.";
 			emotion e_sry;
-			close;
+			close2;
+			cutin "", 255;
+			end;
 		}
 		if(Zeny < 40){
 			mes "I'm sorry, but you don't";
@@ -165,7 +202,9 @@ rachel,109,138,5	script	Cool Event Corp. Staff::CoolEventCorpStaffRachel	874,{
 			mes "the Storage Service. Our";
 			mes "Storage access fee is 40 Zeny.";
 			emotion e_cash;
-			close;
+			close2;
+			cutin "", 255;
+			end;
 		}
 		set Zeny, Zeny - 40;
 		set RESRVPTS, RESRVPTS + 4;
@@ -186,12 +225,16 @@ rachel,109,138,5	script	Cool Event Corp. Staff::CoolEventCorpStaffRachel	874,{
 			mes "Blacksmiths, White Smiths,";
 			mes "Alchemists and Creators.";
 			emotion e_sry;
-			close;
+			close2;
+			cutin "", 255;
+			end;
 		}
 		if(getskilllv(39) == 0){
 			mes "You can only rent a cart after";
 			mes "learning the Pushcart Skill.";
-			close;
+			close2;
+			cutin "", 255;
+			end;
 		}
 		if(checkcart() == 1){
 			mes "You already have";
@@ -199,12 +242,16 @@ rachel,109,138,5	script	Cool Event Corp. Staff::CoolEventCorpStaffRachel	874,{
 			mes "Unfortunately, we can't";
 			mes "rent more than one to";
 			mes "each customer at a time.";
-			close;
+			close2;
+			cutin "", 255;
+			end;
 		}
 		if(countitem(7061)){
 			delitem 7061,1;
 			setcart;
-			close;
+			close2;
+			cutin "", 255;
+			end;
 		}
 		mes "The Pushcart rental";
 		mes "fee is 800 Zeny. Would";
@@ -218,16 +265,25 @@ rachel,109,138,5	script	Cool Event Corp. Staff::CoolEventCorpStaffRachel	874,{
 				mes "Zeny to pay the Pushcart";
 				mes "rental fee of 800 Zeny.";
 				emotion e_cash;
-				close;
+				close2;
+				cutin "", 255;
+				end;
 			} else {
 				set Zeny, Zeny - 800;
 				set RESRVPTS, RESRVPTS + 80;
 				setcart;
-				close;
+				close2;
+				cutin "", 255;
+				end;
 			}
 		}
-		close;
+		close2;
+		cutin "", 255;
+		end;
 	case 4:
+		callfunc("F_SetKafCode","[Cool Event Corp. Staff]","Cool Event Corp.");
+		//the function closes msg and remoes cutins
+	case 5:
 	default:
 		mes "[Cool Event Corp. Staff]";
 		mes "Cool Event Corp. is always";
@@ -236,6 +292,8 @@ rachel,109,138,5	script	Cool Event Corp. Staff::CoolEventCorpStaffRachel	874,{
 		mes "Help us become the best by";
 		mes "providing us with your opinions";
 		mes "and honest feedback. Thank you.";
-		close;
+		close2;
+		cutin "", 255;
+		end;
 	}
 }