Add naming prefix "Pink" to flower mob & petal item

22 files changed, 46 insertions, 39 deletions

diff --git a/db/item_db.txt b/db/item_db.txt
index 2c0c8159..f5ddd67a 100644
--- a/db/item_db.txt
+++ b/db/item_db.txt
@@ -64,7 +64,7 @@
 562,	ChickenLeg,			Chicken Leg,			0,	250,	125,	10,	,	,	,	,	,	2,	,	,	0,	,	{ itemheal 500,				0; },					{}					
 563,	WinterGloves,			Winter Gloves,			5,	6000,	3000,	20,	,	3,	,	-15,	0,	2,	4,	,	0,	0,	{},					{}										
 564,	TurtleneckSweater,		Turtleneck Sweater,		5,	2000,	1000,	10,	,	6,	,	-18,	0,	2,	512,	,	0,	0,	{},					{}										
-565,	Petal,				Petal,				0,	50,	25,	10,	,	,	,	,	,	2,	,	,	0,	,	{ itemheal 50,				0; },					{}					
+565,	PinkPetal,				Pink Petal,				0,	50,	25,	10,	,	,	,	,	,	2,	,	,	0,	,	{ itemheal 50,				0; },					{}					
 566,	SmallMushroom,			Small Mushroom,			0,	50,	25,	10,	,	,	,	,	,	2,	,	,	0,	,	{ itemheal 50,				0; },					{}					
 567,	IronPotion,			Iron Potion,			0,	500,	250,	10,	,	,	,	,	,	2,	,	,	0,	,	{ sc_start sc_raiseattackstrength,	60,					60; },			{}		
 568,	ConcentrationPotion,		Concentration Potion,		0,	500,	250,	10,	,	,	,	,	,	2,	,	,	0,	,	{ sc_start sc_raiseattackspeed0,	60,					30; },			{}		
diff --git a/db/mob_db.txt b/db/mob_db.txt
index f07d1e47..027a9029 100644
--- a/db/mob_db.txt
+++ b/db/mob_db.txt
@@ -11,7 +11,7 @@
 1011,	FireGoblin,	Fire Goblin,	20,	220,	0,	0,	2,	1,	15,	20,	0,	5,	1,	1,	1,	0,	6,	30,	1,	1,	1,	3,	23,	129,	800,	1872,	672,	480,	505,	800,		501,	150,		518,	800,		502,	150,		521,	70,		522,	10,		701,	500,		0,	0,		0,	0,	0,	0,	,	,	,	,	,	,	2,		30
 1012,	Spider,		Spider,		125,	800,	0,	0,	280,	1,	70,	85,	4,	6,	14,	13,	10,	10,	35,	10,	1,	1,	1,	0,	25,	175,	1000,	1500,	672,	480,	537,	500,		535,	100,		638,	20,		0,	0,		0,	0,		0,	0,		0,	0,		0,	0,		0,	0,	0,	0,	,	,	,	,	,	,	2,		40
 1013,	EvilMushroom,	Evil Mushroom,	110,	650,	0,	0,	110,	1,	65,	80,	4,	6,	16,	12,	10,	10,	35,	10,	1,	1,	1,	3,	22,	137,	800,	1800,	672,	480,	535,	500,		540,	10,		534,	100,		566,	500,		0,	0,		0,	0,		0,	0,		0,	0,		0,	0,	0,	0,	,	,	,	,	,	,	1,		60
