Finish and Release (UNTESTED) George's Quest (LoF).

4 files changed, 30 insertions, 17 deletions

diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index 76d146196..47701fe1f 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -5442,6 +5442,15 @@ item_db: (
 		noauction: true
 	}
 },
+{
+	Id: 923
+	AegisName: "Almanac"
+	Name: "Almanac"
+	Type: "IT_ETC"
+	Buy: 0
+	Sell: 0
+	Weight: 0
+},
 
 
 //	 <!-- Necklaces -->
diff --git a/npc/017-1/roger.txt b/npc/017-1/roger.txt
index ec89a06c5..2f2a4b473 100644
--- a/npc/017-1/roger.txt
+++ b/npc/017-1/roger.txt
@@ -82,13 +82,10 @@ L_Success:
     next;
     mesn;
     mesq l("I asked my father and he agreed to trade it to you, so here is the last copy of the Maritime Almanac Scroll.");
-    /*
-    //TODO: Add the ScrollOfPaper or the AlmanacScroll to finish this quest
     inventoryplace FireScroll, 1;
     delitem MoubooFigurine, 1;
-    getitem FireScroll, 1;
+    getitembound Almanac, 1, 1;
     setq2 LoFQuest_George, 1;
-    */
     close;
 
 L_BadOffer1:
diff --git a/npc/018-1/george.txt b/npc/018-1/george.txt
index 329ae4e62..c899009bd 100644
--- a/npc/018-1/george.txt
+++ b/npc/018-1/george.txt
@@ -46,8 +46,8 @@ L_Main:
         l("What is this island?"), L_Explain,
         rif(.@q == 1, l("Actually, I heard from Roger that you may need some help.")), L_RequestOne,
         rif(.@q == 2, l("About the items you asked me to collect...")), L_ProgressOne,
-        rif(.@q == 3 && 0, l("Do you need any more help?")), L_RequestTwo,
-        rif(.@q == 4 && 0, l("About the items you asked me to collect...")), L_ProgressTwo,
+        rif(.@q == 3, l("Do you need any more help?")), L_RequestTwo,
+        rif(.@q == 4, l("About the items you asked me to collect...")), L_ProgressTwo,
         rif(.@showShovel, l("Could you sell me a treasure map and a shovel?")), L_Shop,
         l("Nothing I guess"), L_Close;
 
@@ -79,7 +79,9 @@ L_RequestTwo:
     if (BaseLevel < 60)
         goto L_Weak;
     mesn l("George the Pirate");
-    mes "\"Arrr matey! My captain asked me to have you get him some items. Please bring us 50 zombie nachos and 50 lady fingers, my captain likes to snack on those during our long voyages. Oh, and something to read too!\"";
+    mesq l("Arrr matey! My captain asked me to have you get him some items. Please bring us %d %s and %d %s, my captain likes to snack on those during our long voyages. Oh, and something to read too!",
+            50, getitemlink(Potatoz),
+            40, getitemlink(Dragonfruit));
     setq LoFQuest_George, 4;
     close;
 
@@ -115,9 +117,9 @@ L_ProgressOne:
 
 // Progress Report 2
 L_ProgressTwo:
-    if (countitem(WarlordPlate) < 100 ||
-        countitem(WarlordPlate) < 50 ||
-        countitem(WarlordPlate) < 1)
+    if (countitem(Potatoz) < 50 ||
+        countitem(Dragonfruit) < 40 ||
+        countitem(Almanac) < 1)
         goto L_NotEnough;
 
     mesn l("George the Pirate");
@@ -130,16 +132,19 @@ L_ProgressTwo:
         goto L_NotEnough;
 
     mesn l("George the Pirate");
-    mes "\"Arrr! Good job matey! You brought us everything we asked for, even the Maritime Almanac Scroll!\"";
+    mesq l("Arrr! Good job matey! You brought us everything we asked for, even the Maritime Almanac Scroll!");
 
     inventoryplace CorsairHat, 1;
-    delitem WarlordPlate, 50;
-    delitem WarlordPlate, 50;
-    delitem WarlordPlate, 1;
-    mes "\"My captain wanted me to give this to you as a special reward for your efforts.\"";
+    delitem Potatoz, 50;
+    delitem Dragonfruit, 40;
+    delitem Almanac, 1;
+    mesq l("My captain wanted me to give this to you as a special reward for your efforts.");
     getitem CorsairHat, 1;
     getexp 15000, 0;
     setq LoFQuest_George, 5;
+    next;
+    mesn;
+    mesq l("You can call yourself a pirate now! HAR HAR HAR!!");
     goto L_Close;
 
 // Fallbacks
@@ -162,7 +167,9 @@ L_NotEnoughOne:
     goto L_Close;
 
 L_NotEnoughTwo:
-    mesq l("Remember, I need 100 @@, 50 @@, and something interesting to read.", getitemlink(WarlordPlate), getitemlink(CorsairHat));
+    mesq l("Remember, I need %d %s, %d %s, and something interesting to read.", 
+           50, getitemlink(Potatoz),
+           40, getitemlink(Dragonfruit));
     goto L_Close;
 
 L_Shop:
diff --git a/npc/functions/util.txt b/npc/functions/util.txt
index 5ca6c3d6e..420c856f2 100644
--- a/npc/functions/util.txt
+++ b/npc/functions/util.txt
@@ -369,7 +369,7 @@ function	script	reputation	{
             .@nr=.@nr+1;
 
         // George Quest (+1 rep)
-        if (getq(LoFQuest_George) >= 3)
+        if (getq(LoFQuest_George) >= 5)
             .@nr=.@nr+1;
 
         // Fairy Quest (+1 rep)