more dungeons

mods/hyrule_mapgen/mapgen.lua

@@ -1855,9 +1855,14 @@ minetest.register_on_generated(function(minp, maxp)
 				minetest.place_schematic(pos, minetest.get_modpath("hyrule_mapgen").."/schematics/dungeon_retro"..number..".mts", random, {}, true)
 				minetest.add_node({x=pos.x+math.random(1,12), y=pos.y+1, z=pos.z+math.random(1,12)}, {name = "mobs_loz:mimic_chest"})
 			else
-			local number = math.random(1,2)
+			local number = math.random(1,5)
+				if math.random(1,5) == 1 then
+				minetest.place_schematic(pos, minetest.get_modpath("hyrule_mapgen").."/schematics/dungeon"..number..".mts", random, {{["hyrule_mapgen:chest"] = "hyrule_mapgen:chest_key",}}, true)
+				minetest.add_node({x=pos.x+math.random(1,12), y=pos.y+1, z=pos.z+math.random(1,12)}, {name = "mobs_loz:mimic_chest"})
+				else
 				minetest.place_schematic(pos, minetest.get_modpath("hyrule_mapgen").."/schematics/dungeon"..number..".mts", random, {}, true)
 				minetest.add_node({x=pos.x+math.random(1,12), y=pos.y+1, z=pos.z+math.random(1,12)}, {name = "mobs_loz:mimic_chest"})
+				end
 			end
 		end
 	end

mods/hyruletools/init.lua

@@ -11,6 +11,9 @@ local counter3 = nil
 
 minetest.register_globalstep(function()
 	for _, player in ipairs(minetest.get_connected_players()) do
+		if player:get_player_name() ~= "singleplayer" then
+		return
+		end
 		count = 0
 		count2 = 0
 		count3 = 0
@@ -50,6 +53,9 @@ minetest.register_globalstep(function()
 end)
 
 minetest.register_on_joinplayer(function(player)
+if player:get_player_name() ~= "singleplayer" then
+return
+end
 local rupee = player:hud_add({
     hud_elem_type = "image",
     position = {x = 0.05, y = 0.9},
@@ -973,6 +979,19 @@ minetest.register_craft({
 	}
 })
 
+minetest.register_craftitem("hyruletools:doompick", {
+	description = "Pickaxe of Doom",
+	inventory_image = "hyruletools_doompick.png",
+	liquids_pointable = true,
+	on_use = function(item, placer, pointed_thing)
+		if pointed_thing.under == nil then
+		return end
+		if minetest.get_node(pointed_thing.under) ~= nil then
+			minetest.remove_node(pointed_thing.under)
+		end
+	end,
+})
+
 minetest.register_craftitem("hyruletools:ocarina4", {
 	description = "green ocarina",
 	inventory_image = "hyruletools_ocarina_green.png",

mods/kpgmobs/init.lua

@@ -1,171 +1,4 @@
 
--- horse functions
-
-local function is_ground(pos)
-	local nn = minetest.get_node(pos).name
-	return minetest.get_item_group(nn, "crumbly") ~= 0
-end
-
-local function get_sign(i)
-	if i == 0 then
-		return 0
-	else
-		return i/math.abs(i)
-	end
-end
-
-local function get_velocity(v, yaw, y)
-	local x = math.cos(yaw)*v
-	local z = math.sin(yaw)*v
-	return {x=x, y=y, z=z}
-end
-
-local function get_v(v)
-	return math.sqrt(v.x^2+v.z^2)
-end
-
-function merge(a, b)
-    if type(a) == 'table' and type(b) == 'table' then
-        for k,v in pairs(b) do if type(v)=='table' and type(a[k] or false)=='table' then merge(a[k],v) else a[k]=v end end
-    end
-    return a
-end
-
--- HORSE go go goooo :)
-
-local horse = {
-	physical = true,
-	collisionbox = {-0.4, -0.01, -0.4, 0.4, 1, 0.4},
-	visual = "mesh",
-	stepheight = 1.1,
-	visual_size = {x=1,y=1},
-	mesh = "mobs_horseh1.x",
-	driver = nil,
-	v = 0,
-
-	on_rightclick = function(self, clicker)
-		if not clicker or not clicker:is_player() then
-			return
-		end
-		if self.driver and clicker == self.driver then
-			self.driver = nil
-			clicker:set_detach()
-		elseif not self.driver then
-			self.driver = clicker
-			clicker:set_attach(self.object, "", {x=0,y=5,z=0}, {x=0,y=0,z=0})
-			self.object:setyaw(clicker:get_look_yaw())
-		end
-	end,
-	
-	on_activate = function(self, staticdata, dtime_s)
-		self.object:set_armor_groups({immortal=1})
-		print (self.texture, self.jmp)
-	end,
-
-	on_punch = function(self, puncher, time_from_last_punch, tool_capabilities, direction)
-		if puncher and puncher:is_player() then
-			puncher:get_inventory():add_item("main", self.name)
-			self.object:remove()
-		end
-	end,
-	
-	on_step = function(self, dtime)
-
-		self.v = get_v(self.object:getvelocity())*get_sign(self.v)
-
-		if self.driver then
-
-			local ctrl = self.driver:get_player_control()
-
-			if ctrl.up then
-				self.v = self.v + self.jmp
-			end
-			if ctrl.down then
-				self.v = self.v-0.1
-			end
-			if ctrl.left then
-				self.object:setyaw(self.object:getyaw()+math.pi/120+dtime*math.pi/120)
-			end
-			if ctrl.right then
-				self.object:setyaw(self.object:getyaw()-math.pi/120-dtime*math.pi/120)
-			end
-			if ctrl.jump then
-				local p = self.object:getpos()
-				p.y = p.y-0.5
-				if is_ground(p) then
-					local pos = self.object:getpos()
-					pos.y = math.floor(pos.y)+4
-					self.object:setpos(pos)
-					self.object:setvelocity(get_velocity(self.v, self.object:getyaw(), 0))
-				end
-			end
-		end
-
-		local s = get_sign(self.v)
-		self.v = self.v - 0.02*s
-
-		if s ~= get_sign(self.v) then
-			self.object:setvelocity({x=0, y=0, z=0})
-			self.v = 0
-			return
-		end
-
-		if math.abs(self.v) > 4.5 then
-			self.v = 4.5*get_sign(self.v)
-		end
-	
-		local p = self.object:getpos()
-		p.y = p.y-0.5
-
-		if not is_ground(p) then
-			if minetest.registered_nodes[minetest.get_node(p).name].walkable then
-				self.v = 0
-			end
-			self.object:setacceleration({x=0, y=-10, z=0})
-			self.object:setvelocity(get_velocity(self.v, self.object:getyaw(), self.object:getvelocity().y))
-		else
-			p.y = p.y+1
-			if is_ground(p) then
-				self.object:setacceleration({x=0, y=3, z=0})
-				local y = self.object:getvelocity().y
-				if y > 2 then
-					y = 2
-				end
-				if y < 0 then
-					self.object:setacceleration({x=0, y=10, z=0})
-				end
-				self.object:setvelocity(get_velocity(self.v, self.object:getyaw(), y))
-			else
-				self.object:setacceleration({x=0, y=0, z=0})
-				if math.abs(self.object:getvelocity().y) < 1 then
-					local pos = self.object:getpos()
-					pos.y = math.floor(pos.y)+0.5
-					self.object:setpos(pos)
-					self.object:setvelocity(get_velocity(self.v, self.object:getyaw(), 0))
-				else
-					self.object:setvelocity(get_velocity(self.v, self.object:getyaw(), self.object:getvelocity().y))
-				end
-			end
-		end
-	end,
-}
-
---END HORSE
-
--- backup table
-local hbak = horse
-
--- Brown Horse
-
-local hrs = {
-	textures = {"mobs_horseh1.png"},
-	jmp = 2,
-}
-minetest.register_entity("kpgmobs:horseh1", merge(hrs, horse))
-
--- tamed horse spawn eggs
-mobs:register_egg("kpgmobs:horseh1", "Tamed Brown Horse", "mobs_horse_inv.png", 0)
--- saddle
 minetest.register_craftitem("kpgmobs:saddle", {
 	description = "Saddle",
 	inventory_image = "mobs_saddle.png",
@@ -192,6 +25,7 @@ mobs:register_mob("kpgmobs:horse", {
 	mesh = "mobs_horse.x",
 	makes_footstep_sound = true,
 	walk_velocity = 1,
+	stepheight = 1.5,
 	armor = 200,
 	drops = {
 		{name = "mobs:meat_raw",
@@ -210,15 +44,47 @@ mobs:register_mob("kpgmobs:horse", {
 	},
 	follow = "farming:wheat",
 	view_range = 5,
-
 	on_rightclick = function(self, clicker)
-		local tool = clicker:get_wielded_item()
-		if tool:get_name() == "kpgmobs:saddle" then
-			clicker:get_inventory():remove_item("main", "kpgmobs:saddle")
-			local pos = self.object:getpos()
-			self.object:remove()
-			minetest.add_entity(pos, "kpgmobs:horseh1")			
+				
+		if mobs:feed_tame(self, clicker, 8, true, true) then
+			return
 		end
+
+		local item = clicker:get_wielded_item():get_name()
+		local inv = clicker:get_inventory()
+
+		if self.driver and clicker == self.driver then
+		if inv:room_for_item("main", {name = "kpgmobs:saddle"}) then
+				clicker:get_inventory():add_item("main", "kpgmobs:saddle")
+		else
+			local pos = self.object:getpos()
+			minetest.env:add_item(pos, "kpgmobs:saddle")
+		end
+		object_detach(self, clicker, {x=1, y=0, z=1})
+		elseif not self.driver and self.tamed then
+		if item == "kpgmobs:saddle" then
+		inv:remove_item("main", "kpgmobs:saddle")
+		object_attach(self, clicker, {x=0, y=19, z=0}, true, {x=0, y=6, z=0})
+		end
+		end
+	end,
+	do_custom = function(self, dtime)
+	if self.driver then
+		object_drive(self, dtime, {
+			speed = 13,
+			decell = 0.5,
+			moving_anim = {x=75, y=100},
+			stand_anim = {x=25, y=25},
+			jump_type = "jump",
+			jump_anim = {x=50, y=75},
+			extra_yaw = 0
+		})
+		if self.state ~= "stand" then
+		self.state = "stand"
+		end
+		return false
+		end
+		return true
 	end,
 })
 mobs:register_spawn("kpgmobs:horse", {"default:dirt_with_grass"}, 20, 8, 11000, 1, 31000)

mods/vehicles_loz/init.lua

@@ -22,12 +22,12 @@ minetest.register_entity("vehicles:horse", {
 		end
 	end,
 	on_punch = function(self, puncher)
-		if not self.driver then
-		local name = self.object:get_luaentity().name
-		local pos = self.object:getpos()
-		minetest.env:add_item(pos, name.."_spawner")
-		self.object:remove()
-		end
+		--if not self.driver then
+		--local name = self.object:get_luaentity().name
+		--local pos = self.object:getpos()
+		--minetest.env:add_item(pos, name.."_spawner")
+		--self.object:remove()
+		--end
 		if self.object:get_hp() == 0 then
 		if self.driver then
 		object_detach(self, self.driver, {x=1, y=0, z=1})
@@ -52,7 +52,7 @@ minetest.register_entity("vehicles:horse", {
 	end,
 })
 
-register_vehicle_spawner("vehicles:horse", "Horse", "vehicles_horse_inv.png")
+--register_vehicle_spawner("vehicles:horse", "Horse", "vehicles_horse_inv.png")
 
 minetest.register_entity("vehicles:spinner", {
 	visual = "mesh",