-1014,	Flower,		Flower,		115,	700,	0,	0,	110,	2,	70,	75,	0,	5,	16,	12,	20,	20,	20,	50,	2,	2,	1,	3,	22,	128,	800,	800,	672,	480,	535,	100,		540,	10,		1199,	100,		526,	400,		565,	500,		0,	0,		0,	0,		0,	0,		0,	0,	0,	0,	,	,	,	,	,	,	2,		50
+1014,	PinkFlower,		Pink Flower,		115,	700,	0,	0,	110,	2,	70,	75,	0,	5,	16,	12,	20,	20,	20,	50,	2,	2,	1,	3,	22,	128,	800,	800,	672,	480,	535,	100,		540,	10,		1199,	100,		526,	400,		565,	500,		0,	0,		0,	0,		0,	0,		0,	0,	0,	0,	,	,	,	,	,	,	2,		50
 1015,	SantaSlime,	Santa Slime,	120,	750,	0,	0,	0,	1,	75,	80,	2,	7,	1,	20,	1,	0,	30,	30,	1,	1,	1,	0,	21,	161,	1500,	1872,	672,	480,	512,	800,		513,	700,		514,	600,		519,	500,		527,	400,		538,	500,		0,	0,		0,	0,		0,	0,	0,	0,	,	,	,	,	,	,	1,		10
 1016,	RudolphSlime,	Rudolph Slime,	50,	350,	0,	0,	16,	1,	30,	35,	10,	7,	1,	20,	1,	0,	30,	30,	1,	1,	1,	0,	21,	131,	1000,	1872,	672,	480,	504,	800,		506,	500,		508,	200,		509,	300,		510,	600,		515,	800,		516,	500,		0,	0,		0,	0,	0,	0,	,	,	,	,	,	,	2,		30
 1017,	Bat,		Bat,		20,	150,	0,	0,	2,	1,	5,	25,	0,	5,	1,	1,	1,	0,	20,	25,	1,	1,	1,	3,	24,	129,	800,	1872,	672,	480,	505,	800,		501,	150,		518,	400,		533,	150,		521,	70,		522,	1,		753,	3000,		754,	2000,		0,	0,	0,	0,	,	,	,	,	,	,	2,		40
diff --git a/db/mob_skill_db.txt b/db/mob_skill_db.txt
index 4b4fa1de..36233ee1 100644
--- a/db/mob_skill_db.txt
+++ b/db/mob_skill_db.txt
@@ -72,6 +72,6 @@
 1024,PoisonSkull@NPC_POISON,attack,178,50,500,0,400,yes,target,always,0,,10,,,,
 //-- 1026,MountainSnake@NPC_POISONATTACK,attack,190,5,10000,0,500,yes,target,always,1,,,,,,
 //-- 1010,Snake@TF_POISON,attack,54,3,10000,0,500,yes,target,always,1,,,,,,
-1014,Flower@NPC_SUMMONSLAVE,attack,198,1,200,2000,0,no,self,myhpltmaxrate,99,1049,,,,,
+1014,PinkFlower@NPC_SUMMONSLAVE,attack,198,1,200,2000,0,no,self,myhpltmaxrate,99,1049,,,,,
 1049,Bee@NPC_POISON,attack,178,20,1000,0,500,yes,target,always,0,,10,,,,
 1049,Bee@NPC_SELFDESTRUCTION,attack,175,1,1000,0,500,yes,self,always,0,30,,,,,
diff --git a/npc/001-1_Tulimshar/rewards_master.txt b/npc/001-1_Tulimshar/rewards_master.txt
index d2811f51..30e762c4 100644
--- a/npc/001-1_Tulimshar/rewards_master.txt
+++ b/npc/001-1_Tulimshar/rewards_master.txt
@@ -5,7 +5,7 @@
 	if (tvis == 0) set tvis, 1;
 	if (Mobpt < tvis) goto L_NotEnough;
 
