From de8b3eb386b010b3ec3273f58b713978aa19465f Mon Sep 17 00:00:00 2001
From: tenplus1 <kinsellaja@yahoo.com>
Date: Tue, 24 Mar 2015 09:23:05 +0000
Subject: [PATCH] Removed obsidian brick & stairs, also pine wood & stairs
---
README.md | 1 +
init.lua | 4 ++--
mapgen_v7n.lua | 33 ++++++--------------------------
mushroom.lua | 2 --
stairs.lua | 14 --------------
textures/mushroom_block.png_OLD | Bin 172 -> 0 bytes
textures/obsidian_brick.png | Bin 261 -> 0 bytes
7 files changed, 9 insertions(+), 45 deletions(-)
delete mode 100644 textures/mushroom_block.png_OLD
delete mode 100644 textures/obsidian_brick.png
diff --git a/README.md b/README.md
index 23d7e3a..b84d146 100644
--- a/README.md
+++ b/README.md
@@ -9,6 +9,7 @@ Changelog:
Added Staff of Light (thanks Xanthin), crafted from illumishrooms and can turn stone into glostone and back again
Changed how Crystal Spikes reproduce
Crystal Ingots now require 2x mese crystal and 2x crystal spikes to craft
+Removed obsidian brick & stairs now they are in default game, also removed pine wood stairs for same reason
1.14
diff --git a/init.lua b/init.lua
index 9e55296..aed8393 100644
--- a/init.lua
+++ b/init.lua
@@ -1,6 +1,6 @@
--[[
- Minetest Ethereal Mod 1.14 (1st March 2015)
+ Minetest Ethereal Mod 1.14 (24th March 2015)
Created by ChinChow
@@ -55,7 +55,7 @@ dofile(minetest.get_modpath("ethereal").."/fences.lua")
dofile(minetest.get_modpath("ethereal").."/gates.lua")
dofile(minetest.get_modpath("ethereal").."/stairs.lua")
--dofile(minetest.get_modpath("ethereal").."/mapgen_v7s.lua") -- 0.4.11 and below
-dofile(minetest.get_modpath("ethereal").."/mapgen_v7n.lua") -- 0.4.11 dev and above
+dofile(minetest.get_modpath("ethereal").."/mapgen_v7n.lua") -- 0.4.12 and above
-- Xanadu server Only
--dofile(minetest.get_modpath("ethereal").."/plantpack.lua")
diff --git a/mapgen_v7n.lua b/mapgen_v7n.lua
index 295ff04..48d95ed 100644
--- a/mapgen_v7n.lua
+++ b/mapgen_v7n.lua
@@ -3,7 +3,7 @@ minetest.clear_registered_biomes()
minetest.clear_registered_decorations()
--minetest.clear_registered_ores()
--- Biomes (for 0.4.11 dev with new changes from Paramat)
+-- Biomes (for 0.4.12 with new changes from Paramat)
if ethereal.bamboo == 1 then
minetest.register_biome({
name = "bamboo",
@@ -12,7 +12,6 @@ minetest.register_biome({
y_min = 1, y_max = 71,
heat_point = 45.0, humidity_point = 75.0,
})
-print ("Ethereal Bamboo Enabled")
end
if ethereal.mesa == 1 then
@@ -23,7 +22,6 @@ minetest.register_biome({
y_min = 2, y_max = 71,
heat_point = 25.0, humidity_point = 28.0,
})
-print ("Ethereal Mesa Enabled")
end
if ethereal.alpine == 1 then
@@ -34,7 +32,6 @@ minetest.register_biome({
y_min = 40, y_max = 90,
heat_point = 10.0, humidity_point = 40.0,
})
-print ("Ethereal Alpine Enabled")
end
if ethereal.healing == 1 then
@@ -45,7 +42,6 @@ minetest.register_biome({
y_min = 75, y_max = 140,
heat_point = 10.0, humidity_point = 40.0,
})
-print ("Ethereal Healing Enabled")
end
if ethereal.snowy == 1 then
@@ -56,7 +52,6 @@ minetest.register_biome({
y_min = 5, y_max = 40,
heat_point = 10.0, humidity_point = 40.0,
})
-print ("Ethereal Snowy Enabled")
end
if ethereal.frost == 1 then
@@ -67,7 +62,6 @@ minetest.register_biome({
y_min = 1, y_max = 71,
heat_point = 10.0, humidity_point = 40.0,
})
-print ("Ethereal Frost Enabled")
end
if ethereal.grassy == 1 then
@@ -78,7 +72,6 @@ minetest.register_biome({
y_min = 1, y_max = 91,
heat_point = 13.0, humidity_point = 40.0,
})
-print ("Ethereal Grassy Enabled")
end
if ethereal.caves == 1 then
@@ -89,7 +82,6 @@ minetest.register_biome({
y_min = 4, y_max = 41,
heat_point = 15.0, humidity_point = 25.0,
})
-print ("Ethereal Caves Enabled")
end
if ethereal.grayness == 1 then
@@ -100,7 +92,6 @@ minetest.register_biome({
y_min = 1, y_max = 41,
heat_point = 15.0, humidity_point = 30.0,
})
-print ("Ethereal Grayness Enabled")
end
if ethereal.grassytwo == 1 then
@@ -111,7 +102,6 @@ minetest.register_biome({
y_min = 1, y_max = 91,
heat_point = 15.0, humidity_point = 40.0,
})
-print ("Ethereal GrassyTwo Enabled")
end
if ethereal.prairie == 1 then
@@ -122,7 +112,6 @@ minetest.register_biome({
y_min = 3, y_max = 26,
heat_point = 20.0, humidity_point = 40.0,
})
-print ("Ethereal Prairie Enabled")
end
if ethereal.jumble == 1 then
@@ -133,7 +122,6 @@ minetest.register_biome({
y_min = 1, y_max = 71,
heat_point = 25.0, humidity_point = 50.0,
})
-print ("Ethereal Jumble Enabled")
end
if ethereal.junglee == 1 then
@@ -144,7 +132,6 @@ minetest.register_biome({
y_min = 1, y_max = 71,
heat_point = 30.0, humidity_point = 60.0,
})
-print ("Ethereal Junglee Enabled")
end
if ethereal.desert ==1 then
@@ -155,7 +142,6 @@ minetest.register_biome({
y_min = 3, y_max = 23,
heat_point = 35.0, humidity_point = 20.0,
})
-print ("Ethereal Desert Enabled")
end
if ethereal.grove == 1 then
@@ -166,7 +152,6 @@ minetest.register_biome({
y_min = 3, y_max = 23,
heat_point = 40.0, humidity_point = 60.0,
})
-print ("Ethereal Grove Enabled")
end
if ethereal.mushroom == 1 then
@@ -177,7 +162,6 @@ minetest.register_biome({
y_min = 1, y_max = 50,
heat_point = 45.0, humidity_point = 65.0,
})
-print ("Ethereal Mushroom Enabled")
end
if ethereal.desertstone == 1 then
@@ -188,7 +172,6 @@ minetest.register_biome({
y_min = 3, y_max = 23,
heat_point = 50.0, humidity_point = 20.0,
})
-print ("Ethereal DesertStone Enabled")
end
if ethereal.quicksand == 1 then
@@ -199,7 +182,6 @@ minetest.register_biome({
y_min = 1, y_max = 1,
heat_point = 50, humidity_point = 38,
})
-print ("Ethereal Quicksand Enabled")
end
if ethereal.lake == 1 then
@@ -211,7 +193,6 @@ minetest.register_biome({
y_min = -31000, y_max = 3,
heat_point = 50, humidity_point = 40,
})
-print ("Ethereal Lake Enabled")
end
if ethereal.plains == 1 then
@@ -222,7 +203,6 @@ minetest.register_biome({
y_min = 3, y_max = 61,
heat_point = 55.0, humidity_point = 25.0,
})
-print ("Ethereal Plains Enabled")
end
if ethereal.fiery == 1 then
@@ -233,7 +213,6 @@ minetest.register_biome({
y_min = 5, y_max = 65,
heat_point = 80.0, humidity_point = 10.0,
})
-print ("Ethereal Fiery Enabled")
end
if ethereal.sandclay == 1 then
@@ -244,7 +223,6 @@ minetest.register_biome({
y_min = 1, y_max = 11,
heat_point = 65.0, humidity_point = 2.0,
})
-print ("Ethereal SandClay Enabled")
end
-- Schematics Decoration
@@ -573,8 +551,7 @@ minetest.register_decoration({ -- Papyrus
-- Palm Tree on Sand next to Water
minetest.register_on_generated(function(minp, maxp, seed)
- --if maxp.y >= 2 and minp.y <= 0 then -- orig
- if maxp.y > 1 and minp.y < 1 then -- new
+ if maxp.y > 1 and minp.y < 1 then
local perlin1 = minetest.get_perlin(354, 3, 0.7, 100)
-- Assume X and Z lengths are equal
local divlen = 8
@@ -585,7 +562,7 @@ minetest.register_on_generated(function(minp, maxp, seed)
local z0 = minp.z + math.floor((divz+0)*divlen)
local x1 = minp.x + math.floor((divx+1)*divlen)
local z1 = minp.z + math.floor((divz+1)*divlen)
- -- Find random positions for palm based on this random
+ -- Find random positions for palm tree
local pr = PseudoRandom(seed+1)
local x = pr:next(x0, x1)
local z = pr:next(z0, z1)
@@ -599,7 +576,9 @@ minetest.register_on_generated(function(minp, maxp, seed)
end)
-- Farming Redo Plants
-if minetest.get_modpath("farming") and farming.mod == "redo" then
+if farming.mod and farming.mod == "redo" then
+
+print ("[MOD] Ethereal - Detected and using Farming Redo mod")
minetest.register_decoration({ -- Potato
deco_type = "simple",
diff --git a/mushroom.lua b/mushroom.lua
index 4b4e4ec..f052b73 100644
--- a/mushroom.lua
+++ b/mushroom.lua
@@ -169,8 +169,6 @@ minetest.register_abm({
end
})
-else
- print ("[MOD] Ethereal - Detected and using Farming Redo mod")
end
-- Temporary compatibility lines for Xanadu server
diff --git a/stairs.lua b/stairs.lua
index 49ebc3f..282588e 100644
--- a/stairs.lua
+++ b/stairs.lua
@@ -80,13 +80,6 @@ stairs.register_stair_and_slab("willow_wood", "ethereal:willow_wood",
"Willow Wood Slab",
default.node_sound_wood_defaults())
-stairs.register_stair_and_slab("pine_wood", "default:pinewood",
- {choppy=2,oddly_breakable_by_hand=1,flammable=3, not_in_craft_guide=1},
- {"default_pinewood.png"},
- "Pine Wood Stair",
- "Pine Wood Slab",
- default.node_sound_wood_defaults())
-
stairs.register_stair_and_slab("redwood_wood", "ethereal:redwood_wood",
{choppy=2,oddly_breakable_by_hand=1,flammable=3, not_in_craft_guide=1},
{"redwood_wood.png"},
@@ -100,10 +93,3 @@ stairs.register_stair_and_slab("acacia_wood", "ethereal:acacia_wood",
"Acacia Wood Stair",
"Acacia Wood Slab",
default.node_sound_wood_defaults())
-
-stairs.register_stair_and_slab("obsidian_brick", "ethereal:obsidian_brick",
- {cracky=1,level=3, not_in_craft_guide=1},
- {"obsidian_brick.png"},
- "Obsidian Brick Stair",
- "Obsidian Brick Slab",
- default.node_sound_stone_defaults())
diff --git a/textures/mushroom_block.png_OLD b/textures/mushroom_block.png_OLD
deleted file mode 100644
index d81ea44dca73890b1b41aa825bac0d29118edc31..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 172
zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4rT@h2A3sW#~2tG*aCb)TyHZl+`fHVzkfy*
z0|P^%r;B5V#p%5h1Gx?ua5zu?9beU2H|3nU>o&dmtL(j<Usl?Lyj9+)R;F?++n3=3
z%O92<oE>#H7+kw&d)mc>npiE*(=T~o+aNG;^Q?Q!O57KiKhJOovr?NPV9&7h<gOR%
a^fbj7Sw*hx`^Lb)z~JfX=d#Wzp$PypKs)#V
diff --git a/textures/obsidian_brick.png b/textures/obsidian_brick.png
deleted file mode 100644
index 62c5688cd90b3d1a12a61caef6ece3f58628eccf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 261
zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd7G?$phPQVgfdnK1d_r6q7#SGYIN5mk1w~}U
zq*P@Ub>!8}m33_YOIGGEFfcGCdAqwXbg;^LFfcH17I;J!Gca%qgD@k*tT_@43=Hfg
zp1!W^_t?1kRG3!Y<haMcz)<Yz;uyklUAN~T*C7WUm-w(f=`YneY|A5$WG{?7&-%Av
zk=eYz|GOg#of2m3;kmbUxAOU0E4B+NYG2@J*GNBM>07Y$`Gy`9PPO7E>$&sqzrPmO
zcQdI!insTEf7YUmsZBg{x;B;C=pD9lzbmp?vpxQ#)NfXy`TXC%{5&Ynz`(%Z>FVdQ
I&MBb@08Cg@vj6}9
--
GitLab