From adabd04d7b33ffa6d2a91c521cf713e092b3dc6f Mon Sep 17 00:00:00 2001
From: TenPlus1 <kinsellaja@yahoo.com>
Date: Tue, 6 Dec 2016 10:48:31 +0000
Subject: [PATCH] Few new tweaks thanks to RQWorldblender

---
 crystal.lua                |  10 +++++-----
 dirt.lua                   |  13 +++++++++++++
 extra.lua                  |   9 ++++++---
 food.lua                   |   5 -----
 init.lua                   |   4 +++-
 schematics/waterlily.lua   |   9 ++++++---
 stairs.lua                 |  17 +++++++++--------
 textures/bucket_cactus.png | Bin 188 -> 276 bytes
 water.lua                  |   4 ++--
 9 files changed, 44 insertions(+), 27 deletions(-)

diff --git a/crystal.lua b/crystal.lua
index 343b9fc..2e9ecd2 100644
--- a/crystal.lua
+++ b/crystal.lua
@@ -13,7 +13,7 @@ minetest.register_node("ethereal:crystal_spike", {
 	sunlight_propagates = true,
 	walkable = false,
 	damage_per_second = 1,
-	groups = {cracky = 1, falling_node = 1, puts_out_fire = 1},
+	groups = {cracky = 1, falling_node = 1, puts_out_fire = 1, cools_lava = 1},
 	sounds = default.node_sound_glass_defaults(),
 	selection_box = {
 		type = "fixed",
@@ -50,7 +50,7 @@ minetest.register_node("ethereal:crystal_block", {
 	tiles = {"crystal_block.png"},
 	light_source = 9,
 	is_ground_content = false,
-	groups = {cracky = 1, level = 2, puts_out_fire = 1},
+	groups = {cracky = 1, level = 2, puts_out_fire = 1, cools_lava = 1},
 	sounds = default.node_sound_glass_defaults(),
 })
 
@@ -110,8 +110,8 @@ minetest.register_tool("ethereal:axe_crystal", {
 		groupcaps = {
 			choppy = {
 				times = {[1] = 2.00, [2] = 0.80, [3] = 0.40},
-				uses = 30,
-				maxlevel = 2
+				uses = 40,
+				maxlevel = 3
 			},
 		},
 		damage_groups = {fleshy = 7},
@@ -152,7 +152,7 @@ minetest.register_tool("ethereal:pick_crystal", {
 				maxlevel = 3
 			},
 		},
-		damage_groups = {fleshy = 7},
+		damage_groups = {fleshy = 6},
 	},
 	sound = {breaks = "default_tool_breaks"},
 })
diff --git a/dirt.lua b/dirt.lua
index 17d02b0..b5f9355 100644
--- a/dirt.lua
+++ b/dirt.lua
@@ -408,3 +408,16 @@ minetest.register_node("ethereal:quicksand2", {
 	groups = {crumbly = 3, sand = 1, liquid = 3, disable_jump = 1},
 	sounds = default.node_sound_sand_defaults(),
 })
+
+-- craft quicksand
+minetest.register_craft({
+	output = "ethereal:quicksand2",
+	recipe = {
+		{"group:sand", "group:sand", "group:sand"},
+		{"group:sand", "group:water_bucket", "group:sand"},
+		{"group:sand", "group:sand", "group:sand"},
+	},
+	replacements = {
+		{"group:water_bucket", "bucket:bucket_empty"}
+	}
+})
diff --git a/extra.lua b/extra.lua
index b8a4bc0..4c5ac47 100644
--- a/extra.lua
+++ b/extra.lua
@@ -42,6 +42,8 @@ minetest.register_craft({
 	}
 })
 
+if ethereal.xcraft == true then
+
 -- X pattern craft recipes (5x 'a' in X pattern gives 5 of 'b')
 local cheat = {
 	{"default:cobble", "default:gravel", 5},
@@ -63,6 +65,8 @@ for n = 1, #cheat do
 	})
 end
 
