Move stuff around - Give Scythe after Hinnak, add Cotton Boots to last stage.

3 files changed, 15 insertions, 4 deletions

diff --git a/npc/012-1/hinnak.txt b/npc/012-1/hinnak.txt
index 89172ee84..3356028b9 100644
--- a/npc/012-1/hinnak.txt
+++ b/npc/012-1/hinnak.txt
@@ -87,10 +87,12 @@ L_Check:
     close;
 
 L_RealHelp:
+    inventoryplace Scythe, 1;
     delitem PinkAntenna, 10;
     getexp 1600, 60;
     Zeny=Zeny+2500;
     setq HurnscaldQuest_Farmers, 2, 0;
+    getitem Scythe, 1;
     mes "";
     mesn;
     mesq l("Waw! You really did it, you're the savior of my farm!! You have my eternal gratitute. Here is 2500 GP for your troubles!");
@@ -101,6 +103,8 @@ L_TrueHelp:
     mesn;
     mesq l("I know how hard it is! I hate them with all my heart, only seeing you killing them left and right was GREAT!");
     next;
+    inventoryplace Scythe, 1;
+    getitem Scythe, 1;
     getexp 1000, 0;
     Zeny=Zeny+500;
     setq HurnscaldQuest_Farmers, 2, 0;
@@ -109,10 +113,12 @@ L_TrueHelp:
     close;
 
 L_Help:
+    inventoryplace Scythe, 1;
     delitem PinkAntenna, 10;
     getexp 1000, 0;
     Zeny=Zeny+1000;
     setq HurnscaldQuest_Farmers, 2, 0;
+    getitem Scythe, 1;
     mes "";
     mesn;
     mesq l("Many thanks. You have my eternal gratitute. Here is 1000 GP for your troubles.");
diff --git a/npc/012-7/airlia.txt b/npc/012-7/airlia.txt
index 8386c7f94..9025adf5b 100644
--- a/npc/012-7/airlia.txt
+++ b/npc/012-7/airlia.txt
@@ -33,10 +33,10 @@ L_Letter:
     mesq l("We're currently the biggest exporter of food. We may be a small town, but Tulimshar and Halinarzo can barely hold themselves.");
     next;
     mesn;
-    mesq l("Here, take this @@. This is the proof that you've helped Hurnscald greatly. This shall open new opportunities to you.", getitemlink(Scythe));
-    inventoryplace Scythe, 1;
+    mesq l("Here, take this @@. This is the proof that you've helped Hurnscald greatly. This shall open new opportunities to you.", getitemlink(CottonBoots));
+    inventoryplace CottonBoots, 1;
     setq HurnscaldQuest_Farmers, 5;
-    getitem Scythe, 1;
+    getitem CottonBoots, 1;
     getexp 0, 1000;
     close;
 
diff --git a/npc/functions/clientversion.txt b/npc/functions/clientversion.txt
index 87b32e217..b00eb870d 100644
--- a/npc/functions/clientversion.txt
+++ b/npc/functions/clientversion.txt
@@ -215,7 +215,7 @@ function	script	checkclientversion	{
         else
             Karma=100+Karma;
     }
-    // Update Tycoon quest Miner Knife
+    // Update Tycoon quest Miner Knife + Hinnak & Oscar Scythe
     // ter mar 26 10:00:22 -03 2019
     if (UPDATE < 1553605222) {
         if (UPDATE <= 1551626524) {
@@ -223,6 +223,11 @@ function	script	checkclientversion	{
                 getitem MinerKnife, 1;
             }
         }
+        if (getq(HurnscaldQuest_Farmers) >= 2 && getq(HurnscaldQuest_Farmers) < 5) {
+            getitem Scythe, 1;
+        } else if (getq(HurnscaldQuest_Farmers) >= 5) {
+            getitem CottonBoots, 1;
+        }
         UPDATE=1553605222;
     }