From de00be27c608052f60c78989efde33341bf100f8 Mon Sep 17 00:00:00 2001
From: LeMagnesium <mg.minetest@gmail.com>
Date: Wed, 7 Oct 2015 21:57:26 +0200
Subject: [PATCH] [mobs] Update pumpkins - Remove Pumpking's eggs - Narrow
 pumpbooms' selection box - Add a spawnblock for pumpbooms

---
 mods/mobs/init.lua                     |  2 +-
 mods/mobs/{bosses.lua => pumpkins.lua} | 43 +++++++++++++++++++-------
 2 files changed, 32 insertions(+), 13 deletions(-)
 rename mods/mobs/{bosses.lua => pumpkins.lua} (73%)

diff --git a/mods/mobs/init.lua b/mods/mobs/init.lua
index 8c239980..23c3716a 100755
--- a/mods/mobs/init.lua
+++ b/mods/mobs/init.lua
@@ -37,7 +37,7 @@ dofile(path.."/yeti.lua") -- ???
 dofile(path.."/minotaur.lua") -- Kalabasa
 
 -- The bosses
-dofile(path.."/bosses.lua")
+dofile(path.."/pumpkins.lua")
 
 -- begin slimes mobs compatibility changes
 -- cannot find mesecons?, craft glue instead
diff --git a/mods/mobs/bosses.lua b/mods/mobs/pumpkins.lua
similarity index 73%
rename from mods/mobs/bosses.lua
rename to mods/mobs/pumpkins.lua
index fb70a359..7fe8ef04 100755
--- a/mods/mobs/bosses.lua
+++ b/mods/mobs/pumpkins.lua
@@ -37,20 +37,11 @@ mobs:register_mob("mobs:pumpking", {
 	},
 	lifetimer = 300,		-- 5 minutes
 	shoot_interval = 1000,	-- (lifetimer - (lifetimer / 4)), borrowed for do_custom timer
-	do_custom = function(self)
-		if self.lifetimer <= self.shoot_interval then
-			p = self.object:getpos()
-			p.y = p.y + 1
-			minetest.add_entity(p, "mobs:pumpboom")
-			minetest.after(5.0, function(pos, str) minetest.add_entity(pos, str) end,
-				p, "mobs:pumpboom")
-			self.shoot_interval = self.shoot_interval - 45
-		end
+	on_die = function(self)
+		minetest.chat_send_all("A group of players killed a Pumpking!")
 	end
 })
 
-mobs:register_egg("mobs:pumpking", "Pumpkin King", "mobs_pumpking_inv.png", 1)
-
 mobs:register_mob("mobs:pumpboom", {
 	type = "monster",
 	visual = "mesh",
@@ -59,7 +50,7 @@ mobs:register_mob("mobs:pumpboom", {
 		{"mobs_pumpboom.png"}
 	},
 	visual_size = {x=3, y=3},
-	collisionbox = {-0.80, -0.3, -0.80, 0.80, 0.80, 0.80},
+	collisionbox = {-0.70, -0.3, -0.70, 0.70, 0.70, 0.70},
 	rotate = 270,
 	animation = {
 		speed_normal = 15,	speed_run = 30,
@@ -105,6 +96,24 @@ minetest.register_node("mobs:pumpking_spawner", {
 		dug = {name="mobs_king", gain=0.25}
 	})
 })
+
+minetest.register_node("mobs:pumpboom_spawner", {
+	description = "Pump Boom Spawner",
+	tiles = {
+		"farming_pumpkin_top.png",
+		"farming_pumpkin_top.png",
+		"farming_pumpkin_side.png",
+		"farming_pumpkin_side.png",
+		"farming_pumpkin_side.png",
+		"farming_pumpkin_face_off.png"
+	},
+	is_ground_content = false,
+	groups = {cracky=3, stone=1, mob_spawner=1},
+	sounds = default.node_sound_stone_defaults({
+		dug = {name="mobs_boom", gain=0.25}
+	})
+})
+
 minetest.register_abm({
 	nodenames = {"mobs:pumpking_spawner"},
 	interval = 300.0,
@@ -113,3 +122,13 @@ minetest.register_abm({
 		minetest.add_entity(pos, "mobs:pumpking")
 	end
 })
+
+minetest.register_abm({
+	nodenames = {"mobs:pumpboom_spawner"},
+	interval = 30.0,
+	chance = 3,
+	action = function(pos, node, active_object_count, active_object_count_wider)
+		pos.y = pos.y + 1
+		minetest.add_entity(pos, "mobs:pumpboom")
+	end
+})