+end -- END if
+
 -- Paper (2x3 string = 4 paper)
 minetest.register_craft({
 	output = "default:paper 4",
@@ -215,10 +219,9 @@ minetest.register_node("ethereal:glostone", {
 })
 
 minetest.register_craft({
+	type = "shapeless",
 	output = "ethereal:glostone",
-	recipe = {
-		{"default:torch", "default:stone", "dye:yellow"},
-	}
+	recipe = {"default:torch", "default:stone", "dye:yellow"}
 })
 
 -- Charcoal Lump
diff --git a/food.lua b/food.lua
index ea62728..586dc0f 100644
--- a/food.lua
+++ b/food.lua
@@ -1,11 +1,6 @@
 
 local S = ethereal.intllib
 
--- fix apples hanging in sky when no tree around
-minetest.override_item("default:apple", {
-	drop = "default:apple",
-})
-
 -- Banana (Heals one heart when eaten)
 minetest.register_node("ethereal:banana", {
 	description = S("Banana"),
diff --git a/init.lua b/init.lua
index dddd4b1..6b43d2d 100644
--- a/init.lua
+++ b/init.lua
@@ -1,6 +1,6 @@
 --[[
 
-	Minetest Ethereal Mod (1st December 2016)
+	Minetest Ethereal Mod (6th December 2016)
 
 	Created by ChinChow
 
@@ -14,6 +14,8 @@ ethereal.leafwalk = false -- true for walkable leaves, false to fall through
 ethereal.cavedirt = true -- caves chop through dirt when true
 ethereal.torchdrop = true -- torches drop when touching water
 ethereal.papyruswalk = true -- papyrus can be walked on
+ethereal.lilywalk = true -- waterlilies can be walked on
+ethereal.xcraft = true -- allow cheat crafts for cobble->gravel->dirt->sand, ice->snow, dry dirt->desert sand
 
 -- Set following to 1 to enable biome or 0 to disable
 ethereal.glacier   = 1 -- Ice glaciers with snow
diff --git a/schematics/waterlily.lua b/schematics/waterlily.lua
index 1936b04..0373a88 100644
--- a/schematics/waterlily.lua
+++ b/schematics/waterlily.lua
@@ -12,6 +12,9 @@ ethereal.waterlily = {
 	},
 }
 
-minetest.override_item("flowers:waterlily", {
-	walkable = true,
-})
+if ethereal.lilywalk == true then
+
+	minetest.override_item("flowers:waterlily", {
+		walkable = true,
+	})
+end
diff --git a/stairs.lua b/stairs.lua
index 5cf51ff..688db1f 100644
--- a/stairs.lua
+++ b/stairs.lua
@@ -12,14 +12,14 @@ stairs.register_all("crystal_block", "ethereal:crystal_block",
 	default.node_sound_glass_defaults())
 
 stairs.register_all("icebrick", "ethereal:icebrick",
-	{crumbly = 3, melts = 1},
+	{cracky = 3, puts_out_fire = 1, cools_lava = 1},
 	{"brick_ice.png"},
 	S("Ice Brick Stair"),
 	S("Ice Brick Slab"),
 	default.node_sound_glass_defaults())
 		
 stairs.register_all("snowbrick", "ethereal:snowbrick",
-	{crumbly = 3, melts = 1},
+	{crumbly = 3, puts_out_fire = 1, cools_lava = 1},
 	{"brick_snow.png"},
 	S("Snow Brick Stair"),
 	S("Snow Brick Slab"),
@@ -118,14 +118,14 @@ stairsplus:register_all("ethereal", "crystal_block", "ethereal:crystal_block", {
 stairsplus:register_all("ethereal", "icebrick", "ethereal:icebrick", {
 	description = S("Ice Brick"),
 	tiles = {"brick_ice.png"},
-	groups = {crumbly = 3, melts = 1},
+	groups = {cracky = 3, puts_out_fire = 1, cools_lava = 1},
 	sounds = default.node_sound_glass_defaults(),
 })
 
 stairsplus:register_all("ethereal", "snowbrick", "ethereal:snowbrick", {
 	description = S("Snow Brick"),
 	tiles = {"brick_snow.png"},
-	groups = {crumbly = 3, melts = 1},
+	groups = {crumbly = 3, puts_out_fire = 1, cools_lava = 1},
 	sounds = default.node_sound_dirt_defaults({
 		footstep = {name = "default_snow_footstep", gain = 0.25},
 		dug = {name = "default_snow_footstep", gain = 0.75},
@@ -220,20 +220,21 @@ stairs.register_stair_and_slab("crystal_block", "ethereal:crystal_block",
 	default.node_sound_glass_defaults())
 
 stairs.register_stair_and_slab("icebrick", "ethereal:icebrick",
-	{crumbly = 3, melts = 1},
+	{cracky = 3, puts_out_fire = 1, cools_lava = 1},
 	{"brick_ice.png"},
 	S("Ice Brick Stair"),
 	S("Ice Brick Slab"),
 	default.node_sound_glass_defaults())
 		
 stairs.register_stair_and_slab("snowbrick", "ethereal:snowbrick",
-	{crumbly = 3, melts = 1},
+	{crumbly = 3, puts_out_fire = 1, cools_lava = 1},
 	{"brick_snow.png"},
 	S("Snow Brick Stair"),
 	S("Snow Brick Slab"),
 	default.node_sound_dirt_defaults({
-		footstep = {name = "default_snow_footstep", gain = 0.25},
-		dug = {name = "default_snow_footstep", gain = 0.75},
+		footstep = {name = "default_snow_footstep", gain = 0.15},
+		dug = {name = "default_snow_footstep", gain = 0.2},
+		dig = {name = "default_snow_footstep", gain = 0.2}
 	}))
 
 stairs.register_stair_and_slab("dry_dirt", "ethereal:dry_dirt",
diff --git a/textures/bucket_cactus.png b/textures/bucket_cactus.png
index 520707b4f779191ca3b9ca318c115b59626aad8c..7d5fd0bfab239f4e9090b1f1b265bb106abb8a2d 100644
GIT binary patch
delta 260
zcmdnPIE86~L_G&H0|SGGE`KnPG7j(wadlu|P*6}vOiXNQYML-%!u<L3mn~biYuB!o
zSHjLeUw;4l{=>H?uQ?mD{d_%;JpQuy*!@{MdYAbEwKJ9k`2{mLJiCzw;v{*yyD)UH
z%6b4foCO|{#S9GG!XV7ZFl&wkP>{XE)7Q0@{Q(avyAFHT5|^1ku_#X$#}J9jz308f
z8WcEK15WraYJ69}HBgpI_N&_-Z61~%;(H#yda?FvV$0N)p90Iew&^eB=#EW1XBBjC
zgXEh?=fcK+Ob=LJzCM47=a%h?B`>TO*tMTM_-neRdj5Z=!rHa6kAb!@c)I$ztaD0e
F0syuOW`qC$

delta 172
zcmbQjw1;tmL_G^L0|Ud`yN`l^lth3}h-+d2kj0RgnAp_RG=Kj5UAuOzIU95QWpRO_
z$a|m!V@Z%-FoVOh8)-mJkf)1d2*>s0gab?xtgNhxC6&7tFicR4U}I5GbX?$}*rE7H
zBSLQtN79a6JEWT>de-TsxhWj&(NjDp(ALqtQL*Eos=}j3YdFjz13Wzi(pnkJRx{Qo
VaQhmjvM&U=!qe5yWt~$(69DVqI>rD1

diff --git a/water.lua b/water.lua
index f5a6e24..60c4dbf 100644
--- a/water.lua
+++ b/water.lua
@@ -8,7 +8,7 @@ minetest.register_node("ethereal:icebrick", {
 	paramtype = "light",
 	freezemelt = "default:water_source",
 	is_ground_content = false,
-	groups = {cracky = 3, melts = 1},
+	groups = {cracky = 3, puts_out_fire = 1, cools_lava = 1},
 	sounds = default.node_sound_glass_defaults(),
 })
 
@@ -27,7 +27,7 @@ minetest.register_node("ethereal:snowbrick", {
 	paramtype = "light",
 	freezemelt = "default:water_source",
 	is_ground_content = false,
-	groups = {crumbly = 3, melts = 1},
+	groups = {crumbly = 3, puts_out_fire = 1, cools_lava = 1},
 	sounds = default.node_sound_dirt_defaults({
 		footstep = {name = "default_snow_footstep", gain = 0.15},
 		dug = {name = "default_snow_footstep", gain = 0.2},
-- 
GitLab