-	setarray @Items$, "AppleCake", "Arrow", "BatTeeth", "BatWing", "Beer", "BluePresentBox", "Boots", "BugLeg", "CactusDrink", "CactusPotion", "Cake", "Candy", "CandyCane", "CasinoCoins", "CaveSnakeLamp", "CaveSnakeTongue", "CherryCake", "ChickenLeg", "ChocolateBar", "ChocolateCake", "CottonBoots", "CottonCloth", "CottonShirt", "CottonShorts", "DecorCandy", "EasterEgg", "FancyHat", "GingerBreadMan", "GrassSnakeEgg", "GrassSnakeTongue", "GreenApple", "HardSpike", "IronOre", "Lifestone", "LightBlueDye", "MaggotSlime", "Milk", "MountainSnakeEgg", "MountainSnakeTongue", "Orange", "OrangeCake", "OrangeCupcake", "Petal", "PileOfAsh", "PinkAntenna", "PoltergeistPowder", "PurplePresentBox", "RawLog", "RedApple", "RedDye", "RedScorpionStinger", "ScorpionStinger", "SerfHat", "SmallHealingPotion", "SmallMushroom", "SnakeEgg", "SnakeSkin", "SnakeTongue", "SpectrePowder", "Steak", "TinyHealingPotion", "TreasureKey", "WhiteCake", "WhiteFur", "WispPowder", "XmasCake", "XmasCandyCane", "YellowDye";
+	setarray @Items$, "AppleCake", "Arrow", "BatTeeth", "BatWing", "Beer", "BluePresentBox", "Boots", "BugLeg", "CactusDrink", "CactusPotion", "Cake", "Candy", "CandyCane", "CasinoCoins", "CaveSnakeLamp", "CaveSnakeTongue", "CherryCake", "ChickenLeg", "ChocolateBar", "ChocolateCake", "CottonBoots", "CottonCloth", "CottonShirt", "CottonShorts", "DecorCandy", "EasterEgg", "FancyHat", "GingerBreadMan", "GrassSnakeEgg", "GrassSnakeTongue", "GreenApple", "HardSpike", "IronOre", "Lifestone", "LightBlueDye", "MaggotSlime", "Milk", "MountainSnakeEgg", "MountainSnakeTongue", "Orange", "OrangeCake", "OrangeCupcake", "PinkPetal", "PileOfAsh", "PinkAntenna", "PoltergeistPowder", "PurplePresentBox", "RawLog", "RedApple", "RedDye", "RedScorpionStinger", "ScorpionStinger", "SerfHat", "SmallHealingPotion", "SmallMushroom", "SnakeEgg", "SnakeSkin", "SnakeTongue", "SpectrePowder", "Steak", "TinyHealingPotion", "TreasureKey", "WhiteCake", "WhiteFur", "WispPowder", "XmasCake", "XmasCandyCane", "YellowDye";
 
 	mes "[Ishi the Rewards Master]";
 	mes "\"Welcome! I see you have " + Mobpt + " Monster Points. Would you like to exchange some of those for items?\"";
diff --git a/npc/007-1_Woodland/_mobs.txt b/npc/007-1_Woodland/_mobs.txt
index 7838015f..39c163c1 100644
--- a/npc/007-1_Woodland/_mobs.txt
+++ b/npc/007-1_Woodland/_mobs.txt
@@ -1,6 +1,6 @@
 // 007-1 Woodland mobs
 
-007-1.gat,0,0,0,0	monster	Flower	1014,17,100000,30000,Mob007-1::On1014
+007-1.gat,0,0,0,0	monster	PinkFlower	1014,17,100000,30000,Mob007-1::On1014
 007-1.gat,0,0,0,0	monster	Spiky Mushroom	1019,15,100000,30000,Mob007-1::On1019
 007-1.gat,0,0,0,0	monster	Fluffy	1020,25,100000,30000,Mob007-1::On1020
 007-1.gat,0,0,0,0	monster	Mauve	1029,3,270000,180000,Mob007-1::On1029
diff --git a/npc/008-1_Hurnscald_outskirts/_mobs.txt b/npc/008-1_Hurnscald_outskirts/_mobs.txt
index ba75f159..54442a97 100644
--- a/npc/008-1_Hurnscald_outskirts/_mobs.txt
+++ b/npc/008-1_Hurnscald_outskirts/_mobs.txt
@@ -1,6 +1,6 @@
 // 008-1 Hurnscald outskirts mobs
 
-008-1.gat,0,0,0,0	monster	Flower	1014,10,20,0,Mob008-1::On1014
+008-1.gat,0,0,0,0	monster	PinkFlower	1014,10,20,0,Mob008-1::On1014
 008-1.gat,0,0,0,0	monster	Pinkie	1018,18,20,0,Mob008-1::On1018
 008-1.gat,0,0,0,0	monster	SpikyMushroom	1019,18,20,0,Mob008-1::On1019
 008-1.gat,0,0,0,0	monster	Fluffy	1020,5,30,0,Mob008-1::On1020
diff --git a/npc/009-1_Hurnscald/_mobs.txt b/npc/009-1_Hurnscald/_mobs.txt
index a866c132..891408d3 100644
--- a/npc/009-1_Hurnscald/_mobs.txt
+++ b/npc/009-1_Hurnscald/_mobs.txt
@@ -1,7 +1,7 @@
 // 009-1 Hurnscald mobs
 
 009-1.gat,74,32,2,1	monster	Clover patch	1037,1,100000,120000,Mob009-1::On1037
