Beheader: Just like light/dark path, allow player to don't make the deal.

2 files changed, 45 insertions, 18 deletions

diff --git a/world/map/db/const-quest.txt b/world/map/db/const-quest.txt
index 6d47175e..7f88c005 100644
--- a/world/map/db/const-quest.txt
+++ b/world/map/db/const-quest.txt
@@ -113,23 +113,24 @@ MFLAG_ELANORE_OMAR         32768 // Told Omar about Elanore's involvement.
 MFLAG_KNOWS_UNFOCUS_RECIPE 65536 // Has been told about unfocus by Luca.
 
 // Flags set in the FLAGS variable:
-FLAG_HAS_BOWLER_BURNSDAY 1     // every year's poem at burns day, shannon gives you a bowler hat
-FLAG_OPENED_UNDERGROUND  2     // this flag is a replacement for variable Open_Underground_Palace_Barrier, which was used only as bool
-FLAG_GOT_NAEM_GLOVES     4     // this replaces Naem_Quest_Done, which was used as a bool variable
-FLAG_GOT_GRADUATIONCAP   8     // this is a bit which was to be found in Tut_var second bit
-FLAG_TOWEL_HELPED        16    // gave the towel npc the stuff he wants
-FLAG_TOWEL_COMPLETED     32    // got the towel from the towel npc
-FLAG_ANDRA_HELPED        64    // Knows Andra and agreed to help her
-FLAG_ROSSI_COMPLETED     128   // Completed the Rossi Quest
-FLAG_TUTORIAL_DONE       256   // player completed tutorial (or entered the tutorial area from outside after it was added)
-FLAG_SNOWMAN             512   // player gave candy to the snowman
-FLAG_SANTAS_HELPER       1024  // player gave presents to Santa's helper
-FLAG_HURNSMINE_CHEST     2048  // player opened the chest with the short sword in Hurnscald mines
-FLAG_GOT_BEANIEHAT       4096  // player got Beanie Copter Hat from Milly
-FLAG_DECLINED_BEANIEHAT  8192  // player declined Beanie Copter Hat from Milly
-FLAG_KESHLAM_FLAWEDLENS  16384 // player got the Flawed Lens from Keshlam's Chest
-FLAG_KESHLAM_RAREDROP    32768 // player got the super rare from Keshlam's Chest
-FLAG_BEHEADER_MASK       65536 // traded with The Beheader
+FLAG_HAS_BOWLER_BURNSDAY 1      // every year's poem at burns day, shannon gives you a bowler hat
+FLAG_OPENED_UNDERGROUND  2      // this flag is a replacement for variable Open_Underground_Palace_Barrier, which was used only as bool
+FLAG_GOT_NAEM_GLOVES     4      // this replaces Naem_Quest_Done, which was used as a bool variable
+FLAG_GOT_GRADUATIONCAP   8      // this is a bit which was to be found in Tut_var second bit
+FLAG_TOWEL_HELPED        16     // gave the towel npc the stuff he wants
+FLAG_TOWEL_COMPLETED     32     // got the towel from the towel npc
+FLAG_ANDRA_HELPED        64     // Knows Andra and agreed to help her
+FLAG_ROSSI_COMPLETED     128    // Completed the Rossi Quest
+FLAG_TUTORIAL_DONE       256    // player completed tutorial (or entered the tutorial area from outside after it was added)
+FLAG_SNOWMAN             512    // player gave candy to the snowman
+FLAG_SANTAS_HELPER       1024   // player gave presents to Santa's helper
+FLAG_HURNSMINE_CHEST     2048   // player opened the chest with the short sword in Hurnscald mines
+FLAG_GOT_BEANIEHAT       4096   // player got Beanie Copter Hat from Milly
+FLAG_DECLINED_BEANIEHAT  8192   // player declined Beanie Copter Hat from Milly
+FLAG_KESHLAM_FLAWEDLENS  16384  // player got the Flawed Lens from Keshlam's Chest
+FLAG_KESHLAM_RAREDROP    32768  // player got the super rare from Keshlam's Chest
+FLAG_BEHEADER_MASK       65536  // traded with The Beheader
+FLAG_GOT_BEHEADER_SWORD  131072 // Obtained the Beheader Sword
 
 // Flags for the battle caves.
 BATTLE_CAVE1 1
diff --git a/world/map/npc/012-3/beheader.txt b/world/map/npc/012-3/beheader.txt
index f2b85b6e..1810127d 100644
--- a/world/map/npc/012-3/beheader.txt
+++ b/world/map/npc/012-3/beheader.txt
@@ -16,6 +16,7 @@
     menu
         "I'm sorry to hear that.", L_Close,
         "Uh... Try wearing a mask?", L_Mask,
+        "Can I behead Terranites on my own?", L_Beheader,
         "You monster!", L_Close;
 
 L_Mask:
@@ -27,7 +28,8 @@ L_Mask:
     mes "\"Hey, how about we do this deal: You bring me a [@@766|@@] and I'll give you one of my finest [@@5209|@@]. It has even been polished and might be useful in combat for you.\"";
     next;
     menu
-        "Sorry, I'm keeping my helmet.", L_Close,
+        "Maybe later, pal.", L_Close,
+        "Sorry, I'm keeping my helmet.", L_Confirm,
         "Take it, I thought it was ugly anyway...", L_Exchange;
 
 L_Exchange:
@@ -47,6 +49,29 @@ L_Exchange:
     mes "\"Muahaha, I'll let you know how it went later.\"";
     close;
 
+L_Confirm:
+    mes "";
+    mes "[The Beheader]";
+    mes "\"What, really? A Terranite Head is waaay cooler than the helmet. And to be honest, you will never be able to obtain a head as cool as the one I am offering you.\"";
+    next;
+    mes "[The Beheader]";
+    mes "\"You may regret in not making this deal with me! I ask you to reconsider.\"";
+    mes "##9Note: Refusing to exchange is permanent and you'll never be able to obtain a [@@5209|@@] with this char, unless you win one at an event. Please be sure you really want this.##0";
+    next;
+    menu
+        "...I'll think on this more thoroughly.", L_Close,
+        "Sorry, I'm keeping my helmet.", L_ReallyGiveUp;
+
+L_ReallyGiveUp:
+    mes "";
+    if (countitem("TerraniteHelmet") < 1)
+        goto L_Nope;
+    getexp 100000, 0;
+    set FLAGS, FLAGS | FLAG_BEHEADER_MASK;
+    mes "[The Beheader]";
+    mes "\"Meeeh, I'll try to get someone else to do it for me, then! Hmpf.\"";
+    close;
+
 L_Complete:
     mes "[The Beheader]";
     mes "\"I am The Beheader, known for beheading Terranites.\"";
@@ -81,6 +106,7 @@ L_Beheader:
     // Some parts are more prone to damage than others, and Terranites, due their
     // anatomy, has a zero per cent success rate for the head surviving death.
     // ...Ever noticed how they crumble to the floor once slain?
+    // set FLAGS, FLAGS | FLAG_GOT_BEHEADER_SWORD;
     close;
 
 L_Nope: