Merge branch 'jesusalva/duel' into 'master'

Fix dueling (missing a command), and also update Trozz's dialog to include duel.

See merge request evol/serverdata!216

3 files changed, 49 insertions, 8 deletions

diff --git a/conf/groups.conf b/conf/groups.conf
index 610f4d77..4e57b899 100644
--- a/conf/groups.conf
+++ b/conf/groups.conf
@@ -107,8 +107,9 @@ groups: (
 		duel: true
 		accept: true
 		reject: true
-		noask: true // Autoreject duels
+		invite: true
 		leave: true
+		noask: true // Autoreject duels
 		email: true
 		request: true
 		time: true
diff --git a/npc/001-2-34/samantha.txt b/npc/001-2-34/samantha.txt
index f49e15aa..a571ccf6 100644
--- a/npc/001-2-34/samantha.txt
+++ b/npc/001-2-34/samantha.txt
@@ -7,10 +7,6 @@
 001-2-34,29,27,0	script	Samantha	NPC_SAMANTHA,{
     mesn;
     mesq lg("Look who we have here, did you come for a training session?");
-
-    goto L_Close;
-
-L_Close:
     close;
 
 OnInit:
diff --git a/npc/001-2-40/trozz.txt b/npc/001-2-40/trozz.txt
index b695f1bc..5cb02840 100644
--- a/npc/001-2-40/trozz.txt
+++ b/npc/001-2-40/trozz.txt
@@ -5,19 +5,63 @@
 //    Chief of the Legion of Aemil of the city of Artis.
 
 001-2-40,36,46,0	script	Trozz#001-2-40	NPC_HUMAN_MALE_CHIEF_ARTIS_LEGION,{
+    function Bureaucracy;
+    function Dueling;
     mesn;
     mesq l("Hi. I am Trozz, and I am the chief of legion training in Artis.");
     next;
     mesn;
     mesq l("If you want to challenge someone for a friendly match, you are at the right place.");
     next;
-    mesn;
-    mesq l("But if you need to deal with more burocratic stuff, go talk to Q'Anon. He is the boss here.");
+    do
+    {
+        select
+            l("That's everything, thanks."),
+            l("I'm looking to have some paperwork fixed."),
+            l("How can I challenge someone for a match?");
+        mes "";
+        switch (@menu) {
+            case 1:
+                goodbye();
+                break;
+            case 2:
+                Bureaucracy();
+                break;
+            case 3:
+                Dueling();
+                break;
+        }
+    } while (@menu != 1);
     close;
 
+function Bureaucracy {
+    mesn;
+    mesq l("If you need to deal with more bureaucratic stuff, go talk to Q'Anon. He is the boss here.");
+    next;
+    mesn;
+    mesq l("You can find him upstairs. Go left, then go right, and you'll find him.");
+    next;
+    return;
+}
+
+function Dueling {
+    mesn;
+    mesq l("First, you need to use %s to enter in duel mode.", b("@duel"));
+    next;
+    mesn;
+    mesq l("Then, to challenge a player, you'll use \"%s <player_name>\".", b("@invite"));
+    next;
+    mesn;
+    mesq l("If you were invited to the duel instead, you can use %s or %s.", b("@accept"), b("@reject"));
+    next;
+    mesn;
+    mesq l("You can exit duel mode with %s. You'll also leave it by death.", b("@leave"));
+    next;
+    return;
+}
+
 OnInit:
     .sex = G_MALE;
     .distance = 4;
     end;
 }
-