removed duplicate wool and straw block in case of farming and wool beeing installed
This commit is contained in:
parent
68465f4109
commit
ccb66008c4
10
init.lua
10
init.lua
|
@ -44,6 +44,16 @@ else
|
||||||
cottages.sounds.stone = default.node_sound_stone_defaults()
|
cottages.sounds.stone = default.node_sound_stone_defaults()
|
||||||
cottages.sounds.leaves = default.node_sound_leaves_defaults()
|
cottages.sounds.leaves = default.node_sound_leaves_defaults()
|
||||||
end
|
end
|
||||||
|
|
||||||
|
-- the straw from default comes with stairs as well and might replace
|
||||||
|
-- cottages:roof_connector_straw and cottages:roof_flat_straw
|
||||||
|
-- however, that does not look very good
|
||||||
|
if( false and minetest.registered_nodes["farming:straw"]) then
|
||||||
|
cottages.straw_texture = "farming_straw.png"
|
||||||
|
cottages.use_farming_straw_stairs = true
|
||||||
|
else
|
||||||
|
cottages.straw_texture = "cottages_darkage_straw.png"
|
||||||
|
end
|
||||||
--cottages.config_use_mesh_barrel = false;
|
--cottages.config_use_mesh_barrel = false;
|
||||||
--cottages.config_use_mesh_handmill = true;
|
--cottages.config_use_mesh_handmill = true;
|
||||||
|
|
||||||
|
|
|
@ -46,7 +46,7 @@ minetest.register_node("cottages:hay_mat", {
|
||||||
drawtype = "nodebox",
|
drawtype = "nodebox",
|
||||||
paramtype2 = "leveled",
|
paramtype2 = "leveled",
|
||||||
description = S("Some hay"),
|
description = S("Some hay"),
|
||||||
tiles = {"cottages_darkage_straw.png^[multiply:#88BB88"},
|
tiles = {cottages.straw_texture.."^[multiply:#88BB88"},
|
||||||
groups = {hay=3, snappy=2, oddly_breakable_by_hand=2, flammable=3},
|
groups = {hay=3, snappy=2, oddly_breakable_by_hand=2, flammable=3},
|
||||||
sounds = cottages.sounds.leaves,
|
sounds = cottages.sounds.leaves,
|
||||||
-- the bale is slightly smaller than a full node
|
-- the bale is slightly smaller than a full node
|
||||||
|
@ -73,7 +73,7 @@ minetest.register_node("cottages:hay_mat", {
|
||||||
-- hay block, similar to straw block
|
-- hay block, similar to straw block
|
||||||
minetest.register_node("cottages:hay", {
|
minetest.register_node("cottages:hay", {
|
||||||
description = S("Hay"),
|
description = S("Hay"),
|
||||||
tiles = {"cottages_darkage_straw.png^[multiply:#88BB88"},
|
tiles = {cottages.straw_texture.."^[multiply:#88BB88"},
|
||||||
groups = {hay=3, snappy=2, oddly_breakable_by_hand=2, flammable=3},
|
groups = {hay=3, snappy=2, oddly_breakable_by_hand=2, flammable=3},
|
||||||
sounds = cottages.sounds.leaves,
|
sounds = cottages.sounds.leaves,
|
||||||
is_ground_content = false,
|
is_ground_content = false,
|
||||||
|
|
|
@ -66,7 +66,7 @@ end
|
||||||
-- right now, this block mostly serves as a placeholder
|
-- right now, this block mostly serves as a placeholder
|
||||||
minetest.register_node("cottages:straw_ground", {
|
minetest.register_node("cottages:straw_ground", {
|
||||||
description = S("straw ground for animals"),
|
description = S("straw ground for animals"),
|
||||||
tiles = {"cottages_darkage_straw.png","cottages_loam.png","cottages_loam.png","cottages_loam.png","cottages_loam.png","cottages_loam.png"},
|
tiles = {cottages.straw_texture,"cottages_loam.png","cottages_loam.png","cottages_loam.png","cottages_loam.png","cottages_loam.png"},
|
||||||
groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2},
|
groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2},
|
||||||
groups = {crumbly=3},
|
groups = {crumbly=3},
|
||||||
sounds = cottages.sounds.leaves,
|
sounds = cottages.sounds.leaves,
|
||||||
|
@ -178,12 +178,16 @@ minetest.register_node("cottages:wool_tent", {
|
||||||
})
|
})
|
||||||
|
|
||||||
-- a fallback for cases in which there is no wool
|
-- a fallback for cases in which there is no wool
|
||||||
minetest.register_node("cottages:wool", {
|
if( not( minetest.registered_nodes["wool:white"])) then
|
||||||
|
minetest.register_node("cottages:wool", {
|
||||||
description = "Wool",
|
description = "Wool",
|
||||||
tiles = {"cottages_wool.png"},
|
tiles = {"cottages_wool.png"},
|
||||||
is_ground_content = false,
|
is_ground_content = false,
|
||||||
groups = {snappy=2,choppy=2,oddly_breakable_by_hand=3,flammable=3,wool=1},
|
groups = {snappy=2,choppy=2,oddly_breakable_by_hand=3,flammable=3,wool=1},
|
||||||
})
|
})
|
||||||
|
else
|
||||||
|
minetest.register_alias("cottages:wool", "wool:white")
|
||||||
|
end
|
||||||
|
|
||||||
|
|
||||||
---------------------------------------------------------------------------------------
|
---------------------------------------------------------------------------------------
|
||||||
|
|
|
@ -36,6 +36,7 @@ cottages.register_roof = function( name, tiles, basic_material, homedecor_altern
|
||||||
})
|
})
|
||||||
|
|
||||||
-- a better roof than the normal stairs; this one is for usage directly on top of walls (it has the form of a stair)
|
-- a better roof than the normal stairs; this one is for usage directly on top of walls (it has the form of a stair)
|
||||||
|
if( name~="straw" or not(minetest.registered_nodes["stairs:stair_straw"]) or not(cottages.use_farming_straw_stairs)) then
|
||||||
minetest.register_node("cottages:roof_connector_"..name, {
|
minetest.register_node("cottages:roof_connector_"..name, {
|
||||||
description = S("Roof connector "..name),
|
description = S("Roof connector "..name),
|
||||||
drawtype = "nodebox",
|
drawtype = "nodebox",
|
||||||
|
@ -60,8 +61,12 @@ cottages.register_roof = function( name, tiles, basic_material, homedecor_altern
|
||||||
},
|
},
|
||||||
is_ground_content = false,
|
is_ground_content = false,
|
||||||
})
|
})
|
||||||
|
else
|
||||||
|
minetest.register_alias("cottages:roof_connector_straw", "stairs:stair_straw")
|
||||||
|
end
|
||||||
|
|
||||||
-- this one is the slab version of the above roof
|
-- this one is the slab version of the above roof
|
||||||
|
if( name~="straw" or not(minetest.registered_nodes["stairs:slab_straw"]) or not(cottages.use_farming_straw_stairs)) then
|
||||||
minetest.register_node("cottages:roof_flat_"..name, {
|
minetest.register_node("cottages:roof_flat_"..name, {
|
||||||
description = S("Roof (flat) "..name),
|
description = S("Roof (flat) "..name),
|
||||||
drawtype = "nodebox",
|
drawtype = "nodebox",
|
||||||
|
@ -85,6 +90,9 @@ cottages.register_roof = function( name, tiles, basic_material, homedecor_altern
|
||||||
},
|
},
|
||||||
is_ground_content = false,
|
is_ground_content = false,
|
||||||
})
|
})
|
||||||
|
else
|
||||||
|
minetest.register_alias("cottages:roof_flat_straw", "stairs:slab_straw")
|
||||||
|
end
|
||||||
|
|
||||||
|
|
||||||
if( not( homedecor_alternative )
|
if( not( homedecor_alternative )
|
||||||
|
@ -147,9 +155,9 @@ end -- of cottages.register_roof( name, tiles, basic_material )
|
||||||
-- add the diffrent roof types
|
-- add the diffrent roof types
|
||||||
---------------------------------------------------------------------------------------
|
---------------------------------------------------------------------------------------
|
||||||
cottages.register_roof( 'straw',
|
cottages.register_roof( 'straw',
|
||||||
{"cottages_darkage_straw.png","cottages_darkage_straw.png",
|
{cottages.straw_texture, cottages.straw_texture,
|
||||||
"cottages_darkage_straw.png","cottages_darkage_straw.png",
|
cottages.straw_texture, cottages.straw_texture,
|
||||||
"cottages_darkage_straw.png","cottages_darkage_straw.png"},
|
cottages.straw_texture, cottages.straw_texture},
|
||||||
'cottages:straw_mat', nil );
|
'cottages:straw_mat', nil );
|
||||||
cottages.register_roof( 'reet',
|
cottages.register_roof( 'reet',
|
||||||
{"cottages_reet.png","cottages_reet.png",
|
{"cottages_reet.png","cottages_reet.png",
|
||||||
|
|
|
@ -12,9 +12,9 @@ local S = cottages.S
|
||||||
minetest.register_node("cottages:straw_mat", {
|
minetest.register_node("cottages:straw_mat", {
|
||||||
description = S("layer of straw"),
|
description = S("layer of straw"),
|
||||||
drawtype = 'nodebox',
|
drawtype = 'nodebox',
|
||||||
tiles = { 'cottages_darkage_straw.png' }, -- done by VanessaE
|
tiles = { cottages.straw_texture }, -- done by VanessaE
|
||||||
wield_image = 'cottages_darkage_straw.png',
|
wield_image = cottages.straw_texture,
|
||||||
inventory_image = 'cottages_darkage_straw.png',
|
inventory_image = cottages.straw_texture,
|
||||||
sunlight_propagates = true,
|
sunlight_propagates = true,
|
||||||
paramtype = 'light',
|
paramtype = 'light',
|
||||||
paramtype2 = "facedir",
|
paramtype2 = "facedir",
|
||||||
|
@ -64,15 +64,19 @@ minetest.register_node("cottages:straw_bale", {
|
||||||
})
|
})
|
||||||
|
|
||||||
-- just straw
|
-- just straw
|
||||||
minetest.register_node("cottages:straw", {
|
if( not(minetest.registered_nodes["farming:straw"])) then
|
||||||
|
minetest.register_node("cottages:straw", {
|
||||||
drawtype = "normal",
|
drawtype = "normal",
|
||||||
description = S("straw"),
|
description = S("straw"),
|
||||||
tiles = {"cottages_darkage_straw.png"},
|
tiles = {cottages.straw_texture},
|
||||||
groups = { hay = 3, snappy = 2, oddly_breakable_by_hand = 2, flammable=3 },
|
groups = { hay = 3, snappy = 2, oddly_breakable_by_hand = 2, flammable=3 },
|
||||||
sounds = cottages.sounds.leaves,
|
sounds = cottages.sounds.leaves,
|
||||||
-- the bale is slightly smaller than a full node
|
-- the bale is slightly smaller than a full node
|
||||||
is_ground_content = false,
|
is_ground_content = false,
|
||||||
})
|
})
|
||||||
|
else
|
||||||
|
minetest.register_alias("cottages:straw", "farming:straw")
|
||||||
|
end
|
||||||
|
|
||||||
|
|
||||||
local cottages_formspec_treshing_floor =
|
local cottages_formspec_treshing_floor =
|
||||||
|
@ -239,7 +243,7 @@ minetest.register_node("cottages:threshing_floor", {
|
||||||
end
|
end
|
||||||
|
|
||||||
local overlay1 = "^farming_wheat.png";
|
local overlay1 = "^farming_wheat.png";
|
||||||
local overlay2 = "^cottages_darkage_straw.png";
|
local overlay2 = "^"..cottages.straw_texture;
|
||||||
local overlay3 = "^"..cottages.texture_wheat_seed;
|
local overlay3 = "^"..cottages.texture_wheat_seed;
|
||||||
|
|
||||||
-- this can be enlarged by a multiplicator if desired
|
-- this can be enlarged by a multiplicator if desired
|
||||||
|
|
Loading…
Reference in New Issue