diff options
| -rw-r--r-- | adaptions.lua | 2 | ||||
| -rw-r--r-- | init.lua | 1 | ||||
| -rw-r--r-- | nodes_anvil.lua | 33 | ||||
| -rw-r--r-- | nodes_barrel.lua | 10 | ||||
| -rw-r--r-- | nodes_chests.lua | 6 | ||||
| -rw-r--r-- | nodes_doorlike.lua | 12 | ||||
| -rw-r--r-- | nodes_feldweg.lua | 114 | ||||
| -rw-r--r-- | nodes_fences.lua | 6 | ||||
| -rw-r--r-- | nodes_furniture.lua | 14 | ||||
| -rw-r--r-- | nodes_historic.lua | 40 | ||||
| -rw-r--r-- | nodes_mining.lua | 7 | ||||
| -rw-r--r-- | nodes_straw.lua | 65 | ||||
| -rw-r--r-- | textures/cottages_loam.png | bin | 5743 -> 4598 bytes | |||
| -rw-r--r-- | textures/cottages_loam_old.png | bin | 0 -> 5743 bytes |
14 files changed, 231 insertions, 79 deletions
diff --git a/adaptions.lua b/adaptions.lua index 24782cd..5d59e1b 100644 --- a/adaptions.lua +++ b/adaptions.lua @@ -56,7 +56,9 @@ cottages.texture_chest = {"default_chest_top.png", "default_chest_top.png", "def -- the treshing floor produces wheat seeds cottages.craftitem_seed_wheat = "farming:seed_wheat"; +cottages.craftitem_seed_barley = "farming:seed_barley"; cottages.texture_wheat_seed = "farming_wheat_seed.png"; +cottages.texture_barley_seed = "farming_barley_seed.png"; cottages.texture_stick = "default_stick.png"; -- texture for roofs where the tree bark is the main roof texture @@ -45,6 +45,7 @@ dofile(minetest.get_modpath("cottages").."/adaptions.lua"); -- add a stack size if you want a higher yield cottages.handmill_product = {}; cottages.handmill_product[ cottages.craftitem_seed_wheat ] = 'farming:flour 1'; +cottages.handmill_product[ cottages.craftitem_seed_barley ] = 'farming:flour 1'; --[[ some examples: cottages.handmill_product[ 'default:cobble' ] = 'default:gravel'; cottages.handmill_product[ 'default:gravel' ] = 'default:sand'; diff --git a/nodes_anvil.lua b/nodes_anvil.lua index 9456ed1..626419a 100644 --- a/nodes_anvil.lua +++ b/nodes_anvil.lua @@ -42,7 +42,7 @@ local cottages_anvil_formspec = "label[6.0,3.0;"..S("storage for").."]".. "label[6.0,3.3;"..S("your hammer").."]".. - "label[0,-0.5;"..S("Anvil").."]".. + "label[0,0;"..S("Anvil").."]".. "label[0,3.0;"..S("Punch anvil with hammer to").."]".. "label[0,3.3;"..S("repair tool in workpiece-slot.").."]".. "list[current_player;main;0,4;8,4;]"; @@ -50,7 +50,7 @@ local cottages_anvil_formspec = minetest.register_node("cottages:anvil", { drawtype = "nodebox", - description = S("anvil"), + description = S("Anvil"), tiles = {"cottages_stone.png"}, -- TODO default_steel_block.png, default_obsidian.png are also nice paramtype = "light", paramtype2 = "facedir", @@ -129,8 +129,9 @@ minetest.register_node("cottages:anvil", { if( listname=='hammer' and stack and stack:get_name() ~= 'cottages:hammer') then return 0; end + if( listname=='input' - and( stack:get_wear() == 0 + and( stack:get_wear() == 0 or stack:get_name() == "technic:water_can" or stack:get_name() == "technic:lava_can" )) then @@ -138,6 +139,14 @@ minetest.register_node("cottages:anvil", { S('The workpiece slot is for damaged tools only.')); return 0; end + + local itemdef = minetest.registered_items[stack:get_name()] + if itemdef.wear_represents and itemdef.wear_represents == "technic_RE_charge" then + minetest.chat_send_player( player:get_player_name(), + S('The workpiece slot is for mechanical tools only.')); + return 0; + end + return stack:get_count() end, @@ -166,17 +175,25 @@ minetest.register_node("cottages:anvil", { local input = inv:get_stack('input',1); + -- only tools can be repaired - if( not( input ) - or input:is_empty() - or input:get_name() == "technic:water_can" - or input:get_name() == "technic:lava_can" ) then - + if (not( input ) + or input:is_empty() + or input:get_name() == "technic:water_can" + or input:get_name() == "technic:lava_can" ) then meta:set_string("formspec", cottages_anvil_formspec, "label[2.5,-0.5;"..S("Owner: %s"):format(meta:get_string('owner') or "").."]"); return; end + + local itemdef = minetest.registered_items[input:get_name()] + if itemdef.wear_represents and itemdef.wear_represents == "technic_RE_charge" then + meta:set_string("formspec", + cottages_anvil_formspec, + "label[2.5,-0.5;"..S("Owner: %s"):format(meta:get_string('owner') or "").."]"); + return; + end -- 65535 is max damage local damage_state = 40-math.floor(input:get_wear()/1638); diff --git a/nodes_barrel.lua b/nodes_barrel.lua index 4c84983..4a2d096 100644 --- a/nodes_barrel.lua +++ b/nodes_barrel.lua @@ -69,7 +69,7 @@ end -- right-click to open/close barrel; punch to switch between horizontal/vertical position minetest.register_node("cottages:barrel", { - description = S("barrel (closed)"), + description = S("Barrel (closed)"), paramtype = "light", drawtype = "mesh", mesh = "cottages_barrel_closed.obj", @@ -100,7 +100,7 @@ end -- this barrel is opened at the top minetest.register_node("cottages:barrel_open", { - description = S("barrel (open)"), + description = S("Barrel (open)"), paramtype = "light", drawtype = "mesh", mesh = "cottages_barrel.obj", @@ -119,7 +119,7 @@ end -- horizontal barrel minetest.register_node("cottages:barrel_lying", { - description = S("barrel (closed), lying somewhere"), + description = S("Barrel (closed), lying somewhere"), paramtype = "light", paramtype2 = "facedir", drawtype = "mesh", @@ -143,7 +143,7 @@ end -- horizontal barrel, open minetest.register_node("cottages:barrel_lying_open", { - description = S("barrel (opened), lying somewhere"), + description = S("Barrel (opened), lying somewhere"), paramtype = "light", paramtype2 = "facedir", drawtype = "mesh", @@ -168,7 +168,7 @@ end -- let's hope "tub" is the correct english word for "bottich" minetest.register_node("cottages:tub", { - description = S("tub"), + description = S("Tub"), paramtype = "light", drawtype = "mesh", mesh = "cottages_tub.obj", diff --git a/nodes_chests.lua b/nodes_chests.lua index c099749..bc7bbbc 100644 --- a/nodes_chests.lua +++ b/nodes_chests.lua @@ -24,7 +24,7 @@ cottages_chests.can_dig = function(pos,player) -- the chests do not need receipes since they are only placeholders and not intended to be built by players -- (they are later on supposed to be filled with diffrent items by fill_chest.lua) minetest.register_node("cottages:chest_private", { - description = S("private NPC chest"), + description = S("Private NPC chest"), infotext = "chest containing the possesions of one of the inhabitants", tiles = cottages.texture_chest, paramtype2 = "facedir", @@ -36,7 +36,7 @@ minetest.register_node("cottages:chest_private", { }) minetest.register_node("cottages:chest_work", { - description = S("chest for work utils and kitchens"), + description = S("Chest for work utils and kitchens"), infotext = "everything the inhabitant needs for his work", tiles = cottages.texture_chest, paramtype2 = "facedir", @@ -48,7 +48,7 @@ minetest.register_node("cottages:chest_work", { }) minetest.register_node("cottages:chest_storage", { - description = S("storage chest"), + description = S("Storage chest"), infotext = "stored food reserves", tiles = cottages.texture_chest, paramtype2 = "facedir", diff --git a/nodes_doorlike.lua b/nodes_doorlike.lua index d989c05..007b051 100644 --- a/nodes_doorlike.lua +++ b/nodes_doorlike.lua @@ -44,7 +44,7 @@ end -- window shutters - they cover half a node to each side minetest.register_node("cottages:window_shutter_open", { - description = S("opened window shutters"), + description = S("Opened window shutters"), drawtype = "nodebox", -- top, bottom, side1, side2, inner, outer tiles = {"cottages_minimal_wood.png"}, @@ -73,7 +73,7 @@ minetest.register_node("cottages:window_shutter_open", { }) minetest.register_node("cottages:window_shutter_closed", { - description = S("closed window shutters"), + description = S("Closed window shutters"), drawtype = "nodebox", -- top, bottom, side1, side2, inner, outer tiles = {"cottages_minimal_wood.png"}, @@ -140,7 +140,7 @@ minetest.register_abm({ -- a half door; can be combined to a full door where the upper part can be operated seperately; usually found in barns/stables ------------------------------------------------------------------------------------------------------------------------------ minetest.register_node("cottages:half_door", { - description = S("half door"), + description = S("Half door"), drawtype = "nodebox", -- top, bottom, side1, side2, inner, outer tiles = {"cottages_minimal_wood.png"}, @@ -181,7 +181,7 @@ minetest.register_node("cottages:half_door", { minetest.register_node("cottages:half_door_inverted", { - description = S("half door inverted"), + description = S("Half door inverted"), drawtype = "nodebox", -- top, bottom, side1, side2, inner, outer tiles = {"cottages_minimal_wood.png"}, @@ -225,7 +225,7 @@ minetest.register_node("cottages:half_door_inverted", { -- this gate for fences solves the "where to store the opened gate" problem by dropping it to the floor in optened state ------------------------------------------------------------------------------------------------------------------------------ minetest.register_node("cottages:gate_closed", { - description = S("closed fence gate"), + description = S("Closed fence gate"), drawtype = "nodebox", -- top, bottom, side1, side2, inner, outer tiles = {cottages.texture_furniture}, @@ -257,7 +257,7 @@ minetest.register_node("cottages:gate_closed", { minetest.register_node("cottages:gate_open", { - description = S("opened fence gate"), + description = S("Opened fence gate"), drawtype = "nodebox", -- top, bottom, side1, side2, inner, outer tiles = {cottages.texture_furniture}, diff --git a/nodes_feldweg.lua b/nodes_feldweg.lua index bb21479..e424e15 100644 --- a/nodes_feldweg.lua +++ b/nodes_feldweg.lua @@ -2,7 +2,7 @@ -- decoration and building material --------------------------------------------------------------------------------------- -- * includes a wagon wheel that can be used as decoration on walls or to build (stationary) wagons --- * dirt road - those are more natural in small old villages than cobble roads +-- * Dirt road - those are more natural in small old villages than cobble roads -- * loam - no, old buildings are usually not built out of clay; loam was used -- * straw - useful material for roofs -- * glass pane - an improvement compared to fence posts as windows :-) @@ -11,7 +11,7 @@ local S = cottages.S -- supported modes: --- * simple: only a straight dirt road; no curves, junctions etc. +-- * simple: only a straight Dirt road; no curves, junctions etc. -- * flat: each node is a full node; junction, t-junction and corner are included -- * nodebox: like flat - except that each node has a nodebox that fits to that road node -- * mesh: like nodebox - except that it uses a nice roundish model @@ -19,10 +19,51 @@ if( not( cottages_feldweg_mode )) then cottages_feldweg_mode = "mesh"; end ---- a nice dirt road for small villages or paths to fields +local function register_recipes(include_end) + + minetest.register_craft({ + output = "cottages:feldweg_crossing 5", + recipe = { + {"", "cottages:feldweg", "" }, + {"cottages:feldweg", "cottages:feldweg", "cottages:feldweg"}, + {"", "cottages:feldweg", "" }, + }, + }) + + minetest.register_craft({ + output = "cottages:feldweg_t_junction 5", + recipe = { + {"", "cottages:feldweg", "" }, + {"", "cottages:feldweg", "" }, + {"cottages:feldweg", "cottages:feldweg", "cottages:feldweg"} + + }, + }) + + minetest.register_craft({ + output = "cottages:feldweg_curve 5", + recipe = { + {"cottages:feldweg", "", "" }, + {"cottages:feldweg", "", ""}, + {"cottages:feldweg", "cottages:feldweg", "cottages:feldweg"} + }, + }) + + if include_end then + minetest.register_craft({ + output = "cottages:feldweg_end 5", + recipe = { + {"cottages:feldweg", "", "cottages:feldweg" }, + {"cottages:feldweg", "cottages:feldweg", "cottages:feldweg"} + }, + }) + end +end + +--- a nice Dirt road for small villages or paths to fields if( cottages_feldweg_mode == "simple" or cottages_feldweg_mode == "flat" ) then minetest.register_node("cottages:feldweg", { - description = S("dirt road"), + description = S("Dirt road"), tiles = {"cottages_feldweg.png","default_dirt.png", "default_dirt.png^default_grass_side.png"}, paramtype2 = "facedir", groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2}, @@ -41,7 +82,7 @@ end if( cottages_feldweg_mode == "flat" ) then minetest.register_node("cottages:feldweg_crossing", { - description = S("dirt road crossing"), + description = S("Dirt road crossing"), tiles = {"cottages_feldweg_kreuzung.png","default_dirt.png", "default_dirt.png^default_grass_side.png"}, paramtype2 = "facedir", groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2}, @@ -52,7 +93,7 @@ if( cottages_feldweg_mode == "flat" ) then }) minetest.register_node("cottages:feldweg_t_junction", { - description = S("dirt road t junction"), + description = S("Dirt road t junction"), tiles = {"cottages_feldweg_t-kreuzung.png^[transform2","default_dirt.png", "default_dirt.png^default_grass_side.png"}, paramtype2 = "facedir", groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2}, @@ -63,7 +104,7 @@ if( cottages_feldweg_mode == "flat" ) then }) minetest.register_node("cottages:feldweg_curve", { - description = S("dirt road curve"), + description = S("Dirt road curve"), tiles = {"cottages_feldweg_ecke.png^[transform2","default_dirt.png", "default_dirt.png^default_grass_side.png"}, paramtype2 = "facedir", groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2}, @@ -72,13 +113,14 @@ if( cottages_feldweg_mode == "flat" ) then sounds = default.node_sound_dirt_defaults, is_ground_content = false, }) - + + register_recipes(false) -- -- cube-style nodebox version -- elseif( cottages_feldweg_mode == "nodebox" ) then minetest.register_node("cottages:feldweg", { - description = S("dirt road"), + description = S("Dirt road"), tiles = {"cottages_feldweg_orig.png","default_dirt.png", "default_dirt.png^default_grass_side.png"}, paramtype2 = "facedir", roups = {snappy=2,choppy=2,oddly_breakable_by_hand=2}, @@ -110,7 +152,7 @@ elseif( cottages_feldweg_mode == "nodebox" ) then }) minetest.register_node("cottages:feldweg_crossing", { - description = S("dirt road crossing"), + description = S("Dirt road crossing"), tiles = {"cottages_feldweg_kreuzung.png","default_dirt.png", "default_dirt.png^default_grass_side.png"}, paramtype2 = "facedir", groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2}, @@ -156,7 +198,7 @@ elseif( cottages_feldweg_mode == "nodebox" ) then }) minetest.register_node("cottages:feldweg_t_junction", { - description = S("dirt road t junction"), + description = S("Dirt road t junction"), tiles = {"cottages_feldweg_t-kreuzung.png^[transform2","default_dirt.png", "default_dirt.png^default_grass_side.png"}, paramtype2 = "facedir", groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2}, @@ -200,7 +242,7 @@ elseif( cottages_feldweg_mode == "nodebox" ) then }) minetest.register_node("cottages:feldweg_curve", { - description = S("dirt road curve"), + description = S("Dirt road curve"), tiles = {"cottages_feldweg_ecke.png^[transform2","default_dirt.png", "default_dirt.png^default_grass_side.png"}, paramtype2 = "facedir", groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2}, @@ -243,15 +285,17 @@ elseif( cottages_feldweg_mode == "nodebox" ) then }, }) + register_recipes(false) + -- -- the mesh version (rounded); provided and created by VanessaE -- elseif( cottages_feldweg_mode == "mesh" ) then - -- a nice dirt road for small villages or paths to fields + -- a nice Dirt road for small villages or paths to fields minetest.register_node("cottages:feldweg", { - description = S("dirt road"), + description = S("Dirt road"), paramtype2 = "facedir", groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2}, legacy_facedir_simple = true, @@ -269,7 +313,7 @@ elseif( cottages_feldweg_mode == "mesh" ) then minetest.register_node("cottages:feldweg_crossing", { - description = S("dirt road crossing"), + description = S("Dirt road crossing"), paramtype2 = "facedir", groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2}, legacy_facedir_simple = true, @@ -284,8 +328,10 @@ elseif( cottages_feldweg_mode == "mesh" ) then mesh = "feldweg-crossing.obj", }) + + minetest.register_node("cottages:feldweg_t_junction", { - description = S("dirt road t junction"), + description = S("Dirt road t junction"), paramtype2 = "facedir", groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2}, legacy_facedir_simple = true, @@ -299,9 +345,11 @@ elseif( cottages_feldweg_mode == "mesh" ) then drawtype = "mesh", mesh = "feldweg-T-junction.obj", }) + + minetest.register_node("cottages:feldweg_curve", { - description = S("dirt road curve"), + description = S("Dirt road curve"), paramtype2 = "facedir", groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2}, legacy_facedir_simple = true, @@ -316,8 +364,10 @@ elseif( cottages_feldweg_mode == "mesh" ) then mesh = "feldweg-curve.obj", }) + + minetest.register_node("cottages:feldweg_end", { - description = S("dirt road end"), + description = S("Dirt road end"), paramtype2 = "facedir", groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2}, legacy_facedir_simple = true, @@ -332,6 +382,11 @@ elseif( cottages_feldweg_mode == "mesh" ) then drawtype = "mesh", mesh = "feldweg_end.obj", }) + + + register_recipes(true) + + end @@ -366,7 +421,7 @@ if( cottages_feldweg_mode == "nodebox" or cottages_feldweg_mode == "mesh" ) then }}; minetest.register_node("cottages:feldweg_slope", { - description = S("dirt road slope"), + description = S("Dirt road slope"), paramtype2 = "facedir", groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2}, legacy_facedir_simple = true, @@ -385,8 +440,10 @@ if( cottages_feldweg_mode == "nodebox" or cottages_feldweg_mode == "mesh" ) then selection_box = box_slope, }) + + minetest.register_node("cottages:feldweg_slope_long", { - description = S("dirt road slope long"), + description = S("Dirt road slope long"), paramtype2 = "facedir", groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2}, legacy_facedir_simple = true, @@ -403,4 +460,21 @@ if( cottages_feldweg_mode == "nodebox" or cottages_feldweg_mode == "mesh" ) then collision_box = box_slope_long, selection_box = box_slope_long, }) + + + minetest.register_craft({ + output = "cottages:feldweg_slope 3", + recipe = { + {"cottages:feldweg", "", "" }, + {"cottages:feldweg", "cottages:feldweg", ""} + }, + }) + + minetest.register_craft({ + output = "cottages:feldweg_slope_long 4", + recipe = { + {"cottages:feldweg", "", "" }, + {"cottages:feldweg", "cottages:feldweg", "cottages:feldweg"} + }, + }) end diff --git a/nodes_fences.lua b/nodes_fences.lua index 0a4a26f..c912f2a 100644 --- a/nodes_fences.lua +++ b/nodes_fences.lua @@ -3,7 +3,7 @@ local S = cottages.S minetest.register_node("cottages:fence_small", { - description = S("small fence"), + description = S("Small fence"), drawtype = "nodebox", -- top, bottom, side1, side2, inner, outer tiles = {"cottages_minimal_wood.png"}, @@ -32,7 +32,7 @@ minetest.register_node("cottages:fence_small", { minetest.register_node("cottages:fence_corner", { - description = S("small fence corner"), + description = S("Small fence corner"), drawtype = "nodebox", -- top, bottom, side1, side2, inner, outer tiles = {"cottages_minimal_wood.png"}, @@ -68,7 +68,7 @@ minetest.register_node("cottages:fence_corner", { minetest.register_node("cottages:fence_end", { - description = S("small fence end"), + description = S("Small fence end"), drawtype = "nodebox", -- top, bottom, side1, side2, inner, outer tiles = {"cottages_minimal_wood.png"}, diff --git a/nodes_furniture.lua b/nodes_furniture.lua index 056c8d7..dbbf927 100644 --- a/nodes_furniture.lua +++ b/nodes_furniture.lua @@ -89,7 +89,7 @@ minetest.register_node("cottages:bed_head", { -- the basic version of a bed - a sleeping mat -- to facilitate upgrade path straw mat -> sleeping mat -> bed, this uses a nodebox minetest.register_node("cottages:sleeping_mat", { - description = S("sleeping mat"), + description = S("Sleeping mat"), drawtype = 'nodebox', tiles = { 'cottages_sleepingmat.png' }, -- done by VanessaE wield_image = 'cottages_sleepingmat.png', @@ -124,7 +124,7 @@ minetest.register_node("cottages:sleeping_mat", { -- this one has a pillow for the head; thus, param2 becomes visible to the builder, and mobs may use it as a bed minetest.register_node("cottages:sleeping_mat_head", { - description = S("sleeping mat with pillow"), + description = S("Sleeping mat with pillow"), drawtype = 'nodebox', tiles = { 'cottages_sleepingmat.png' }, -- done by VanessaE wield_image = 'cottages_sleepingmat.png', @@ -157,7 +157,7 @@ minetest.register_node("cottages:sleeping_mat_head", { -- furniture; possible replacement: 3dforniture:chair minetest.register_node("cottages:bench", { drawtype = "nodebox", - description = S("simple wooden bench"), + description = S("Simple wooden bench"), tiles = {"cottages_minimal_wood.png", "cottages_minimal_wood.png", "cottages_minimal_wood.png", "cottages_minimal_wood.png", "cottages_minimal_wood.png", "cottages_minimal_wood.png"}, paramtype = "light", paramtype2 = "facedir", @@ -189,7 +189,7 @@ minetest.register_node("cottages:bench", { -- a simple table; possible replacement: 3dforniture:table local cottages_table_def = { - description = S("table"), + description = S("Table"), drawtype = "nodebox", -- top, bottom, side1, side2, inner, outer tiles = {"cottages_minimal_wood.png"}, @@ -235,7 +235,7 @@ minetest.register_node("cottages:table", cottages_table_def ); -- looks better than two slabs impersonating a shelf; also more 3d than a bookshelf -- the infotext shows if it's empty or not minetest.register_node("cottages:shelf", { - description = S("open storage shelf"), + description = S("Open storage shelf"), drawtype = "nodebox", -- top, bottom, side1, side2, inner, outer tiles = {"cottages_minimal_wood.png"}, @@ -297,7 +297,7 @@ minetest.register_node("cottages:shelf", { -- so that the smoke from a furnace can get out of a building minetest.register_node("cottages:stovepipe", { - description = S("stovepipe"), + description = S("Stovepipe"), drawtype = "nodebox", tiles = {"cottages_steel_block.png"}, paramtype = "light", @@ -321,7 +321,7 @@ minetest.register_node("cottages:stovepipe", { -- this washing place can be put over a water source (it is open at the bottom) minetest.register_node("cottages:washing", { - description = S("washing place"), + description = S("Washing place"), drawtype = "nodebox", -- top, bottom, side1, side2, inner, outer tiles = {"cottages_clay.png"}, diff --git a/nodes_historic.lua b/nodes_historic.lua index 90e48c4..993fb3e 100644 --- a/nodes_historic.lua +++ b/nodes_historic.lua @@ -12,7 +12,7 @@ local S = cottages.S -- can be used to buid real stationary wagons or attached to walls as decoration minetest.register_node("cottages:wagon_wheel", { - description = S("wagon wheel"), + description = S("Wagon wheel"), drawtype = "signlike", tiles = {"cottages_wagonwheel.png"}, -- done by VanessaE! inventory_image = "cottages_wagonwheel.png", @@ -34,7 +34,7 @@ minetest.register_node("cottages:wagon_wheel", { -- people didn't use clay for houses; they did build with loam minetest.register_node("cottages:loam", { - description = S("loam"), + description = S("Loam"), tiles = {"cottages_loam.png"}, groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2}, groups = {crumbly=3}, @@ -48,17 +48,17 @@ if( minetest.get_modpath("stairs") and stairs and stairs.register_stair_and_slab stairs.register_stair_and_slab("loam", "cottages:loam", {snappy=2,choppy=2,oddly_breakable_by_hand=2}, {"cottages_loam.png"}, - S("Loam Stairs"), - S("Loam Slab"), - default.node_sound_dirt_defaults) + S("Loam stairs"), + S("Loam slab"), + default.node_sound_dirt_defaults()) if( minetest.registered_nodes["default:clay"]) then stairs.register_stair_and_slab("clay", "default:clay", {crumbly=3}, {"cottages_clay.png"}, - S("Clay Stairs"), - S("Clay Slab"), - default.node_sound_dirt_defaults) + S("Clay stairs"), + S("Clay slab"), + default.node_sound_dirt_defaults()) end end @@ -66,7 +66,7 @@ end -- straw is a common material for places where animals are kept indoors -- right now, this block mostly serves as a placeholder 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"}, groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2}, groups = {crumbly=3}, @@ -77,7 +77,7 @@ minetest.register_node("cottages:straw_ground", { -- note: these houses look good with a single fence pile as window! the glass pane is the version for 'richer' inhabitants minetest.register_node("cottages:glass_pane", { - description = S("simple glass pane (centered)"), + description = S("Simple glass pane (centered)"), drawtype = "nodebox", -- top, bottom, side1, side2, inner, outer tiles = {"cottages_glass_pane.png"}, @@ -101,7 +101,7 @@ minetest.register_node("cottages:glass_pane", { minetest.register_node("cottages:glass_pane_side", { - description = S("simple glass pane"), + description = S("Simple glass pane"), drawtype = "nodebox", -- top, bottom, side1, side2, inner, outer tiles = {"cottages_glass_pane.png"}, @@ -128,7 +128,7 @@ minetest.register_node("cottages:glass_pane_side", { -- a very small wooden slab --------------------------------------------------------------------------------------- minetest.register_node("cottages:wood_flat", { - description = S("flat wooden planks"), + description = S("Flat wooden planks"), drawtype = "nodebox", -- top, bottom, side1, side2, inner, outer tiles = {"cottages_minimal_wood.png"}, @@ -155,7 +155,7 @@ minetest.register_node("cottages:wood_flat", { -- useful for building tents --------------------------------------------------------------------------------------- minetest.register_node("cottages:wool_tent", { - description = S("wool for tents"), + description = S("Wool for tents"), drawtype = "nodebox", -- top, bottom, side1, side2, inner, outer tiles = {"cottages_wool.png"}, @@ -179,12 +179,14 @@ minetest.register_node("cottages:wool_tent", { }) -- a fallback for cases in which there is no wool -minetest.register_node("cottages:wool", { - description = "Wool", - tiles = {"cottages_wool.png"}, - is_ground_content = false, - groups = {snappy=2,choppy=2,oddly_breakable_by_hand=3,flammable=3,wool=1}, -}) +if not minetest.get_modpath("wool") then + minetest.register_node("cottages:wool", { + description = S("Wool"), + tiles = {"cottages_wool.png"}, + is_ground_content = false, + groups = {snappy=2,choppy=2,oddly_breakable_by_hand=3,flammable=3,wool=1}, + }) +end --------------------------------------------------------------------------------------- diff --git a/nodes_mining.lua b/nodes_mining.lua index b33ec3d..297af3e 100644 --- a/nodes_mining.lua +++ b/nodes_mining.lua @@ -1,4 +1,5 @@ - +-- Boilerplate to support localized strings if intllib mod is installed. +local S = cottages.S --------------------------------------------------------------------------------------- -- a rope that is of use to the mines @@ -6,7 +7,7 @@ -- the rope can only be digged if there is no further rope above it; -- Note: This rope also counts as a rail node; thus, carts can move through it minetest.register_node("cottages:rope", { - description = "rope for climbing", + description = S("Rope for climbing"), tiles = {"cottages_rope.png"}, groups = {snappy=3,choppy=3,oddly_breakable_by_hand=3,rail=1,connect_to_raillike=1},--connect_to_raillike=minetest.raillike_group("rail")}, walkable = false, @@ -38,7 +39,7 @@ minetest.register_craft({ -- Note: This rope also counts as a rail node; thus, carts can move through it minetest.register_node("cottages:ladder_with_rope_and_rail", { - description = "Ladder with rail support", + description = S("Ladder with rail support"), drawtype = "signlike", tiles = {"default_ladder_wood.png^carts_rail_straight.png^cottages_rope.png"}, inventory_image = "default_ladder_wood.png", diff --git a/nodes_straw.lua b/nodes_straw.lua index c19b869..d119c98 100644 --- a/nodes_straw.lua +++ b/nodes_straw.lua @@ -22,7 +22,7 @@ end -- an even simpler from of bed - usually for animals -- it is a nodebox and not wallmounted because that makes it easier to replace beds with straw mats minetest.register_node("cottages:straw_mat", { - description = S("layer of straw"), + description = S("Layer of straw"), drawtype = 'nodebox', tiles = { 'cottages_darkage_straw.png' }, -- done by VanessaE wield_image = 'cottages_darkage_straw.png', @@ -54,7 +54,7 @@ minetest.register_node("cottages:straw_mat", { -- straw bales are a must for farming environments; if you for some reason do not have the darkage mod installed, this here gets you a straw bale minetest.register_node("cottages:straw_bale", { drawtype = "nodebox", - description = S("straw bale"), + description = S("Straw bale"), tiles = {"cottages_darkage_straw_bale.png"}, paramtype = "light", groups = {snappy=1,choppy=2,oddly_breakable_by_hand=2,flammable=3}, @@ -78,7 +78,7 @@ minetest.register_node("cottages:straw_bale", { -- just straw minetest.register_node("cottages:straw", { drawtype = "normal", - description = S("straw"), + description = S("Straw block"), tiles = {"cottages_darkage_straw.png"}, groups = {snappy=3,choppy=3,oddly_breakable_by_hand=3,flammable=3}, sounds = default.node_sound_wood_defaults, @@ -104,7 +104,7 @@ local cottages_formspec_treshing_floor = minetest.register_node("cottages:threshing_floor", { drawtype = "nodebox", - description = S("threshing floor"), + description = S("Threshing floor"), -- TODO: stone also looks pretty well for this tiles = {"cottages_junglewood.png^farming_wheat.png","cottages_junglewood.png","cottages_junglewood.png^"..cottages.texture_stick}, paramtype = "light", @@ -358,7 +358,7 @@ local cottages_handmill_formspec = "size[8,8]".. "list[current_player;main;0,4;8,4;]"; minetest.register_node("cottages:handmill", { - description = S("mill, powered by punching"), + description = S("Mill, powered by punching"), drawtype = "mesh", mesh = "cottages_handmill.obj", tiles = {"cottages_stone.png"}, @@ -576,3 +576,58 @@ minetest.register_craft({ {"cottages:straw_bale"}, }, }) + +----- +-- Derivative blocks +----- + +if stairs and stairs.mod and stairs.mod == "redo" then + + stairs.register_all("straw_bale", "cottages:straw_bale", + {snappy = 1, choppy = 2, oddly_breakable_by_hand = 2, flammable = 3}, + {"cottages_darkage_straw_bale.png"}, + S("Straw bale stair"), + S("Straw bale slab"), + default.node_sound_wood_defaults()) + + stairs.register_all("straw", "cottages:straw", + {snappy = 3, choppy = 3, oddly_breakable_by_hand = 3, flammable = 3}, + {"cottages_darkage_straw.png"}, + S("Straw block stair"), + S("Straw block slab"), + default.node_sound_wood_defaults()) + +elseif minetest.global_exists("stairsplus") then + + stairsplus:register_all("cottages", "straw_bale", "cottages:straw_bale", { + description = S("Straw bale"), + tiles = {"cottages_darkage_straw_bale.png"}, + groups = {snappy = 1, choppy = 2, oddly_breakable_by_hand = 2, flammable = 3}, + sounds = default.node_sound_wood_defaults(), + }) + + stairsplus:register_all("cottages", "straw", "cottages:straw", { + description = S("Straw block"), + tiles = {"cottages_darkage_straw.png"}, + groups = {snappy = 3, choppy = 3, oddly_breakable_by_hand = 3, flammable = 3}, + sounds = default.node_sound_wood_defaults(), + }) + +else + + stairs.register_stair_and_slab("straw_bale", "cottages:straw_bale", + {snappy = 1, choppy = 2, oddly_breakable_by_hand = 2, flammable = 3}, + {"cottages_darkage_straw_bale.png"}, + S("Straw bale stair"), + S("Straw bale slab"), + default.node_sound_wood_defaults()) + + stairs.register_stair_and_slab("straw", "cottages:straw", + {snappy = 3, choppy = 3, oddly_breakable_by_hand = 3, flammable = 3}, + {"cottages_darkage_straw.png"}, + S("Straw block stair"), + S("Straw block slab"), + default.node_sound_wood_defaults()) + + +end
\ No newline at end of file diff --git a/textures/cottages_loam.png b/textures/cottages_loam.png Binary files differindex bdf058f..ee83bd0 100644 --- a/textures/cottages_loam.png +++ b/textures/cottages_loam.png diff --git a/textures/cottages_loam_old.png b/textures/cottages_loam_old.png Binary files differnew file mode 100644 index 0000000..bdf058f --- /dev/null +++ b/textures/cottages_loam_old.png |
