Prepare Generals and King, partly, so you have enough level for the player quest.

2 files changed, 62 insertions, 0 deletions

diff --git a/npc/024-16/generals.txt b/npc/024-16/generals.txt
index 0fa9cfab6..5699e68a6 100644
--- a/npc/024-16/generals.txt
+++ b/npc/024-16/generals.txt
@@ -4,7 +4,46 @@
 // Description:
 //    Generals
 
+// FrostiaGeneralQuest( Skillname )
+function	script	FrostiaGeneralQuest	{
+	.@at$=getarg(0);
+	mesn;
+	mesq l("Hey. You there. Time to do @@ and show what you're made of.", .@at$);
+	next;
+	mesn;
+	mesq l("If you conclude the training, you'll be suitable for the difficult mission our King have to you.");
+	next;
+    mesc b(l(".:: Main Quest 4-3 ::.")), 3;
+    msObjective(BaseLevel >= 52, l("* @@/@@ Base Level", BaseLevel, 52));
+    msObjective(JobLevel >= 24, l("* @@/@@ Job Level", JobLevel, 24));
+	next;
+	if (BaseLevel >= 52 && JobLevel >= 24) {
+		mesn;
+		mesq l("Congrats, you did it.");
+		next;
+		inventoryplace ElixirOfLife, 1, MercCard_Saulc, 1;
+		mesn;
+		mesq l("Take this @@. It might save your life on the secret mission you're about to be assigned to.");
+		next;
+		mesn;
+		mesq l("Now go talk to the King.");
+		setq General_Narrator, 15;
+		getitem MercCard_Saulc, 1;
+		getitem ElixirOfLife, 1;
+		getexp 0, 400; // Get 10% JEXP. Reference: 3988~5564
+	}
+	mesn;
+	mesq l("Now, a simple @@ quest to make you stronger...", .@at$);
+	next;
+	mesn;
+	mesq l("Can't think on anything. Go away.");
+	close;
+}
+
 024-16,29,21,0	script	Wizard General	NPC_BLUESABER,{
+	.@q=getq(General_Narrator);
+	if (.@q == 14)
+		FrostiaGeneralQuest("Magic");
     hello;
     end;
 
@@ -14,6 +53,9 @@ OnInit:
 }
 
 024-16,31,21,0	script	Warrior General	NPC_REDSABER,{
+	.@q=getq(General_Narrator);
+	if (.@q == 14)
+		FrostiaGeneralQuest("Fight");
     hello;
     end;
 
diff --git a/npc/024-16/king.txt b/npc/024-16/king.txt
index 5b28d0ceb..2b3c8caae 100644
--- a/npc/024-16/king.txt
+++ b/npc/024-16/king.txt
@@ -65,6 +65,26 @@ L_MainQuest:
     msObjective(BaseLevel >= 40, l("* @@/@@ Base Level", BaseLevel, 40));
     msObjective(true, l("* Deliver Nikolai's Letter to Frostia Mayor"));
     msObjective(ESTATE_RENTTIME >= gettimetick(2), l("* Rent a room in Frostia's Inn"));
+    if (ESTATE_RENTTIME >= gettimetick(2))
+        goto L_Continue;
+    close;
+
+L_Continue:
+    next;
+    mesn;
+    mesq l("Great, I see you've already made yourself comfortable!");
+    next;
+    mesn;
+    mesq l("Do not hesit to purchase furniture. The furniture belongs to the house, so if you lose the house, you'll lose it, too. But apartments are never rent to someone else!");
+    next;
+    mesn;
+    mesq l("Bah, sorry my manners! I love to chat! Anyway, talk to any General of mine, just behind me. See if they need help.");
+    next;
+    mesn;
+    mesq l("There's somewhere I want you to go, but you're not strong enough yet, so be patient and help them first.");
+    setq General_Narrator, 14, 0;
+
+    // Endtrail
     mes "";
     mesc l("@@ You need to wait further releases to continue this quest!", b(l("WARNING:"))), 1;
     close;