Replace reed.txt

1 files changed, 40 insertions, 48 deletions

diff --git a/npc/006-2-5/reed.txt b/npc/006-2-5/reed.txt
index 039aa1b0c..aca6c70a8 100644
--- a/npc/006-2-5/reed.txt
+++ b/npc/006-2-5/reed.txt
@@ -2,39 +2,57 @@
 // Original Authors: Hal9000 & Qwerty Dragon
 // TMW-2 Authors:
 //	  +seeds
+//	  dangerduck
 // Description:
 //    Piou captain who gives information about shrewboo mounts and the Piou Knights.
 
 006-2-5,40,25,0	script	Captain Reed	NPC_PIOU_KNIGHT_L,{
-	function reedIgnore;
 	function reedHello;
 	function reedAboutKnights;
 	function reedAboutShrewboos;
 	.@q=getq(LilitQuest_Pouf);
 
-    function reedHello {
-    do
+	if (.@q <= 2)
     {
-        mesn;
-        mesq l("Do you need assistance, Knight %s?", strcharinfo(0));
-        next;
-        select
-            l("What can you tell me about the Piou Knights?"),
-            l("Why do Piou Knights need mounts if they can fly?"),
-            l("I just wanted to say hi.");
-        mes "";
-        switch (@menu) {
-        case 1:
-            reedAboutKnights();
-            break;
-        case 2:
-            reedAboutShrewboos();
-            break;
-        case 3:
-            close;
-            break;
-        }
+		.@r = rand2(3);
+		if (.@r == 0)
+		{
+			npctalk3 l("This is no place for a weakling like you. I suggest you leave.");
+		}
+		else if (.@r == 1)
+		{
+			npctalk3 l("Allowing you to remain on our Isles is dangerous. Tread carefully, %s.", get_race());
+		}
+		else
+		{
+			npctalk3 l("I'll be keeping an eye on you, %s. Don't make trouble.", strcharinfo(0));
+		}
+	}    
+    else if (.@q == 3)
+    {
+        reedHello();
     }
+    close;
+
+function reedHello {
+	mesn;
+	mesq l("Do you need assistance, Knight %s?", strcharinfo(0));
+	next;
+	select
+		l("What can you tell me about the Piou Knights?"),
+		l("Why do Piou Knights need mounts if they can fly?"),
+		l("I just wanted to say hi.");
+	mes "";
+	switch (@menu) {
+	case 1:
+		reedAboutKnights();
+		break;
+	case 2:
+		reedAboutShrewboos();
+	case 3:
+		// fallthrough
+		break;
+	}
     return;
 }
 
@@ -68,32 +86,6 @@ function reedAboutShrewboos {
     reedHello();
 }
 
-function reedIgnore {
-    next;
-	if (.@q <= 2)
-    {
-		.@r = rand2(3);
-		if (.@r == 0)
-		{
-			mesq l("This is no place for a weakling like you. I suggest you leave.");
-		}
-		else if (.@r == 1)
-		{
-			mesq l("Allowing you to remain on our Isles is dangerous. Tread carefully, %s.", get_race());
-		}
-		else
-		{
-			mesq l("I'll be keeping an eye on you, %s. Don't make trouble.", strcharinfo(0));
-		}
-		return;
-		}    
-    else if (.@q == 3)
-    {
-        reedHello();
-    }
-    return;
-}
-
 OnInit:
     .sex = G_Other;
     .distance = 4;