Replace dusk.txt

1 files changed, 42 insertions, 50 deletions

diff --git a/npc/006-2-5/dusk.txt b/npc/006-2-5/dusk.txt
index b9ca703b2..8558ddabf 100644
--- a/npc/006-2-5/dusk.txt
+++ b/npc/006-2-5/dusk.txt
@@ -2,39 +2,57 @@
 // Original Authors: Hal9000 & Qwerty Dragon
 // TMW-2 Authors:
 //	  +seeds
+//	  dangerduck
 // Description:
-//    Piou captain who gives information about the war and piou queen.
+//    Piou captain who gives information about the war, and the piou queen.
 
 006-2-5,36,25,0	script	Captain Dusk	NPC_PIOU_KNIGHT_R,{
-	function duskIgnore;
 	function duskHello;
 	function duskAboutQueen;
 	function reedAboutWar;
 	.@q=getq(LilitQuest_Pouf);
 
-    function reedHello {
-    do
+	if (.@q <= 2)
+    {
+		.@r = rand2(3);
+		if (.@r == 0)
+		{
+			npctalk3 l("Don't think you'll sneak anything by me. I'm watching you.");
+		}
+		else if (.@r == 1)
+		{
+			npctalk3 l("I don't tolerate a piou who is afraid of hard work... or a %s.", get_race());
+		}
+		else
+		{
+			npctalk3 l("Best steer clear of the Princess, %s. It won't go well if you upset her.", strcharinfo(0));
+		}
+	}
+    else if (.@q == 3)
     {
-        mesn;
-        mesq l("Welcome to the Order of the Piou Knights, %s.", strcharinfo(0));
-        next;
-        select
-            l("Why is Princess Pouf not a Queen?"),
-            l("How is the war going?"),
-            l("I just wanted to say hi.");
-        mes "";
-        switch (@menu) {
-        case 1:
-            duskAboutQueen();
-            break;
-        case 2:
-            duskAboutWar();
-            break;
-        case 3:
-            close;
-            break;
-        }
+        duskHello();
     }
+    close;
+
+function duskHello {
+	mesn;
+	mesq l("Welcome to the Order of the Piou Knights, %s.", strcharinfo(0));
+	next;
+	select
+		l("Where is the Piou Queen?"),
+		l("How is the war going?"),
+		l("I just wanted to say hi.");
+	mes "";
+	switch (@menu) {
+	case 1:
+		duskAboutQueen();
+		break;
+	case 2:
+		duskAboutWar();
+	case 3:
+		// fallthrough
+		break;
+	}
     return;
 }
 
@@ -55,38 +73,12 @@ function duskAboutWar {
     mesn;
     mesq l("So far neither the Duck Side or the Piou Knights have gained the upper hand in the war.");
     mesn;
-    mesq l("However, our mages have recently begun sensing something dark stirring.");
+    mesq l("However, our mages have recently sensed something dark stirring.");
     mesn;
     mesq l("I fear something terrible is rising, and I do not know if we can weather the coming storm.");
     mesn;
     mesc l("The captain falls quiet, and appears to be lost in thought.");
     mesn;
-    close;
-}
-
-function duskignore {
-    next;
-	if (.@q <= 2)
-    {
-		.@r = rand2(3);
-		if (.@r == 0)
-		{
-			mesq l("Don't think you'll sneak anything by me. I'm watching you.");
-		}
-		else if (.@r == 1)
-		{
-			mesq l("I don't tolerate a piou who is afraid of hard work... or a %s.", get_race());
-		}
-		else
-		{
-			mesq l("Best steer clear of the Princess, %s. It won't go well if you upset her.", strcharinfo(0));
-		}
-		return;
-		}    
-    else if (.@q == 3)
-    {
-        duskHello();
-    }
     return;
 }