Merge branch 'master' into magicv2008.12.25

1 files changed, 10 insertions, 7 deletions

diff --git a/npc/001-1_Tulimshar/guide.txt b/npc/001-1_Tulimshar/guide.txt
index 1efc79fe..d4367616 100644
--- a/npc/001-1_Tulimshar/guide.txt
+++ b/npc/001-1_Tulimshar/guide.txt
@@ -140,12 +140,7 @@ L_Key:
 
 L_Laws:
 	mes "[Ian the Guide]";
-        mes "\"Lady Platyna, the Overseer, has decreed the following rules:";
-        mes "1. Do not abuse others (insult, swear etc.)";
-        mes "2. No bots.";
-        mes "3. No spamming/flooding.";
-        mes "4. No begging.";
-        mes "5. Speak English.";
+        mes "\"The constable can help you with them.\"";
         next;
 	goto L_Menu_A;
         
@@ -153,12 +148,20 @@ L_Know:
 	close;
 
 S_Grad:
+	getinventorylist;
+	if (@inventorylist_count == 100) goto L_TooMany;
 	mes "[Ian the Guide]";
 	mes "\"Hey, you've been doing good, let me give you this.\"";
-	next;
 
 	getitem 675, 1;
 	set TUT_var, TUT_var | 2;
+	next;
+
+	return;
 
+L_TooMany:
+	mes "[Ian the Guide]";
+	mes "\"I wanted to give you something, but you don't have room for it.\"";
+	next;
 	return;
 }