diff --git a/README.md b/README.md index 0a3896e..9c40eef 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,68 @@ superseded by newer versions. For more information about this mod, please refer to https://forum.minetest.net/viewtopic.php?id=5120 -The texture cottages/textures/cottages_slate.png is derived from Universal schema.jpg by Stefanie Lindener, which can be found here: http://de.wikipedia.org/w/index.php?title=Datei:Universal_schema.jpg&filetimestamp=20060510110309& The texture is CC-by-sa 2.0/de. Liscence of this mod: GPLv3 + +--- +--- Textures and media: +--- +VanessaE (CC-by-SA 3.0): + cottages_waonwheel.png + cottages_homedecor_shingles_asphalt.png + cottages_homedecor_shingles_terracotta.png + cottages_homedecor_shingles_wood.png + glooptest_tool_steelhammer.png + cottages_sleepingmat.png + cottages_barrel.png + +badger436 (created for this mod; CC BY-SA 3.0): + cottages_feldweg.png + +Some textures are taken from + https://github.com/minetest/minetest_game +and renamed (default_NAME.png -> cottages_NAME.png) + +Cisoun's WTFPL texture pack: + cottages_stone.png (for anvil and handmill) + +Zeg9 (CC BY-SA 3.0): + cottages_steel_block.png (for steel hatch and stovepipie) + +MasterGollum (WTFPL, darkage mod): + cottages_darkage_straw_bale.png + cottages_darkage_straw.png + cottages_reet.png (straw texture changed in color) + +Sokomine (CC-by-SA 3.0): + cottages_glass_pane.png (modification of default_glass.png) + cottages_loam.png (part of a real loam wall) + +Copyright (C) 2010-2012 celeron55, Perttu Ahola +Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0) +http://creativecommons.org/licenses/by-sa/3.0/ + cottages_clay.png (washing place, stairs and slab) +From the supplied minimal game: + cottages_minimal_wood.png + +PilzAdam (WTFPL; default and beds mod): + cottages_junglewood.png + cottages_beds_bed_side.png + cottages_beds_bed_side_top_l.png + cottages_beds_bed_side_top_r.png + cottages_beds_bed_top_bottom.png + cottages_beds_bed_top_top.png + +Derived from Universal schema.jpg by Stefanie Lindener, which can be found here: http://de.wikipedia.org/w/index.php?title=Datei:Universal_schema.jpg&filetimestamp=20060510110309& The texture is CC-by-sa 2.0/de. + cottages_slate.png + +Textures not provided but used (need to be supplied by a default mod): + default_wood.png + default_tree.png + default_dirt.png + default_grass_side.png + default_chest_top.png + default_chest_side.png + default_chest_front.png + default_stick.png + farming_wheat.png diff --git a/depends.txt b/depends.txt index 2ba42a9..e819a5f 100644 --- a/depends.txt +++ b/depends.txt @@ -1,4 +1,4 @@ -default +default? farming stairs? homedecor? diff --git a/init.lua b/init.lua index 2bb4244..7baec8a 100644 --- a/init.lua +++ b/init.lua @@ -24,6 +24,29 @@ cottages = {} -- uncomment parts you do not want +-- texture used for fence gate and bed posts +cottages.texture_furniture = "default_wood.png"; +-- texture for the side of roof nodes +cottages.texture_roof_sides = "default_wood.png"; +-- if the default wood node does not exist, use an alternate wood texture +-- (which is also used for furnitures and doors in this mod) +if( not( minetest.registered_nodes['default:wood'])) then + cottages.texture_roof_sides = "cottages_minimal_wood.png"; + cottages.texture_furniture = "cottages_minimal_wood.png"; +end + +-- texture for roofs where the tree bark is the main roof texture +cottages.textures_roof_wood = "default_tree.png"; +if( not( minetest.registered_nodes["default:tree"])) then + -- realtest has diffrent barks; the spruce one seems to be the most fitting + if( minetest.registered_nodes["trees:spruce_log" ]) then + cottages.textures_roof_wood = "trees_spruce_trunk.png"; + else + -- does not look so well in this case as it's no bark; but what else shall we do? + cottages.textures_roof_wood = "cottages_minimal_wood.png"; + end +end + dofile(minetest.get_modpath("cottages").."/nodes_furniture.lua"); dofile(minetest.get_modpath("cottages").."/nodes_historic.lua"); dofile(minetest.get_modpath("cottages").."/nodes_straw.lua"); diff --git a/nodes_anvil.lua b/nodes_anvil.lua index 7ebdfed..e04f92f 100644 --- a/nodes_anvil.lua +++ b/nodes_anvil.lua @@ -37,7 +37,7 @@ minetest.register_tool("cottages:hammer", { minetest.register_node("cottages:anvil", { drawtype = "nodebox", description = S("anvil"), - tiles = {"default_stone.png"}, -- TODO default_steel_block.png, default_obsidian.png are also nice + tiles = {"cottages_stone.png"}, -- TODO default_steel_block.png, default_obsidian.png are also nice paramtype = "light", paramtype2 = "facedir", groups = {cracky=2}, diff --git a/nodes_doorlike.lua b/nodes_doorlike.lua index 38e2ef8..600c1b3 100644 --- a/nodes_doorlike.lua +++ b/nodes_doorlike.lua @@ -234,7 +234,7 @@ minetest.register_node("cottages:gate_closed", { description = S("closed fence gate"), drawtype = "nodebox", -- top, bottom, side1, side2, inner, outer - tiles = {"default_wood.png"}, + tiles = {cottages.texture_furniture}, paramtype = "light", paramtype2 = "facedir", groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2}, @@ -266,7 +266,7 @@ minetest.register_node("cottages:gate_open", { description = S("opened fence gate"), drawtype = "nodebox", -- top, bottom, side1, side2, inner, outer - tiles = {"default_wood.png"}, + tiles = {cottages.texture_furniture}, paramtype = "light", paramtype2 = "facedir", drop = "cottages:gate_closed", @@ -364,7 +364,7 @@ end -- further alternate hatch materials: wood, tree, copper_block cottages.register_hatch( 'cottages:hatch_wood', 'wooden hatch', 'cottages_minimal_wood.png', 'stairs:slab_wood' ); -cottages.register_hatch( 'cottages:hatch_steel', 'metal hatch', 'default_steel_block.png', 'default:steel_ingot' ); +cottages.register_hatch( 'cottages:hatch_steel', 'metal hatch', 'cottages_steel_block.png', 'default:steel_ingot' ); diff --git a/nodes_furniture.lua b/nodes_furniture.lua index 0137103..3494c6d 100644 --- a/nodes_furniture.lua +++ b/nodes_furniture.lua @@ -25,7 +25,7 @@ end minetest.register_node("cottages:bed_foot", { description = S("Bed (foot region)"), drawtype = "nodebox", - tiles = {"cottages_beds_bed_top_bottom.png", "default_wood.png", "cottages_beds_bed_side.png", "cottages_beds_bed_side.png", "cottages_beds_bed_side.png", "cottages_beds_bed_side.png"}, + tiles = {"cottages_beds_bed_top_bottom.png", cottages.texture_furniture, "cottages_beds_bed_side.png", "cottages_beds_bed_side.png", "cottages_beds_bed_side.png", "cottages_beds_bed_side.png"}, paramtype = "light", paramtype2 = "facedir", groups = {snappy=1,choppy=2,oddly_breakable_by_hand=2,flammable=3}, @@ -57,7 +57,7 @@ minetest.register_node("cottages:bed_foot", { minetest.register_node("cottages:bed_head", { description = S("Bed (head region)"), drawtype = "nodebox", - tiles = {"cottages_beds_bed_top_top.png", "default_wood.png", "cottages_beds_bed_side_top_r.png", "cottages_beds_bed_side_top_l.png", "default_wood.png", "cottages_beds_bed_side.png"}, + tiles = {"cottages_beds_bed_top_top.png", cottages.texture_furniture, "cottages_beds_bed_side_top_r.png", "cottages_beds_bed_side_top_l.png", cottages.texture_furniture, "cottages_beds_bed_side.png"}, paramtype = "light", paramtype2 = "facedir", groups = {snappy=1,choppy=2,oddly_breakable_by_hand=2,flammable=3}, @@ -243,7 +243,7 @@ minetest.register_node("cottages:shelf", { minetest.register_node("cottages:stovepipe", { description = S("stovepipe"), drawtype = "nodebox", - tiles = {"default_steel_block.png"}, + tiles = {"cottages_steel_block.png"}, paramtype = "light", paramtype2 = "facedir", groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2}, @@ -268,7 +268,7 @@ minetest.register_node("cottages:washing", { description = S("washing place"), drawtype = "nodebox", -- top, bottom, side1, side2, inner, outer - tiles = {"default_clay.png"}, + tiles = {"cottages_clay.png"}, paramtype = "light", paramtype2 = "facedir", groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2}, diff --git a/nodes_historic.lua b/nodes_historic.lua index 4b2a3fe..5fa29a9 100644 --- a/nodes_historic.lua +++ b/nodes_historic.lua @@ -79,7 +79,7 @@ if( stairs and stairs.register_stair_and_slab) then stairs.register_stair_and_slab("clay", "default:clay", {crumbly=3}, - {"default_clay.png"}, + {"cottages_clay.png"}, S("Clay Stairs"), S("Clay Slab"), default.node_sound_dirt_defaults()) diff --git a/nodes_roof.lua b/nodes_roof.lua index 7cecda5..2c891cf 100644 --- a/nodes_roof.lua +++ b/nodes_roof.lua @@ -18,7 +18,7 @@ cottages.register_roof = function( name, tiles, basic_material, homedecor_altern minetest.register_node("cottages:roof_"..name, { description = S("Roof "..name), drawtype = "nodebox", - --tiles = {"default_tree.png","default_wood.png","default_wood.png","default_wood.png","default_wood.png","default_tree.png"}, + --tiles = {cottages.textures_roof_wood,cottages.texture_roof_sides,cottages.texture_roof_sides,cottages.texture_roof_sides,cottages.texture_roof_sides,cottages.textures_roof_wood}, tiles = tiles, paramtype = "light", paramtype2 = "facedir", @@ -45,8 +45,6 @@ cottages.register_roof = function( name, tiles, basic_material, homedecor_altern description = S("Roof connector "..name), drawtype = "nodebox", -- top, bottom, side1, side2, inner, outer - --tiles = {"default_tree.png","default_wood.png","default_tree.png","default_tree.png","default_wood.png","default_tree.png"}, - --tiles = {"darkage_straw.png","default_wood.png","darkage_straw.png","darkage_straw.png","darkage_straw.png","darkage_straw.png"}, tiles = tiles, paramtype = "light", paramtype2 = "facedir", @@ -73,7 +71,6 @@ cottages.register_roof = function( name, tiles, basic_material, homedecor_altern description = S("Roof (flat) "..name), drawtype = "nodebox", -- top, bottom, side1, side2, inner, outer - --tiles = {"default_tree.png","default_wood.png","default_tree.png","default_tree.png","default_wood.png","default_tree.png"}, -- this one is from all sides - except from the underside - of the given material tiles = { tiles[1], tiles[2], tiles[1], tiles[1], tiles[1], tiles[1] }; paramtype = "light", @@ -155,25 +152,39 @@ end -- of cottages.register_roof( name, tiles, basic_material ) -- add the diffrent roof types --------------------------------------------------------------------------------------- cottages.register_roof( 'straw', - {"cottages_darkage_straw.png","cottages_darkage_straw.png","cottages_darkage_straw.png","cottages_darkage_straw.png","cottages_darkage_straw.png","cottages_darkage_straw.png"}, + {"cottages_darkage_straw.png","cottages_darkage_straw.png", + "cottages_darkage_straw.png","cottages_darkage_straw.png", + "cottages_darkage_straw.png","cottages_darkage_straw.png"}, 'cottages:straw_mat', nil ); cottages.register_roof( 'reet', - {"cottages_reet.png","cottages_reet.png","cottages_reet.png","cottages_reet.png","cottages_reet.png","cottages_reet.png"}, + {"cottages_reet.png","cottages_reet.png", + "cottages_reet.png","cottages_reet.png", + "cottages_reet.png","cottages_reet.png"}, 'default:papyrus', nil ); cottages.register_roof( 'wood', - {"default_tree.png","default_wood.png","default_wood.png","default_wood.png","default_wood.png","default_tree.png"}, + {cottages.textures_roof_wood, cottages.texture_roof_sides, + cottages.texture_roof_sides, cottages.texture_roof_sides, + cottages.texture_roof_sides, cottages.textures_roof_wood}, 'default:wood', nil); cottages.register_roof( 'black', - {"cottages_homedecor_shingles_asphalt.png","default_wood.png","default_wood.png","default_wood.png","default_wood.png","cottages_homedecor_shingles_asphalt.png"}, + {"cottages_homedecor_shingles_asphalt.png", cottages.texture_roof_sides, + cottages.texture_roof_sides, cottages.texture_roof_sides, + cottages.texture_roof_sides, "cottages_homedecor_shingles_asphalt.png"}, 'homedecor:shingles_asphalt', 'default:coal_lump'); cottages.register_roof( 'red', - {"cottages_homedecor_shingles_terracotta.png","default_wood.png","default_wood.png","default_wood.png","default_wood.png","cottages_homedecor_shingles_terracotta.png"}, + {"cottages_homedecor_shingles_terracotta.png", cottages.texture_roof_sides, + cottages.texture_roof_sides, cottages.texture_roof_sides, + cottages.texture_roof_sides, "cottages_homedecor_shingles_terracotta.png"}, 'homedecor:shingles_terracotta', 'default:clay_brick'); cottages.register_roof( 'brown', - {"cottages_homedecor_shingles_wood.png","default_wood.png","default_wood.png","default_wood.png","default_wood.png","cottages_homedecor_shingles_wood.png"}, + {"cottages_homedecor_shingles_wood.png", cottages.texture_roof_sides, + cottages.texture_roof_sides, cottages.texture_roof_sides, + cottages.texture_roof_sides, "cottages_homedecor_shingles_wood.png"}, 'homedecor:shingles_wood', 'default:dirt'); cottages.register_roof( 'slate', - {"cottages_slate.png","default_wood.png","cottages_slate.png","cottages_slate.png","default_wood.png","cottages_slate.png"}, + {"cottages_slate.png", cottages.texture_roof_sides, + "cottages_slate.png", "cottages_slate.png", + cottages.texture_roof_sides,"cottages_slate.png"}, 'default:stone', nil); @@ -182,7 +193,7 @@ cottages.register_roof( 'slate', --------------------------------------------------------------------------------------- minetest.register_node("cottages:slate_vertical", { description = S("Vertical Slate"), - tiles = {"cottages_slate.png","default_wood.png","cottages_slate.png","cottages_slate.png","default_wood.png","cottages_slate.png"}, + tiles = {"cottages_slate.png",cottages.texture_roof_sides,"cottages_slate.png","cottages_slate.png",cottages.texture_roof_sides,"cottages_slate.png"}, paramtype2 = "facedir", groups = {cracky=2, stone=1}, sounds = default.node_sound_stone_defaults(), diff --git a/nodes_straw.lua b/nodes_straw.lua index 745b40b..3fec05f 100644 --- a/nodes_straw.lua +++ b/nodes_straw.lua @@ -81,7 +81,7 @@ minetest.register_node("cottages:threshing_floor", { drawtype = "nodebox", description = S("threshing floor"), -- TODO: stone also looks pretty well for this - tiles = {"default_junglewood.png^farming_wheat.png","default_junglewood.png","default_junglewood.png^default_stick.png"}, + tiles = {"cottages_junglewood.png^farming_wheat.png","cottages_junglewood.png","cottages_junglewood.png^default_stick.png"}, paramtype = "light", paramtype2 = "facedir", groups = {cracky=2}, @@ -250,7 +250,7 @@ minetest.register_node("cottages:handmill", { description = S("mill, powered by punching"), drawtype = "mesh", mesh = "cottages_handmill.obj", - tiles = {"default_stone.png"}, + tiles = {"cottages_stone.png"}, paramtype = "light", paramtype2 = "facedir", groups = {cracky=2}, diff --git a/textures/cottages_clay.png b/textures/cottages_clay.png new file mode 100644 index 0000000..76e5a40 Binary files /dev/null and b/textures/cottages_clay.png differ diff --git a/textures/cottages_junglewood.png b/textures/cottages_junglewood.png new file mode 100644 index 0000000..2507706 Binary files /dev/null and b/textures/cottages_junglewood.png differ diff --git a/textures/cottages_steel_block.png b/textures/cottages_steel_block.png new file mode 100644 index 0000000..7f49f61 Binary files /dev/null and b/textures/cottages_steel_block.png differ diff --git a/textures/cottages_stone.png b/textures/cottages_stone.png new file mode 100644 index 0000000..63cb7c4 Binary files /dev/null and b/textures/cottages_stone.png differ