add bees to flowers, add drops to clover patch and to bandits, add bandits and flower spawns to maps, change flower spawn place

5 files changed, 77 insertions, 14 deletions

diff --git a/db/re/mob_db.conf b/db/re/mob_db.conf
index dd99976e..ea6b137f 100644
--- a/db/re/mob_db.conf
+++ b/db/re/mob_db.conf
@@ -1460,6 +1460,8 @@ mob_db: (
     AttackMotion: 1
     DamageMotion: 1
     Drops: {
+        GrassSeeds: 2000
+        FlowerSeeds: 100
     }
 },
 {
@@ -1496,6 +1498,8 @@ mob_db: (
     AttackMotion: 750
     DamageMotion: 550
     Drops: {
+        PinkPetal: 1000
+        PinkPetal: 200
     }
 },
 {
@@ -2628,6 +2632,7 @@ mob_db: (
 	AttackMotion: 672
 	DamageMotion: 900
 	Drops: {
+        BottleOfWater: 250
 		CoinBag: 500
 		Dagger: 90
 		BanditTrousers: 1
@@ -2672,8 +2677,11 @@ mob_db: (
 	AttackMotion: 672
 	DamageMotion: 900
 	Drops: {
+        EmptyBottle: 500
 		CoinBag: 500
-		Dagger: 90
+		TrainingArrow: 5000
+		TrainingArrow: 1000
+		TrainingArrow: 500
 		BanditTrousers: 1
 		BanditHood: 1
 		BanditGloves: 1
diff --git a/db/re/mob_skill_db.conf b/db/re/mob_skill_db.conf
index c7cc33f9..73f0a2af 100644
--- a/db/re/mob_skill_db.conf
+++ b/db/re/mob_skill_db.conf
@@ -387,6 +387,66 @@ mob_skill_db:(
 			ConditionData: 2
 		}
 	}
+	/**********************************************************************/
+	PinkFlower: {
+		NPC_SUMMONMONSTER: {
+			SkillState: "MSS_ANY"
+			SkillLevel: 2
+			Rate: 10000
+			SkillTarget: "MST_SELF"
+			CastCondition: "MSC_ALWAYS"
+			ConditionData: 3
+			val0: 1029
+		}
+	}
+	/**********************************************************************/
+	YellowTulip: {
+		NPC_SUMMONMONSTER: {
+			SkillState: "MSS_ANY"
+			SkillLevel: 2
+			Rate: 10000
+			SkillTarget: "MST_SELF"
+			CastCondition: "MSC_ALWAYS"
+			ConditionData: 1
+			val0: 1029
+		}
+	}
+	/**********************************************************************/
+	YellowRose: {
+		NPC_SUMMONMONSTER: {
+			SkillState: "MSS_ANY"
+			SkillLevel: 2
+			Rate: 10000
+			SkillTarget: "MST_SELF"
+			CastCondition: "MSC_ALWAYS"
+			ConditionData: 2
+			val0: 1029
+		}
+	}
+	/**********************************************************************/
+	BlueRose: {
+		NPC_SUMMONMONSTER: {
+			SkillState: "MSS_ANY"
+			SkillLevel: 2
+			Rate: 10000
+			SkillTarget: "MST_SELF"
+			CastCondition: "MSC_ALWAYS"
+			ConditionData: 3
+			val0: 1029
+		}
+	}
+	/**********************************************************************/
+	RedRose: {
+		NPC_SUMMONMONSTER: {
+			SkillState: "MSS_ANY"
+			SkillLevel: 2
+			Rate: 10000
+			SkillTarget: "MST_SELF"
+			CastCondition: "MSC_ALWAYS"
+			ConditionData: 2
+			val0: 1029
+		}
+	}
 }
 )
 
diff --git a/npc/008-1-1/_mobs.txt b/npc/008-1-1/_mobs.txt
index 4bb14ace..35a0bc0f 100644
--- a/npc/008-1-1/_mobs.txt
+++ b/npc/008-1-1/_mobs.txt
@@ -20,11 +20,6 @@
 008-1-1,68,29,7,7	monster	Mouboo	1023,3,30000,60000
 008-1-1,126,45,0,0	monster	Beehive	1056,1,30000,100000
 008-1-1,121,45,0,0	monster	Beehive	1056,1,30000,100000
-008-1-1,94,39,0,0	monster	Blue Rose	1061,1,250000,100000
-008-1-1,98,42,0,0	monster	Yellow Tulip	1059,1,180000,85000
-008-1-1,95,45,0,0	monster	Red Rose	1062,1,210000,95000
-008-1-1,98,48,0,0	monster	Yellow Rose	1060,1,195000,65000
-008-1-1,95,43,0,0	monster	Yellow Tulip	1059,1,180000,85000
-008-1-1,97,46,0,0	monster	Red Rose	1062,1,210000,95000
-008-1-1,96,49,0,0	monster	Yellow Rose	1060,1,195000,65000
-008-1-1,93,48,0,0	monster	Yellow Rose	1060,1,195000,65000
+008-1-1,163,178,2,1	monster	Red Rose	1062,1,50000,10000
+008-1-1,158,191,3,1	monster	Yellow Rose	1060,1,20000,5000
+008-1-1,166,184,1,1	monster	Blue Rose	1061,1,100000,20000
diff --git a/npc/008-1/_mobs.txt b/npc/008-1/_mobs.txt
index 4a08a718..d4e6a597 100644
--- a/npc/008-1/_mobs.txt
+++ b/npc/008-1/_mobs.txt
@@ -81,7 +81,7 @@
 008-1,68,167,14,9	monster	Silkworm	1040,3,3000,6000
 008-1,46,193,16,28	monster	Grass Snake	1042,7,3000,12000
 008-1,166,114,14,5	monster	Spiky Mushroom	1049,2,3000,6000
-008-1,118,97,14,5	monster	Spiky Mushroom	1049,2,3000,6000
+008-1,128,48,4,5	monster	Bandit	1063,1,4000,11000
 008-1,186,33,6,7	monster	Spiky Mushroom	1049,4,3000,6000
 008-1,84,77,4,2	monster	Scorpion	1043,1,6000,12000
 008-1,106,62,7,4	monster	Mouboo	1023,1,30000,120000
@@ -99,3 +99,7 @@
 008-1,140,144,2,6	monster	Mauve Plant	1036,3,1000,2000
 008-1,192,147,3,2	monster	Gamboge Plant	1038,2,1000,10000
 008-1,197,136,2,5	monster	Cobalt Plant	1039,2,1000,30000
+008-1,109,93,14,5	monster	Spiky Mushroom	1049,2,3000,6000
+008-1,111,68,8,3	monster	Robin Bandit	1064,2,8000,12000
+008-1,126,80,8,3	monster	Bandit	1063,2,5500,8000
+008-1,122,44,4,7	monster	Robin Bandit	1064,1,3000,8000
diff --git a/npc/008-1/shop.txt b/npc/008-1/shop.txt
index f50912f2..a0b825ec 100644
--- a/npc/008-1/shop.txt
+++ b/npc/008-1/shop.txt
@@ -19,7 +19,6 @@ OnInit:
     sellitem ARedTulip, -1, 50;
     sellitem AWhiteTulip, -1, 50;
     sellitem AYellowTulip, -1, 50;
-    sellitem ABlueTulip, -1, 20;
 
     .sex = G_OTHER;
     .distance = 10;
@@ -33,7 +32,6 @@ OnClock0000:
     restoreshopitem ARedTulip, 10;
     restoreshopitem AWhiteTulip, 10;
     restoreshopitem AYellowTulip, 10;
-    restoreshopitem ABlueTulip, 5;
 OnClock0800:
     restoreshopitem ARedRose, 10;
     restoreshopitem AWhiteRose, 10;
@@ -42,7 +40,6 @@ OnClock0800:
     restoreshopitem ARedTulip, 10;
     restoreshopitem AWhiteTulip, 10;
     restoreshopitem AYellowTulip, 10;
-    restoreshopitem ABlueTulip, 5;
 OnClock1600:
     restoreshopitem ARedRose, 10;
     restoreshopitem AWhiteRose, 10;
@@ -51,5 +48,4 @@ OnClock1600:
     restoreshopitem ARedTulip, 10;
     restoreshopitem AWhiteTulip, 10;
     restoreshopitem AYellowTulip, 10;
-    restoreshopitem ABlueTulip, 5;
 }