tektite, dungeons, waterfall fix

minetest.conf

@@ -17,3 +17,4 @@ weather_allow_override_nodes = false
 weather_allow_abm = true
 enable_moreplants = true
 twilight = false
+3d_leaves = true

mods/default/mapgen.lua

@@ -31,9 +31,9 @@ minetest.register_alias("mapgen_pine_needles", "default:pine_needles")
 
 -- Dungeons
 
-minetest.register_alias("mapgen_cobble", "default:cobble")
+minetest.register_alias("mapgen_cobble", "hyrule_mapgen:dungeon_brick")
 minetest.register_alias("mapgen_stair_cobble", "stairs:stair_cobble")
-minetest.register_alias("mapgen_mossycobble", "default:mossycobble")
+minetest.register_alias("mapgen_mossycobble", "hyrule_mapgen:dungeon_brick")
 minetest.register_alias("mapgen_sandstonebrick", "default:sandstonebrick")
 minetest.register_alias("mapgen_stair_sandstonebrick", "stairs:stair_sandstonebrick")
 

mods/hyrule_mapgen/init.lua

@@ -121,7 +121,7 @@ minetest.register_abm({
 		local above = minetest.get_node({x=pos.x, y=pos.y+1, z=pos.z}).name
 		local below = minetest.get_node({x=pos.x, y=pos.y-1, z=pos.z}).name
 		local above2 = minetest.get_node({x=pos.x, y=pos.y+2, z=pos.z}).name
-		if above == "default:water_flowing" and below ~= "default:water_flowing" and above2 == "default:water_flowing" then
+		if above == "default:water_flowing" and below ~= "default:water_flowing" and above2 == "default:water_flowing" and minetest.find_nodes_in_area({x=pos.x-2, y=pos.y, z=pos.z-2}, {x=pos.x+2, y=pos.x+3, z=pos.z+2}, {"default:water_source"}) ~= nil then
 		minetest.add_particlespawner({
 			amount = 9,
 			time = 1,
@@ -357,7 +357,7 @@ minetest.override_item("flowers:waterlily", {
 	walkable = true,
 })
 
-if minetest.setting_get("leaves_style") == "fancy" then
+if minetest.setting_getbool("3d_leaves") then
 minetest.override_item("default:leaves", {
 	drawtype = "mesh",
 	mesh = "leaf.b3d",
@@ -407,7 +407,11 @@ minetest.override_item("default:grass_1", {
 		if num == 5 then
 		minetest.env:add_item(pos, "hyruletools:green_rupee")
 		end
+		if num == 4 then
+		minetest.env:add_item(pos, "farming:seed_wheat")
+		end
 	end,
+	drop = "",
 	selection_box = {
 		type = "fixed",
 		fixed = {-0.3, -0.5, -0.3, 0.3, 0, 0.3},
@@ -420,20 +424,29 @@ minetest.override_item("default:grass_2", {
 		if num == 5 then
 		minetest.env:add_item(pos, "hyruletools:green_rupee")
 		end
+		if num == 4 then
+		minetest.env:add_item(pos, "farming:seed_wheat")
+		end
 	end,
+	drop = "",
 	selection_box = {
 		type = "fixed",
 		fixed = {-0.3, -0.5, -0.3, 0.3, 0, 0.3},
 	},
 })
 
+
 minetest.override_item("default:grass_3", {
 	on_destruct = function(pos, oldnode)
 		local num = math.random(3,5)
 		if num == 5 then
 		minetest.env:add_item(pos, "hyruletools:green_rupee")
 		end
+		if num == 4 then
+		minetest.env:add_item(pos, "farming:seed_wheat")
+		end
 	end,
+	drop = "",
 	selection_box = {
 		type = "fixed",
 		fixed = {-0.3, -0.5, -0.3, 0.3, 0, 0.3},
@@ -446,7 +459,11 @@ minetest.override_item("default:grass_4", {
 		if num == 5 then
 		minetest.env:add_item(pos, "hyruletools:green_rupee")
 		end
+		if num == 4 then
+		minetest.env:add_item(pos, "farming:seed_wheat")
+		end
 	end,
+	drop = "",
 	selection_box = {
 		type = "fixed",
 		fixed = {-0.3, -0.5, -0.3, 0.3, 0, 0.3},
@@ -459,13 +476,18 @@ minetest.override_item("default:grass_5", {
 		if num == 5 then
 		minetest.env:add_item(pos, "hyruletools:green_rupee")
 		end
+		if num == 4 then
+		minetest.env:add_item(pos, "farming:seed_wheat")
+		end
 	end,
+	drop = "",
 	selection_box = {
 		type = "fixed",
 		fixed = {-0.3, -0.5, -0.3, 0.3, 0, 0.3},
 	},
 })
 
+
 minetest.override_item("default:ice", {
 	drawtype = "glasslike",
 	use_texture_alpha = true,
@@ -625,6 +647,8 @@ minetest.register_node("hyrule_mapgen:sinkingsand", {
 	walkable = false
 })
 
+
+--used for testing
 chest_items = {
 	{"hyruletools:clawshot"},
 	{"hyruletools:eye"},
@@ -670,7 +694,7 @@ minetest.register_node("hyrule_mapgen:chest", {
 			item:take_item()
 			local meta = minetest.get_meta(pos)
 			local item = meta:get_string("item")
-			minetest:add_item(pos, {name = item})
+			minetest.env:add_item(pos, item)
 			minetest.env:remove_node(pos)
 		end
 	end,
@@ -695,7 +719,7 @@ minetest.register_node("hyrule_mapgen:chest_key", {
 	groups = {cracky = 2, oddly_breakable_by_hand = 1},
 	is_ground_content = false,
 	on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
-			minetest:add_item(pos, {name = "hyruletoools:key"})
+			minetest.env:add_item(pos, "hyruletools:key")
 			minetest.env:remove_node(pos)
 			return itemstack
 	end,
@@ -1402,7 +1426,7 @@ minetest.register_node("hyrule_mapgen:stone_with_greenrupee", {
 })
 
 minetest.register_node("hyrule_mapgen:dungeon_barrier", {
-	description = "Dungeon Barrier",
+	description = "Retro Dungeon Barrier",
 	tiles = {
 		"hyrule_mapgen_dungeon_barrier.png",
 	},
@@ -1410,7 +1434,7 @@ minetest.register_node("hyrule_mapgen:dungeon_barrier", {
 })
 
 minetest.register_node("hyrule_mapgen:dungeon_tile", {
-	description = "Dungeon Tile",
+	description = "Retro Dungeon Tile",
 	tiles = {
 		"hyrule_mapgen_dungeon_tile.png",
 	},
@@ -1418,7 +1442,7 @@ minetest.register_node("hyrule_mapgen:dungeon_tile", {
 })
 
 minetest.register_node("hyrule_mapgen:dungeon_brick", {
-	description = "Dungeon Brick",
+	description = "Retro Dungeon Brick",
 	tiles = {
 		"hyrule_mapgen_dungeon_brick.png",
 	},
@@ -1426,7 +1450,7 @@ minetest.register_node("hyrule_mapgen:dungeon_brick", {
 })
 
 minetest.register_node("hyrule_mapgen:dungeon_barrier2", {
-	description = "Dungeon Barrier 2",
+	description = "Retro Dungeon Barrier 2",
 	tiles = {
 		"hyrule_mapgen_dungeon_barrier2.png",
 	},
@@ -1434,7 +1458,7 @@ minetest.register_node("hyrule_mapgen:dungeon_barrier2", {
 })
 
 minetest.register_node("hyrule_mapgen:dungeon_tile2", {
-	description = "Dungeon Tile 2",
+	description = "Retro Dungeon Tile 2",
 	tiles = {
 		"hyrule_mapgen_dungeon_tile2.png",
 	},
@@ -1442,7 +1466,7 @@ minetest.register_node("hyrule_mapgen:dungeon_tile2", {
 })
 
 minetest.register_node("hyrule_mapgen:dungeon_brick2", {
-	description = "Dungeon Brick 2",
+	description = "Retro Dungeon Brick 2",
 	tiles = {
 		"hyrule_mapgen_dungeon_brick2.png",
 	},
@@ -1889,7 +1913,7 @@ minetest.register_node("hyrule_mapgen:magic_leaves", {
 	walkable = false,
 })
 
-if minetest.setting_get("leaves_style") == "fancy" then
+if minetest.setting_getbool("3d_leaves") then
 minetest.override_item("hyrule_mapgen:magic_leaves", {
 	drawtype = "mesh",
 	mesh = "leaf.b3d",
@@ -1985,7 +2009,7 @@ minetest.register_node("hyrule_mapgen:wild_leaves", {
 	walkable = false,
 })
 
-if minetest.setting_get("leaves_style") == "fancy" then
+if minetest.setting_getbool("3d_leaves") then
 minetest.override_item("hyrule_mapgen:wild_leaves", {
 	drawtype = "mesh",
 	mesh = "leaf.b3d",

mods/mobs_loz/chuchu.lua

@@ -25,11 +25,11 @@ mobs:register_mob("mobs_loz:chuchu", {
 	jump = false,
 	drops = {
 		{name = "hyruletools:blue_rupee",
-		chance = 2, min = 1, max = 3},
+		chance = 10, min = 1, max = 3},
 	},
 	on_die = function(self)
 		local pos = self.object:getpos()
-		if math.random(1,2) == 2 then
+		if math.random(1,4) == 2 then
 		minetest.env:add_entity(pos, "hyruletools:heart_entity")
 		end
 		minetest.env:add_entity(pos, "experience:orb")

mods/mobs_loz/init.lua

@@ -28,4 +28,5 @@ dofile(path.."/leever.lua")
 dofile(path.."/armos.lua")
 dofile(path.."/wolfos.lua")
 dofile(path.."/darknut.lua")
+dofile(path.."/tektite.lua")
 end

mods/mobs_loz/octorock.lua

@@ -98,7 +98,7 @@ mobs:register_mob("mobs_loz:octorock_boss", {
 	hp_max = 35,
 	armor = 80,
 	collisionbox = {-1, 0, -1, 1, 2, 1},
-	visual_size = {x=3.5, y=3.5},
+	visual_size = {x=3.6, y=3.6},
 	visual = "mesh",
 	mesh = "octorock.b3d",
 	textures = {
@@ -143,4 +143,4 @@ mobs:register_mob("mobs_loz:octorock_boss", {
 
 --mobs:register_spawn("mobs_loz:octorock_boss", {"default:sand", "default:dirt_with_grass3", "default:desert_sand"}, 20, 10, 15000, 2, 31000)
 
-mobs:register_egg("mobs_loz:octorock_boss", "Giant Octorock", "default_sand.png", 1)
+mobs:register_egg("mobs_loz:octorock_boss", "Big Octorock", "default_sand.png", 1)

mods/mobs_loz/peahat.lua

@@ -9,7 +9,7 @@ mobs:register_mob("mobs_loz:peahat", {
 	hp_min = 7,
 	hp_max = 12,
 	armor = 130,
-	collisionbox = {-0.3, 0, -0.3, 0.3, 0.5, 0.3},
+	collisionbox = {-0.4, 0, -0.4, 0.4, 1.2, 0.4},
 	visual = "mesh",
 	mesh = "peahat.b3d",
 	textures = {

mods/mobs_loz/tektite.lua

@@ -0,0 +1,107 @@
+mobs:register_mob("mobs_loz:tektite", {
+	type = "monster",
+	passive = false,
+	attack_type = "dogfight",
+	reach = 2,
+	damage = 2,
+	hp_min = 28,
+	hp_max = 37,
+	armor = 90,
+	collisionbox = {-0.2, -0, -0.2, 0.2, 0.7, 0.2},
+	--visual_size = {x=1.5, y=1.5},
+	visual = "mesh",
+	mesh = "tektite.b3d",
+	textures = {
+		{"mobs_tektite.png"},
+	},
+	makes_footstep_sound = false,
+	view_range = 5,
+	walk_velocity = 1.5,
+	run_velocity = 2,
+	jump = false,
+	drops = {
+		{name = "hyruletools:green_rupee",
+		chance = 5, min = 1, max = 3},
+	},
+	on_die = function(self)
+		local pos = self.object:getpos()
+		if math.random(1,5) == 2 then
+		minetest.env:add_entity(pos, "hyruletools:heart_entity")
+		end
+		minetest.env:add_entity(pos, "experience:orb")
+	end,
+	water_damage = 0,
+	lava_damage = 5,
+	light_damage = 0,
+	fear_height = 6,
+	animation = {
+		speed_normal = 12,
+		speed_run = 15,
+		stand_start = 20,
+		stand_end = 30,
+		walk_start = 1,
+		walk_end = 20,
+		run_start = 1,
+		run_end = 20,
+		punch_start = 1,
+		punch_end = 20,
+	},
+})
+
+mobs:register_spawn("mobs_loz:tektite", {"default:sand", "default:river_water_source", "default:dirt_with_grass2"}, 7, 0, 7000, 2, 31000)
+
+mobs:register_egg("mobs_loz:tektite", "Blue Tektite", "wool_cyan.png", 1)
+
+mobs:register_mob("mobs_loz:tektite2", {
+	type = "monster",
+	passive = false,
+	attack_type = "dogfight",
+	reach = 2,
+	damage = 3,
+	hp_min = 28,
+	hp_max = 37,
+	armor = 90,
+	collisionbox = {-0.2, -0, -0.2, 0.2, 0.7, 0.2},
+	--visual_size = {x=1.5, y=1.5},
+	visual = "mesh",
+	mesh = "tektite.b3d",
+	textures = {
+		{"mobs_tektite2.png"},
+	},
+	makes_footstep_sound = false,
+	view_range = 5,
+	walk_velocity = 1.5,
+	run_velocity = 2,
+	jump = false,
+	drops = {
+		{name = "hyruletools:red_rupee",
+		chance = 5, min = 1, max = 3},
+	},
+	on_die = function(self)
+		local pos = self.object:getpos()
+		if math.random(1,5) == 2 then
+		minetest.env:add_entity(pos, "hyruletools:heart_entity")
+		end
+		minetest.env:add_entity(pos, "experience:orb")
+	end,
+	water_damage = 0,
+	lava_damage = 5,
+	light_damage = 0,
+	fear_height = 6,
+	animation = {
+		speed_normal = 12,
+		speed_run = 15,
+		stand_start = 20,
+		stand_end = 30,
+		walk_start = 1,
+		walk_end = 20,
+		run_start = 1,
+		run_end = 20,
+		punch_start = 1,
+		punch_end = 20,
+	},
+})
+
+mobs:register_spawn("mobs_loz:tektite2", {"hyrule_mapgen:dirt", "default:desert_sand", "default:stone"}, 7, 0, 7000, 2, 31000)
+
+mobs:register_egg("mobs_loz:tektite2", "Red Tektite", "wool_orange.png", 1)

mods/mobs_loz/tingle.lua

@@ -1,5 +1,6 @@
 mobs:register_mob("mobs_loz:tingle", {
 	type = "animal",
+	passive = true,
 	hp_min = 13,
 	hp_max = 27,
 	armor = 90,
@@ -14,8 +15,9 @@ mobs:register_mob("mobs_loz:tingle", {
 	makes_footstep_sound = true,
 	view_range = 5,
 	walk_velocity = 1,
-	run_velocity = 4,
+	run_velocity = 6,
 	runaway = true,
+	runaway_timer = 30,
 	jump = false,
 	drops = {
 		{name = "hyruletools:nyan_rupee",
@@ -57,7 +59,7 @@ mobs:register_mob("mobs_loz:tingle", {
 	fear_height = 10,
 	animation = {
 		speed_normal = 12,
-		speed_run = 14,
+		speed_run = 24,
 		punch_start = 1,
 		punch_end = 20,
 		stand_start = 50,