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

npc/Changelog.txt

@@ -32,6 +32,8 @@ Playtester
 
 Date		Added
 ======
+09/16
+	* fixed apple dice game in Airship, fixed missing } in Einbech quests [Lupus]
 09/15
 	* Ein.Town Pollution fix [Lupus]
 09/14
@@ -41,7 +43,7 @@ Date		Added
 		thanks to cbmaster & $ephiroth
 	- Fixed Guild Defence / Economy underflow, thanks to kyoki
 	- Zoc's fix to keep number of unopened boxes on reboot
-	- Now each castle spawns 1st/2nd Treasuer Box type as 50%/50% w/o random
+	- Now each castle spawns 1st/2nd Treasure Box type as 50%/50% w/o random
 	- Fixed Momotaro Quest, thanks to .~Abism0~.
 09/11
 	* Moved custom Umbalian quests to custom folder [Lupus]

npc/airports/airships.txt

@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= MasterOfMuppets
 //===== Current Version: ===================================== 
-//= 0.5a
+//= 0.5b
 //===== Compatible With: ===================================== 
 //= eAthena SVN 3422+(Requires jA Script System)
 //===== Description: ========================================= 
@@ -17,7 +17,7 @@
 //= 0.3 Implemented some more NPCs [MasterOfMuppets]
 //= 0.4 Implemented two mini games scripted by Dj-Yhn [MasterOfMuppets]
 //= 0.5 Removed Duplicates [Silent]
-//= 0.5aFixed a typo [Evera]
+//= 0.5aFixed a typo [Evera] 0.5b Fixed appledice bugs [Lupus]
 //============================================================ 
 
 //============================================================ 
