Performed some eAthena-style adjustments to the comodo gambling script.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9739 54d463be-8e91-2dee-dedb-b68131a5f0ec

npc/other/comodo_gambling.txt

@@ -24,6 +24,7 @@
 comodo.gat,219,160,3	script	Kachua	91,{
 
 	cutin "katsua01.bmp",2;
+
 	mes "[Kachua]";
 	mes "Diamonds...!";
 	mes "I simply can't get my mind off";
@@ -31,9 +32,30 @@ comodo.gat,219,160,3	script	Kachua	91,{
 	mes "showed me that diamond,";
 	mes "it's been all I think about!";
 	next;
-	switch(select("Would you like to have mine?", "Ah, what a shame...")) {
+
-	case 1:
+	if (select("Would you like to have mine?", "Ah, what a shame...") == 2) {
-		if(countitem(732) > 0) {
+		mes "[Kachua]";
+		mes "Yes, I know...";
+		mes "Even among everything";
+		mes "in my collections, nothing";
+		mes "compares to diamonds...";
+		close2;
+		cutin "katsua01.bmp",255;
+		end;
+	}
+	
+	if (countitem(732) == 0) {
+		cutin "katsua01.bmp",255;
+		cutin "katsua03.bmp",2;
+		mes "[Kachua]";
+		mes "*piff*";
+		mes "You don't have any diamonds!";
+		mes "Don't even try to fool me!";
+		close2;
+		cutin "katsua03.bmp",255;
+		end;
+	}
+	
 	mes "[Kachua]";
 	mes "Are you sure you don't mind";
 	mes "giving this to me? Thank you";
@@ -42,6 +64,7 @@ comodo.gat,219,160,3	script	Kachua	91,{
 	mes "you something from one of my";
 	mes "collections~";
 	next;
+	
 	if (Weight >= MaxWeight/2) {
 		cutin "katsua01.bmp",255;
 		cutin "katsua03.bmp",2;
@@ -53,7 +76,8 @@ comodo.gat,219,160,3	script	Kachua	91,{
 		close2;
 		cutin "katsua03.bmp",255;
 		end;
-			} else {
+	}
+	
 	if (countitem(732) == 0) { // anti-hack
 		logmes "Hack: Tried to bypass item check.";
 		cutin "katsua01.bmp",255;					
@@ -61,6 +85,7 @@ comodo.gat,219,160,3	script	Kachua	91,{
 	}
 		
 	delitem 732,1;
+	
 	mes "[Kachua]";
 	mes "So what would";
 	mes "you like to have?";
@@ -333,32 +358,6 @@ comodo.gat,219,160,3	script	Kachua	91,{
 	cutin "katsua02.bmp",255;
 	end;
 }
-			close;
-		} else {
-			cutin "katsua01.bmp",255;
-			cutin "katsua03.bmp",2;
-			mes "[Kachua]";
-			mes "*piff*";
-			mes "You don't have any diamonds!";
-			mes "Don't even try to fool me!";
-			close2;
-			cutin "katsua03.bmp",255;
-			end;
-		}
-	break;
-	case 2:
-		mes "[Kachua]";
-		mes "Yes, I know...";
-		mes "Even among everything";
-		mes "in my collections, nothing";
-		mes "compares to diamonds...";
-		close2;
-		cutin "katsua01.bmp",255;
-		end;
-	break;
-	}
-	close;
-}
 
 mjolnir_02.gat,85,364,3	script	Blacksmith Miner	726,{
 
@@ -366,6 +365,7 @@ mjolnir_02.gat,85,364,3	script	Blacksmith Miner	726,{
 	mes "Wahahahaha~";
 	mes "I've dug up a fortune!";
 	next;
+	
 	mes "[Dwayne]";
 	mes "Diamonds! Hundreds and";
 	mes "thousands of Diamonds,";
@@ -373,8 +373,18 @@ mjolnir_02.gat,85,364,3	script	Blacksmith Miner	726,{
 	mes "I'm rich!";
 	emotion e_heh;
 	next;
-	switch(select("I want to buy some.", "Congratulations.")) {
+	
-	case 1:
+	if (select("I want to buy some.", "Congratulations.") == 2) {
+		mes "[Dwayne]";
+		mes "Haha, thank you~";
+		mes "If by any chance";
+		mes "you need a diamond,";
+		mes "please drop by.";
+		mes "I'll sell them to";
+		mes "you at a cheap price.";
+		close;
+	}
+	
 	mes "[Dwayne]";
 	mes "Ah, you have an";
 	mes "eye for valuables!";
@@ -383,12 +393,14 @@ mjolnir_02.gat,85,364,3	script	Blacksmith Miner	726,{
 	mes "55,000 Zeny for a diamond,";
 	mes "how does that sound?";
 	next;
+	
 	mes "[Dwayne]";
 	mes "How many";
 	mes "diamonds do you need?";
 	mes "If you change your mind";
 	mes "please enter '0' to cancel";
 	next;
+	
 	while(1) {
 		input .@amount;
 		if (.@amount <= 0) {
@@ -406,6 +418,7 @@ mjolnir_02.gat,85,364,3	script	Blacksmith Miner	726,{
 			break;
 		}
 	}
+	
 	set .@price, .@amount * 55000;
 	if (Zeny < .@price) {
 		mes "[Dwayne]";
@@ -415,6 +428,7 @@ mjolnir_02.gat,85,364,3	script	Blacksmith Miner	726,{
 		mes "Zeny for that many!";
 		close;
 	}
+	
 	if (!checkweight(732, .@amount)) {
 		mes "[Dwayne]";
 		mes "Errr... You brought too many things.";
@@ -422,27 +436,16 @@ mjolnir_02.gat,85,364,3	script	Blacksmith Miner	726,{
 		mes "You better reorganise your inventory and try again.";
 		close;
 	}
+	
 	set Zeny, Zeny - .@price;
 	getitem 732, .@amount;
+	
 	mes "[Dwayne]";
 	mes "Thank you for";
 	mes "buying my diamonds!";
 	mes "You're welcome to";
 	mes "come back anytime.";
 	close;
-	break;
-	case 2:
-		mes "[Dwayne]";
-		mes "Haha, thank you~";
-		mes "If by any chance";
-		mes "you need a diamond,";
-		mes "please drop by.";
-		mes "I'll sell them to";
-		mes "you at a cheap price.";
-		close;
-	break;
-	}
-	close;
 }
 
 comodo.gat,204,148,7	script	Devellin	90,{
@@ -468,12 +471,12 @@ comodo.gat,204,148,7	script	Devellin	90,{
 	mes "something far more valuable than a";
 	mes "diamond in exchange...";
 	close;
-
 }
 
 comodo.gat,210,154,4	script	Suspicious Guy	118,{
 
 	if (BaseClass == Job_Thief) {
+	
 		mes "[Cain]";
 		mes "Heeeey...";
 		mes "It seems we share the same line of";
@@ -509,8 +512,7 @@ comodo.gat,210,154,4	script	Suspicious Guy	118,{
 		mes "whaddya say? Wanna be partners in";
 		mes "crime and rob her house?";
 		next;
-		switch(select("No, thanks.", "Sweet, I'm in.")) {
+		if (select("No, thanks.", "Sweet, I'm in.") == 1) {
-		case 1:
 			mes "[Cain]";
 			mes "Wha... ?";
 			mes "C'mon I thought pilfering was";
@@ -518,8 +520,7 @@ comodo.gat,210,154,4	script	Suspicious Guy	118,{
 			mes "gonna do it, but stay hushed on";
 			mes "this, got it?";
 			close;
-		break;
+		}
-		case 2:
 		mes "[Cain]";
 		mes "Ha ha ha!";
 		mes "... Dork!";
@@ -540,10 +541,9 @@ comodo.gat,210,154,4	script	Suspicious Guy	118,{
 		mes "exchange them for whatever the old";
 		mes "lady's got. Take care, pal~";
 		close;
-		break;
+		
-		}
-		close;
 	} else {
+	
 		mes "[Cain]";
 		mes "Hey...";
 		mes "I got a hot tip for you.";
@@ -551,9 +551,24 @@ comodo.gat,210,154,4	script	Suspicious Guy	118,{
 		mes "and trust me, it's worth it.";
 		mes "So whaddya say... ?";
 		next;
-		switch(select("Alright.", "No, thanks.")) {
+		if (select("Alright.", "No, thanks.") == 2) {
-		case 1:
+			mes "[Cain]";
-			if(Zeny >= 500) {
+			mes "Hey hey!";
+			mes "What are you, a cheapskate? You";
+			mes "understand that everything has its";
+			mes "price and this information is so";
+			mes "worth it. C'mon, you can't pass";
+			mes "this up, can you?";
+			close;
+		}
+		if(Zeny < 500) {
+			mes "[Cain]";
+			mes "What the hell?!";
+			mes "Don't you even have any money? Didn't I";
+			mes "say 500 zeny? Hey man, Info like";
+			mes "this doesn't come cheap!";
+			close;
+		}
 		set Zeny, Zeny - 500;
 		mes "[Cain]";
 		mes "You see that lady over there?";
@@ -592,26 +607,5 @@ comodo.gat,210,154,4	script	Suspicious Guy	118,{
 		mes "exchange them for whatever the old";
 		mes "lady's got. Take care, pal~";
 		close;
-			} else {
-				mes "[Cain]";
-				mes "What the hell?!";
-				mes "Don't you even have any money? Didn't I";
-				mes "say 500 zeny? Hey man, Info like";
-				mes "this doesn't come cheap!";
-				close;
-			}
-		break;
-		case 2:
-			mes "[Cain]";
-			mes "Hey hey!";
-			mes "What are you, a cheapskate? You";
-			mes "understand that everything has its";
-			mes "price and this information is so";
-			mes "worth it. C'mon, you can't pass";
-			mes "this up, can you?";
-			close;
-		break;
-		}
-		close;
 	}
 }