Added roulette, some more fixes to black jack, reverted last changes to monster points related scripts

3 files changed, 283 insertions, 37 deletions

diff --git a/npc/tulimshar/casino.txt b/npc/tulimshar/casino.txt
index e5c469ad..c759def9 100644
--- a/npc/tulimshar/casino.txt
+++ b/npc/tulimshar/casino.txt
@@ -137,11 +137,10 @@ new_8-1.gat,28,63,0	script	BlackJack	107,{
 L_Yes:
 	if(countitem(503) < 15) goto L_NoCoin;
 	delitem 503,15;
-	set @croupier,rand(4);
+	set @croupier,rand(0, 4);
 	set @croupier,@croupier + 17;
 	
-	set @player,rand(17);
-	set @player,@player + 4;
+	set @player,rand(4, 20);
 	
 	mes "You got " + @player + " with your cards.";
 	mes "Do you want another card?";
@@ -149,9 +148,7 @@ L_Yes:
 	
 	menu "Yes",L_Another,"No",L_End;
 L_Another:
-	set @card,rand(9);
-	set @card,@card + 2;
-	set @player,@player+@card;
+	set @player,@player+rand(2, 11);
 	
 	if (@player > 21) goto L_Lost;	
 	mes "You got " + @player + " with your cards.";	
@@ -182,3 +179,187 @@ L_Lost:
 	mes "I had " + @croupier + "";
 	close;
 }