@@ -855,7 +855,7 @@ function script applegamble {
 	mes "to wager some Apples";
 	mes "in a friendly game of Dice?";
 	next;
-	switch(select("Play Dice Game:Learn Dice Game Rules:Cancel")) {
+	switch(select("Play Dice Game:Learn Dice Game Rules:Cancel")){
 	case 3:
 		mes "["+getarg(0)+"]";
 		mes "I'm up for a game of";
@@ -912,6 +912,7 @@ function script applegamble {
 		mes "returned to you. Fair, right?";
 		close;
 	case 1:
+		break;
 	}
 	mes "["+getarg(0)+"]";
 	mes "Ooh, so you'll play with";
@@ -923,21 +924,20 @@ function script applegamble {
 	next;
 L_Input:
 	input @amount;
-	if (@amount == 0) {
+	if(@amount == 0) {
 		mes "["+getarg(0)+"]";
 		mes "Changed your mind?";
 		mes "I understand. Well then,";
 		mes "I hope we can play sometime.";
 		close;
 	}
-	if (@amount > 50) set @amount,50;
+	if(@amount > 50) set @amount,50;
 	mes "["+getarg(0)+"]";
 	mes "So you'll be";
 	mes "betting ^FF0000"+@amount+"^000000 Apples.";
 	mes "Is that right?";
 	next;
-	switch(select("Yes:No")) {
-		case 2:
+	if(select("Yes:No")==2){
 		mes "["+getarg(0)+"]";
 		mes "Mm, made a mistake?";
 		mes "Alright, please enter the";
@@ -945,9 +945,8 @@ L_Input:
 		mes "wish to place in this bet";
 		next;
 		goto L_Input;
-		case 1:
 	}
-	if (countitem(512) < @amount) {
+	if(countitem(512)<@amount){
 		//more apples then in inventory
 		//-Improvised-
 		mes "["+getarg(0)+"]";
@@ -974,6 +973,7 @@ L_Input:
 	mes strcharinfo(0)+".";
 	next;
 	menu "Roll Dice.",-;
+
 	mes "^0000FF*Rolling and rumbling*";
 	set @player1,rand(1,6);
 	set @player2,rand(1,6);
@@ -992,14 +992,14 @@ L_Input:
 		mes "your court. Are you going";
 		mes "to roll your third die,";
 		mes strcharinfo(0)+"?";
-	} else if (@playersub > @tablesub) {
+	} else if(@playersub > @tablesub) {
 		mes "Since my total is only ^0000FF"+@tablesub+"^000000,";
 		mes "you have the advantage for";
 		mes "now with your total of ^FF0000"+@playersub+"^000000. Do";
 		mes "you wanna roll one more die?";
 		mes "Remember, you'll bust if all three";
 		mes "of your dice total more than 12.";
-	} else if (@tablesub > @playersub) {
+	} else if(@tablesub > @playersub) {
 		mes "Since my total is ^0000FF"+@tablesub+"^000000,";
 		mes "I have the advantage for";
 		mes "now with your total of ^FF0000"+@playersub+"^000000. Do";
@@ -1008,18 +1008,17 @@ L_Input:
 		mes "of your dice total more than 12.";
 	}
 	next;
-	switch(select("Roll another die.:Don't Roll.")) {
-		case 2:
+	if(select("Roll another dice.:Don't Roll.")==2){
 		mes "["+getarg(0)+"]";
 		mes "Not gonna roll, huh?";
-			if (@tablesub == @playersub) {
+		if(@tablesub == @playersub) {
 			mes "You better hope I roll";
 			mes "too high and bust, or";
 			mes "I'll beat you for sure!";
 			mes "Okay, here goes nothing...";
 			next;
 			goto L_Table3;
-			} else if (@tablesub < @playersub) {
+		} else if(@tablesub < @playersub) {
 			next;
 			mes "["+getarg(0)+"]";
 			mes "Alright, I see that you";
@@ -1028,9 +1027,8 @@ L_Input:
 			mes "I'll go ahead and roll then.";
 			next;
 			goto L_Table3;
-			} else if (@tablesub > @playersub) {
-			 //you have a lower sub total then table, and do not roll 3th
-	 		//-Improvised-
+		} else if(@tablesub > @playersub) {
+		//you have a lower sub total then table, and do not roll 3th -Improvised-
 			mes "["+getarg(0)+"]";
 			mes "Not gonna roll, huh?";
 			mes "Well, then I'm not";
@@ -1043,15 +1041,14 @@ L_Input:
 			mes "I'm sorry, but you lose";
 			mes "this game, "+strcharinfo(0)+". Better";
 			mes "luck next time.";
+		}
 		close;
 	}
-		case 1:
 	mes "^0000FF*Rolling and rumbling*";
 	set @player3,rand(1,6);
 	set @playersub,@playersub+@player3;
-		if (@playersub > 12) {
-		 //player bust
-			//--Improvised--
+	if(@playersub > 12) {
+	//player bust --Improvised--
 		next;
 		mes "["+getarg(0)+"]";
 		mes "Oh my... You rolled a ^FF000"+@player3+"^000000,";
@@ -1071,7 +1068,7 @@ L_Input:
 		mes "I'm gonna go for it...";
 		next;
 		goto L_Table3;
-		} else if (@playersub < @tablesub) {
+	} else if(@playersub < @tablesub) {
 		//player's sub together with 3th die is still too low
 		//--Improvised--
 		mes "a ^FF0000"+@player3+"^000000, giving";
@@ -1083,12 +1080,12 @@ L_Input:
 		mes "the breaks, I suppose...";
 		close;
 	}
-	L_Table3:
+L_Table3:
 	mes "^0000FF*Rolling and rumbling*";
 	set @table3,rand(1,6);
 	set @tablesub,@tablesub+@table3;
 	next;
-	if (@tablesub > 12) {
+	if(@tablesub > 12) {
 		mes "["+getarg(0)+"]";
 		mes "Eh? I rolled a ^0000FF"+@table3+"^000000, making";
 		mes "my total ^0000FF"+@tablesub+"^000000. I hate to say";
@@ -1100,7 +1097,7 @@ L_Input:
 		end;
 	}
 	mes "["+getarg(0)+"]";
-	if (@tablesub < @playersub) {
+	if(@tablesub < @playersub) {
 		mes "I rolled a "+@table3+", which";
 		mes "gives me a total of ^0000FF"+@tablesub+"^000000.";
 		mes "But... It's still not enough";
@@ -1110,7 +1107,7 @@ L_Input:
 		close2;
 		getitem 512,@amount*2;
 		end;
-	} else if (@tablesub > @playersub) {
+	} else if(@tablesub > @playersub) {
 	mes "I rolled a ^0000FF"+@table3+"^000000, giving";
 	mes "me a total of ^0000FF"+@tablesub+"^000000 which";
 	mes "beats your total of ^FF0000"+@playersub+"^000000.";
@@ -1118,7 +1115,7 @@ L_Input:
 	mes "game, "+strcharinfo(0)+". Them's";
 	mes "the breaks, I suppose...";
 	close;
-	} else if (@tablesub == @playersub) {
+	} else if(@tablesub == @playersub) {
 		//Result = tie, --Improvised--
 		mes "I rolled a ^0000FF"+@table3+"^000000, giving";
 		mes "me a total of ^0000FF"+@tablesub+"^000000, which";

npc/quests/quests_ein.txt

@@ -900,6 +900,7 @@ L_Apples:
 			else
 				set @man,@man+1;
 		}
+	}
 	mes "[Kaci]";
 	mes "Oooh...";
 	mes "I got a total of ^FF0000"+@kaci+"^000000,";