Merge branch 'add_rideable_ostrich' of Xachman/Epic into master

mods/desert_life/ostrich.lua

@@ -16,7 +16,7 @@ mobs:register_mob("desert_life:ostrich", {
    textures = {
       {'dl_ostrich.png'},
    },
-    visual_size = {x=9, y=9},
+   visual_size = {x=9, y=9},
    makes_footstep_sound = true,
    walk_velocity = 1,
    run_velocity = 3,
@@ -49,6 +49,109 @@ mobs:register_mob("desert_life:ostrich", {
    replace_what = {'group:flora', 'group:plant'},
    replace_with = 'air',
    replace_rate = 1,
+	do_custom = function(self, dtime)
+
+		-- set needed values if not already present
+		if not self.v2 then
+			self.v2 = 0
+			self.max_speed_forward = 6
+			self.max_speed_reverse = 2
+			self.accel = 6
+			self.terrain_type = 3
+			self.driver_attach_at = {x = 0, y = y_off, z = -0.5}
+			self.driver_eye_offset = {x = 0, y = 3, z = 0}
+         	self.driver_scale = {x = .125, y = .125}
+		end
+
+		-- if driver present allow control of horse
+		if self.driver then
+
+			mobs.drive(self, "walk", "stand", false, dtime)
+
+			return false -- skip rest of mob functions
+		end
+
+		return true
+	end,
+	on_die = function(self, pos)
+
+		-- drop saddle when horse is killed while riding
+		-- also detach from horse properly
+		if self.driver then
+
+			minetest.add_item(pos, "mobs:saddle")
+
+			mobs.detach(self.driver, {x = 1, y = 0, z = 1})
+
+			self.saddle = nil
+		end
+
+		-- drop any horseshoes added
+		if self.shoed then
+			minetest.add_item(pos, self.shoed)
+		end
+
+	end,
+	on_rightclick = function(self, clicker)
+
+		-- make sure player is clicking
+		if not clicker or not clicker:is_player() then
+			return
+		end
+
+		-- feed, tame or heal horse
+		if mobs:feed_tame(self, clicker, 10, true, true) then
+			return
+		end
+
+		-- applying protection rune
+		if mobs:protect(self, clicker) then
+			return
+		end
+
+		-- make sure tamed horse is being clicked by owner only
+		if self.tamed and self.owner == clicker:get_player_name() then
+
+			local inv = clicker:get_inventory()
+			local tool = clicker:get_wielded_item()
+			local item = tool:get_name()
+
+			-- detatch player already riding horse
+			if self.driver and clicker == self.driver then
+
+				mobs.detach(clicker, {x = 1, y = 0, z = 1})
+
+				-- add saddle back to inventory
+				if inv:room_for_item("main", "mobs:saddle") then
+					inv:add_item("main", "mobs:saddle")
+				else
+					minetest.add_item(clicker:get_pos(), "mobs:saddle")
+				end
+
+				self.saddle = nil
+
+			-- attach player to horse
+			elseif (not self.driver and not self.child
+			and clicker:get_wielded_item():get_name() == "mobs:saddle")
+			or self.saddle then
+
+				self.object:set_properties()
+				print(self.object)
+				mobs.attach(self, clicker)
+
+				-- take saddle from inventory
+				if not self.saddle then
+					inv:remove_item("main", "mobs:saddle")
+				end
+
+				self.saddle = true
+			end
+
+		end
+
+		-- used to capture horse with magic lasso
+		mobs:capture_mob(self, clicker, 0, 0, 80, false, nil)
+	end
 })
 
 mobs:spawn({
@@ -60,3 +163,6 @@ mobs:spawn({
    chance = 10000,
    active_object_count = 5,
 })
+
+
+mobs:register_egg("desert_life:ostrich", "Ostrich", "wool.png^[multiply:#40230f", 1)