Knit Hat quest, based on Luffyx Summer Shorts quest. Fix bugs on the later.

2 files changed, 54 insertions, 4 deletions

diff --git a/npc/012-1/luffyx.txt b/npc/012-1/luffyx.txt
index 54f521bbb..67c6b69e4 100644
--- a/npc/012-1/luffyx.txt
+++ b/npc/012-1/luffyx.txt
@@ -23,7 +23,6 @@ L_Main:
 L_SummerQuest:
     next;
     mesn;
-    // TODO: Sunglass
     mesq l("Hey, do you know what is good on summer? @@!", getitemlink(LuffyxSummerShorts));
     next;
     mesn;
@@ -42,9 +41,10 @@ L_SummerQuest:
         goto L_Main;
     if (@menu == 2) {
         if (
-            countitem(CherryCocktail) < 25 ||
             countitem(CactusCocktail) < 80 ||
-            countitem(AppleCocktail)  < 40
+            countitem(AppleCocktail)  < 40 ||
+            countitem(CherryCocktail) < 25 ||
+            !countitem(JeansShorts)
             ) goto L_Lying;
 
         inventoryplace LuffyxSummerShorts, 1;
diff --git a/npc/020-1/serge.txt b/npc/020-1/serge.txt
index dd921e1aa..da67dff3c 100644
--- a/npc/020-1/serge.txt
+++ b/npc/020-1/serge.txt
@@ -27,7 +27,7 @@ L_Main:
 L_OutOfSeason:
     mesn;
     mesq l("Hmm, Nivalis is a wonderful place to live in! Although it is a tad too cold on Winter...");
-    close;
+    goto L_Main;
 
 L_QuestDisabled:
     mesn;
@@ -35,6 +35,56 @@ L_QuestDisabled:
     mesc l("The @@ quest is disabled during Christmas event.", getitemlink(KnitHat));
     close;
 
+L_WinterQuest:
+    next;
+    mesn;
+    mesq l("Hey, do you know what is good on this harsh winter? A @@!", getitemlink(KnitHat));
+    next;
+    mesn;
+    mes l("What about you bring me:");
+    mes l("@@/120 @@", countitem(Snowflake), getitemlink(Snowflake));
+    mes l("@@/80 @@", countitem(CaramelCandy), getitemlink(CaramelCandy));
+    mes l("@@/40 @@", countitem(GingerBreadMan), getitemlink(GingerBreadMan));
+    mes l("@@/10 @@", countitem(ChocolateBiscuit), getitemlink(ChocolateBiscuit)); // Found at Chocolate Slime: 4.00%
+    next;
+    select
+        l("Not now, thanks"),
+        l("To be honest, I have that with me!");
+
+    mes "";
+    if (@menu == 1)
+        goto L_Main;
+    if (@menu == 2) {
+        if (
+            countitem(Snowflake)        < 120 ||
+            countitem(CaramelCandy)     < 80 ||
+            countitem(GingerBreadMan)   < 40 ||
+            countitem(ChocolateBiscuit) < 10
+            ) goto L_Lying;
+
+        inventoryplace KnitHat, 1;
+        delitem Snowflake, 120;
+        delitem CaramelCandy,  80;
+        delitem GingerBreadMan, 40;
+        delitem ChocolateBiscuit, 10;
+        getitem KnitHat, 1;
+        getexp 6500, 120;
+        setq1 SQuest_Winter, 1;
+        mesn;
+        mesq l("Yay yay! Many thanks! Here, take the reward as promised!");
+        next;
+        mesn;
+        mesq l("We can do this again on next winter!");
+        goto L_Main;
+    }
+
+    close;
+
+L_Lying:
+    mesn;
+    mesq l("Please don't lie to me...");
+    goto L_Main;
+
 OnInit:
     .@npcId = getnpcid(.name$);
     setunitdata(.@npcId, UDT_HEADTOP, CommunityShirt);