Fixed monster points scripts, added casino scripts

3 files changed, 211 insertions, 96 deletions

diff --git a/npc/tulimshar/casino.txt b/npc/tulimshar/casino.txt
new file mode 100644
index 00000000..fc35fed9
--- /dev/null
+++ b/npc/tulimshar/casino.txt
@@ -0,0 +1,180 @@
+// Warps room 1
+new_8-1.gat,45,24	warp	upstairs	0,2,new_8-1.gat,65,25
+new_8-1.gat,25,35	warp	outside	0,2,new_3-1.gat,33,73
+// Warps room 2
+new_8-1.gat,64,25	warp	downstairs	0,1,new_8-1.gat,42,25
+new_8-1.gat,68,22	warp	tocasino	2,0,new_8-1.gat,32,72
+new_8-1.gat,67,31	warp	tobedroom1	1,1,new_8-1.gat,102,23
+new_8-1.gat,76,31	warp	tobedroom2	1,1,new_8-1.gat,130,23
+// Warps room 3
+new_8-1.gat,102,22	warp	bedroom1tohall	2,0,new_8-1.gat,67,29
+// Warps room 4
+new_8-1.gat,130,22	warp	bedroom2tohall	2,0,new_8-1.gat,76,29
+// Warps room 5
+new_8-1.gat,32,74	warp	tohall	1,0,new_8-1.gat,68,23
+
+new_8-1.gat,26,26,0	shop	InnKeeper	112,539:175,513:20,519
+
+new_8-1.gat,103,26,0	script	Waitress	118,{
+	mes "[Rebecca]";
+	mes "Would you like to rest? It's only 100 gp.";
+	next;
+	
+	menu "Yes",L_Yes,"No",L_No;
+L_Yes:
+	mes "Sleep well!";
+	next;
+	if (zeny < 100) goto L_NoMoney;
+	set zeny,zeny-100;
+	heal 10000,10000;
+	close;
+	
+L_No:
+	mes "See you.";
+	close;
+	
+L_NoMoney:
+	mes "Hey! You don't have enough money!";
+	close;
+}
+
+new_8-1.gat,134,23,0	script	Worker	117,{
+	mes "[Valdo]";
+	mes "Please let me work, I'm really in a hurry!";
+	close;
+}
+
+new_8-1.gat,37,65,0	script	Slot1	127,{
+	mes "Pull the lever...";
+	next;
+	if(countitem(503) < 1) goto L_NoCoin;
+	delitem 503,1;
+	set @Temp1,rand(7);
+	set @Temp2,rand(7);
+	set @Temp3,rand(7);
+	mes "Numbers: "+ @Temp1 +"/"+ @Temp2 +"/"+ @Temp3 +"";
+	next;
+	if(@Temp1 != @Temp2) goto L_Lost;
+	if(@Temp2 != @Temp3) goto L_Lost;
+	if(@Temp1 != @Temp3) goto L_Lost;
+	mes "Congratulations! You won!";
+	mes "You get 10 casino coins";
+	getitem 503,10;
+	close;
+	
+L_Lost:
+	mes "You lost!";
+	close;
+	
+L_NoCoin:
+	mes "Insert coin";
+	close;
+}
+
+new_8-1.gat,39,65,0	script	Slot2	127,{
+	mes "Pull the lever...";
+	next;
+	if(countitem(503) < 1) goto L_NoCoin;
+	delitem 503,1;
+	set @Temp1,rand(7);
+	set @Temp2,rand(7);
+	set @Temp3,rand(7);
+	mes "Numbers: "+ @Temp1 +"/"+ @Temp2 +"/"+ @Temp3 +"";
+	next;
+	if(@Temp1 != @Temp2) goto L_Lost;
+	if(@Temp2 != @Temp3) goto L_Lost;
+	if(@Temp1 != @Temp3) goto L_Lost;
+	mes "Congratulations! You won!";
+	mes "You get 10 casino coins";
+	getitem 503,10;
+	close;
+	
+L_Lost:
+	mes "You lost!";
+	close;
+	
+L_NoCoin:
+	mes "Insert coin";
+	close;
+}
+
+new_8-1.gat,41,65,0	script	Slot3	127,{
+	mes "Pull the lever...";
+	next;
+	if(countitem(503) < 1) goto L_NoCoin;
+	delitem 503,1;
+	set @Temp1,rand(7);
+	set @Temp2,rand(7);
+	set @Temp3,rand(7);
+	mes "Numbers: "+ @Temp1 +"/"+ @Temp2 +"/"+ @Temp3 +"";
+	next;
+	if(@Temp1 != @Temp2) goto L_Lost;
+	if(@Temp2 != @Temp3) goto L_Lost;
+	if(@Temp1 != @Temp3) goto L_Lost;
+	mes "Congratulations! You won!";
+	mes "You get 10 casino coins";
+	getitem 503,10;
+	close;
+	
+L_Lost:
+	mes "You lost!";
+	close;
+	
+L_NoCoin:
+	mes "Insert coin";
+	close;
+}
+
+new_8-1.gat,32,67,0	shop	MoneyChanger	124,503:10
+
+new_8-1.gat,28,63,0	script	BlackJack	107,{
+	mes "[Croupier]";
+	mes "Would you like to play Black Jack?";
+	mes "You will need 5 casino coins";
+	next;
+	
+	menu "Yes",L_Yes,"No",L_No;
+L_Yes:
+	if(countitem(503) < 5) goto L_NoCoin;
+	delitem 503,5;
+	set @croupier,rand(4);
+	set @croupier, croupier + 17;
+	
+	set @player,rand(20);
+	set @player,@player+1;
+	
+	mes "You got " + @player + "";
+	mes "Do you want another card?";
+	next;
+	
+	menu "Yes",L_Another,"No",L_End;
+L_Another:
+	set @card,rand(10);
+	set @card,@card+1;
+	set @player,@player+@card;
+	
+	mes "You got " + @player + "";
+	if (@player > 21) goto L_Lost;
+	mes "Do you want another card?";
+	next;
+	
+	menu "Yes",L_Another,"No",L_End;
+	
+L_End:
+	if (@player < @croupier) goto L_Lost;
+	mes "Congratulations, you won!";
+	mes "You get 50 casino coins";
+	getitem 503,50;
+	
+L_No:
+	mes "As you wish";
+	close;
+	
+L_NoCoin:
+	mes "You need at least 5 coins";
+	close;
+	
+L_Lost:
+	mes "I'm sorry but you lost";
+	close;
+}
diff --git a/npc/tulimshar/monster_guide.txt b/npc/tulimshar/monster_guide.txt
index b7372c77..ef51a9ee 100644
--- a/npc/tulimshar/monster_guide.txt
+++ b/npc/tulimshar/monster_guide.txt
@@ -1,96 +1,38 @@
-new_3-1.gat,53,185,0	script	ConquestMob0	-1,{
+//new_3-1.gat,53,185,0	script	ConquestMob0	-1,{
 OnInit:
-// 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";
+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";
 break;
 }
