Merge pull request #12 from taikedz/dragonplus

Dragonplus

dragons/dragon_normal.lua

@@ -1,5 +1,7 @@
 --dragon
 
+dofile(minetest.get_modpath("dmobs").."/dragons/piloting.lua")
+
 mobs:register_mob("dmobs:dragon", {
    type = "monster",
    passive = false,
@@ -63,6 +65,8 @@ mobs:register_mob("dmobs:dragon", {
 	  punch_end = 47,
    },
 	knock_back = 2,
+	do_custom = dmobs.dragon.step_custom,
+	on_rightclick = dmobs.dragon.on_rc
 })
 
 

dragons/main.lua

@@ -2,66 +2,10 @@
 
 dmobs.dragon = {}
 
-dmobs.dragon.step_custom = function(self, dtime)
+dofile(minetest.get_modpath("dmobs").."/dragons/piloting.lua")
-	if self.driver then
-		lib_mount.drive(self, dtime, "walk", "stand", true)
-		if self.state == "attack" then
-			self.state = nil
-		end
-		return false
-	end
-	return true
-end
 
 local tamed_dragons = {}
 
-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
-					inv:add_item("main", "mobs:saddle")
-			else
-					minetest.add_item(clicker.getpos(), "mobs:saddle")
-			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
-	end
-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
-			self.state = "idle"
-		end
-		
-		return false
-	end
-	return true
-end
-
-
 --items and tools
 
 minetest.register_craftitem("dmobs:dragon_gem_lightning", {

dragons/piloting.lua

@@ -0,0 +1,61 @@
+
+if not dmobs.dragon then
+	dmobs.dragon = {}
+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
+					inv:add_item("main", "mobs:saddle")
+			else
+					minetest.add_item(clicker.getpos(), "mobs:saddle")
+			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
+	end
+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
+			self.state = "idle"
+		end
+		
+		return false
+	end
+	return true
+end

init.lua

@@ -8,6 +8,7 @@ dofile(minetest.get_modpath("dmobs").."/api.lua")
 
 -- Enable dragons (disable to remove tamed dragons and dragon bosses)
 dmobs.dragons = minetest.setting_getbool("dmobs.dragons") or false
+dmobs.regulars = minetest.setting_getbool("dmobs.regulars") or true
 
 -- Enable fireballs/explosions
 dmobs.destructive = minetest.setting_getbool("dmobs.destructive") or false
@@ -68,9 +69,11 @@ local mobslist = {
 	"ogre",
 }
 
+if dmobs.regulars then
 	for _,mobname in pairs(mobslist) do
 		loadmob(mobname)
 	end
+end
 
 -- dragons!!
 
@@ -87,9 +90,9 @@ else
 	loadmob("wyvern","/dragons/")
 	
 	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")
-end
 
 -- General arrow definitions
 

spawn.lua

@@ -1,3 +1,4 @@
+if dmobs.regulars then
 	-- friendlies
 
 	mobs:register_spawn("dmobs:nyan", {"default:pine_needles","default:leaves"}, 20, 10, 50000, 2, 31000)
@@ -35,15 +36,18 @@ end
 	mobs:register_spawn("dmobs:rat", {"default:stone","default:sand"}, 20, 0, 32000, 2, 31000)
 	mobs:register_spawn("dmobs:treeman", {"default:leaves", "default:pine_needles"}, 7, 0, 16000, 2, 31000)
 	mobs:register_spawn("dmobs:skeleton", {"default:stone"}, 7, 0, 16000, 2, 31000)
+end
 
 -- dragons
 
+if not dmobs.dragons then
 	mobs:register_spawn("dmobs:dragon", {"default:leaves","default:dirt_with_grass"}, 20, 10, 64000, 2, 31000)
 
+else
 	mobs:register_spawn("dmobs:dragon2", {"default:pine_needles"}, 20, 10, 64000, 2, 31000)
 	mobs:register_spawn("dmobs:dragon3", {"default:acacia_leaves","default:dirt_with_dry_grass"}, 20, 10, 64000, 2, 31000)
 	mobs:register_spawn("dmobs:dragon4", {"default:jungleleaves"}, 20, 10, 64000, 2, 31000)
 	mobs:register_spawn("dmobs:waterdragon", {"default:water_source"}, 20, 10, 32000, 1, 31000, false)
 	mobs:register_spawn("dmobs:wyvern",	{"default:leaves"}, 20, 10, 32000, 1, 31000, false)
 	mobs:register_spawn("dmobs:dragon_great", {"default:lava_source"}, 20, 0, 64000, -21000, 1000, false)
-
+end