Made some scripts a bit less annoying (like don't offer a bed if the player

doesn't have enough money) and added some information (rewards master tells you
your number of monster points). I hope I didn't break anything.

2 files changed, 61 insertions, 66 deletions

diff --git a/npc/tulimshar/monster_guide.txt b/npc/tulimshar/monster_guide.txt
index 002f7d7c..bdc709dd 100644
--- a/npc/tulimshar/monster_guide.txt
+++ b/npc/tulimshar/monster_guide.txt
@@ -1,36 +1,35 @@
 new_3-1.gat,46,66,0	script	MonsterGuide	102,{
-if(MPQUEST == 0) goto Register;
+	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. These points are acquired while killing monsters";
 	close;
 Register:
 	mes "[Monster Guide]";
 	mes "Oh my, you dont seem to be registered as a Quest Participant, would you like to register?";
-	next;	
-	menu "Register",L_R,"Skip",L_N,"Information",L_I;
-		L_R:
-			mes "[Monster Guide]";
-		mes "Give me a second to look over your paperwork.";
-			next;
-			mes "[Monster Guide]";
-		mes "Well, looks like you qualify!";
-			mes "Welcome to the questing world!";
-			set MPQUEST,1;
-			close;
-		L_N:
-			mes "[Monster Guide]";
-			mes "Very well, you dont know what your missing.";
-			close;
-		L_I:
-			mes "[Monster Guide]";
-			mes "Here in The Mana World, there are certain rewards for your vanquishing of foes.";
-			mes "For example, there are Monster Points, every monster you kill has a certain amount of points that get added to your account.";
-			mes "The more points you have, the more expensive things you can buy using them.";
-			next;
-			mes "[Monster Guide]";
-			mes "So whaddya say, sign up wont u?";
-			close;
+	next;
+Choice:
+	menu "Register",L_R,"Not at the moment",L_N,"Information",L_I;
+L_R:
+	mes "[Monster Guide]";
+	mes "Give me a second to look over your paperwork.";
+	next;
+	mes "[Monster Guide]";
+	mes "Well, looks like you qualify!";
+	mes "Welcome to the questing world!";
+	set MPQUEST,1;
+	close;
+L_N:
+	mes "[Monster Guide]";
+	mes "Very well, you dont know what your missing.";
+	close;
+L_I:
+	mes "[Monster Guide]";
+	mes "Here in The Mana World, there are certain rewards for your vanquishing of foes.";
+	mes "For example, there are Monster Points, every monster you kill has a certain amount of points that get added to your account.";
+	mes "The more points you have, the more expensive things you can buy using them.";
+	next;
+	mes "[Monster Guide]";
+	mes "So whaddya say, sign up wont u?";
+	next;
+	goto Choice;
 }
-
-
diff --git a/npc/tulimshar/rewards_master.txt b/npc/tulimshar/rewards_master.txt
index 7f0c07e0..7ef95970 100644
--- a/npc/tulimshar/rewards_master.txt
+++ b/npc/tulimshar/rewards_master.txt
@@ -1,8 +1,10 @@
 new_3-1.gat,55,51,0	script	Rewards	106,{
 	if (MPQUEST == 0) goto Register;
+	if (tvis == 0) set tvis,1;
+	if (Mobpt < tvis) goto NotEnough;
 
 	mes "[Rewards Master]";
-	mes "Welcome! Would you like to exchange some points for items?";
+	mes "Welcome! I see you have " +Mobpt+ " Monster Points. Would you like to exchange some of those for an item?";
 	next;
 	menu "Yes",Y1,"No Thanks",LEAVE;
 	next;
@@ -13,38 +15,33 @@ Register:
 	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;
-	next;
-		set @TEMP,rand(1);
-		if(@TEMP ==0) goto R_1;
-		if(@TEMP ==1) goto R_2;
+	set @TEMP,rand(1);
+	if(@TEMP ==0) goto R_1;
+	if(@TEMP ==1) goto R_2;
 R_1:
-		set @TEMP,rand(19);
-		if(@TEMP ==0) goto R1_1;
-		if(@TEMP ==1) goto R1_2;
-		if(@TEMP ==2) goto R1_3;
-		if(@TEMP ==3) goto R1_4;
-		if(@TEMP ==4) goto R1_5;
-		if(@TEMP ==5) goto R1_6;
-		if(@TEMP ==6) goto R1_7;
-		if(@TEMP ==7) goto R1_8;
-		if(@TEMP ==8) goto R1_9;
-		if(@TEMP ==9) goto R1_10;
-		if(@TEMP ==10) goto R1_11;
-		if(@TEMP ==11) goto R1_12;
-		if(@TEMP ==12) goto R1_13;
-		if(@TEMP ==13) goto R1_14;
-		if(@TEMP ==14) goto R1_15;
-		if(@TEMP ==15) goto R1_16;
-		if(@TEMP ==16) goto R1_17;
-		if(@TEMP ==17) goto R1_18;
-		if(@TEMP ==18) goto R1_19;
-		if(@TEMP ==19) goto R1_20;
+	set @TEMP,rand(19);
+	if(@TEMP ==0) goto R1_1;
+	if(@TEMP ==1) goto R1_2;
+	if(@TEMP ==2) goto R1_3;
+	if(@TEMP ==3) goto R1_4;
+	if(@TEMP ==4) goto R1_5;
+	if(@TEMP ==5) goto R1_6;
+	if(@TEMP ==6) goto R1_7;
+	if(@TEMP ==7) goto R1_8;
+	if(@TEMP ==8) goto R1_9;
+	if(@TEMP ==9) goto R1_10;
+	if(@TEMP ==10) goto R1_11;
+	if(@TEMP ==11) goto R1_12;
+	if(@TEMP ==12) goto R1_13;
+	if(@TEMP ==13) goto R1_14;
+	if(@TEMP ==14) goto R1_15;
+	if(@TEMP ==15) goto R1_16;
+	if(@TEMP ==16) goto R1_17;
+	if(@TEMP ==17) goto R1_18;
+	if(@TEMP ==18) goto R1_19;
+	if(@TEMP ==19) goto R1_20;
 
 R1_1:
 	mes "[Rewards Master]";
@@ -148,11 +145,11 @@ R1_20:
 	goto Q;
 
 R_2:
-		set @TEMP,rand(3);
-		if(@TEMP ==0) goto R2_1;
-		if(@TEMP ==1) goto R2_2;
-		if(@TEMP ==2) goto R2_3;
-		if(@TEMP ==3) goto R2_4;
+	set @TEMP,rand(3);
+	if(@TEMP ==0) goto R2_1;
+	if(@TEMP ==1) goto R2_2;
+	if(@TEMP ==2) goto R2_3;
+	if(@TEMP ==3) goto R2_4;
 
 R2_1:
 	mes "[Rewards Master]";
@@ -176,9 +173,8 @@ R2_4:
 	goto Q;
 
 NotEnough:
-	next;
 	mes "[Rewards Master]";
-	mes "Kill some more monsters first.";
+	mes "You don't have enough Monster Points for a reward. Kill some more monsters first.";
 	close;
 LEAVE:
 	close;