-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";
+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";
 	break;
-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_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;
-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";
+spawn:
+	areamonster "new_3-1.gat",51,50,244,247,"Maggot",1002,1,"ConquestMob1::OnGuardianDied10";
 	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";
+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";
 	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";
+spawn:
+	areamonster "new_3-1.gat",51,50,244,247,"Maggot",1002,1,"ConquestMob1::OnGuardianDied10";
 	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 acquired while killing monsters"; 
+	mes "you currently have " +Mobpt+ " Monster Points";
+	mes "These points are acuired while killing monsters"; 
 	close;
 Register:
 	mes "[Monster Guide]";
diff --git a/npc/tulimshar/ptsrewards.txt b/npc/tulimshar/ptsrewards.txt
index 4dd567b7..10619856 100644
--- a/npc/tulimshar/ptsrewards.txt
+++ b/npc/tulimshar/ptsrewards.txt
@@ -1,30 +1,23 @@
 new_3-1.gat,55,51,0	script	Rewards	106,{
-	if (MPQUEST == 0) goto Register;
-
 	mes "[Rewards Master]";
-	mes "Welcome! Would you like to exchange some points for items?";
+	mes "Welcome";
+	mes "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.";
-        if (tvis == 0) set tvis,1;
-	if (Mobpt < tvis) goto NotEnough;
-	set Mobpt,Mobpt-tvis;
-	set tvis,tvis+1;
+	set @tempus,rand(30);
+	if (Mobpt < @tempus) goto NotEnough;
+	set Mobpt,Mobpt-@tempus;
 	next;
 		set @TEMP,rand(1);
 		if(@TEMP ==0) goto R_1;
 		if(@TEMP ==1) goto R_2;
 R_1:
-		set @TEMP,rand(19);
+		set @TEMP,rand(30);
 		if(@TEMP ==0) goto R1_1;
 		if(@TEMP ==1) goto R1_2;
 		if(@TEMP ==2) goto R1_3;
@@ -123,7 +116,7 @@ R1_15:
 	goto Q;
 R1_16:
 	mes "[Rewards Master]";
-	mes "You got Yellow Present.";
+	mes "You got Blue Present.";
 	getitem 516,1;
 	goto Q;
 R1_17:
@@ -171,7 +164,7 @@ R2_3:
 	goto Q;
 R2_4:
 	mes "[Rewards Master]";
-	mes "You got an Cotton Shirt.";
+	mes "You got a Cotton Shirt.";
 	getitem 1202,1;
 	goto Q;