12 files changed, 86 insertions, 3 deletions
diff --git a/db/constants.conf b/db/constants.conf
index 45ec831be..7e805b9e9 100644
--- a/db/constants.conf
+++ b/db/constants.conf
@@ -1852,6 +1852,7 @@ constants_db: {
 
 	// TMW-BR Non Animated NPCs
 	NPC_SHOPPAKEP:          301
+	NPC_OLDPIRATE:          304
 	NPC_BRGUARD_SWORD:      306
 	NPC_BRGUARD_SPEAR:      307
 	NPC_BRGUARD_BOW:        308
@@ -1869,6 +1870,8 @@ constants_db: {
 	NPC_MIRAJ:              323
 	NPC_BELLA:              324
 	NPC_RED_WIZARD_F:       325
+	NPC_CRYSTAL:            326
+	NPC_POOH:               327
 	NPC_ERNANDO:            328
 	NPC_ANDREI:             329
 	NPC_MOUBOOTAUR:			330
@@ -1941,6 +1944,7 @@ constants_db: {
 	NPC_KENTON:             458
 	NPC_GUARD_DEAD:         459
 	NPC_LEGACY_CHEST:       416
+	NPC_BEEKEEPER:          461
 
 	NPC_MONSTERKING:        500
 	NPC_AIRSHIP:            501
diff --git a/db/re/mob_db.conf b/db/re/mob_db.conf
index 952debf1a..383ca00e5 100644
--- a/db/re/mob_db.conf
+++ b/db/re/mob_db.conf
@@ -2541,8 +2541,8 @@ mob_db: (
 		Dex: 60
 		Luk: 5
 	}
-	ViewRange: 12
-	ChaseRange: 12
+	ViewRange: 14
+	ChaseRange: 14
 	Race: 2
 	Element: (4, 1)
 	Mode: {
diff --git a/maps/re/014-1.mcache b/maps/re/014-1.mcache
index df8fbc8b4..fccf8bd8a 100644
--- a/maps/re/014-1.mcache
+++ b/maps/re/014-1.mcache
diff --git a/npc/005-1/_mobs.txt b/npc/005-1/_mobs.txt
index 5238b10d5..ed13f979f 100644
--- a/npc/005-1/_mobs.txt
+++ b/npc/005-1/_mobs.txt
@@ -1,7 +1,7 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 005-1: Candor Island mobs
 005-1,43,50,2,1	monster	Clover Field	1028,1,35000,300000
-005-1,30,66,1,0	monster	Diamond Bif	1108,1,35000,120000,Rosen::OnKillMBif
+005-1,30,66,1,0	monster	Diamond Bif	1108,1,35000,90000,Rosen::OnKillMBif
 005-1,70,94,7,6	monster	Maggot	1030,9,35000,300000,Trainer::OnKillMaggot
 005-1,89,97,8,9	monster	Candor Scorpion	1073,7,35000,300000,Trainer::OnKillCandorScorpion
 005-1,43,115,6,3	monster	Piou	1002,1,35000,300000
diff --git a/npc/014-1/_import.txt b/npc/014-1/_import.txt
index a036c39cc..83582d718 100644
--- a/npc/014-1/_import.txt
+++ b/npc/014-1/_import.txt
@@ -2,3 +2,4 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 "npc/014-1/_mobs.txt",
 "npc/014-1/_warps.txt",
+"npc/014-1/galimatia.txt",
diff --git a/npc/014-1/_mobs.txt b/npc/014-1/_mobs.txt
index 9ed41ada4..f0d8a6550 100644
--- a/npc/014-1/_mobs.txt
+++ b/npc/014-1/_mobs.txt
@@ -5,6 +5,8 @@
 014-1,85,82,54,35	monster	Squirrel	1032,11,30000,45000
 014-1,87,80,52,18	monster	Tipiou	1016,3,30000,40000
 014-1,135,91,6,28	monster	Blub	1008,2,30000,20000
+014-1,138,23,25,10	monster	Bee Hive	1047,2,30000,20000
+014-1,140,25,26,15	monster	Bee	1065,5,30000,20000
 014-1,95,58,105,59	monster	Cobalt Plant	1136,2,45000,50000
 014-1,88,68,104,43	monster	Mauve Plant	1135,3,45000,50000
 014-1,66,53,43,62	monster	Gamboge Plant	1134,3,45000,50000
diff --git a/npc/014-1/_warps.txt b/npc/014-1/_warps.txt
index d77a98243..6fa9bd8b3 100644
--- a/npc/014-1/_warps.txt
+++ b/npc/014-1/_warps.txt
@@ -2,3 +2,23 @@
 // Map 014-1: Woodland Mining Camp warps
 014-1,79,98,0	warp	#014-1_79_98	3,0,012-1,78,18
 014-1,79,57,0	warp	#014-1_79_57	1,0,015-1,99,132
+014-1,158,34,0	script	#014-1_158_34	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 153,47; end;
+}
+014-1,153,46,0	script	#014-1_153_46	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 158,35; end;
+}
+014-1,147,40,0	script	#014-1_147_40	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 112,62; end;
+}
+014-1,112,61,0	script	#014-1_112_61	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 147,41; end;
+}
diff --git a/npc/014-1/galimatia.txt b/npc/014-1/galimatia.txt
new file mode 100644
index 000000000..942b5c8ab
--- /dev/null
+++ b/npc/014-1/galimatia.txt
@@ -0,0 +1,16 @@
+// TMW2 scripts.
+// Author:
+//    Jesusalva
+// Description:
+//    A bee keeper
+
+014-1,126,21,0	script	Galimatia	NPC_BEEKEEPER,{
+    mesn;
+    mesq l("Feel free to collect honey from the hives. Remember to bottle them before picking up... You can use the discardable bottles I keep near them for that.");
+    close;
+
+OnInit:
+    .sex = G_FEMALE;
+    .distance = 4;
+    end;
+}
diff --git a/npc/015-3-1/_import.txt b/npc/015-3-1/_import.txt
index e00d98674..b49c4f008 100644
--- a/npc/015-3-1/_import.txt
+++ b/npc/015-3-1/_import.txt
@@ -2,3 +2,4 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 "npc/015-3-1/_mobs.txt",
 "npc/015-3-1/_warps.txt",
