Bake a working draft for Thorn and Blossom

2 files changed, 80 insertions, 40 deletions

diff --git a/npc/014-4/thorn.txt b/npc/014-4/thorn.txt
index bdfb81686..3ec5a08d7 100644
--- a/npc/014-4/thorn.txt
+++ b/npc/014-4/thorn.txt
@@ -5,7 +5,9 @@
 //    Spring Quest, disabled during Easter
 //    Sighly inspired with Soren and Demure relationship, I guess
 //
-//    SQuest_SPring
+//    SQuest_Spring
+//      0 - Not Assigned
+//      1 - 
 
 014-4,149,98,0	script	Thorn	NPC_THORN_NPC,{
     if (season() != SPRING)
@@ -17,14 +19,14 @@
     mesn;
     mesq l("Blossom, blossom, why you do this to me...");
     if (.@q < 1)
-        goto L_springQuest;
+        goto L_SpringQuest;
 
 L_Main:
     close;
 
 L_OutOfSeason:
     mesn;
-    mesq l("Hmm, Woodlands is a wonderful place to live in! Although it is a tad too cold on spring...");
+    mesq l("Maybe on spring Blossom will look at me... For now, my wose part is withering.");
     goto L_Main;
 
 L_QuestDisabled:
@@ -34,17 +36,28 @@ L_QuestDisabled:
     next;
     goto L_Main;
 
-L_springQuest:
+L_SpringQuest:
     next;
     mesn;
-    mesq l("Hey, do you know what is good on this harsh spring? A @@!", getitemlink(Wreath));
+    mesq l("Hey, you! Help me!");
+    next;
+    mesn;
+    mesq l("My waifu Blossom has me trapped here, and she won't even look at me, because I'm part-Wose!");
+    next;
+    mesn;
+    mesq l("But it is spring! Perhaps, if you bring me some flowers and fruits which only grow at Spring, I could impress her!");
     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%
+    mes l("@@/50 @@", countitem(Rose), getitemlink(Rose));
+    mes l("@@/50 @@", countitem(Tulip), getitemlink(Tulip));
+    mes l("@@/50 @@", countitem(Blueberries), getitemlink(Blueberries));
+    mes l("@@/10 @@", countitem(GrassSeeds), getitemlink(GrassSeeds));
+
+    mes l("@@/80 @@", countitem(MauveHerb), getitemlink(MauveHerb));
+    mes l("@@/80 @@", countitem(GambogeHerb), getitemlink(GambogeHerb));
+    mes l("@@/80 @@", countitem(CobaltHerb), getitemlink(CobaltHerb));
+    mes l("@@/70 @@", countitem(AlizarinHerb), getitemlink(AlizarinHerb));
     next;
     select
         l("Not now, thanks"),
@@ -55,25 +68,33 @@ L_springQuest:
         goto L_Main;
     if (@menu == 2) {
         if (
-            countitem(Snowflake)        < 120 ||
-            countitem(CaramelCandy)     < 80 ||
-            countitem(GingerBreadMan)   < 40 ||
-            countitem(ChocolateBiscuit) < 10
+            countitem(Rose)             < 50 ||
+            countitem(Tulip)            < 50 ||
+            countitem(Blueberries)      < 50 ||
+            countitem(GrassSeeds)       < 10 ||
+            countitem(MauveHerb)        < 80 ||
+            countitem(GambogeHerb)      < 80 ||
+            countitem(CobaltHerb)       < 80 ||
+            countitem(AlizarinHerb)     < 70
             ) goto L_Lying;
 
         inventoryplace Wreath, 1;
-        delitem Snowflake, 120;
-        delitem CaramelCandy,  80;
-        delitem GingerBreadMan, 40;
-        delitem ChocolateBiscuit, 10;
+        delitem Rose, 50;
+        delitem Tulip, 50;
+        delitem Blueberries, 50;
+        delitem GrassSeeds, 50;
+        delitem MauveHerb, 50;
+        delitem GambogeHerb, 50;
+        delitem CobaltHerb, 50;
+        delitem AlizarinHerb, 50;
         getitem Wreath, 1;
         getexp 6500, 120;
         setq1 SQuest_Spring, 1;
         mesn;
-        mesq l("Yay yay! Many thanks! Here, take the reward as promised!");
+        mesq l("Many thanks! If I let my wose side blossom, I'm sure she'll look at me!");
         next;
         mesn;
-        mesq l("We can do this again on next spring!");
+        mesq l("Here, take the reward as promised!");
         goto L_Main;
     }
 
@@ -81,7 +102,7 @@ L_springQuest:
 
 L_Lying:
     mesn;
-    mesq l("Please don't lie to me...");
+    mesq l("Please don't lie to me...") + " </3";
     goto L_Main;
 
 OnInit:
diff --git a/npc/014-5/blossom.txt b/npc/014-5/blossom.txt
index c5a5d286f..fa4ba7f22 100644
--- a/npc/014-5/blossom.txt
+++ b/npc/014-5/blossom.txt
@@ -14,16 +14,16 @@
 
     .@q=getq(SQuest_Spring);
     mesn;
-    mesq l("Brrrr... I'm freezing! The spring at Woodlands is so harsh!!");
+    mesq l("Thorn is so annoying...");
     if (.@q < 1)
-        goto L_springQuest;
+        goto L_SpringQuest;
 
 L_Main:
     close;
 
 L_OutOfSeason:
     mesn;
-    mesq l("Hmm, Woodlands is a wonderful place to live in! Although it is a tad too cold on spring...");
+    mesq l("Hmm, Woodlands is a wonderful place to live in! Although Thorn gets really a thorn in my boots during spring...");
     goto L_Main;
 
 L_QuestDisabled:
@@ -33,17 +33,28 @@ L_QuestDisabled:
     next;
     goto L_Main;
 
-L_springQuest:
+L_SpringQuest:
     next;
     mesn;
-    mesq l("Hey, do you know what is good on this harsh spring? A @@!", getitemlink(Wreath));
+    mesq l("Hey, you! Aid me!");
+    next;
+    mesn;
+    mesq l("There's an annoying half-wose-half-elf called Thorn trying to impress me with his wose side!");
+    next;
+    mesn;
+    mesq l("I do not like him, but even so, he keeps bothering me! Maybe I could out-impress him, though!");
     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%
+    mes l("@@/50 @@", countitem(Rose), getitemlink(Rose));
+    mes l("@@/50 @@", countitem(Tulip), getitemlink(Tulip));
+    mes l("@@/50 @@", countitem(Blueberries), getitemlink(Blueberries));
+    mes l("@@/10 @@", countitem(GrassSeeds), getitemlink(GrassSeeds));
+
+    mes l("@@/80 @@", countitem(MauveHerb), getitemlink(MauveHerb));
+    mes l("@@/80 @@", countitem(GambogeHerb), getitemlink(GambogeHerb));
+    mes l("@@/80 @@", countitem(CobaltHerb), getitemlink(CobaltHerb));
+    mes l("@@/70 @@", countitem(AlizarinHerb), getitemlink(AlizarinHerb));
     next;
     select
         l("Not now, thanks"),
@@ -54,25 +65,33 @@ L_springQuest:
         goto L_Main;
     if (@menu == 2) {
         if (
-            countitem(Snowflake)        < 120 ||
-            countitem(CaramelCandy)     < 80 ||
-            countitem(GingerBreadMan)   < 40 ||
-            countitem(ChocolateBiscuit) < 10
+            countitem(Rose)             < 50 ||
+            countitem(Tulip)            < 50 ||
+            countitem(Blueberries)      < 50 ||
+            countitem(GrassSeeds)       < 10 ||
+            countitem(MauveHerb)        < 80 ||
+            countitem(GambogeHerb)      < 80 ||
+            countitem(CobaltHerb)       < 80 ||
+            countitem(AlizarinHerb)     < 70
             ) goto L_Lying;
 
         inventoryplace Wreath, 1;
-        delitem Snowflake, 120;
-        delitem CaramelCandy,  80;
-        delitem GingerBreadMan, 40;
-        delitem ChocolateBiscuit, 10;
+        delitem Rose, 50;
+        delitem Tulip, 50;
+        delitem Blueberries, 50;
+        delitem GrassSeeds, 50;
+        delitem MauveHerb, 50;
+        delitem GambogeHerb, 50;
+        delitem CobaltHerb, 50;
+        delitem AlizarinHerb, 50;
         getitem Wreath, 1;
         getexp 6500, 120;
         setq1 SQuest_Spring, 1;
         mesn;
-        mesq l("Yay yay! Many thanks! Here, take the reward as promised!");
+        mesq l("Many thanks! At least he'll know he haven't impressed me yet!");
         next;
         mesn;
-        mesq l("We can do this again on next spring!");
+        mesq l("Here, take the reward as promised!");
         goto L_Main;
     }
 
@@ -84,7 +103,7 @@ L_Lying:
     goto L_Main;
 
 OnInit:
-    .sex=G_MALE;
+    .sex=G_FEMALE;
     .distance=4;
 	end;