-009-1.gat,29,44,9,13	monster	Flower	1014,2,0,250,Mob009-1::On1014
+009-1.gat,29,44,9,13	monster	PinkFlower	1014,2,0,250,Mob009-1::On1014
 009-1.gat,88,51,15,4	monster	Squirrel	1038,2,0,5000,Mob009-1::On1038
 009-1.gat,80,38,5,5	monster	Squirrel	1038,1,0,5000,Mob009-1::On1038
 
diff --git a/npc/010-1_Woodland/_mobs.txt b/npc/010-1_Woodland/_mobs.txt
index 674031f2..e3276fb0 100644
--- a/npc/010-1_Woodland/_mobs.txt
+++ b/npc/010-1_Woodland/_mobs.txt
@@ -2,7 +2,7 @@
 
 010-1.gat,82,63,19,19	monster	Scorpion	1003,1,100000,30000,Mob010-1::On1003
 010-1.gat,49,71,31,19	monster	Shroom	1019,1,100000,30000,Mob010-1::On1019
-010-1.gat,0,0,0,0	monster	Flower	1014,30,50,0,Mob010-1::On1014
+010-1.gat,0,0,0,0	monster	PinkFlower	1014,30,50,0,Mob010-1::On1014
 010-1.gat,0,0,0,0	monster	Fluffy	1020,20,50,0,Mob010-1::On1020
 010-1.gat,0,0,0,0	monster	SpikyMushroom	1019,45,50,0,Mob010-1::On1019
 010-1.gat,0,0,0,0	monster	LogHead	1025,40,100,0,Mob010-1::On1025
diff --git a/npc/011-1_Woodland/_mobs.txt b/npc/011-1_Woodland/_mobs.txt
index 353f8f2d..846b565d 100644
--- a/npc/011-1_Woodland/_mobs.txt
+++ b/npc/011-1_Woodland/_mobs.txt
@@ -1,7 +1,7 @@
 // 011-1 Woodland mobs
 
 011-1.gat,0,0,0,0	monster	EvilMushroom	1013,30,0,0,Mob011-1::On1013
-011-1.gat,0,0,0,0	monster	Flower	1014,20,0,0,Mob011-1::On1014
+011-1.gat,0,0,0,0	monster	PinkFlower	1014,20,0,0,Mob011-1::On1014
 011-1.gat,0,0,0,0	monster	Spiky Mushroom	1019,5,0,0,Mob011-1::On1019
 011-1.gat,0,0,0,0	monster	Fluffy	1020,1,0,0,Mob011-1::On1020
 011-1.gat,0,0,0,0	monster	Mouboo	1028,5,0,10,Mob011-1::On1028
diff --git a/npc/011-1_Woodland/alchemist.txt b/npc/011-1_Woodland/alchemist.txt
index 8c9e39ff..de07be70 100644
--- a/npc/011-1_Woodland/alchemist.txt
+++ b/npc/011-1_Woodland/alchemist.txt
@@ -296,13 +296,13 @@ L_iron:
 	close;
 
 L_concentration:
-	if(countitem("Petal") < 20) goto L_no_concentration;
+	if(countitem("PinkPetal") < 20) goto L_no_concentration;
 	getinventorylist;
-	if (@inventorylist_count == 100 && countitem("Petal") > 20) goto L_TooMany;
+	if (@inventorylist_count == 100 && countitem("PinkPetal") > 20) goto L_TooMany;
 	mes "[Rauk the Alchemist]";
 	mes "\"Great! You brought me exactly what I need!";
 	mes "Here is your Concentration potion.\"";
-	delitem "Petal", 20;
+	delitem "PinkPetal", 20;
 	getitem "ConcentrationPotion", 1;
 	close;
 
@@ -311,7 +311,7 @@ L_no_iron:
 	close;
 	
 L_no_concentration:
-	mes "\"You have to bring me 20 [petals].\"";
+	mes "\"You have to bring me 20 [pink petals].\"";
 	close;
 
 L_dyeing_intro:
