Petal shop

4 files changed, 24 insertions, 17 deletions

diff --git a/world/map/db/const-quest.txt b/world/map/db/const-quest.txt
index 6f3f7148..1bea162b 100644
--- a/world/map/db/const-quest.txt
+++ b/world/map/db/const-quest.txt
@@ -115,20 +115,20 @@ MFLAG_KNOWS_UNFOCUS_RECIPE 65536  // Has been told about unfocus by Luca.
 MFLAG_GOT_MANA_PEARL       131072 // Had enough magic exp to get the Mana Pearl.
 
 // 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_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_ 16384   // not used at the moment
 //FLAG_ 32768   // not used at the moment
 FLAG_BEHEADER_MASK       65536    // traded with The Beheader
@@ -141,6 +141,15 @@ FLAG_LUCA_FIX            4194304  // fixed a bug
 FLAG_XMAS21              8388608  // Christmas 2021 Rewards
 FLAG_KESHLAM_REPACKED    16777216 // Moved FLAG_KESHLAM_FLAWEDLENS (16384) and FLAG_KESHLAM_RAREDROP (32768) to KESHLAM_STATE
 
+// Flags set in the HURNS1_STATE variable:
+// Pink Petal Shop Quest is using bits 1-8 (BYTE_0_SHIFT, BYTE_0_MASK)
+// Constants Related to Blossom
+PINK_FLOWER_SEEDS_NEEDED               250 // 1-253 possible, PINK_PETAL_SHOP_FOUND_FLOWER_SEEDS and PINK_PETAL_SHOP_DELIVERED_FLOWER_SEEDS need to be adjusted to this
+PINK_FLOWER_SEEDS_CHANCE               50
+PINK_PETAL_SHOP_ASKED_FOR_PETALS       1   // player asked Blossom if she sells petals
+PINK_PETAL_SHOP_FOUND_FLOWER_SEEDS     251 // player found the needed amount of Pink Flower Seeds
+PINK_PETAL_SHOP_DELIVERED_FLOWER_SEEDS 252 // player delivered the needed amount of Pink Flower Seeds
+
 // Flags set in the KESHLAM_STATE variable:
 FLAG_KESHLAM_FLAWEDLENS  65536      // player got the Flawed Lens from Keshlam's Chest
 FLAG_KESHLAM_RAREDROP    131072     // player got the super rare from Keshlam's Chest
diff --git a/world/map/db/item_db.conf b/world/map/db/item_db.conf
index 9ee50411..00294852 100644
--- a/world/map/db/item_db.conf
+++ b/world/map/db/item_db.conf
@@ -5273,7 +5273,6 @@ item_db: (
 		noauction: true
 		noselltonpc: true
 	}
-	//Disabled: true // @TMWA
 },
 {
 	Id: 5296
diff --git a/world/map/db/item_db_generic.txt b/world/map/db/item_db_generic.txt
index d9bc9567..13f24527 100644
--- a/world/map/db/item_db_generic.txt
+++ b/world/map/db/item_db_generic.txt
@@ -266,7 +266,7 @@
 5288,   Naftalin,               3,      0,          0,          1,          0,      0,      0,      0,      0,      2,      0,          0,      0,      0,      0,      {},                                                                     {}
 5292,   SilverOre,              3,      1600,       800,        40,         0,      0,      0,      0,      0,      2,      0,          0,      0,      0,      0,      {},                                                                     {}
 //5293, CrystallizedDragonBlood,3,      0,          0,          1111,       0,      0,      0,      0,      0,      2,      0,          0,      0,      0,      7,      {},                                                                     {}
-//5295, PinkFlowerSeed,         3,      0,          0,          10,         0,      0,      0,      0,      0,      2,      0,          0,      0,      0,      7,      {},                                                                     {}
+5295,   PinkFlowerSeed,         3,      0,          0,          10,         0,      0,      0,      0,      0,      2,      0,          0,      0,      0,      7,      {},                                                                     {}
 //5296, SilverIngot,            3,      20000,      2200,       1000,       0,      0,      0,      0,      0,      2,      0,          0,      0,      0,      7,      {},                                                                     {}
 5297,   GoldenTooth,            3,      20000,      2000,       40,         0,      0,      0,      0,      0,      2,      0,          0,      0,      0,      0,      {},                                                                     {}
 //5298, CloverDrawing,          3,      0,          0,          10,         0,      0,      0,      0,      0,      2,      0,          0,      0,      0,      7,      {},                                                                     {}
diff --git a/world/map/db/mob_skill_db.txt b/world/map/db/mob_skill_db.txt
index 23d85820..82964f89 100644
--- a/world/map/db/mob_skill_db.txt
+++ b/world/map/db/mob_skill_db.txt
@@ -54,7 +54,6 @@
 1014,PinkFlower@NPC_SUMMONSLAVE,any,198,1,10000,1000,60000,no,self,slavelt,4,1049,0,0,0,0,
 1095,WhiteBell@NPC_SUMMONSLAVE,any,198,1,10000,1000,60000,no,self,slavelt,4,1093,0,0,0,0,
 1049,Bee@NPC_POISON,attack,178,20,1000,0,500,yes,target,always,0,0,10,0,0,0,
-1049,Bee@NPC_SELFDESTRUCTION,attack,175,1,1000,0,500,yes,self,notintown,0,30,0,0,0,0,
 1139,Virus@NPC_POISON,attack,178,50,1500,1000,600,yes,target,always,0,0,10,0,0,0,
 // The Lost Abilities
 1073,TheLost@NPC_SUMMONSLAVE_DMUSHX2X,any,198,1,8000,1000,5000,no,self,slavelt,2,1106,0,0,0,0,