From 27ea894b3d60a4650d307a0ee227605f533d6d26 Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Tue, 18 Jun 2019 22:48:41 -0300
Subject: You can now select the mercenary which will come with you

---
 npc/024-16/generals.txt | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

(limited to 'npc')

diff --git a/npc/024-16/generals.txt b/npc/024-16/generals.txt
index 9549a1cea..3cf3a2135 100644
--- a/npc/024-16/generals.txt
+++ b/npc/024-16/generals.txt
@@ -62,9 +62,25 @@ function	script	FrostiaGeneralQuest	{
 		mesn;
 		mesq l("Congrats, you did it.");
 		next;
-		inventoryplace ElixirOfLife, 1, MercCard_Saulc, 1, Grenade, 3;
 		mesn;
-		mesq l("Take this @@. It might save your life on the secret mission you're about to be assigned to.", getitemlink(MercCard_Saulc));
+		mesq l("So, if you hired a Mercenary to protect your back... Would you prefer it to attack from rearguard, or charge against certain death, buying you time?");
+		next;
+		select
+			l("I honestely wouldn't hire a Mercenary."),
+			l("Running is for noobs, we should hold our ground!"),
+			l("I can protect myself, so it should attack from afar.");
+		mes "";
+		// Decide which mercenary you'll get
+		if (@menu == 2)
+			.@card=MercCard_Saulc;
+		else if (@menu == 3)
+			.@card=MercCard_Arthur;
+		else
+			.@card=any(MercCard_Saulc, MercCard_Arthur);
+
+		inventoryplace ElixirOfLife, 1, .@card, 1, Grenade, 3;
+		mesn;
+		mesq l("Take this @@. It might save your life on the secret mission you're about to be assigned to.", getitemlink(.@card));
 		next;
 		mesn;
 		mesq l("I'll also provide you a few @@s and an Elixir. Use them wisely.", getitemlink(Grenade));
@@ -73,7 +89,7 @@ function	script	FrostiaGeneralQuest	{
 		mesq l("Now go talk to the King.");
 		setq General_Narrator, 15;
 		getitem Grenade, 3;
-		getitem MercCard_Saulc, 1;
+		getitem .@card, 1;
 		getitem ElixirOfLife, 1;
 		getexp 0, 400; // Get 10% JEXP. Reference: 3988~5564
 		close;
-- 
cgit v1.2.3-70-g09d2