@@ -389,7 +389,7 @@ L_description_quick:
 
 	menu "Can you make some dye for me, please?", L_pick_colour,
 		"Where can I get the herbs?", L_d_herbs,
-		"Where can I find petals?", L_d_petals,
+		"Where can I find pink petals?", L_d_pink_petals,
 		"Where can I find iron ore?", L_d_ore,
 		"Where can I find a pearl?", L_d_pearl,
 		"Where can I find maggot slime?", L_d_maggot_slime,
@@ -402,9 +402,9 @@ L_d_herbs:
 	next;
 	goto L_description_quick;
 
-L_d_petals:
+L_d_pink_petals:
 	mes "[Rauk the Alchemist]";
-	mes "\"Just take some from the flowers around here. But be careful, they seem to be a bit fond of them.\"";
+	mes "\"Just take some from the pink flowers around here. But be careful, they seem to be a bit fond of them.\"";
 	next;
 	goto L_description_quick;
 
@@ -556,19 +556,19 @@ L_d_orange:
 
 L_pink:
 	if (countitem("AlizarinHerb") < 10) goto L_pink_fail;
-	if (countitem("Petal") < 6) goto L_pink_fail;
+	if (countitem("PinkPetal") < 6) goto L_pink_fail;
 	if (zeny < 1000) goto L_pink_fail;
 	getinventorylist;
-	if (@inventorylist_count == 100 && countitem("AlizarinHerb") > 10 && countitem("Petal") > 6) goto L_TooMany;
+	if (@inventorylist_count == 100 && countitem("AlizarinHerb") > 10 && countitem("PinkPetal") > 6) goto L_TooMany;
 	delitem "AlizarinHerb", 10;
-	delitem "Petal", 6;
+	delitem "PinkPetal", 6;
 	set zeny, zeny - 1000;
 	getitem "PinkDye", 1;
 	goto L_ok;
 
 L_pink_fail:
 	mes "[Rauk the Alchemist]";
-	mes "\"No, you don't have all I need, and that would be ten alizarin leaves, six flower petals, and 1000 GP.\"";
+	mes "\"No, you don't have all I need, and that would be ten alizarin leaves, six pink flower petals, and 1000 GP.\"";
 	next;
 	goto L_intermediate;
 
diff --git a/npc/011-1_Woodland/auldsbel.txt b/npc/011-1_Woodland/auldsbel.txt
index f31b26c1..595c1a9f 100644
--- a/npc/011-1_Woodland/auldsbel.txt
+++ b/npc/011-1_Woodland/auldsbel.txt
@@ -1196,7 +1196,7 @@ LL_student_3:
 
 LL_student_3_repeat:
         mes "[Auldsbel the Wizard]";
-        mes "\"This one has the invocation `" + getspellinvocation("make-concentration-potion") + "'.  Put two cobalt leaves and two flower petals into a bottle of water, hold it up, and speak that phrase.\"";
+        mes "\"This one has the invocation `" + getspellinvocation("make-concentration-potion") + "'.  Put two cobalt leaves and two pink flower petals into a bottle of water, hold it up, and speak that phrase.\"";
         next;
 
         mes "[Auldsbel the Wizard]";
diff --git a/npc/012-1_Woodland_Hills/_mobs.txt b/npc/012-1_Woodland_Hills/_mobs.txt
index 65aa2be8..46e36388 100644
--- a/npc/012-1_Woodland_Hills/_mobs.txt
+++ b/npc/012-1_Woodland_Hills/_mobs.txt
@@ -1,6 +1,6 @@
 // 012-1 Woodland Hills mobs
 
-012-1.gat,0,0,0,0	monster	Flower	1014,13,0,100,Mob012-1::On1014
+012-1.gat,0,0,0,0	monster	PinkFlower	1014,13,0,100,Mob012-1::On1014
 012-1.gat,0,0,0,0	monster	SpikyMushroom	1019,25,0,10,Mob012-1::On1019
 012-1.gat,0,0,0,0	monster	Mouboo	1028,20,0,10,Mob012-1::On1028
 012-1.gat,0,0,0,0	monster	Mauve	1029,5,2700000,1800000,Mob012-1::On1029
