Add the Pirates, but our Marley cannot clone herself.

4 files changed, 225 insertions, 1 deletions

diff --git a/db/re/mob_db.conf b/db/re/mob_db.conf
index c0969cba8..707e4245a 100644
--- a/db/re/mob_db.conf
+++ b/db/re/mob_db.conf
@@ -12040,6 +12040,182 @@ mob_db: (
 		Ele_Ghost: 7500
 	}
 },
+{
+	Id: 1442
+	SpriteName: "Thug"
+	Name: "Thug"
+	Lv: 45
+	Hp: 5420
+	Sp: 0
+	Exp: 272
+	JExp: 20
+	AttackRange: 1
+	Attack: [365, 404]
+	Def: 64
+	Mdef: 22
+	Stats: {
+		Str: 22
+		Agi: 30
+		Vit: 46
+		Int: 30
+		Dex: 50
+		Luk: 70
+	}
+	ViewRange: 12
+	ChaseRange: 16
+	Race: 2
+	Element: (7, 1)
+	Mode: {
+		CanMove: true
+		CanAttack: true
+		ChangeTargetMelee: true
+		ChangeChase: true
+		CastSensorChase: true
+		Aggressive: true
+		Angry: true
+		Looter: true
+	}
+	MoveSpeed: 440
+	AttackDelay: 1672
+	AttackMotion: 672
+	DamageMotion: 480
+	Drops: {
+		Beer: 500
+	}
+},
+{
+	Id: 1443
+	SpriteName: "Swashbuckler"
+	Name: "Swashbuckler"
+	Lv: 45
+	Hp: 5420
+	Sp: 0
+	Exp: 272
+	JExp: 20
+	AttackRange: 1
+	Attack: [277, 307]
+	Def: 64
+	Mdef: 22
+	Stats: {
+		Str: 22
+		Agi: 30
+		Vit: 46
+		Int: 30
+		Dex: 90
+		Luk: 60
+	}
+	ViewRange: 12
+	ChaseRange: 16
+	Race: 2
+	Element: (7, 1)
+	Mode: {
+		CanMove: true
+		CanAttack: true
+		ChangeTargetMelee: true
+		ChangeChase: true
+		CastSensorChase: true
+		Aggressive: true
+		Angry: true
+		Looter: true
+	}
+	MoveSpeed: 375
+	AttackDelay: 1272
+	AttackMotion: 672
+	DamageMotion: 480
+	Drops: {
+		Beer: 500
+	}
+},
+{
+	Id: 1444
+	SpriteName: "Grenadier"
+	Name: "Grenadier"
+	Lv: 47
+	Hp: 5200
+	Sp: 0
+	Exp: 295
+	JExp: 22
+	AttackRange: 6
+	Attack: [259, 288]
+	Def: 33
+	Mdef: 23
+	Stats: {
+		Str: 22
+		Agi: 10
+		Vit: 46
+		Int: 60
+		Dex: 110
+		Luk: 75
+	}
+	ViewRange: 12
+	ChaseRange: 16
+	Race: 2
+	Element: (7, 1)
+	Mode: {
+		CanMove: true
+		CanAttack: true
+		ChangeTargetMelee: true
+		ChangeChase: true
+		CastSensorChase: true
+		Aggressive: true
+		Angry: true
+		Looter: true
+	}
+	MoveSpeed: 470
+	AttackDelay: 2272
+	AttackMotion: 672
+	DamageMotion: 480
+	Drops: {
+		Beer: 500
+	}
+},
+{
+	Id: 1445
+	SpriteName: "Marley"
+	Name: "Dreaded Pirate Marley"
+	Lv: 72
+	Hp: 12000
+	Exp: 1250
+	JExp: 100
+	AttackRange: 4
+	Attack: [210, 280]
+	Def: 57
+	Mdef: 74
+	Stats: {
+		Str: 99
+		Agi: 49
+		Vit: 99
+		Int: 99
+		Dex: 150
+		Luk: 120
+	}
+	ViewRange: 14
+	ChaseRange: 18
+	Race: 2
+	Element: (7, 2)
+	Mode: {
+		CanMove: true
+		Aggressive: true
+		ChangeChase: true
+		ChangeTargetChase: true
+		ChangeTargetMelee: true
+		CanAttack: true
+		CastSensorChase: true
+		Angry: true
+		Boss: true
+	}
+	MoveSpeed: 400
+	AttackDelay: 700
+	AttackMotion: 672
+	DamageMotion: 480
+	Drops: {
+		FluoPowder: 900
+		Beer: 50
+	}
+	WeaponAttacks: {
+		All: 7000
+	}
+},
 // System
 {
 	Id: 1491
diff --git a/maps/re/015-3.mcache b/maps/re/015-3.mcache
index 316e69de4..4965044bb 100644
--- a/maps/re/015-3.mcache
+++ b/maps/re/015-3.mcache
diff --git a/npc/015-3/_mobs.txt b/npc/015-3/_mobs.txt
index 796e7a193..41536efe9 100644
--- a/npc/015-3/_mobs.txt
+++ b/npc/015-3/_mobs.txt
@@ -2,4 +2,17 @@
 // Map 015-3: Butterfly Caves mobs
 015-3,160,179,19,18	monster	Cave Bat	1039,24,30000,40000
 015-3,142,31,24,14	monster	Green Slime	1085,5,30000,40000
-015-3,102,105,81,87	monster	Small Emerald Bif	1104,4,65000,45000
+015-3,118,179,22,18	monster	Cave Snake	1035,12,30000,20000
+015-3,157,110,22,18	monster	Snake	1122,12,30000,20000
+015-3,144,94,32,39	monster	Black Scorpion	1074,12,30000,20000
+015-3,156,66,24,14	monster	Robin Bandit	1153,5,30000,40000
+015-3,113,100,55,37	monster	Red Slime	1092,57,30000,40000
+015-3,107,177,14,8	monster	Archant	1026,2,30000,40000
+015-3,46,44,31,18	monster	Night Scorpion	1077,1,3600000,1800000
+015-3,86,59,28,32	monster	Terranite	1167,3,100000,40000
+015-3,69,89,33,28	monster	Wicked Mushroom	1176,6,100000,30000
+015-3,84,142,23,50	monster	Troll	1171,6,100000,30000
+015-3,32,37,31,12	monster	Copper Slime Mother	1238,1,300000,120000
+015-3,38,49,26,17	monster	Gobo Bear	1214,5,40000,20000
+015-3,102,105,81,87	monster	Small Emerald Bif	1104,6,65000,45000
+015-3,98,123,24,62	monster	Copper Slime	1088,12,40000,40000
diff --git a/npc/015-3/_warps.txt b/npc/015-3/_warps.txt
index 4373993db..a468b3548 100644
--- a/npc/015-3/_warps.txt
+++ b/npc/015-3/_warps.txt
@@ -11,6 +11,21 @@ OnTouch:
 	slide 147,39; end;
 }
 015-3,172,196,0	warp	#015-3_172_196	0,0,014-3,120,122
+015-3,129,199,0	script	#015-3_129_199	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 152,57; end;
+}
+015-3,119,196,0	script	#015-3_119_196	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 134,58; end;
+}
+015-3,98,161,0	script	#015-3_98_161	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 123,38; end;
+}
 015-3,123,39,0	script	#015-3_123_39	NPC_HIDDEN,0,0,{
 	end;
 OnTouch:
@@ -21,3 +36,23 @@ OnTouch:
 OnTouch:
 	slide 171,162; end;
 }
+015-3,152,56,0	script	#015-3_152_56	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 129,198; end;
+}
+015-3,134,57,0	script	#015-3_134_57	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 119,195; end;
+}
+015-3,64,74,0	script	#015-3_64_74	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 47,61; end;
+}
+015-3,47,62,0	script	#015-3_47_62	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 64,73; end;
+}