+
+new_8-1.gat,22,69,0	script	Roulette	107,{
+	mes "Good evening monsieur...";
+	mes "How much would you like to bet?";
+	next;
+	
+	menu "Maybe I'll play later",L_Later,"1 coin",L_b1,"5 coins",L_b5,"10 coins",L_b10,"50 coins",L_b50,"100 coins",L_b100;
+L_b1:
+	set @bet,1;
+	goto L_Check;
+L_b5:
+	set @bet,5;
+	goto L_Check;
+L_b10:
+	set @bet,10;
+	goto L_Check;
+L_b50:
+	set @bet,50;
+	goto L_Check;
+L_b100:
+	set @bet,100;
+	goto L_Check;
+	
+L_Check:
+	if(countitem(503) < @bet) goto L_NoCoin;
+	delitem 503,@bet;	
+	
+	menu "Choose a color",L_Color,"Choose a number",L_Number;
+	
+L_Color:
+	menu "Black",L_ColorEnd,"Red",L_ColorEnd;
+
+L_ColorEnd:
+    set @color,rand(2);
+	if(@color == 1) goto L_Lost;
+	mes "You won!";
+	getitem 503,@bet * 2;
+	close;
+
+L_Number:
+	menu "0",L0,"00",L00,"1",L1,"2",L2,"3",L3,"4",L4,"5",L5,"6",L6,"7",L7,
+		 "8",L8,"9",L9,"10",L10,"11",L11,"12",L12,"13",L13,"14",L14,"15",L15,
+		 "16",L16,"17",L17,"18",L18,"19",L19,"20",L20,"21",L21,"22",L22,
+		 "23",L23,"24",L24,"25",L25,"26",L26,"27",L27,"28",L28,"29",L29,
+		 "30",L30,"31",L31,"32",L32,"33",L33,"34",L34,"35",L35,"36",L36;
+		 
+L0:
+	set @number,0;
+	goto L_CheckNumber;
+L00:
+	set @number,37;
+	goto L_CheckNumber;
+L1:
+	set @number,1;
+	goto L_CheckNumber;
+L2:
+	set @number,2;
+	goto L_CheckNumber;
+L3:
+	set @number,3;
+	goto L_CheckNumber;
+L4:
+	set @number,4;
+	goto L_CheckNumber;
+L5:
+	set @number,5;
+	goto L_CheckNumber;
+L6:
+	set @number,6;
+	goto L_CheckNumber;
+L7:
+	set @number,7;
+	goto L_CheckNumber;
+L8:
+	set @number,8;
+	goto L_CheckNumber;
+L9:
+	set @number,9;
+	goto L_CheckNumber;
+L10:
+	set @number,10;
+	goto L_CheckNumber;
+L11:
+	set @number,11;
+	goto L_CheckNumber;
+L12:
+	set @number,12;
+	goto L_CheckNumber;
+L13:
+	set @number,13;
+	goto L_CheckNumber;
+L14:
+	set @number,14;
+	goto L_CheckNumber;
+L15:
+	set @number,15;
+	goto L_CheckNumber;
+L16:
+	set @number,16;
+	goto L_CheckNumber;
+L17:
+	set @number,17;
+	goto L_CheckNumber;
+L18:
+	set @number,18;
+	goto L_CheckNumber;
+L19:
+	set @number,19;
+	goto L_CheckNumber;
+L20:
+	set @number,20;
+	goto L_CheckNumber;
+L21:
+	set @number,21;
+	goto L_CheckNumber;
+L22:
+	set @number,22;
+	goto L_CheckNumber;
+L23:
+	set @number,23;
+	goto L_CheckNumber;
+L24:
+	set @number,24;
+	goto L_CheckNumber;
+L25:
+	set @number,25;
+	goto L_CheckNumber;
+L26:
+	set @number,26;
+	goto L_CheckNumber;
+L27:
+	set @number,27;
+	goto L_CheckNumber;
+L28:
+	set @number,28;
+	goto L_CheckNumber;
+L29:
+	set @number,29;
+	goto L_CheckNumber;
+L30:
+	set @number,30;
+	goto L_CheckNumber;
+L31:
+	set @number,31;
+	goto L_CheckNumber;
+L32:
+	set @number,32;
+	goto L_CheckNumber;
+L33:
+	set @number,33;
+	goto L_CheckNumber;
+L34:
+	set @number,34;
+	goto L_CheckNumber;
+L35:
+	set @number,35;
+	goto L_CheckNumber;
+L36:
+	set @number,36;
+	goto L_CheckNumber;
+	
+L_CheckNumber:
+	set @roulette,rand(38);
+	if (@roulette == 37) mes "We got a 00";
+	if (@roulette < 37) mes "We got a " + @roulette;
+	if (@number != @roulette) goto L_Lost;
+	mes "You won!";
+	getitem 503,@bet * 10;
+	close;
+
+L_Later:
+	mes "Rien va plus...";
+	close;
+
+L_NoCoin:
+	mes "You don't have enough coins";
+	close;
+	
+L_Lost:
+	mes "I'm sorry, you lost."
+	close;
+}
+
+
diff --git a/npc/tulimshar/monster_guide.txt b/npc/tulimshar/monster_guide.txt
index ef51a9ee..b7372c77 100644
--- a/npc/tulimshar/monster_guide.txt
+++ b/npc/tulimshar/monster_guide.txt
@@ -1,38 +1,96 @@
-//new_3-1.gat,53,185,0	script	ConquestMob0	-1,{
+new_3-1.gat,53,185,0	script	ConquestMob0	-1,{
 OnInit:
-areamonster "new_3-1.gat",51,50,244,247,"Maggot",1002, 15,"ConquestMob1::OnGuardianDied10";
-areamonster "new_3-1.gat",51,50,244,247,"Scorpion",1003, 5,"ConquestMob2::OnGuardianDied11";
+// all monsters ingame by 31.Jul 2005 sorted by map, monsterID
+areamonster "new_1-1.gat",15,17,105,103,"RedScorpion",1004, 1,"ConquestMob-new_1-1::OnGuardianDied1004";
+areamonster "new_1-1.gat",15,17,105,103,"GreenSlime",1005, 50,"ConquestMob-new_1-1::OnGuardianDied1005";
+areamonster "new_1-1.gat",15,17,105,103,"GiantMaggot",1006, 30,"ConquestMob-new_1-1::OnGuardianDied1006";
+areamonster "new_2-1.gat",31,31,90,97,"RedSlime",1008, 24,"ConquestMob-new_2-1::OnGuardianDied1008";
+areamonster "new_2-1.gat",53,34,96,36,"RedSlime",1008, 6,"ConquestMob-new_2-1::OnGuardianDied1008b";
+areamonster "new_2-1.gat",31,31,90,97,"BlackScorpion",1009, 15,"ConquestMob-new_2-1::OnGuardianDied1009";
+areamonster "new_2-1.gat",84,52,93,91,"BlackScorpion",1009, 5,"ConquestMob-new_2-1::OnGuardianDied1009a";
+areamonster "new_3-1.gat",22,42,142,79,"Maggot",1002, 35,"ConquestMob-new_3-1::OnGuardianDied1002";
+areamonster "new_3-1.gat",22,42,142,79,"Scorpion",1003, 10,"ConquestMob-new_3-1::OnGuardianDied1003";
+areamonster "new_5-1.gat",32,32,90,100,"YellowSlime",1007, 20,"ConquestMob-new_5-1::OnGuardianDied1007";
+areamonster "new_5-1.gat",88,33,98,42,"RedSlime",1008, 3,"ConquestMob-new_5-1::OnGuardianDied1008a";
+areamonster "new_5-1.gat",32,32,90,100,"Spider",1012, 8,"ConquestMob-new_5-1::OnGuardianDied1012";
+areamonster "new_5-1.gat",81,32,85,38,"Spider",1012, 2,"ConquestMob-new_5-1::OnGuardianDied1012a";
+areamonster "new_7-1.gat",22,27,176,174,"Snake",1010, 15,"ConquestMob-new_7-1::OnGuardianDied1010";
 break;
 }