diff --git a/npc/013-1_Woodland_hills/_mobs.txt b/npc/013-1_Woodland_hills/_mobs.txt
index 5fba767e..2bbd5e70 100644
--- a/npc/013-1_Woodland_hills/_mobs.txt
+++ b/npc/013-1_Woodland_hills/_mobs.txt
@@ -1,6 +1,6 @@
 // 013-1 Woodland hills mobs
 
-013-1.gat,0,0,0,0	monster	Flower	1014,13,0,100,Mob013-1::On1014
+013-1.gat,0,0,0,0	monster	PinkFlower	1014,13,0,100,Mob013-1::On1014
 013-1.gat,0,0,0,0	monster	SpikyMushroom	1019,12,0,100,Mob013-1::On1019
 013-1.gat,0,0,0,0	monster	Mouboo	1028,5,0,100,Mob013-1::On1028
 013-1.gat,0,0,0,0	monster	Mauve	1029,1,270,180,Mob013-1::On1029
diff --git a/npc/013-3_Cave/mask_chest.txt b/npc/013-3_Cave/mask_chest.txt
index 2e292e50..15404e6d 100644
--- a/npc/013-3_Cave/mask_chest.txt
+++ b/npc/013-3_Cave/mask_chest.txt
@@ -6,7 +6,7 @@
 
 	if (countitem("MaggotSlime") == 0) goto L_No_maggot_slime;
 	if (countitem("SmallMushroom") == 0) goto L_No_mushroom;
-	if (countitem("Petal") == 0) goto L_No_petal;
+	if (countitem("PinkPetal") == 0) goto L_No_pink_petal;
 
 	if (countitem("Pearl") == 0) goto L_No_pearl;
 	if (countitem("HardSpike") == 0) goto L_No_hard_spike;
