ocd3/diff/default.diff/nodes.lua.diff

78,81c78,81
< default:jungletree
< default:junglewood
< default:jungleleaves
< default:junglesapling
---
> default:jungle_tree
> default:jungle_wood
> default:jungle_leaves
> default:jungle_sapling
131c131
< default:junglegrass
---
> default:jungle_grass
188c188
< default:fence_junglewood
---
> default:fence_jungle_wood
572c572
< 	description = "Tree",
---
> 	description = "Apple Tree",
583c583
< 	description = "Wooden Planks",
---
> 	description = "Apple Wood Planks",
593,595c593,610
< 	description = "Sapling",
< 	drawtype = "plantlike",
< 	tiles = {"default_sapling.png"},
---
> 	description = "Apple Tree Sapling",
> 	drawtype = "nodebox",
> 	paramtype = "light",
>         node_box = {
>                 type = "fixed",
>                 fixed = {
>                         {-0.0625, -0.5, -0.0625, 0.0625, -0.3125, 0.0625}, -- NodeBox1
>                         {-0.125, -0.375, -0.1875, 0.1875, 0, 0.1875}, -- NodeBox2
>                         {0, -0.125, -0.0625, 0.1875, 0.125, 0.125}, -- NodeBox3
>                 }
> 	},
> 	tiles = {"default_sapling_top.png",
> 		 "default_sapling_bottom.png",
> 		 "default_sapling_side.png",
> 		 "default_sapling_side.png",
> 		 "default_sapling_side.png",
> 		 "default_sapling_side.png"
> 		 },
600c615
< 	walkable = false,
---
> 	walkable = true,
611c626
< 		minetest.get_node_timer(pos):start(math.random(2400,4800))
---
> 		minetest.get_node_timer(pos):start(math.random(300, 1500))
629c644
< 	description = "Leaves",
---
> 	description = "Apple Tree Leaves",
659c674,681
< 	drawtype = "plantlike",
---
> 	drawtype = "nodebox",
> 	node_box = {
> 		type = "fixed",
> 		fixed = {
> 			{-0.25, -0.5, -0.25, 0.25, 0.0625, 0.25}, -- NodeBox1
> 			{-0.0625, 0.0625, -0.0625, 0.0625, 0.25, 0.0625}, -- NodeBox2
> 		}
> 	},
683c705
< minetest.register_node("default:jungletree", {
---
> minetest.register_node("default:jungle_tree", {
685,686c707,708
< 	tiles = {"default_jungletree_top.png", "default_jungletree_top.png",
< 		"default_jungletree.png"},
---
> 	tiles = {"default_jungle_tree_top.png", "default_jungle_tree_top.png",
> 		"default_jungle_tree.png"},
695c717
< minetest.register_node("default:junglewood", {
---
> minetest.register_node("default:jungle_wood", {
699c721
< 	tiles = {"default_junglewood.png"},
---
> 	tiles = {"default_jungle_wood.png"},
705,706c727,728
< minetest.register_node("default:jungleleaves", {
< 	description = "Jungle Leaves",
---
> minetest.register_node("default:jungle_leaves", {
> 	description = "Jungle Tree Leaves",
709,710c731,732
< 	tiles = {"default_jungleleaves.png"},
< 	special_tiles = {"default_jungleleaves_simple.png"},
---
> 	tiles = {"default_jungle_leaves.png"},
> 	special_tiles = {"default_jungle_leaves_simple.png"},
717,718c739,740
< 			{items = {'default:junglesapling'}, rarity = 20},
< 			{items = {'default:jungleleaves'}}
---
> 			{items = {'default:jungle_sapling'}, rarity = 20},
> 			{items = {'default:jungle_leaves'}}
726,731c748,769
< minetest.register_node("default:junglesapling", {
< 	description = "Jungle Sapling",
< 	drawtype = "plantlike",
< 	tiles = {"default_junglesapling.png"},
< 	inventory_image = "default_junglesapling.png",
< 	wield_image = "default_junglesapling.png",
---
> minetest.register_node("default:jungle_sapling", {
> 	description = "Jungle Tree Sapling",
> 	tiles = {
> 		"default_jungle_sapling_top.png",
> 		"default_jungle_sapling_bottom.png",
> 		"default_jungle_sapling_side.png",
> 		"default_jungle_sapling_side.png",
> 		"default_jungle_sapling_side.png",
> 		"default_jungle_sapling_side.png"
> 	},
> 	drawtype = "nodebox",
> 	paramtype = "light",
> 	node_box = {
> 		type = "fixed",
> 		fixed = {
> 			{-0.0625, -0.5, -0.0625, 0.0625, -0.3125, 0.0625}, -- NodeBox1
> 			{-0.25, -0.3125, -0.25, 0.25, 0, 0.25}, -- NodeBox3
> 			{-0.125, -0.0625, -0.125, 0.1875, 0.125, 0.1875}, -- NodeBox4
> 		}			
> 	},
> 	inventory_image = "default_jungle_sapling.png",
> 	wield_image = "default_jungle_sapling.png",
734c772
< 	walkable = false,
---
> 	walkable = true,
745c783
< 		minetest.get_node_timer(pos):start(math.random(2400,4800))
---
> 		minetest.get_node_timer(pos):start(math.random(300, 1500))
806,808c844,865
< 	description = "Pine Sapling",
< 	drawtype = "plantlike",
< 	tiles = {"default_pine_sapling.png"},
---
> 	description = "Pine Tree Sapling",
> 	drawtype = "nodebox",
> 	paramtype = "light",
> 	node_box = {
> 		type = "fixed",
> 		fixed = {
> 			{-0.0625, -0.5, -0.0625, 0.0625, -0.3125, 0.0625}, -- NodeBox1
> 			{-0.3125, -0.375, -0.3125, 0.3125, -0.3125, 0.3125}, -- NodeBox2
> 			{-0.25, -0.3125, -0.25, 0.25, -0.25, 0.25}, -- NodeBox3
> 			{-0.1875, -0.25, -0.1875, 0.1875, -0.125, 0.1875}, -- NodeBox4
> 			{-0.125, -0.1875, -0.125, 0.125, -0.0625, 0.125}, -- NodeBox5
> 			{-0.0625, -0.0625, -0.0625, 0.0625, 0.0625, 0.0625}, -- NodeBox6
> 		}
> 	},
> 	tiles = {
> 		"default_pine_sapling_top.png",
> 		"default_pine_sapling_bottom.png",
> 		"default_pine_sapling_side.png",
> 		"default_pine_sapling_side.png",
> 		"default_pine_sapling_side.png",
> 		"default_pine_sapling_side.png"
> 	},
824c881
< 		minetest.get_node_timer(pos):start(math.random(2400,4800))
---
> 		minetest.get_node_timer(pos):start(math.random(300, 1500))
865c922
< 	description = "Acacia Leaves",
---
> 	description = "Acacia Tree Leaves",
887,888c944,960
< 	drawtype = "plantlike",
< 	tiles = {"default_acacia_sapling.png"},
---
> 	drawtype = "nodebox",
> 	paramtype = "light",
>         node_box = {
>                 type = "fixed",
>                 fixed = {
>                         {-0.0625, -0.5, -0.0625, 0.0625, -0.3125, 0.0625}, -- NodeBox1
>                         {-0.125, -0.375, -0.1875, 0.1875, 0, 0.1875}, -- NodeBox2
>                         {0, -0.125, -0.0625, 0.1875, 0.125, 0.125}, -- NodeBox3
>                 }
> 	},
> 	tiles = {"default_acacia_sapling_top.png",
> 		 "default_acacia_sapling_bottom.png",
> 		 "default_acacia_sapling_side.png",
> 		 "default_acacia_sapling_side.png",
> 		 "default_acacia_sapling_side.png",
> 		 "default_acacia_sapling_side.png"
> 		 },
893c965
< 	walkable = false,
---
> 	walkable = true,
904c976
< 		minetest.get_node_timer(pos):start(math.random(2400,4800))
---
> 		minetest.get_node_timer(pos):start(math.random(300, 1500))
944c1016
< 	description = "Aspen Leaves",
---
> 	description = "Aspen Tree Leaves",
965,966c1037,1053
< 	drawtype = "plantlike",
< 	tiles = {"default_aspen_sapling.png"},
---
> 	drawtype = "nodebox",
> 	paramtype = "light",
>         node_box = {
>                 type = "fixed",
>                 fixed = {
>                         {-0.0625, -0.5, -0.0625, 0.0625, -0.3125, 0.0625}, -- NodeBox1
>                         {-0.125, -0.375, -0.1875, 0.1875, 0, 0.1875}, -- NodeBox2
>                         {0, -0.125, -0.0625, 0.1875, 0.125, 0.125}, -- NodeBox3
>                 }
> 	},
> 	tiles = {"default_aspen_sapling_top.png",
> 		 "default_aspen_sapling_bottom.png",
> 		 "default_aspen_sapling_side.png",
> 		 "default_aspen_sapling_side.png",
> 		 "default_aspen_sapling_side.png",
> 		 "default_aspen_sapling_side.png"
> 	 },
971c1058
< 	walkable = false,
---
> 	walkable = true,
982c1069
< 		minetest.get_node_timer(pos):start(math.random(2400,4800))
---
> 		minetest.get_node_timer(pos):start(math.random(300, 1500))
1147c1234,1243
< 	drawtype = "plantlike",
---
> 	drawtype = "nodebox",
> 	node_box = {
> 		type = "fixed",
> 		fixed = {
> 			{0.1875, -0.5, 0.1875, 0.4375, 0.5, 0.4375}, -- NodeBox1
> 			{0.1875, -0.5, -0.4375, 0.4375, 0.5, -0.1875}, -- NodeBox2
> 			{-0.4375, -0.5, -0.4375, -0.1875, 0.5, -0.1875}, -- NodeBox3
> 			{-0.4375, -0.5, 0.1875, -0.1875, 0.5, 0.4375}, -- NodeBox4
> 		}
> 	},
1149,1150c1245,1246
< 	inventory_image = "default_papyrus.png",
< 	wield_image = "default_papyrus.png",
---
> 	inventory_image = "default_inv_papyrus.png",
> 	wield_image = "default_inv_papyrus.png",
1185c1281
< minetest.register_node("default:junglegrass", {
---
> minetest.register_node("default:jungle_grass", {
1187,1192c1283,1297
< 	drawtype = "plantlike",
< 	waving = 1,
< 	visual_scale = 1.69,
< 	tiles = {"default_junglegrass.png"},
< 	inventory_image = "default_junglegrass.png",
< 	wield_image = "default_junglegrass.png",
---
> 	drawtype = "nodebox",
> 	node_box = {
> 		type = "fixed",
> 		fixed = {
> 			{-0.125, -0.5, -0.125, 0.125, 0.25, 0.125}, -- NodeBox18
> 			{0.125, 0.25, -0.125, 0.375, 0.5, 0.125}, -- NodeBox19
> 			{0.25, -0.5, 0.25, 0.5, -0.125, 0.5}, -- NodeBox20
> 			{-0.5, -0.5, 0.25, -0.25, -0.25, 0.5}, -- NodeBox21
> 			{0.25, -0.5, -0.5, 0.5, -0.1875, -0.25}, -- NodeBox22
> 			{-0.5, -0.5, -0.5, -0.25, -0.0625, -0.25}, -- NodeBox23
> 		}
> 	},
> 	tiles = {"default_grass.png"},
> 	inventory_image = "default_jungle_grass.png",
> 	wield_image = "default_jungle_grass.png",
1193a1299
> 	paramtype2 = "facedir",
1208c1314,1322
< 	drawtype = "plantlike",
---
> 	drawtype = "nodebox",
> 	node_box = {
> 		type = "fixed",
> 		fixed = {
> 			{-0.375, -0.5, 0.125, -0.125, -0.25, 0.375}, -- NodeBox9
> 			{0.125, -0.5, 0.125, 0.375, -0.25, 0.375}, -- NodeBox11
> 			{-0.375, -0.5, -0.375, -0.125, -0.25, -0.125}, -- NodeBox12
> 		}
> 	},
1210c1324
< 	tiles = {"default_grass_1.png"},
---
> 	tiles = {"default_grass.png"},
1212,1213d1325
< 	inventory_image = "default_grass_3.png",
< 	wield_image = "default_grass_3.png",
1223a1336
> })
1225,1231c1338,1364
< 	on_place = function(itemstack, placer, pointed_thing)
< 		-- place a random grass node
< 		local stack = ItemStack("default:grass_" .. math.random(1,5))
< 		local ret = minetest.item_place(stack, placer, pointed_thing)
< 		return ItemStack("default:grass_1 " ..
< 			itemstack:get_count() - (1 - ret:get_count()))
< 	end,
---
> minetest.register_node("default:grass_2", {
> 	description = "Grass",
> 	drawtype = "nodebox",
> 	node_box = {
> 		type = "fixed",
> 		fixed = {
> 			{-0.125, -0.5, -0.125, 0.125, -0.1875, 0.125}, -- NodeBox8
> 			{-0.375, -0.5, 0.125, -0.125, 0.0625, 0.375}, -- NodeBox9
> 			{0.125, -0.5, 0.125, 0.375, 0.0625, 0.375}, -- NodeBox11
> 			{-0.375, -0.5, -0.375, -0.125, 0.0625, -0.125}, -- NodeBox12
> 			{0.125, -0.5, -0.375, 0.375, 0.0625, -0.125}, -- NodeBox13
> 		}
> 	},
> 	waving = 1,
> 	tiles = {"default_grass.png"},
> 	paramtype = "light",
> 	sunlight_propagates = true,
> 	walkable = false,
> 	buildable_to = true,
> 	drop = "default:grass_2",
> 	groups = {snappy = 3, flora = 1, attached_node = 1,
> 		not_in_creative_inventory = 1, grass = 1, flammable = 1},
> 		sounds = default.node_sound_leaves_defaults(),
> 	selection_box = {
> 		type = "fixed",
> 		fixed = {-6 / 16, -0.5, -6 / 16, 6 / 16, -3 / 16, 6 / 16},
> 	},
1234,1248c1367,1388
< for i = 2, 5 do
< 	minetest.register_node("default:grass_" .. i, {
< 		description = "Grass",
< 		drawtype = "plantlike",
< 		waving = 1,
< 		tiles = {"default_grass_" .. i .. ".png"},
< 		inventory_image = "default_grass_" .. i .. ".png",
< 		wield_image = "default_grass_" .. i .. ".png",
< 		paramtype = "light",
< 		sunlight_propagates = true,
< 		walkable = false,
< 		buildable_to = true,
< 		drop = "default:grass_1",
< 		groups = {snappy = 3, flora = 1, attached_node = 1,
< 			not_in_creative_inventory = 1, grass = 1, flammable = 1},
---
> minetest.register_node("default:grass_3", {
> 	description = "Grass",
> 	drawtype = "nodebox",
> 	node_box = {
> 		type = "fixed",
> 		fixed = {
>         		{-0.125, -0.5, -0.125, 0.125, -0.1875, 0.125}, -- NodeBox8
> 			{-0.375, -0.5, 0.125, -0.125, 0.3125, 0.375}, -- NodeBox9
> 			{0.125, -0.5, 0.125, 0.375, 0.3125, 0.375}, -- NodeBox11
> 			{-0.375, -0.5, -0.375, -0.125, 0.3125, -0.125}, -- NodeBox12
> 			{0.125, -0.5, -0.375, 0.375, 0.3125, -0.125}, -- NodeBox13
> 		}
> 	},
> 	waving = 1,
> 	tiles = {"default_grass.png"},
> 	paramtype = "light",
> 	sunlight_propagates = true,
> 	walkable = false,
> 	buildable_to = true,
> 	drop = "default:grass_3",
> 	groups = {snappy = 3, flora = 1, attached_node = 1,
> 		not_in_creative_inventory = 1, grass = 1, flammable = 1},
1250,1255c1390,1423
< 		selection_box = {
< 			type = "fixed",
< 			fixed = {-6 / 16, -0.5, -6 / 16, 6 / 16, -3 / 16, 6 / 16},
< 		},
< 	})
< end
---
> 	selection_box = {
> 		type = "fixed",
> 		fixed = {-6 / 16, -0.5, -6 / 16, 6 / 16, -3 / 16, 6 / 16},
> 	},
> })
> 
> minetest.register_node("default:grass_4", {
> 	description = "Grass",
> 	drawtype = "nodebox",
> 	node_box = {
> 		type = "fixed",
> 		fixed = {
> 			{0.125, -0.5, 0.125, 0.4375, 0.5, 0.4375}, -- NodeBox1
> 			{0.125, -0.5, -0.4375, 0.4375, 0.5, -0.125}, -- NodeBox2
> 			{-0.4375, -0.5, -0.4375, -0.125, 0.5, -0.125}, -- NodeBox3
> 			{-0.4375, -0.5, 0.125, -0.125, 0.5, 0.4375}, -- NodeBox4
> 			{-0.125, -0.5, -0.125, 0.125, -0.0625, 0.125}, -- NodeBox7
> 		}
> 	},
> 	waving = 1,
> 	tiles = {"default_grass.png"},
> 	paramtype = "light",
> 	sunlight_propagates = true,
> 	walkable = false,
> 	buildable_to = true,
> 	drop = "default:grass_3",
> 	groups = {snappy = 3, flora = 1, attached_node = 1,
> 		not_in_creative_inventory = 1, grass = 1, flammable = 1},
> 		sounds = default.node_sound_leaves_defaults(),
> 	selection_box = {
> 		type = "fixed",
> 		fixed = {-6 / 16, -0.5, -6 / 16, 6 / 16, -3 / 16, 6 / 16},
> 	},
> })
1256a1425,1452
> minetest.register_node("default:grass_5", {
> 	description = "Grass",
> 	drawtype = "nodebox",
> 	node_box = {
> 		type = "fixed",
> 		fixed = {
> 			{0.125, -0.5, 0.125, 0.4375, 0.5, 0.4375}, -- NodeBox1
> 			{0.125, -0.5, -0.4375, 0.4375, 0.5, -0.125}, -- NodeBox2
> 			{-0.4375, -0.5, -0.4375, -0.125, 0.5, -0.125}, -- NodeBox3
> 			{-0.4375, -0.5, 0.125, -0.125, 0.5, 0.4375}, -- NodeBox4
> 			{-0.125, -0.5, -0.125, 0.125, 0.125, 0.125}, -- NodeBox7
> 		}
> 	},
> 	waving = 1,
> 	tiles = {"default_grass.png"},
> 	paramtype = "light",
> 	sunlight_propagates = true,
> 	walkable = false,
> 	buildable_to = true,
> 	drop = "default:grass_3",
> 	groups = {snappy = 3, flora = 1, attached_node = 1,
> 		not_in_creative_inventory = 1, grass = 1, flammable = 1},
> 		sounds = default.node_sound_leaves_defaults(),
> 	selection_box = {
> 		type = "fixed",
> 		fixed = {-6 / 16, -0.5, -6 / 16, 6 / 16, -3 / 16, 6 / 16},
> 	},
> })
1365c1561
< 		minetest.get_node_timer(pos):start(math.random(1200, 2400))
---
> 		minetest.get_node_timer(pos):start(math.random(300, 1500))
1436c1632
< 		minetest.get_node_timer(pos):start(math.random(1200, 2400))
---
> 		minetest.get_node_timer(pos):start(math.random(300, 1500))
1712c1908
< 	liquid_renewable = false,
---
> 	liquid_renewable = true,
1758c1954
< 	liquid_renewable = false,
---
> 	liquid_renewable = true,
1769c1965
< local function get_chest_formspec(pos)
---
> function default.get_chest_formspec(pos)
1786c1982
< 	local above = { x = pos.x, y = pos.y + 1, z = pos.z }
---
> 	local above = {x = pos.x, y = pos.y + 1, z = pos.z}
1789c1985,1986
< 	if def.drawtype == "airlike" or
---
> 	if def and
> 			(def.drawtype == "airlike" or
1792c1989
< 			(def.drawtype == "nodebox" and def.paramtype2 == "wallmounted") then
---
> 			(def.drawtype == "nodebox" and def.paramtype2 == "wallmounted")) then
1892c2089
< 					"default:chest", get_chest_formspec(pos))
---
> 					"default:chest", default.get_chest_formspec(pos))
1914c2111
< 				get_chest_formspec(pos)
---
> 				default.get_chest_formspec(pos)
1959c2156
< 					"default:chest", get_chest_formspec(pos))
---
> 					"default:chest", default.get_chest_formspec(pos))
1991a2189,2195
> 	for i = 1, #def_opened.tiles do
> 		if type(def_opened.tiles[i]) == "string" then
> 			def_opened.tiles[i] = {name = def_opened.tiles[i], backface_culling = true}
> 		elseif def_opened.tiles[i].backface_culling == nil then
> 			def_opened.tiles[i].backface_culling = true
> 		end
> 	end
1997c2201
< 		}
---
> 	}
2146a2351,2389
> torch_box = {
>         type = "wallmounted",
>         wall_top = {-0.5/3, -0.5/3, -0.5/3, 0.5/3, 1.5/3, 0.5/3},
>         wall_bottom = {-0.5/3, -1.5/3, -0.5/3, 0.5/3, 0.5/3, 0.5/3},
>         wall_side = {-1.5/3, -0.5/3, -0.5/3, 0.5/3, 0.5/3, 0.5/3},
> }
> 
> minetest.register_node("default:torch", {
>         drawtype = "nodebox",
>         description = "Torch",
>         tiles = {"default_torch.png"},
>         inventory_image = "default_torch_inventory.png",
>         wield_image = "default_torch_inventory.png",
>         paramtype = "light",
>         paramtype2 = "wallmounted",
>         legacy_wallmounted = true,
>         sunlight_propagates = true,
>         walkable = false,
>         light_source = default.LIGHT_MAX-2,
>         node_box = torch_box,
>         groups = {attached_node=1, dig_immediate=3,not_in_creative_inventory=1},
>         drop='"default:torch" 1',
>         sounds = default.node_sound_wood_defaults(),
> --      on_construct = function(pos)
> --              local tmr = minetest.env:get_node_timer(pos)
> --              tmr:start(torch_time)
> --      end,
> --      on_rightclick = function(pos, node)
> --              local tmr = minetest.env:get_node_timer(pos)
> --              local meta = minetest.get_meta(pos)
> --              local proc = math.floor(tmr:get_elapsed()/(torch_time/100))
> --              meta:set_string("infotext", proc.."%")
> --      end,
> --      on_timer = function(pos,elapsed)
> --              local node = minetest.get_node(pos)
> --              minetest.set_node(pos, {name="default:torch_out", param2 = node.param2})
> --      end,
> })
> 
2247c2490
< 	description = "Wooden Fence",
---
> 	description = "Apple Wood Fence",
2257c2500
< 	description = "Acacia Fence",
---
> 	description = "Acacia Wood Fence",
2266c2509
< default.register_fence("default:fence_junglewood", {
---
> default.register_fence("default:fence_jungle_wood", {
2268,2271c2511,2514
< 	texture = "default_fence_junglewood.png",
< 	inventory_image = "default_fence_overlay.png^default_junglewood.png^default_fence_overlay.png^[makealpha:255,126,126",
< 	wield_image = "default_fence_overlay.png^default_junglewood.png^default_fence_overlay.png^[makealpha:255,126,126",
< 	material = "default:junglewood",
---
> 	texture = "default_fence_jungle_wood.png",
> 	inventory_image = "default_fence_overlay.png^default_jungle_wood.png^default_fence_overlay.png^[makealpha:255,126,126",
> 	wield_image = "default_fence_overlay.png^default_jungle_wood.png^default_fence_overlay.png^[makealpha:255,126,126",
> 	material = "default:jungle_wood",
2277c2520
< 	description = "Pine Fence",
---
> 	description = "Pine Wood Fence",
2287c2530
< 	description = "Aspen Fence",
---
> 	description = "Aspen Wood Fence",
2301c2544
< 	paramtype2 = "glasslikeliquidlevel",
---
> 	--	paramtype2 = "glasslikeliquidlevel",
2389,2390c2632,2633
< 		trunks = {"default:jungletree"},
< 		leaves = {"default:jungleleaves"},
---
> 		trunks = {"default:jungle_tree"},
> 		leaves = {"default:jungle_leaves"},
2407,2408c2650,2651
< 		trunks = {"default:jungletree"},
< 		leaves = {"default:jungleleaves"},
---
> 		trunks = {"default:jungle_tree"},
> 		leaves = {"default:jungle_leaves"},
2441a2685,2692
> 
> minetest.register_alias("default:jungleleaves", "default:jungle_leaves")
> minetest.register_alias("default:junglewood", "default:jungle_wood")
> minetest.register_alias("default:junglesapling", "default:jungle_sapling")
> minetest.register_alias("default:jungletree", "default:jungle_tree")
> minetest.register_alias("default:junglegrass", "default:jungle_grass")
> 
> minetest.register_alias("default:fence_junglewood", "default:fence_jungle_wood")