-new_3-1.gat,53,185,0	script	ConquestMob1	-1,{
-OnGuardianDied10:
-if (MPQUEST == 0) goto spawn;
-	// event when mob dies
-	set Mobpt,Mobpt+1;
-	areamonster "new_3-1.gat",51,50,244,247,"Maggot",1002,1,"ConquestMob1::OnGuardianDied10";
+new_1-1.gat,53,185,0	script	ConquestMob-new_1-1	-1,{
+// event when mob dies
+OnGuardianDied1004:
+	if (MPQUEST == 1) set Mobpt,Mobpt+42;
+	areamonster "new_1-1.gat",15,17,105,103,"RedScorpion",1004, 1,"ConquestMob-new_1-1::OnGuardianDied1004";
 	break;
-spawn:
-	areamonster "new_3-1.gat",51,50,244,247,"Maggot",1002,1,"ConquestMob1::OnGuardianDied10";
+OnGuardianDied1005:
+	if (MPQUEST == 1) set Mobpt,Mobpt+5;
+	areamonster "new_1-1.gat",15,17,105,103,"GreenSlime",1005, 1,"ConquestMob-new_1-1::OnGuardianDied1005";
+	break;
+OnGuardianDied1006:
+	if (MPQUEST == 1) set Mobpt,Mobpt+14;
+	areamonster "new_1-1.gat",15,17,105,103,"GiantMaggot",1006, 1,"ConquestMob-new_1-1::OnGuardianDied1006";
 	break;
-
 }
-new_3-1.gat,53,185,0	script	ConquestMob2	-1,{
-OnGuardianDied11:
-if (MPQUEST == 0) goto spawn;
-	// event when mob dies
-	set Mobpt,Mobpt+2;
-	areamonster "new_3-1.gat",51,50,244,247,"Scorpion",1003,1,"ConquestMob2::OnGuardianDied11";
+new_2-1.gat,53,185,0	script	ConquestMob-new_2-1	-1,{
+OnGuardianDied1008:
+	if (MPQUEST == 1) set Mobpt,Mobpt+18;
+	areamonster "new_2-1.gat",31,31,90,97,"RedSlime",1008, 1,"ConquestMob-new_2-1::OnGuardianDied1008";
 	break;
-spawn:
-	areamonster "new_3-1.gat",51,50,244,247,"Maggot",1002,1,"ConquestMob1::OnGuardianDied10";
+OnGuardianDied1008b:
+	if (MPQUEST == 1) set Mobpt,Mobpt+18;
+	areamonster "new_2-1.gat",53,34,96,36,"RedSlime",1008, 1,"ConquestMob-new_2-1::OnGuardianDied1008b";
+	break;
+OnGuardianDied1009:
+	if (MPQUEST == 1) set Mobpt,Mobpt+45;
+	areamonster "new_2-1.gat",31,31,90,97,"BlackScorpion",1009, 1,"ConquestMob-new_2-1::OnGuardianDied1009";
+	break;
+OnGuardianDied1009a:
+	if (MPQUEST == 1) set Mobpt,Mobpt+45;
+	areamonster "new_2-1.gat",84,52,93,91,"BlackScorpion",1009, 1,"ConquestMob-new_2-1::OnGuardianDied1009a";
+	break;
+}
+new_3-1.gat,53,185,0	script	ConquestMob-new_3-1	-1,{
+OnGuardianDied1002:
+	if (MPQUEST == 1) set Mobpt,Mobpt+1;
+	areamonster "new_3-1.gat",22,42,142,79,"Maggot",1002, 1,"ConquestMob-new_3-1::OnGuardianDied1002";
+	break;
+OnGuardianDied1003:
+	if (MPQUEST == 1) set Mobpt,Mobpt+2;
+	areamonster "new_3-1.gat",22,42,142,79,"Scorpion",1003, 1,"ConquestMob-new_3-1::OnGuardianDied1003";
+	break;
+}
+new_5-1.gat,53,185,0	script	ConquestMob-new_5-1	-1,{
+OnGuardianDied1007:
+	if (MPQUEST == 1) set Mobpt,Mobpt+9;
+	areamonster "new_5-1.gat",32,32,90,100,"YellowSlime",1007, 1,"ConquestMob-new_5-1::OnGuardianDied1007";
+	break;
+// 3 Red Slimes guard treasure
+OnGuardianDied1008a:
+	if (MPQUEST == 1) set Mobpt,Mobpt+18;
+	areamonster "new_5-1.gat",88,33,98,42,"RedSlime",1008, 1,"ConquestMob-new_5-1::OnGuardianDied1008a";
+	break;
+OnGuardianDied1012:
+	if (MPQUEST == 1) set Mobpt,Mobpt+56;
+	areamonster "new_5-1.gat",32,32,90,100,"Spider",1012, 1,"ConquestMob-new_5-1::OnGuardianDied1012";
+	break;
+// 2 spiders guard entrance to treasure
+OnGuardianDied1012a:
+	if (MPQUEST == 1) set Mobpt,Mobpt+56;
+	areamonster "new_5-1.gat",81,32,85,38,"Spider",1012, 1,"ConquestMob-new_5-1::OnGuardianDied1012a";
+	break;
+}
+new_7-1.gat,53,185,0	script	ConquestMob-new_7-1	-1,{
+OnGuardianDied1010:
+	if (MPQUEST == 1) set Mobpt,Mobpt+51;
+	areamonster "new_7-1.gat",22,27,176,174,"Snake",1010, 1,"ConquestMob-new_7-1::OnGuardianDied1010";
 	break;
-
 }
 new_3-1.gat,46,66,0	script	MonsterGuide	102,{
 if(MPQUEST == 0) goto Register;
 	mes "[Monster Guide]";
-	mes "you currently have " +Mobpt+ " Monster Points";
-	mes "These points are acuired while killing monsters"; 
+	mes "You currently have " +Mobpt+ " Monster Points";
+	mes "These points are acquired while killing monsters"; 
 	close;
 Register:
 	mes "[Monster Guide]";
diff --git a/npc/tulimshar/ptsrewards.txt b/npc/tulimshar/ptsrewards.txt
index 10619856..4dd567b7 100644
--- a/npc/tulimshar/ptsrewards.txt
+++ b/npc/tulimshar/ptsrewards.txt
@@ -1,23 +1,30 @@
 new_3-1.gat,55,51,0	script	Rewards	106,{
+	if (MPQUEST == 0) goto Register;
+
 	mes "[Rewards Master]";
-	mes "Welcome";
-	mes "Would you like to exchange some points for items?";
+	mes "Welcome! Would you like to exchange some points for items?";
 	next;
 	menu "Yes",Y1,"No Thanks",LEAVE;
 	next;
 
+Register:
+	mes "[Rewards Master]";
+	mes "Hey, it seems like you didn't register as a quest participant yet! You can sign up at the gate below.";
+	close;
+
 Y1:
 	mes "[Rewards Master]";
 	mes "Ok lets check those points.";
-	set @tempus,rand(30);
-	if (Mobpt < @tempus) goto NotEnough;
-	set Mobpt,Mobpt-@tempus;
+        if (tvis == 0) set tvis,1;
+	if (Mobpt < tvis) goto NotEnough;
+	set Mobpt,Mobpt-tvis;
+	set tvis,tvis+1;
 	next;
 		set @TEMP,rand(1);
 		if(@TEMP ==0) goto R_1;
 		if(@TEMP ==1) goto R_2;
 R_1:
-		set @TEMP,rand(30);
+		set @TEMP,rand(19);
 		if(@TEMP ==0) goto R1_1;
 		if(@TEMP ==1) goto R1_2;
 		if(@TEMP ==2) goto R1_3;
@@ -116,7 +123,7 @@ R1_15:
 	goto Q;
 R1_16:
 	mes "[Rewards Master]";
-	mes "You got Blue Present.";
+	mes "You got Yellow Present.";
 	getitem 516,1;
 	goto Q;
 R1_17:
@@ -164,7 +171,7 @@ R2_3:
 	goto Q;
 R2_4:
 	mes "[Rewards Master]";
-	mes "You got a Cotton Shirt.";
+	mes "You got an Cotton Shirt.";
 	getitem 1202,1;
 	goto Q;