@@ -32,7 +32,7 @@
 
 	getinventorylist;
 	if (@inventorylist_count == 100 && countitem("MaggotSlime") > 1 && countitem("BugLeg") > 1 && countitem("SilkCocoon") > 1
-					&& countitem("SmallMushroom") > 1 && countitem("Petal") > 1 && countitem("Pearl") > 1
+					&& countitem("SmallMushroom") > 1 && countitem("PinkPetal") > 1 && countitem("Pearl") > 1
 					&& countitem("HardSpike") > 1 && countitem("RawLog") > 1 && countitem("PinkAntenna") > 1
 					&& countitem("DarkCrystal") > 1 && countitem("IronOre") > 1 && countitem("ScorpionStinger") > 1
 					&& countitem("RedScorpionStinger") > 1 && countitem("BlackScorpionStinger") > 1 && countitem("SnakeTongue") > 1
@@ -46,7 +46,7 @@
 	delitem "SilkCocoon", 1;
 
 	delitem "SmallMushroom", 1;
-	delitem "Petal", 1;
+	delitem "PinkPetal", 1;
 	delitem "Pearl", 1;
 
 	delitem "HardSpike", 1;
@@ -91,8 +91,8 @@ L_No_mushroom:
 	mes "You do not have a mushroom, neither big, nor small.";
 	close;
 
-L_No_petal:
-	mes "You can't seem to find that petal you had.";
+L_No_pink_petal:
+	mes "You can't seem to find that pink petal you had.";
 	close;
 
 L_No_pearl:
diff --git a/npc/014-1_Woodland/_mobs.txt b/npc/014-1_Woodland/_mobs.txt
index 19194433..dedcb14a 100644
--- a/npc/014-1_Woodland/_mobs.txt
+++ b/npc/014-1_Woodland/_mobs.txt
@@ -1,7 +1,7 @@
 // 014-1 Woodland mobs
 
 014-1.gat,0,0,0,0	monster	EvilMushroom	1013,20,0,0,Mob014-1::On1013
-014-1.gat,0,0,0,0	monster	Flower	1014,25,0,0,Mob014-1::On1014
+014-1.gat,0,0,0,0	monster	PinkFlower	1014,25,0,0,Mob014-1::On1014
 014-1.gat,0,0,0,0	monster	Spiky Mushroom	1019,15,0,0,Mob014-1::On1019
 014-1.gat,0,0,0,0	monster	Mouboo	1028,5,0,10,Mob014-1::On1028
 014-1.gat,0,0,0,0	monster	Mauve	1029,1,270,180,Mob014-1::On1029
diff --git a/npc/015-1_Woodland/monsters.txt b/npc/015-1_Woodland/monsters.txt
index 20dc2c0c..b6ff0fd9 100644
--- a/npc/015-1_Woodland/monsters.txt
+++ b/npc/015-1_Woodland/monsters.txt
@@ -4,7 +4,7 @@
 
 015-1.gat,0,0,0,0	monster	LogHead		1025,40,0,0,Mob31::OnLogHead
 015-1.gat,0,0,0,0	monster	SpikyMushroom	1019,20,0,0,Mob31::OnSpikyMushroom
-015-1.gat,0,0,0,0	monster	Flower		1014,20,0,0,Mob31::OnFlower
+015-1.gat,0,0,0,0	monster	PinkFlower		1014,20,0,0,Mob31::OnPinkFlower
 
 015-1.gat,0,0,0,0	monster	Gamboge		1031,5,0,0,Mob31::OnGamboge
 015-1.gat,0,0,0,0	monster	Alizarin	1032,5,0,0,Mob31::OnAlizarin
@@ -25,7 +25,7 @@ OnSpikyMushroom:
 	callfunc "MobPoints";
 	break;
 
-OnFlower:
+OnPinkFlower:
 	set @mobID, 1014;
 	callfunc "MobPoints";
 	break;
diff --git a/npc/017-1_Woodland_hills/monsters.txt b/npc/017-1_Woodland_hills/monsters.txt
index cf33e0d8..28f2d7e2 100644
--- a/npc/017-1_Woodland_hills/monsters.txt
+++ b/npc/017-1_Woodland_hills/monsters.txt
@@ -5,7 +5,7 @@
 017-1.gat,0,0,0,0	monster	Bat		1017,5,0,0,Mob33::OnBat
 017-1.gat,0,0,0,0	monster	FireGoblin	1011,5,0,0,Mob33::OnFireGoblin
 017-1.gat,0,0,0,0	monster	Mouboo		1028,5,0,0,Mob33::OnMouboo
-017-1.gat,0,0,0,0	monster	Flower		1014,5,0,0,Mob33::OnFlower
+017-1.gat,0,0,0,0	monster	PinkFlower		1014,5,0,0,Mob33::OnPinkFlower
 017-1.gat,0,0,0,0	monster	SpikyMushroom	1019,5,0,0,Mob33::OnSpikyMushroom
 017-1.gat,0,0,0,0	monster	EvilMushshroom	1013,10,0,0,Mob33::OnEvilMushroom
 
@@ -34,7 +34,7 @@ OnMouboo:
 	callfunc "MobPoints";
 	break;
 
-OnFlower:
+OnPinkFlower:
 	set @mobID, 1014;
 	callfunc "MobPoints";
 	break;
diff --git a/npc/018-1_Woodland_mining_camp/_mobs.txt b/npc/018-1_Woodland_mining_camp/_mobs.txt
index 8d3ca4d2..0b73d8f9 100644
--- a/npc/018-1_Woodland_mining_camp/_mobs.txt
+++ b/npc/018-1_Woodland_mining_camp/_mobs.txt
@@ -3,7 +3,7 @@
 018-1.gat,136,79,9,41	monster	Sea Slime	1033,10,100000,30000,Mob018-1::On1033
 018-1.gat,108,87,53,25	monster	Log Head	1025,10,100000,30000,Mob018-1::On1025
 018-1.gat,116,44,6,7	monster	Sea  Slime	1033,3,100000,30000,Mob018-1::On1033
-018-1.gat,119,56,13,6	monster	Flower	1014,2,100000,30000,Mob018-1::On1014
+018-1.gat,119,56,13,6	monster	PinkFlower	1014,2,100000,30000,Mob018-1::On1014
 018-1.gat,175,28,17,19	monster	Jack O	1022,1,300000,240000,Mob018-1::On1022
 018-1.gat,78,59,3,1	monster	Yellow Slime	1007,1,100000,30000,Mob018-1::On1007
 018-1.gat,57,63,14,7	monster	Silk Worm	1035,2,100000,30000,Mob018-1::On1035
diff --git a/npc/018-3_Cave/_mobs.txt b/npc/018-3_Cave/_mobs.txt
index c5699a01..30e9579d 100644
--- a/npc/018-3_Cave/_mobs.txt
+++ b/npc/018-3_Cave/_mobs.txt
@@ -3,7 +3,7 @@
 018-3.gat,48,28,56,17	monster	Bat	1017,10,100000,30000,Mob018-3::On1017
 018-3.gat,35,144,31,48	monster	Evil Mushroom	1013,10,120000,30000,Mob018-3::On1013
 018-3.gat,35,65,28,22	monster	Spider	1012,20,100000,50000,Mob018-3::On1012
-018-3.gat,28,157,3,2	monster	Flower	1014,1,60000,30000,Mob018-3::On1014
+018-3.gat,28,157,3,2	monster	PinkFlower	1014,1,60000,30000,Mob018-3::On1014
 018-3.gat,99,110,17,39	monster	Yellow slime	1007,10,90000,30000,Mob018-3::On1007
 018-3.gat,134,140,12,8	monster	Maggot	1002,3,80000,40000,Mob018-3::On1002
 018-3.gat,132,137,15,25	monster	Spider	1012,8,300000,120000,Mob018-3::On1012
diff --git a/npc/018-3_Cave/bookcase.txt b/npc/018-3_Cave/bookcase.txt
index c4970fed..843c94ae 100644
--- a/npc/018-3_Cave/bookcase.txt
+++ b/npc/018-3_Cave/bookcase.txt
@@ -27,7 +27,7 @@ L_Search:
 
 	mes "The slime of a maggot.";
 	mes "A mushroom, big or small.";
-	mes "The petal of a flower.";
+	mes "The petal of a pink flower.";
 	next;
 
 	mes "A pearl from the sea.";
diff --git a/npc/025-1_Woodland_Swamp/_mobs.txt b/npc/025-1_Woodland_Swamp/_mobs.txt
index 2d6e3105..b6b9c02f 100644
--- a/npc/025-1_Woodland_Swamp/_mobs.txt
+++ b/npc/025-1_Woodland_Swamp/_mobs.txt
@@ -6,7 +6,7 @@
 025-1.gat,55,62,24,13	monster	Fluffy	1020,7,30000,12000,Mob025-1::On1020
 025-1.gat,38,84,37,31	monster	Silkworm	1035,18,40000,300,Mob025-1::On1035
 025-1.gat,96,47,63,55	monster	Log Head	1025,14,18000,3000,Mob025-1::On1025
-025-1.gat,73,61,106,83	monster	Flower	1014,34,20000,5000,Mob025-1::On1014
+025-1.gat,73,61,106,83	monster	Pink Flower	1014,34,20000,5000,Mob025-1::On1014
 025-1.gat,73,61,107,82	monster	Spiky Mushroom	1019,40,90000,500,Mob025-1::On1019
 025-1.gat,101,53,55,65	monster	Squirrel	1038,18,60000,9000,Mob025-1::On1038
 025-1.gat,26,61,15,85	monster	Scorpion	1003,12,100000,50000,Mob025-1::On1003
diff --git a/npc/functions/mob_points.txt b/npc/functions/mob_points.txt
index 38ab9adf..1683e53b 100644
--- a/npc/functions/mob_points.txt
+++ b/npc/functions/mob_points.txt
@@ -16,7 +16,7 @@ function	script	MobPoints	{
 		4, // Fire Goblin
 		55, // Spider
 		23, // Evil Mushroom
-		35, // Flower
+		35, // Pink Flower
 		40, // Santa Slime
 		15, // Rudolph Slime
 		2, // Bat
@@ -27,7 +27,7 @@ function	script	MobPoints	{
 		100, // Jack-O
 		80, // Fire Skull
 		80, // Poison Skull
-		20, // Stumpy
+		20, // Log Head
 		70, // Mountain Snake
 		15, // Easter Fluffy
 		40, // Mouboo
@@ -50,6 +50,13 @@ function	script	MobPoints	{
 		120, // Fallen
 		0, // Snake Lord
 		80, // Poltergeist
+		5, // Duck
+		5, // Bee
+		10, // Larvespa
+    45, // Vespa
+    200, // Hivespa
+    30, // Froad
+    100, // Troll
 		// Add more here		
 		0; // END