Adjusted ground content flags

2015-06-24 10:00:12 +01:00 · 2015-06-24 10:00:12 +01:00 · 2bc7406c9a
commit 2bc7406c9a
parent d22a051434
12 changed files with 31 additions and 23 deletions
--- a/crystal.lua
+++ b/crystal.lua
@ -37,6 +37,7 @@ minetest.register_node("ethereal:crystal_block", {
 	description = "Crystal Block",
 	tiles = {"crystal_block.png"},
 	light_source = default.LIGHT_MAX - 5,
+	is_ground_content = false,
 	groups = {cracky=1,level=2,puts_out_fire=1},
 	sounds = default.node_sound_glass_defaults(),
 })
@ -134,7 +135,7 @@ minetest.register_tool("ethereal:shovel_crystal", {

 	on_use = function(itemstack, user, pointed_thing)

-		if pointed_thing.type == "node" then
+		if pointed_thing.type ~= "node" then return end

 		-- Check if node protected
 		if not minetest.is_protected(pointed_thing.under, user:get_player_name()) then
@ -158,7 +159,6 @@ minetest.register_tool("ethereal:shovel_crystal", {
 			end

 		end
-		end

 	end,
 })
--- a/extra.lua
+++ b/extra.lua
@ -65,6 +65,7 @@ minetest.register_node("ethereal:paper_wall", {
 	groups = {snappy=3},
 	sounds = default.node_sound_wood_defaults(),
 	walkable = true,
+	is_ground_content = false,
 	paramtype2 = "facedir",
 	selection_box = {
 		type = "fixed",
--- a/fences.lua
+++ b/fences.lua
@ -23,6 +23,7 @@ for _, row in ipairs(fence.type) do
 minetest.register_node("ethereal:fence_"..name, {
 	description = desc.." Fence",
 	drawtype = "fencelike",
+	is_ground_content = false,
 	tiles = {texture},
 	inventory_image = "default_fence_overlay.png^"..texture.."^default_fence_overlay.png^[makealpha:255,126,126",
 	wield_image = "default_fence_overlay.png^"..texture.."^default_fence_overlay.png^[makealpha:255,126,126",
--- a/fishing.lua
+++ b/fishing.lua
@ -36,7 +36,7 @@ minetest.register_craftitem("ethereal:worm", {
 minetest.register_craftitem("ethereal:fishing_rod", {
 	description = "Fishing Rod",
 	inventory_image = "fishing_rod.png",
-	stack_max = 1,
+--	stack_max = 1,
 	liquids_pointable = true,
 })

@ -48,20 +48,22 @@ minetest.register_craftitem("ethereal:fishing_rod_baited", {
 	stack_max = 1,
 	liquids_pointable = true,
 	on_use = function (itemstack, user, pointed_thing)
-		if pointed_thing and pointed_thing.under then
-			local node = minetest.get_node(pointed_thing.under)
-			if string.find(node.name, "default:water_source") then
-				if math.random(1, 100) < 5 then
-					local inv = user:get_inventory()
-					if inv:room_for_item("main", {name="ethereal:fish_raw"}) then
-						inv:add_item("main", {name="ethereal:fish_raw"})
-						return {name="ethereal:fishing_rod"}
-					else
-				minetest.chat_send_player(user:get_player_name(), "Your Fish Got Away! Inventory Full")
-					end
-				end
+
+		if pointed_thing.type ~= "node" then return end
+		
+		local node = minetest.get_node(pointed_thing.under)
+		if (node.name == "default:water_source"
+		or node.name == "default:river_water_source")
+		and math.random(1, 100) < 5 then
+			local inv = user:get_inventory()
+			if inv:room_for_item("main", {name="ethereal:fish_raw"}) then
+				inv:add_item("main", {name="ethereal:fish_raw"})
+				return {name="ethereal:fishing_rod"}
+			else
+				minetest.chat_send_player(user:get_player_name(), "Inventory full, your Fish Got Away!")
 			end
 		end
+
 	end,
 })

--- a/gates.lua
+++ b/gates.lua
@ -56,6 +56,7 @@ minetest.register_node("ethereal:"..name.."gate_open", {
 	paramtype = "light",
 	paramtype2 = "facedir",
 	sunlight_propagates = true,
+	is_ground_content = false,
 	walkable = true,
 	groups = {snappy = 1, choppy = 2, oddly_breakable_by_hand = 2, flammable = 2, not_in_inventory = 1},
 	drop = "ethereal:"..name.."gate_closed",
--- a/init.lua
+++ b/init.lua
@ -1,6 +1,6 @@
 --[[

-	Minetest Ethereal Mod 1.16 (5th June 2015)
+	Minetest Ethereal Mod 1.16 (24th June 2015)

 	Created by ChinChow

--- a/plantlife.lua
+++ b/plantlife.lua
@ -10,7 +10,6 @@ minetest.register_node("ethereal:fern", {
 	sunlight_propagates = true,
 	waving = 1,
 	walkable = false,
-	is_ground_content = true,
 	buildable_to = true,
 	drop = {
 		max_items = 1,
@ -46,7 +45,6 @@ minetest.register_node("ethereal:dry_shrub", {
 	sunlight_propagates = true,
 	waving = 1,
 	walkable = false,
-	is_ground_content = true,
 	buildable_to = true,
 	groups = {snappy=3,flora=1,attached_node=1},
 	sounds = default.node_sound_leaves_defaults(),
@ -69,7 +67,6 @@ minetest.register_node("ethereal:snowygrass", {
 	waving = 1,
 	walkable = false,
 	buildable_to = true,
-	is_ground_content = true,
 	groups = {snappy=3,flora=1,attached_node=1},
 	sounds = default.node_sound_leaves_defaults(),
 	selection_box = {
@ -91,7 +88,6 @@ minetest.register_node("ethereal:crystalgrass", {
 	waving = 1,
 	walkable = false,
 	buildable_to = true,
-	is_ground_content = true,
 	groups = {snappy=3,flora=1,attached_node=1},
 	sounds = default.node_sound_leaves_defaults(),
 	selection_box = {
@ -259,7 +255,6 @@ minetest.register_node("ethereal:bamboo", {
 	wield_image = "bamboo.png",
 	paramtype = "light",
 	sunlight_propagates = true,
-	is_ground_content = true,
 	walkable = true,
 	selection_box = {
 		type = "fixed",
@ -282,7 +277,6 @@ minetest.register_node("ethereal:bamboo_sprout", {
 	paramtype = "light",
 	sunlight_propagates = true,
 	walkable = false,
-	is_ground_content = true,
 	buildable_to = true,
 	groups = {snappy=3,flora=1,attached_node=1,flammable=2},
 	sounds = default.node_sound_leaves_defaults(),
--- a/sapling.lua
+++ b/sapling.lua
@ -12,6 +12,7 @@ ethereal.register_sapling = function( sapling_node_name, sapling_descr, sapling_
 			wield_image = sapling_texture,
 			paramtype = "light",
 			sunlight_propagates = true,
+			is_ground_content = false,
 			walkable = false,
 			selection_box = {type = "fixed",fixed = {-0.5, -0.5, -0.5, 0.5, -5/16, 0.5},},
 			groups = {snappy=2,dig_immediate=3,flammable=2,ethereal_sapling=1,attached_node=1},
--- a/screenshot.png
+++ b/screenshot.png
--- a/strawberry.lua
+++ b/strawberry.lua
@ -107,7 +107,6 @@ minetest.register_node("ethereal:strawberry_7", {
 	waving = 1,
 	walkable = false,
 	buildable_to = true,
-	is_ground_content = true,
 	drop = 	{
 		items = {
 			{items = {"ethereal:strawberry 1"},rarity=1},
--- a/water.lua
+++ b/water.lua
@ -4,6 +4,7 @@ minetest.register_node("ethereal:icebrick", {
 	tiles = {"brick_ice.png"},
 	paramtype = "light",
 	freezemelt = "default:water_source",
+	is_ground_content = false,
 	groups = {cracky=3, melts=1},
 	sounds = default.node_sound_glass_defaults(),
 })
@ -22,6 +23,7 @@ minetest.register_node("ethereal:snowbrick", {
 	tiles = {"brick_snow.png"},
 	paramtype = "light",
 	freezemelt = "default:water_source",
+	is_ground_content = false,
 	groups = {crumbly=3, melts=1},
 	sounds = default.node_sound_dirt_defaults({
 		footstep = {name="default_snow_footstep", gain=0.25},
--- a/wood.lua
+++ b/wood.lua
@ -10,6 +10,7 @@ minetest.register_node("ethereal:acacia_trunk", {			-- Acacia Trunk (thanks to V
 minetest.register_node("ethereal:acacia_wood", {			-- Acacia Wood
 	description = "Acacia Wood",
 	tiles = {"moretrees_acacia_wood.png"},
+	is_ground_content = false,
 	groups = {wood=1,choppy=2,oddly_breakable_by_hand=1,flammable=3},
 	sounds = default.node_sound_wood_defaults(),
 })
@ -30,6 +31,7 @@ minetest.register_node("ethereal:willow_trunk", {		-- Willow Trunk
 minetest.register_node("ethereal:willow_wood", {		-- Willow Wood
 	description = "Willow Wood",
 	tiles = {"willow_wood.png"},
+	is_ground_content = false,
 	groups = {wood=1,choppy=2,oddly_breakable_by_hand=1,flammable=3},
 	sounds = default.node_sound_wood_defaults(),
 })
@ -50,6 +52,7 @@ minetest.register_node("ethereal:redwood_trunk", {		-- Redwood Trunk
 minetest.register_node("ethereal:redwood_wood", {		-- Redwood Wood
 	description = "Redwood Wood",
 	tiles = {"redwood_wood.png"},
+	is_ground_content = false,
 	groups = {wood=1,choppy=2,oddly_breakable_by_hand=1,flammable=3},
 	sounds = default.node_sound_wood_defaults(),
 })
@ -70,6 +73,7 @@ minetest.register_node("ethereal:frost_tree", {			-- Frost Trunk
 minetest.register_node("ethereal:frost_wood", {			-- Frost Wood
 	description = "Frost Wood",
 	tiles = {"frost_wood.png"},
+	is_ground_content = false,
 	groups = {wood=1,choppy=2,oddly_breakable_by_hand=1,put_out_fire=1},
 	sounds = default.node_sound_wood_defaults(),
 })
@ -90,6 +94,7 @@ minetest.register_node("ethereal:yellow_trunk", {		-- Healing Trunk
 minetest.register_node("ethereal:yellow_wood", {		-- Healing Wood
 	description = "Healing Tree Wood",
 	tiles = {"yellow_wood.png"},
+	is_ground_content = false,
 	groups = {wood=1,choppy=2,oddly_breakable_by_hand=1,put_out_fire=1},
 	sounds = default.node_sound_wood_defaults(),
 })
@ -110,6 +115,7 @@ minetest.register_node("ethereal:palm_trunk", {			-- Palm Trunk
 minetest.register_node("ethereal:palm_wood", {			-- Palm Wood
 	description = "Palm Wood",
 	tiles = {"moretrees_palm_wood.png"},
+	is_ground_content = false,
 	groups = {wood=1,choppy=2,oddly_breakable_by_hand=1,flammable=3},
 	sounds = default.node_sound_wood_defaults(),
 })
@ -130,6 +136,7 @@ minetest.register_node("ethereal:banana_trunk", {		-- Banana Tree Trunk
 minetest.register_node("ethereal:banana_wood", {		-- Banana Tree Wood
 	description = "Banana Wood",
 	tiles = {"banana_wood.png"},
+	is_ground_content = false,
 	groups = {wood=1,choppy=2,oddly_breakable_by_hand=1,flammable=3},
 	sounds = default.node_sound_wood_defaults(),
 })