+"npc/015-3-1/pablin.txt",
diff --git a/npc/015-3-1/pablin.txt b/npc/015-3-1/pablin.txt
new file mode 100644
index 000000000..f39a9b852
--- /dev/null
+++ b/npc/015-3-1/pablin.txt
@@ -0,0 +1,22 @@
+// TMW2 scripts.
+// Author:
+//    Jesusalva
+// Description:
+//    A retired pirate
+
+015-3-1,83,39,0	script	Pablin	NPC_OLDPIRATE,{
+    mesn;
+    mesq l("Hey, you! What are you doing here?!");
+    next;
+    mesn;
+    mesq l("These are dangerous caves since Marley and her gang made it a hideout.");
+    next;
+    mesn;
+    mesq l("I won't stop you from going inside, but be careful, you hear me?");
+    close;
+
+OnInit:
+    .sex = G_MALE;
+    .distance = 4;
+    end;
+}
diff --git a/npc/015-3/_import.txt b/npc/015-3/_import.txt
index 2a8f058b8..89332994a 100644
--- a/npc/015-3/_import.txt
+++ b/npc/015-3/_import.txt
@@ -5,3 +5,4 @@
 "npc/015-3/_warps.txt",
 "npc/015-3/arkim.txt",
 "npc/015-3/logic.txt",
+"npc/015-3/pooh.txt",
diff --git a/npc/015-3/pooh.txt b/npc/015-3/pooh.txt
new file mode 100644
index 000000000..95e64613b
--- /dev/null
+++ b/npc/015-3/pooh.txt
@@ -0,0 +1,16 @@
+// TMW2 scripts.
+// Author:
+//    Jesusalva
+// Description:
+//    A bee keeper
+
+015-3,127,181,0	script	Pooh	NPC_POOH,{
+    mesn;
+    mesq l("OMG so cute! This must be the cutest bear you ever seen your whole life.");
+    close;
+
+OnInit:
+    .sex = G_OTHER;
+    .distance = 4;
+    end;
+}