Tweaked and tidied code, fixed few bugs.

CHANGELOG.md

@@ -1,3 +1,6 @@
+* 2021-02-01 : TenPlus1
+  * Updated and tidied code to work with Minetest 5.x and latest Mobs Redo API
+  * Fixed a few nil error bugs
 * 2019-07-31 : Grossam
   * spawn.lua rewritten using mobs:spawn()
   * spawn rules modified for more consistency (e.g. hedgehogs now spawn at night)
@@ -13,4 +16,3 @@
   * great dragons now need a diamond block nest (you've to deserve greatness !)
 * 2019-07-27 : Grossam
   * Forked on https://git.fwhost.eu/Grossam/dmobs
-

arrows/dragonarrows.lua

@@ -1,5 +1,3 @@
-local name = {}
-
 local base_arrow = {
 	visual = "sprite",
 	visual_size = {x = 0.5, y = 0.5},
@@ -9,6 +7,7 @@ local base_arrow = {
 	tail_texture = "dmobs_ice.png",
 
 	hit_player = function(self, player)
+
 		player:punch(self.object, 1.0, {
 			full_punch_interval = 1.0,
 			damage_groups = {fleshy = 8},
@@ -16,6 +15,7 @@ local base_arrow = {
 	end,
 
 	hit_mob = function(self, player)
+
 		player:punch(self.object, 1.0, {
 			full_punch_interval = 1.0,
 			damage_groups = {fleshy = 8},
@@ -27,8 +27,9 @@ local base_arrow = {
 	end,
 }
 
-for _,arrowtype in pairs( {"ice","lightning","poison"} ) do
+for _,arrowtype in pairs({"ice","lightning","poison"}) do
-	base_arrow.textures = {"dmobs_"..arrowtype..".png"}
+
-	name = "dmobs:"..arrowtype
+	base_arrow.textures = {"dmobs_" .. arrowtype .. ".png"}
-	mobs:register_arrow(name, dmobs.deepclone(base_arrow) )
+
+	mobs:register_arrow("dmobs:" .. arrowtype, dmobs.deepclone(base_arrow))
 end

arrows/dragonfire.lua

@@ -1,40 +1,63 @@
 --function to register tamed dragon attacks
 
-function dmobs.register_fire(fname, texture, dmg, replace_node, explode, ice, variance, size)
+function dmobs.register_fire(fname, texture, dmg, replace_node, explode,
-minetest.register_entity(fname, {
+		ice, variance, size)
+
+	minetest.register_entity(fname, {
 		textures = {texture},
 		velocity = 0.1,
 		damage = dmg,
 		collisionbox = {0, 0, 0, 0, 0, 0},
 		on_step = function(self, obj, pos)
+
 			local remove = minetest.after(2, function()
 				self.object:remove()
 			end)
+
 			local pos = self.object:get_pos()
 			local objs = minetest.get_objects_inside_radius({x=pos.x,y=pos.y,z=pos.z}, 2)
+
 				for k, obj in pairs(objs) do
+
 					if obj:get_luaentity() ~= nil then
-					if obj:get_luaentity().name ~= fname and obj:get_luaentity().name ~= "dmobs:dragon_red" and obj:get_luaentity().name ~= "dmobs:dragon_blue" and obj:get_luaentity().name ~= "dmobs:dragon_black" and obj:get_luaentity().name ~= "dmobs:dragon_green" and obj:get_luaentity().name ~= "dmobs:dragon_great_tame" and obj:get_luaentity().name ~= "__builtin:item" then
+
+						if obj:get_luaentity().name ~= fname
+						and obj:get_luaentity().name ~= "dmobs:dragon_red"
+						and obj:get_luaentity().name ~= "dmobs:dragon_blue"
+						and obj:get_luaentity().name ~= "dmobs:dragon_black"
+						and obj:get_luaentity().name ~= "dmobs:dragon_green"
+						and obj:get_luaentity().name ~= "dmobs:dragon_great_tame"
+						and obj:get_luaentity().name ~= "__builtin:item" then
+
 							obj:punch(self.launcher, 1.0, {
-							full_punch_interval=1.0,
+								full_punch_interval = 1.0,
-							damage_groups={fleshy=3},
+								damage_groups={fleshy = 3},
 							}, nil)
+
 							self.object:remove()
 						end
 					end
 				end
-			for dx=0,1 do
+
-						for dy=0,1 do
+				for dx = 0, 1 do
-							for dz=0,1 do
+					for dy = 0, 1 do
+						for dz = 0, 1 do
+
 							local p = {x=pos.x+dx, y=pos.y, z=pos.z+dz}
 							local t = {x=pos.x+dx, y=pos.y+dy, z=pos.z+dz}
 							local n = minetest.get_node(p).name
-								if n ~= fname and n ~="default:dirt_with_grass" and n ~="default:dirt_with_dry_grass" and n ~="default:stone"  then
+
-									if minetest.registered_nodes[n].groups.flammable --[[or math.random(1, 100) <= 1]] then
+							if n ~= fname and n ~="default:dirt_with_grass"
+							and n ~="default:dirt_with_dry_grass"
+							and n ~="default:stone" then
+
+								if minetest.registered_nodes[n].groups.flammable then
+
 									minetest.set_node(t, {name=replace_node})
 									self.object:remove()
 									return
 								end
+
 								if ice and n == "default:water_source" then
 									minetest.set_node(t, {name="default:ice"})
 									self.object:remove()
@@ -43,7 +66,11 @@ minetest.register_entity(fname, {
 						end
 					end
 				end
-		local apos = self.object:get_pos() ; if not apos then return end
+
+				local apos = self.object:get_pos()
+
+				if not apos then return end
+
 				minetest.add_particlespawner({
 					amount = 6,
 					time = 0.3,
@@ -60,11 +87,18 @@ minetest.register_entity(fname, {
 					collisiondetection = false,
 					texture = texture
 				})
-	end,
+		end
-})
+	})
 end
 
-dmobs.register_fire("dmobs:fire_plyr", "dmobs_fire.png", 2, "fire:basic_flame", true, false, 0.3, 1)
+dmobs.register_fire("dmobs:fire_plyr", "dmobs_fire.png", 2,
-dmobs.register_fire("dmobs:ice_plyr", "dmobs_ice.png", 2, "default:ice", false, true, 0.5, 10)
+		"fire:basic_flame", true, false, 0.3, 1)
-dmobs.register_fire("dmobs:poison_plyr", "dmobs_poison.png", 2, "air", false, false, 0.3, 1)
+
-dmobs.register_fire("dmobs:lightning_plyr", "dmobs_lightning.png", 2, "air", true, false, 0, 0.5)
+dmobs.register_fire("dmobs:ice_plyr", "dmobs_ice.png", 2,
+		"default:ice", false, true, 0.5, 10)
+
+dmobs.register_fire("dmobs:poison_plyr", "dmobs_poison.png", 2,
+		"air", false, false, 0.3, 1)
+
+dmobs.register_fire("dmobs:lightning_plyr", "dmobs_lightning.png", 2,
+		"air", true, false, 0, 0.5)

arrows/fire.lua

@@ -8,6 +8,7 @@ mobs:register_arrow("dmobs:fire", {
 	tail_texture = "fire_basic_flame.png",
 
 	hit_player = function(self, player)
+
 		player:punch(self.object, 1.0, {
 			full_punch_interval = 1.0,
 			damage_groups = {fleshy = 8},
@@ -15,6 +16,7 @@ mobs:register_arrow("dmobs:fire", {
 	end,
 
 	hit_mob = function(self, player)
+
 		player:punch(self.object, 1.0, {
 			full_punch_interval = 1.0,
 			damage_groups = {fleshy = 8},

arrows/fire_explosive.lua

@@ -1,4 +1,3 @@
-
 mobs:register_arrow("dmobs:fire", {
 	visual = "sprite",
 	visual_size = {x = 0.5, y = 0.5},
@@ -8,6 +7,7 @@ mobs:register_arrow("dmobs:fire", {
 	tail_texture = "fire_basic_flame.png",
 
 	hit_player = function(self, player)
+
 		player:punch(self.object, 1.0, {
 			full_punch_interval = 1.0,
 			damage_groups = {fleshy = 8},
@@ -15,6 +15,7 @@ mobs:register_arrow("dmobs:fire", {
 	end,
 
 	hit_mob = function(self, player)
+
 		player:punch(self.object, 1.0, {
 			full_punch_interval = 1.0,
 			damage_groups = {fleshy = 8},

arrows/sting.lua

@@ -7,6 +7,7 @@ mobs:register_arrow("dmobs:sting", {
 	tail_texture = "fire_basic_flame.png",
 
 	hit_player = function(self, player)
+
 		player:punch(self.object, 1.0, {
 			full_punch_interval = 1.0,
 			damage_groups = {fleshy = 1},
@@ -19,4 +20,4 @@ mobs:register_arrow("dmobs:sting", {
 	hit_node = function(self, pos, node)
 		self.object:remove()
 	end,
-	})
+})

dragons/dragon1.lua

@@ -10,7 +10,7 @@ local dragondef = {
 	shoot_interval = 2.5,
 	dogshoot_switch = 2,
 	dogshoot_count = 0,
-	dogshoot_count_max =5,
+	dogshoot_count_max = 5,
 	arrow = "dmobs:fire",
 	shoot_offset = 1,
 	hp_min = 70,
@@ -23,7 +23,7 @@ local dragondef = {
 		{"dmobs_dragon.png"},
 	},
 	blood_texture = "mobs_blood.png",
-   visual_size = {x=2, y=2},
+	visual_size = {x = 2, y = 2},
 	makes_footstep_sound = true,
 	runaway = false,
 	jump_chance = 30,
@@ -39,7 +39,10 @@ local dragondef = {
 	run_velocity = 5,
 	jump = true,
 	fly = true,
-   fly_in = {"air","default:water_source", "default:water_flowing", "default:lava_source", "default:lava_flowing"},
+	fly_in = {
+		"air", "default:water_source", "default:water_flowing",
+		"default:lava_source", "default:lava_flowing"
+	},
 	drops = {
 		{name = "dmobs:egg", chance = 1, min = 1, max = 1},
 		{name = "dmobs:dragon_gem", chance = 1, min = 1, max = 1},
@@ -69,7 +72,7 @@ local dragondef = {
 
 
 -- The wild dragon is registered
-mobs:register_mob("dmobs:dragon1", dmobs.deepclone(dragondef) )
+mobs:register_mob("dmobs:dragon1", dmobs.deepclone(dragondef))
 
 -- The def is modified to make it tamed and rideable
 dragondef.type = "npc"
@@ -78,4 +81,4 @@ dragondef.on_rightclick = dmobs.dragon.ride
 dragondef.do_custom = dmobs.dragon.do_custom
 
 -- The tamed version is registered
-mobs:register_mob("dmobs:dragon_red", dmobs.deepclone(dragondef) )
+mobs:register_mob("dmobs:dragon_red", dmobs.deepclone(dragondef))

dragons/dragon2.lua

@@ -10,7 +10,7 @@ local dragondef = {
 	shoot_interval = 2.5,
 	dogshoot_switch = 2,
 	dogshoot_count = 0,
-	dogshoot_count_max =5,
+	dogshoot_count_max = 5,
 	arrow = "dmobs:lightning",
 	shoot_offset = 1,
 	hp_min = 70,
@@ -23,7 +23,7 @@ local dragondef = {
 		{"dmobs_dragon2.png"},
 	},
 	blood_texture = "mobs_blood.png",
-   visual_size = {x=2, y=2},
+	visual_size = {x = 2, y = 2},
 	makes_footstep_sound = true,
 	runaway = false,
 	jump_chance = 30,
@@ -68,13 +68,11 @@ local dragondef = {
 }
 
 
-mobs:register_mob("dmobs:dragon2", dmobs.deepclone(dragondef) )
+mobs:register_mob("dmobs:dragon2", dmobs.deepclone(dragondef))
 
 dragondef.type = "npc"
 dragondef.attacks_monsters = true
-
 dragondef.on_rightclick = dmobs.dragon.ride
-	
 dragondef.do_custom = dmobs.dragon.do_custom
 
-mobs:register_mob("dmobs:dragon_black", dmobs.deepclone(dragondef) )
+mobs:register_mob("dmobs:dragon_black", dmobs.deepclone(dragondef))

dragons/dragon3.lua

@@ -23,7 +23,7 @@ local dragondef = {
 		{"dmobs_dragon3.png"},
 	},
 	blood_texture = "mobs_blood.png",
-   visual_size = {x=2, y=2},
+	visual_size = {x = 2, y = 2},
 	makes_footstep_sound = true,
 	runaway = false,
 	jump_chance = 30,
@@ -68,13 +68,11 @@ local dragondef = {
 }
 
 
-mobs:register_mob("dmobs:dragon3", dmobs.deepclone(dragondef) )
+mobs:register_mob("dmobs:dragon3", dmobs.deepclone(dragondef))
 
 dragondef.type = "npc"
 dragondef.attacks_monsters = true
-
 dragondef.on_rightclick = dmobs.dragon.ride
-	
 dragondef.do_custom = dmobs.dragon.do_custom
 
-mobs:register_mob("dmobs:dragon_green", dmobs.deepclone(dragondef) )
+mobs:register_mob("dmobs:dragon_green", dmobs.deepclone(dragondef))

dragons/dragon4.lua

@@ -23,7 +23,7 @@ local dragondef = {
 		{"dmobs_dragon4.png"},
 	},
 	blood_texture = "mobs_blood.png",
-   visual_size = {x=2, y=2},
+	visual_size = {x = 2, y = 2},
 	makes_footstep_sound = true,
 	runaway = false,
 	jump_chance = 30,
@@ -67,12 +67,11 @@ local dragondef = {
 	on_rightclick = dmobs.dragon.on_rc
 }
 
-mobs:register_mob("dmobs:dragon4", dmobs.deepclone(dragondef) )
+mobs:register_mob("dmobs:dragon4", dmobs.deepclone(dragondef))
 
 dragondef.type = "npc"
 dragondef.attacks_monsters = true
-
 dragondef.on_rightclick = dmobs.dragon.ride
 dragondef.do_custom = dmobs.dragon.do_custom
 
-mobs:register_mob("dmobs:dragon_blue", dmobs.deepclone(dragondef) )
+mobs:register_mob("dmobs:dragon_blue", dmobs.deepclone(dragondef))

dragons/dragon_normal.lua

@@ -1,7 +1,5 @@
 -- 'Generic' dragon
 
-dofile(minetest.get_modpath("dmobs").."/dragons/piloting.lua")
-
 mobs:register_mob("dmobs:dragon", {
 	type = "monster",
 	passive = false,
@@ -28,7 +26,7 @@ mobs:register_mob("dmobs:dragon", {
 		{"dmobs_dragon4.png"},
 	},
 	blood_texture = "mobs_blood.png",
-   visual_size = {x=2, y=2},
+	visual_size = {x = 2, y = 2},
 	makes_footstep_sound = true,
 	runaway = false,
 	jump_chance = 30,

dragons/eggs.lua

@@ -1,23 +1,29 @@
 -- eggs from mobs_dragon --------------------------------------------------------------------------
 
 local dragonpairs = {
-	fire = {colour="red",nest="default:lava_source"},
+	fire = {colour = "red", nest = "default:lava_source"},
-	lightning = {colour="black",nest="default:obsidian"},
+	lightning = {colour = "black", nest = "default:obsidian"},
-	poison = {colour="green",nest="default:cactus"},
+	poison = {colour = "green", nest = "default:cactus"},
-	ice = {colour="blue",nest="default:ice"},
+	ice = {colour = "blue", nest = "default:ice"},
-	great = {colour="great",nest="default:diamond_block"}, -- You've to deserve greatness !'
+	-- You've to deserve greatness !'
+	great = {colour = "great", nest = "default:diamond_block"}
 }
 
 local function egg_transform(pos, node, clicker, item, _)
+
 	local wield_item = clicker:get_wielded_item():get_name()
+
 	if wield_item == "dmobs:dragon_gem" then
 
 		local p = {x = pos.x, y = pos.y - 1, z = pos.z}
 		local corner_name
+
 		for x1 = -1,1 do
 			for z1 = -1,1 do
+
 				p.x = pos.x + x1
 				p.z = pos.z + z1
+
 				local nestfloor_name = minetest.get_node(p).name
 
 				if x1 == -1 and z1 == -1 then
@@ -26,7 +32,6 @@ local function egg_transform(pos, node, clicker, item, _)
 				elseif x1 == 0 and z1 == 0 then -- special case in centre
 					-- must be obsidian
 					if nestfloor_name ~= "default:obsidian" then return end
-
 				else
 					-- else ring must all be of the same type
 					if nestfloor_name ~= corner_name then return end
@@ -35,24 +40,27 @@ local function egg_transform(pos, node, clicker, item, _)
 		end
 
 		local dragon_type
+
 		for element,details in pairs(dragonpairs) do
+
 			if corner_name == details.nest then
 				dragon_type = element
 				break
 			end
 		end
+
 		-- default to Great dragon si it doesn't crash
 		if dragon_type == nil then
 			dragon_type = "great"
 		end
 
-		minetest.chat_send_player(clicker:get_player_name()," ... something seems to be happening .... come back later?")
+		minetest.chat_send_player(clicker:get_player_name(),
+				" ... something seems to be happening .... come back later?")
 
 		minetest.after(dmobs.eggtimer,
 			function(pos, dragon, pname)
 				minetest.set_node(pos, {name="dmobs:dragon_egg_"..dragon_type})
-			end,
+			end, pos
-			pos
 		)
 
 		item:take_item()
@@ -60,43 +68,56 @@ local function egg_transform(pos, node, clicker, item, _)
 end
 
 local function egghatch(pos, node, clicker, item, _)
+
 	local wield_item = clicker:get_wielded_item():get_name()
 	local eggnode = minetest.get_node(pos).name
 
 	for nature,details in pairs(dragonpairs) do
-		if ( wield_item == "dmobs:dragon_gem_"..nature and eggnode:find(nature) ) or
-		   ( wield_item == "dmobs:dragon_gem" and eggnode == "dmobs:dragon_egg_great" ) then -- special case... because inconsiderate/inconsistent naming
 
-		   	minetest.chat_send_player(clicker:get_player_name(), " ... it ... swallowed the gem...")
+		if ( wield_item == "dmobs:dragon_gem_"..nature
+		and eggnode:find(nature) )
+		or ( wield_item == "dmobs:dragon_gem"
+		-- special case... because inconsiderate/inconsistent naming
+		and eggnode == "dmobs:dragon_egg_great" ) then
+
+			minetest.chat_send_player(clicker:get_player_name(),
+					" ... it ... swallowed the gem...")
+
+			minetest.after(dmobs.eggtimer, function(pos, dragon, pname)
 
-			minetest.after(dmobs.eggtimer,
-				function(pos, dragon, pname)
 					local neweggnode = minetest.get_node(pos).name
+
 					if eggnode ~= neweggnode then return end -- prevent infinite hatchings
 
 					minetest.remove_node(pos)
 
 					local thedragon = "dmobs:dragon_"..details.colour
+
 					if eggnode == "dmobs:dragon_egg_great" then
 						thedragon = "dmobs:dragon_great_tame"
 					end
 
 					local ent = minetest.add_entity(pos, thedragon)
+
 					minetest.sound_play("dmobs_chirrup",{pos=pos,max_hear_distance=20})
 
 					local obj = ent:get_luaentity()
+
 					if eggnode ~= "dmobs:dragon_egg_great" then
+
 						ent:set_properties({
 							textures = {"dmobs_dragon_young.png"},
 							visual_size = {x=1, y=1},
 						})
 					end
+
 					obj.tamed = true
 					obj.owner = clicker:get_player_name()
-				end,
+				end, pos, clicker:get_player_name()
-				pos, clicker:get_player_name()
 			)
+
 			item:take_item()
+
 			break
 		end
 	end -- for loop

dragons/great_dragon.lua

@@ -21,7 +21,7 @@ local gdragon_base = {
 		{"dmobs_dragon_great.png"},
 	},
 	blood_texture = "mobs_blood.png",
-	visual_size = {x=2.5, y=2.5},
+	visual_size = {x = 2.5, y = 2.5},
 	makes_footstep_sound = true,
 	runaway = false,
 	jump_chance = 30,
@@ -37,7 +37,10 @@ local gdragon_base = {
 	run_velocity = 5,
 	jump = true,
 	fly = true,
-	fly_in = {"air","default:water_source","default:water_flowing", "default:lava_source","default:lava_flowing"},
+	fly_in = {
+		"air","default:water_source","default:water_flowing",
+		"default:lava_source","default:lava_flowing"
+	},
 	drops = {
 		{name = "dmobs:dragon_egg_great", chance = 1, min = 1, max = 1},
 	},
@@ -62,13 +65,11 @@ local gdragon_base = {
 	knock_back = 2,
 }
 
-mobs:register_mob("dmobs:dragon_great", dmobs.deepclone(gdragon_base) )
+mobs:register_mob("dmobs:dragon_great", dmobs.deepclone(gdragon_base))
 
 gdragon_base.type = "npc"
 gdragon_base.attacks_monsters = true
-
 gdragon_base.on_rightclick = dmobs.dragon.ride
-
 gdragon_base.do_custom = dmobs.dragon.do_custom
 
-mobs:register_mob("dmobs:dragon_great_tame", dmobs.deepclone(gdragon_base) )
+mobs:register_mob("dmobs:dragon_great_tame", dmobs.deepclone(gdragon_base))

dragons/main.lua

@@ -1,9 +1,5 @@
 --thanks to diriel, blert2112 and taikedz
 
-dmobs.dragon = {}
-
-dofile(minetest.get_modpath("dmobs").."/dragons/piloting.lua")
-
 local tamed_dragons = {}
 
 --items and tools
@@ -12,14 +8,17 @@ minetest.register_craftitem("dmobs:dragon_gem_lightning", {
 	description = "Lightning Gem",
 	inventory_image = "dmobs_gem_lightning.png"
 })
+
 minetest.register_craftitem("dmobs:dragon_gem_ice", {
 	description = "Ice Gem",
 	inventory_image = "dmobs_gem_ice.png"
 })
+
 minetest.register_craftitem("dmobs:dragon_gem_fire", {
 	description = "Fire Gem",
 	inventory_image = "dmobs_gem_fire.png"
 })
+
 minetest.register_craftitem("dmobs:dragon_gem_poison", {
 	description = "Poison Gem",
 	inventory_image = "dmobs_gem_poison.png"
@@ -50,5 +49,5 @@ mobs:register_egg("dmobs:dragon_red", "Tamed Fire Dragon", "default_apple.png",
 mobs:register_egg("dmobs:dragon_black", "Tamed Lightning Dragon", "dmobs_lightning.png", 1)
 mobs:register_egg("dmobs:dragon_green", "Tamed Poison Dragon", "dmobs_poison.png", 1)
 mobs:register_egg("dmobs:dragon_blue", "Tamed Ice Dragon", "default_ice.png", 1)
-mobs:register_egg("dmobs:dragon_great_tame", "Tamed Great Dragon", "default_lava_source_animated.png", 1)
+mobs:register_egg("dmobs:dragon_great_tame", "Tamed Great Dragon",
-
+		"default_lava_source_animated.png", 1)

dragons/piloting.lua

@@ -4,21 +4,30 @@ if not dmobs.dragon then
 end
 
 dmobs.dragon.step_custom = function(self, dtime)
+
 	if self.driver then
+
 		object_fly(self, dtime, 10, true, "dmobs:fire_plyr", "walk", "stand")
+
 		if self.state == "attack" then
 			self.state = nil
 		end
+
 		return false
 	end
+
 	return true
 end
 
+
 dmobs.dragon.ride = function(self, clicker)
+
 	if self.tamed and self.owner == clicker:get_player_name() then
+
 		local inv = clicker:get_inventory()
 
 		if self.driver and clicker == self.driver then
+
 			object_detach(self, clicker, {x=1, y=0, z=1})
 
 			if inv:room_for_item("main", "mobs:saddle") then
@@ -28,8 +37,11 @@ dmobs.dragon.ride = function(self, clicker)
 			end
 
 		elseif not self.driver then
+
 			if clicker:get_wielded_item():get_name() == "mobs:saddle" then
+
 				object_attach(self, clicker, {x=0, y=12, z=4}, {x=0, y=0, z=4})
+
 				inv:remove_item("main", "mobs:saddle")
 			end
 		end
@@ -38,17 +50,23 @@ end
 
 
 dmobs.dragon.on_rc = function(self, clicker)
+
 	if not clicker or not clicker:is_player() then
 		return
 	end
+
 	if mobs:feed_tame(self, clicker, 1, false, false) then
 		return
 	end
+
 	dmobs.dragon.ride(self, clicker)
 end
 
+
 dmobs.dragon.do_custom = function(self, dtime)
+
 	if self.driver then
+
 		object_fly(self, dtime, 10, true, "dmobs:fire_plyr", "walk", "stand")
 
 		if self.state == "attack" then
@@ -57,5 +75,6 @@ dmobs.dragon.do_custom = function(self, dtime)
 
 		return false
 	end
+
 	return true
 end

dragons/water_dragon.lua

@@ -17,7 +17,7 @@ mobs:register_mob("dmobs:waterdragon", {
 	hp_max = 127,
 	armor = 100,
 	collisionbox = {-0.4, -0.5, -0.4, 0.4, 5, 0.4},
-	visual_size = {x=4, y=4},
+	visual_size = {x = 4, y = 4},
 	visual = "mesh",
 	mesh = "water_dragon.b3d",
 	textures = {
@@ -57,8 +57,10 @@ mobs:register_mob("dmobs:waterdragon", {
 		shoot_end = 40,
 	},
 	do_custom = function(self)
+
 		--follow thanks to TenPlus1 and Byakuren
 		if not self.hydra then
+
 			self.hydra = true -- flip switch so this part is done only once
 
 			-- get head position and define a few temp variables
@@ -66,12 +68,16 @@ mobs:register_mob("dmobs:waterdragon", {
 			local obj, obj2, ent
 
 			-- add body and make it follow head
-                obj = minetest.add_entity({x=pos.x+1, y=pos.y, z=pos.z}, "dmobs:waterdragon_2")
+			obj = minetest.add_entity(
+					{x=pos.x+1, y=pos.y, z=pos.z}, "dmobs:waterdragon_2")
+
 			ent = obj:get_luaentity()
 			ent.following = self.object
 
 			-- add body and make it follow previous body segment
-                obj2 = minetest.add_entity({x=pos.x-1, y=pos.y, z=pos.z}, "dmobs:waterdragon_2")
+			obj2 = minetest.add_entity(
+					{x=pos.x-1, y=pos.y, z=pos.z}, "dmobs:waterdragon_2")
+
 			ent = obj2:get_luaentity()
 			ent.following = self.object
 		end
@@ -79,7 +85,6 @@ mobs:register_mob("dmobs:waterdragon", {
 })
 
 
-
 mobs:register_mob("dmobs:waterdragon_2", {
 	type = "monster",
 	passive = false,

init.lua

@@ -1,121 +1,102 @@
-dmobs = {}
-
 -- dmobs by D00Med
 
 -- mounts api by D00Med and lib_mount api by blert2112
 
-dofile(minetest.get_modpath("dmobs").."/api.lua")
+dmobs = {dragon = {}}
+
+local dpath = minetest.get_modpath("dmobs") .. "/"
+
+dofile(dpath .. "api.lua")
+
 
 -- Enable dragons (disable to remove tamed dragons and dragon bosses)
-dmobs.dragons = minetest.settings:get_bool("dmobs.dragons")
+dmobs.dragons = minetest.settings:get_bool("dmobs.dragons", true)
-if dmobs.dragons == nil then
+dmobs.regulars = minetest.settings:get_bool("dmobs.regulars", true)
-dmobs.dragons = true
-end
-dmobs.regulars = minetest.settings:get_bool("dmobs.regulars")
-if dmobs.regulars == nil then
-dmobs.regulars = true
-end
-
 
 -- Enable fireballs/explosions
-dmobs.destructive = minetest.settings:get_bool("dmobs.destructive") or false
+dmobs.destructive = minetest.settings:get_bool("dmobs.destructive", false)
 
 -- Timer for the egg mechanics
 dmobs.eggtimer = tonumber(minetest.settings:get("dmobs.eggtimer") ) or 100
 
 
-
 -- Table cloning to reduce code repetition
-dmobs.deepclone = function(t) -- deep-copy a table -- from https://gist.github.com/MihailJP/3931841
+-- deep-copy a table -- from https://gist.github.com/MihailJP/3931841
+dmobs.deepclone = function(t)
+
 	if type(t) ~= "table" then return t end
 
 	local target = {}
 
 	for k, v in pairs(t) do
+
 		if k ~= "__index" and type(v) == "table" then -- omit circular reference
 			target[k] = dmobs.deepclone(v)
 		else
 			target[k] = v
 		end
 	end
+
 	return target
 end
 
--- Start loading ----------------------------------------------------------------------------------
-
-local function loadmob(mobname,dir)
-	dir = dir or "/mobs/"
-	dofile(minetest.get_modpath("dmobs")..dir..mobname..".lua")
-end
-
--- regular mobs
-
-local mobslist = {
-	-- friendlies
-	"pig",
-	"panda",
-	"tortoise",
-	"golem_friendly",
-	"nyan",
-	"gnorm",
-	"hedgehog",
-	"owl",
-	"whale",
-	"badger",
-	"butterfly",
-	"elephant",
-
-	-- baddies
-	"pig_evil",
-	"fox",
-	"rat",
-	"wasps",
-	"treeman",
-	"golem",
-	"skeleton",
-	"orc",
-	"ogre",
-}
 
 if dmobs.regulars then
-	for _,mobname in pairs(mobslist) do
+
-		loadmob(mobname)
+	-- load friendly mobs
-	end
+	dofile(dpath .. "mobs/pig.lua")
+	dofile(dpath .. "mobs/panda.lua")
+	dofile(dpath .. "mobs/tortoise.lua")
+	dofile(dpath .. "mobs/golem_friendly.lua")
+	dofile(dpath .. "mobs/nyan.lua")
+	dofile(dpath .. "mobs/gnorm.lua")
+	dofile(dpath .. "mobs/hedgehog.lua")
+	dofile(dpath .. "mobs/owl.lua")
+	dofile(dpath .. "mobs/whale.lua")
+	dofile(dpath .. "mobs/badger.lua")
+	dofile(dpath .. "mobs/butterfly.lua")
+	dofile(dpath .. "mobs/elephant.lua")
+
+	-- load baddies
+	dofile(dpath .. "mobs/pig_evil.lua")
+	dofile(dpath .. "mobs/fox.lua")
+	dofile(dpath .. "mobs/rat.lua")
+	dofile(dpath .. "mobs/wasps.lua")
+	dofile(dpath .. "mobs/treeman.lua")
+	dofile(dpath .. "mobs/golem.lua")
+	dofile(dpath .. "mobs/skeleton.lua")
+	dofile(dpath .. "mobs/orc.lua")
+	dofile(dpath .. "mobs/ogre.lua")
 end
 
----------------
+-- dragons!!
--- dragons!! --
+dofile(dpath .. "dragons/dragon_normal.lua")
----------------
+dofile(dpath .. "dragons/piloting.lua")
 
-loadmob("dragon_normal","/dragons/")
 if dmobs.dragons then
-	loadmob("main","/dragons/")
+	dofile(dpath .. "dragons/main.lua")
-	loadmob("dragon1","/dragons/")
+	dofile(dpath .. "dragons/dragon1.lua")
-	loadmob("dragon2","/dragons/")
+	dofile(dpath .. "dragons/dragon2.lua")
-	loadmob("dragon3","/dragons/")
+	dofile(dpath .. "dragons/dragon3.lua")
-	loadmob("dragon4","/dragons/")
+	dofile(dpath .. "dragons/dragon4.lua")
-	loadmob("great_dragon","/dragons/")
+	dofile(dpath .. "dragons/great_dragon.lua")
-	loadmob("water_dragon","/dragons/")
+	dofile(dpath .. "dragons/water_dragon.lua")
-	loadmob("wyvern","/dragons/")
+	dofile(dpath .. "dragons/wyvern.lua")
-
+	dofile(dpath .. "dragons/eggs.lua")
-	dofile(minetest.get_modpath("dmobs").."/dragons/eggs.lua")
 end
-dofile(minetest.get_modpath("dmobs").."/arrows/dragonfire.lua")
+
-dofile(minetest.get_modpath("dmobs").."/arrows/dragonarrows.lua")
+dofile(dpath .. "arrows/dragonfire.lua")
+dofile(dpath .. "arrows/dragonarrows.lua")
+dofile(dpath .. "arrows/sting.lua")
 
 -- General arrow definitions
-
 if dmobs.destructive == true then
-	dofile(minetest.get_modpath("dmobs").."/arrows/fire_explosive.lua")
+	dofile(dpath .. "arrows/fire_explosive.lua")
 else
-	dofile(minetest.get_modpath("dmobs").."/arrows/fire.lua")
+	dofile(dpath .. "arrows/fire.lua")
 end
 
-dofile(minetest.get_modpath("dmobs").."/nodes.lua")
+dofile(dpath .. "nodes.lua")
-dofile(minetest.get_modpath("dmobs").."/arrows/sting.lua")
 
 -- Spawning
-
+dofile(dpath .. "spawn.lua")
-
-dofile(minetest.get_modpath("dmobs").."/spawn.lua")
-dofile(minetest.get_modpath("dmobs").."/saddle.lua")

mobs/badger.lua

@@ -41,7 +41,6 @@ mobs:register_mob("dmobs:badger", {
 		run_end = 58,
 		punch_start = 60,
 		punch_end = 80,
-
 	},
 	on_rightclick = function(self, clicker)
 

mobs/butterfly.lua

@@ -2,38 +2,49 @@
 --butterflies
 
 minetest.register_abm({
-	nodenames = {"flowers:flower_rose", "flowers:flower_tulip",
+	nodenames = {
+		"flowers:flower_rose", "flowers:flower_tulip",
 		"flowers:flower_dandelion_yellow", "flowers:flower_viola",
-		"flowers:flower_dandelion_white", "flowers:flower_geranium"},
+		"flowers:flower_dandelion_white", "flowers:flower_geranium"
-	interval = 10.0,
+	},
+	interval = 10,
 	chance = 10,
 	action = function(pos, node, active_object_count, active_object_count_wider)
 		minetest.add_entity({x=pos.x,y=pos.y+0.3,z=pos.z}, "dmobs:butterfly")
 	end
 })
 
+
 minetest.register_entity("dmobs:butterfly", {
 	visual = "mesh",
 	mesh = "butterfly.b3d",
 	physical = true,
-	textures = {"dmobs_butterfly.png",},
+	textures = {"dmobs_butterfly.png"},
 	visual_size = {x=0.3, y=0.3},
+	collisionbox = {0,0,0,0,0.1,0},
 	on_activate = function(self)
+
 		num = math.random(1,4)
+
 		self.object:set_properties({textures = {"dmobs_butterfly"..num..".png",},})
 		self.object:set_animation({x=1, y=10}, 20, 0)
 		self.object:set_yaw(math.pi+num)
+
 		minetest.after(10, function()
 			self.object:remove()
 		end)
 	end,
+
 	on_step = function(self)
+
 		local pos = self.object:get_pos()
 		local vec = self.object:get_velocity()
 		local num = math.random(-math.pi, math.pi)
+
 		self.object:set_yaw(math.pi+num)
-		self.object:set_velocity({x=-math.sin(12*pos.y), y=math.cos(12*pos.x), z=-math.sin(12*pos.y)})
+		self.object:set_velocity(
-		self.object:set_acceleration({x=-math.sin(6*vec.y), y=math.cos(6*vec.x), z=-math.sin(6*vec.y)})
+				{x=-math.sin(12*pos.y), y=math.cos(12*pos.x), z=-math.sin(12*pos.y)})
+		self.object:set_acceleration(
+				{x=-math.sin(6*vec.y), y=math.cos(6*vec.x), z=-math.sin(6*vec.y)})
 	end,
-	collisionbox = {0,0,0,0,0.1,0},
 })

mobs/elephant.lua

@@ -26,7 +26,9 @@ mobs:register_mob("dmobs:elephant", {
 	fall_speed = -20, -- extra heavy!
 	fear_height = 2,
 	replace_rate = 10,
-	replace_what = {"default:grass_3", "default:grass_4", "default:grass_5", "ethereal:bamboo"},
+	replace_what = {
+		"default:grass_3", "default:grass_4", "default:grass_5", "ethereal:bamboo"
+	},
 	replace_with = "air",
 	follow = {"farming:wheat"},
 	view_range = 14,

mobs/fox.lua

@@ -1,4 +1,5 @@
 -- Fox
+
 mobs:register_mob("dmobs:fox", {
 	type = "monster",
 	attacks_monsters = true,
@@ -36,7 +37,10 @@ mobs:register_mob("dmobs:fox", {
 	fall_damage = 1,
 	fear_height = 4,
 	replace_rate = 10,
-	replace_what = {"farming:wheat_5", "default:fence_wood", "default:grass_5", "default:dirt_with_grass"},
+	replace_what = {
+		"farming:wheat_5", "default:fence_wood", "default:grass_5",
+		"default:dirt_with_grass"
+	},
 	replace_with = "air",
 	follow = {"mobs:meat_raw"},
 	view_range = 14,

mobs/gnorm.lua

@@ -28,7 +28,10 @@ mobs:register_mob("dmobs:gnorm", {
 	fall_speed = -6,
 	fear_height = 4,
 	replace_rate = 10,
-	replace_what = {"default:apple", "default:stone", "default:stone_with_coal", "default:fence_wood"},
+	replace_what = {
+		"default:apple", "default:stone", "default:stone_with_coal",
+		"default:fence_wood"
+	},
 	replace_with = "air",
 	follow = {"default:apple"},
 	view_range = 14,

mobs/golem.lua

@@ -1,6 +1,5 @@
 --stone golem
 
-
 mobs:register_mob("dmobs:golem", {
 	type = "monster",
 	reach = 3,

mobs/golem_friendly.lua

@@ -1,4 +1,3 @@
-
 mobs:register_mob("dmobs:golem_friendly", {
 	type = "npc",
 	reach = 3,
@@ -41,4 +40,5 @@ mobs:register_mob("dmobs:golem_friendly", {
 	},
 })
 
+
 mobs:register_egg("dmobs:golem_friendly", "Stone Golem (friendly)", "default_stone.png", 1)

mobs/hedgehog.lua

@@ -34,7 +34,6 @@ mobs:register_mob("dmobs:hedgehog", {
 		stand_end = 10,
 		run_start = 1,
 		run_end = 10,
-
 	},
 	on_rightclick = function(self, clicker)
 

mobs/nyan.lua

@@ -44,25 +44,29 @@ mobs:register_mob("dmobs:nyan", {
 
 	},
 	do_custom = function(self)
-   local apos = self.object:get_pos()
+
+		local apos = self.object:get_pos() ; if not apos then return end
 		local vec = self.object:get_velocity()
-		local part = minetest.add_particlespawner(
+
-			5, --amount
+		minetest.add_particlespawner({
-			0.3, --time
+			amount = 5,
-			{x=apos.x-0.1, y=apos.y+0.3, z=apos.z-0.1}, --minpos
+			time = 0.3,
-			{x=apos.x+0.1, y=apos.y+0.4, z=apos.z+0.1}, --maxpos
+			minpos = {x=apos.x-0.1, y=apos.y+0.3, z=apos.z-0.1},
-			{x=-0, y=-0, z=-0}, --minvel
+			maxpos = {x=apos.x+0.1, y=apos.y+0.4, z=apos.z+0.1},
-			{x=0, y=0, z=0}, --maxvel
+			minvel = {x=-0, y=-0, z=-0},
-			{x=0,y=0,z=0}, --minacc
+			maxvel = {x=0, y=0, z=0},
-			{x=-vec.x,y=0,z=-vec.z}, --maxacc
+			minacc = {x=0,y=0,z=0},
-			0.5, --minexptime
+			maxacc = {x=-vec.x,y=0,z=-vec.z},
-			1.5, --maxexptime
+			minexptime = 0.5,
-			3, --minsize
+			maxexptime = 1.5,
-			5, --maxsize
+			minsize = 3,
-			false, --collisiondetection
+			maxsize = 5,
-			"dmobs_rainbow.png" --texture
+			collisiondetection = false,
-		)
+			texture = "dmobs_rainbow.png",
+			glow = 10
+		})
 	end,
+
 	on_rightclick = function(self, clicker)
 
 		if mobs:feed_tame(self, clicker, 8, true, true) then

mobs/ogre.lua

@@ -1,4 +1,5 @@
 -- Ogre
+
 mobs:register_mob("dmobs:ogre", {
 	type = "monster",
 	passive = false,
@@ -42,8 +43,8 @@ mobs:register_mob("dmobs:ogre", {
 		run_end = 38,
 		punch_start = 70,
 		punch_end = 100,
-
 	},
 })
 
+
 mobs:register_egg("dmobs:ogre", "Ogre", "default_desert_sand.png", 1)

mobs/orc.lua

@@ -1,5 +1,6 @@
 
 -- Orc
+
 mobs:register_mob("dmobs:orc", {
 	type = "monster",
 	passive = false,
@@ -42,10 +43,10 @@ mobs:register_mob("dmobs:orc", {
 		run_end = 18,
 		punch_start = 20,
 		punch_end = 30,
-
 	},
 })
 
+
 -- Orc (Redesign)
 mobs:register_mob("dmobs:orc2", {
 	type = "monster",
@@ -89,10 +90,10 @@ mobs:register_mob("dmobs:orc2", {
 		run_end = 40,
 		punch_start = 1,
 		punch_end = 15,
-
 	},
 })
 
 
-mobs:register_egg("dmobs:orc2", "Morgul Orc", "default_desert_sand.png", 1) -- new and improved, hey
 mobs:register_egg("dmobs:orc", "Orc", "default_desert_sand.png", 1)
+-- new and improved, hey
+mobs:register_egg("dmobs:orc2", "Morgul Orc", "default_desert_sand.png", 1)

mobs/owl.lua

@@ -21,13 +21,18 @@ mobs:register_mob("dmobs:owl", {
 	light_damage = 0,
 	view_range = 1,
 	do_custom = function(self)
+
 		local daytime = minetest.get_timeofday()*24000
+
 		if daytime <=6000 then
+
 			self.object:set_properties({
 				textures = {"dmobs_owl_awake.png"},
 				mesh = "owl.b3d",
 			})
+
 		elseif daytime >=6000 then
+
 			self.object:set_properties({
 				textures = {"dmobs_owl.png"},
 				mesh = "owl.b3d",
@@ -38,7 +43,6 @@ mobs:register_mob("dmobs:owl", {
 		speed_normal = 1,
 		walk_start = 1,
 		walk_end = 50,
-
 	},
 })
 

mobs/panda.lua

@@ -1,5 +1,3 @@
-
-
 mobs:register_mob("dmobs:panda", {
 	type = "animal",
 	passive = false,
@@ -32,7 +30,9 @@ mobs:register_mob("dmobs:panda", {
 	fear_height = 4,
 	jump_height = 2,
 	replace_rate = 10,
-	replace_what = {"default:grass_3", "default:grass_4", "default:grass_5", "ethereal:bamboo"},
+	replace_what = {
+		"default:grass_3", "default:grass_4", "default:grass_5", "ethereal:bamboo"
+	},
 	replace_with = "air",
 	follow = {"default:papyrus"},
 	view_range = 14,
@@ -47,8 +47,8 @@ mobs:register_mob("dmobs:panda", {
 		run_end = 45,
 		punch_start = 46,
 		punch_end = 57,
-
 	},
+
 	on_rightclick = function(self, clicker)
 
 		if mobs:feed_tame(self, clicker, 8, true, true) then

mobs/pig.lua

@@ -33,12 +33,6 @@ mobs:register_mob("dmobs:pig", {
 		random = "mobs_pig",
 		explode = "tnt_explode",
 	},
-	do_custom = function(self)
-		if self.state == "attack" then
-			self.fly = false
-			self.fall_speed = -4
-		end
-	end,
 	water_damage = 0,
 	lava_damage = 2,
 	light_damage = 0,
@@ -55,6 +49,15 @@ mobs:register_mob("dmobs:pig", {
 		run_end = 28,
 
 	},
+
+	do_custom = function(self)
+
+		if self.state == "attack" then
+			self.fly = false
+			self.fall_speed = -4
+		end
+	end,
+
 	on_rightclick = function(self, clicker)
 
 		if mobs:feed_tame(self, clicker, 8, true, true) then

mobs/pig_evil.lua

@@ -32,12 +32,6 @@ local pigdef = {
 	sounds = {
 		random = "mobs_pig",
 	},
-	do_custom = function(self)
-		if self.state == "attack" then
-			self.fly = false
-			self.fall_speed = -4
-		end
-	end,
 	water_damage = 0,
 	lava_damage = 2,
 	light_damage = 0,
@@ -52,8 +46,16 @@ local pigdef = {
 		stand_end = 20,
 		run_start = 22,
 		run_end = 28,
-
 	},
+
+	do_custom = function(self)
+
+		if self.state == "attack" then
+			self.fly = false
+			self.fall_speed = -4
+		end
+	end,
+
 	on_rightclick = function(self, clicker)
 
 		if mobs:feed_tame(self, clicker, 8, true, true) then
@@ -71,5 +73,4 @@ end
 
 mobs:register_mob("dmobs:pig_evil", pigdef)
 
-
 mobs:register_egg("dmobs:pig_evil", "Kamikaze Pig", "wool_pink.png", 1)

mobs/rat.lua

@@ -1,4 +1,4 @@
---Rat
+-- Rat
 
 mobs:register_mob("dmobs:rat", {
 	type = "monster",
@@ -30,7 +30,9 @@ mobs:register_mob("dmobs:rat", {
 	fall_damage = 1,
 	fear_height = 5,
 	replace_rate = 10,
-	replace_what = {"farming:wheat_5", "farming:wheat_4", "farming:wheat_2", "farming:wheat_3"},
+	replace_what = {
+		"farming:wheat_5", "farming:wheat_4", "farming:wheat_2", "farming:wheat_3"
+	},
 	replace_with = "air",
 	follow = {"mobs_animal:cheese"},
 	view_range = 14,

mobs/skeleton.lua

@@ -1,6 +1,5 @@
 --skeleton
 
-
 mobs:register_mob("dmobs:skeleton", {
 	type = "monster",
 	reach = 3,

mobs/tortoise.lua

@@ -1,4 +1,3 @@
-
 mobs:register_mob("dmobs:tortoise", {
 	type = "animal",
 	passive = false,
@@ -44,6 +43,7 @@ mobs:register_mob("dmobs:tortoise", {
 		run_end = 43,
 
 	},
+
 	on_rightclick = function(self, clicker)
 
 		if mobs:feed_tame(self, clicker, 8, true, true) then

mobs/wasps.lua

@@ -1,4 +1,5 @@
 --Wasps!
+
 mobs:register_mob("dmobs:wasp", {
 	type = "monster",
 	reach = 1,
@@ -46,6 +47,7 @@ mobs:register_mob("dmobs:wasp", {
 
 mobs:register_egg("dmobs:wasp", "Wasp", "dmobs_wasp_bg.png", 1)
 
+
 mobs:register_mob("dmobs:wasp_leader", {
 	type = "monster",
 	reach = 1,
@@ -79,12 +81,6 @@ mobs:register_mob("dmobs:wasp_leader", {
 	drops = {
 		{name = "default:gold_lump", chance = 1, min = 3, max = 5},
 	},
-	do_custom = function(self)
-	if math.random(1, 500) >= 500 then
-		local pos = self.object:get_pos()
-		minetest.add_entity(pos, "dmobs:wasp")
-		end
-	end,
 	replace_rate = 700,
 	replace_what = {"air"},
 	replace_with = "dmobs:hive",
@@ -104,6 +100,16 @@ mobs:register_mob("dmobs:wasp_leader", {
 		shoot_start = 6,
 		shoot_end = 15,
 	},
+
+	do_custom = function(self)
+
+		if math.random(1, 500) >= 500 then
+
+			local pos = self.object:get_pos()
+
+			minetest.add_entity(pos, "dmobs:wasp")
+		end
+	end,
 })
 
 

mobs/whale.lua

@@ -46,8 +46,8 @@ mobs:register_mob("dmobs:whale", {
 		stand_end = 39,
 		run_start = 2,
 		run_end = 39,
-
 	},
+
 	on_rightclick = function(self, clicker)
 
 		if mobs:feed_tame(self, clicker, 8, true, true) then

nodes.lua

@@ -1,7 +1,4 @@
-
+-- wasps nest
-
---wasps nest
-
 minetest.register_node("dmobs:hive", {
 	description = "Wasp Nest",
 	tiles = {"dmobs_hive.png"},
@@ -14,17 +11,21 @@ minetest.register_node("dmobs:hive", {
 	end,
 })
 
---golem
+-- golem
-
 minetest.register_node("dmobs:golemstone", {
 	description = "golem stone",
 	tiles = {"dmobs_golem_stone.png",},
 	groups = {cracky=1},
 	on_construct = function(pos, node, _)
+
 		local node1 = minetest.get_node({x=pos.x, y=pos.y-1, z=pos.z}).name
 		local node2 = minetest.get_node({x=pos.x, y=pos.y-2, z=pos.z}).name
 		local node3 = minetest.get_node({x=pos.x, y=pos.y+1, z=pos.z}).name
-		if node1 == "default:stone" and node2 == "default:stone" and node3 == "air" then
+
+		if node1 == "default:stone"
+		and node2 == "default:stone"
+		and node3 == "air" then
+
 			minetest.add_entity(pos, "dmobs:golem_friendly")
 			minetest.remove_node({x=pos.x, y=pos.y-1, z=pos.z})
 			minetest.remove_node({x=pos.x, y=pos.y-2, z=pos.z})

saddle.lua

@@ -1,43 +0,0 @@
---saddle license
-
--- **mobs_saddle.png**
--- -------------------
--- The MIT License (MIT)
-
--- Copyright (c) 2014 Krupnov Pavel
-
--- Permission is hereby granted, free of charge, to any person obtaining a copy
--- of this software and associated documentation files (the "Software"), to deal
--- in the Software without restriction, including without limitation the rights
--- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
--- copies of the Software, and to permit persons to whom the Software is
--- furnished to do so, subject to the following conditions:
-
--- The above copyright notice and this permission notice shall be included in
--- all copies or substantial portions of the Software.
-
--- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
--- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
--- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
--- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
--- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
--- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
--- THE SOFTWARE.
-
-
--- saddle (if not already available)
-if not minetest.get_modpath("mobs_horse") then
-	minetest.register_craftitem(":mobs:saddle", {
-		description = "Saddle",
-		inventory_image = "mobs_saddle.png"
-	})
-
-	minetest.register_craft({
-		output = "mobs:saddle",
-		recipe = {
-			{"mobs:leather", "mobs:leather", "mobs:leather"},
-			{"mobs:leather", "default:steel_ingot", "mobs:leather"},
-			{"mobs:leather", "default:steel_ingot", "mobs:leather"}
-		}
-	})
-end