From 84cd5c4e2757aa3e230f9bb2af86d1cad66439c9 Mon Sep 17 00:00:00 2001
From: "Tai @ Flex" <dch.tai@gmail.com>
Date: Thu, 22 Sep 2016 16:43:11 +0100
Subject: [PATCH 1/5] leave it to the api

---
 init.lua | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/init.lua b/init.lua
index f6477f9..2ffd71f 100644
--- a/init.lua
+++ b/init.lua
@@ -14,9 +14,7 @@ dmobs.destructive = true
 
 --peaceful mobs setting
 
-if not minetest.setting_getbool("only_peaceful_mobs") then
-	dofile(minetest.get_modpath("dmobs").."/baddies.lua")
-end
+dofile(minetest.get_modpath("dmobs").."/baddies.lua")
 
 --friendly mobs
 

From 0b62965ed86e7179af450b1e80a1145cddec86f3 Mon Sep 17 00:00:00 2001
From: "Tai @ Flex" <dch.tai@gmail.com>
Date: Thu, 22 Sep 2016 16:49:47 +0100
Subject: [PATCH 2/5] always pig, conditionally explode

---
 baddies.lua | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/baddies.lua b/baddies.lua
index 4ebb9f0..8b1d5ed 100644
--- a/baddies.lua
+++ b/baddies.lua
@@ -1,11 +1,9 @@
--- Fox
-if dmobs.destructive then
-mobs:register_mob("dmobs:pig_evil", {
+local pigdef = {
 	type = "monster",
 	passive = true,
 	reach = 3,
 	damage = 2,
-	attack_type = "explode",
+	attack_type = "dogfight",
 	explosion_radius = 2,
 	hp_min = 12,
 	hp_max = 22,
@@ -31,9 +29,8 @@ mobs:register_mob("dmobs:pig_evil", {
 	drops = {
 		{name = "mobs:meat_raw", chance = 2, min = 1, max = 1},
 	},
-	sounds = {
-      random = "mobs_pig",
-	  explode = "tnt_explode",
+	pigdef.sounds = {
+		random = "mobs_pig",
 	},
 	do_custom = function(self)
 		if self.state == "attack" then
@@ -65,12 +62,18 @@ mobs:register_mob("dmobs:pig_evil", {
 
 		mobs:capture_mob(self, clicker, 0, 5, 50, false, nil)
 	end,
-})
+}
+
+if dmobs.destructive then
+	pigdef.sounds.explode = "mobs_pig"
+	pigdef.attack_type = "explode",
+end
+
+mobs:register_mob("dmobs:pig_evil", pigdef)
 
 mobs:register_spawn("dmobs:pig_evil", {"default:pine_needles","default:leaves"}, 20, 10, 15000, 2, 31000)
 
 mobs:register_egg("dmobs:pig_evil", "kamikaze Pig", "wool_pink.png", 1)
-end
 
 -- Fox
 mobs:register_mob("dmobs:fox", {

From d9980448757042ad8ae352f26b65bdcf9b8230af Mon Sep 17 00:00:00 2001
From: "Tai @ Flex" <dch.tai@gmail.com>
Date: Thu, 22 Sep 2016 16:59:39 +0100
Subject: [PATCH 3/5] fix typos

---
 baddies.lua | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/baddies.lua b/baddies.lua
index 8b1d5ed..026a9f0 100644
--- a/baddies.lua
+++ b/baddies.lua
@@ -14,10 +14,10 @@ local pigdef = {
 	textures = {
 		{"dmobs_flying_pig_mean.png"},
 	},
-   jump = true,
-   fly = true,
-   fall_speed = 0,
-   stepheight = 1.5,
+	jump = true,
+	fly = true,
+	fall_speed = 0,
+	stepheight = 1.5,
 	blood_texture = "mobs_blood.png",
 	visual_size = {x=1, y=1},
 	makes_footstep_sound = true,
@@ -29,7 +29,7 @@ local pigdef = {
 	drops = {
 		{name = "mobs:meat_raw", chance = 2, min = 1, max = 1},
 	},
-	pigdef.sounds = {
+	sounds = {
 		random = "mobs_pig",
 	},
 	do_custom = function(self)
@@ -66,7 +66,7 @@ local pigdef = {
 
 if dmobs.destructive then
 	pigdef.sounds.explode = "mobs_pig"
-	pigdef.attack_type = "explode",
+	pigdef.attack_type = "explode"
 end
 
 mobs:register_mob("dmobs:pig_evil", pigdef)

From 78b9537a0ab4b2e61d91a4cf2d530fce91735cd7 Mon Sep 17 00:00:00 2001
From: "Tai @ Flex" <dch.tai@gmail.com>
Date: Thu, 22 Sep 2016 17:00:05 +0100
Subject: [PATCH 4/5] leave it to the api

---
 init.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/init.lua b/init.lua
index 2ffd71f..247e859 100644
--- a/init.lua
+++ b/init.lua
@@ -12,7 +12,7 @@ dmobs.dragons = true
 -- Enable fireballs/explosions
 dmobs.destructive = true
 
---peaceful mobs setting
+-- load baddies
 
 dofile(minetest.get_modpath("dmobs").."/baddies.lua")
 

From a61e5a7619ac000b85aed7f325cac2a9833a5ac7 Mon Sep 17 00:00:00 2001
From: "Tai @ Flex" <dch.tai@gmail.com>
Date: Thu, 22 Sep 2016 17:03:02 +0100
Subject: [PATCH 5/5] explosion sound

---
 baddies.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/baddies.lua b/baddies.lua
index 026a9f0..8dc02d5 100644
--- a/baddies.lua
+++ b/baddies.lua
@@ -65,7 +65,7 @@ local pigdef = {
 }
 
 if dmobs.destructive then
-	pigdef.sounds.explode = "mobs_pig"
+	pigdef.sounds.explode = "tnt_explode"
 	pigdef.attack_type = "explode"
 end