diff --git a/init.lua b/init.lua index 64ff3b2..e066698 100644 --- a/init.lua +++ b/init.lua @@ -4,26 +4,12 @@ GLASS_VISC = 1 -- Load other files -- dofile(minetest.get_modpath("medieval").."/mod_files/coloured_glass.lua") -dofile(minetest.get_modpath("medieval").."/mod_files/bars.lua") +dofile(minetest.get_modpath("medieval").."/mod_files/bars_and_plaster.lua") dofile(minetest.get_modpath("medieval").."/mod_files/medieval_tools.lua") -dofile(minetest.get_modpath("medieval").."/mod_files/plaster_node.lua") - - dofile(minetest.get_modpath("medieval").."/mod_files/nodes.lua") +dofile(minetest.get_modpath("medieval").."/mod_files/nodes.lua") - - --- craft -- - -minetest.register_craft({ - output = 'medieval:cauldron', - recipe = { - {'default:steel_ingot', '', 'default:steel_ingot'}, - {'default:steel_ingot', '', 'default:steel_ingot'}, - {'default:steel_ingot', 'default:steel_ingot', 'default:steel_ingot'}, - } -}) diff --git a/mod_files/bars.lua b/mod_files/bars.lua deleted file mode 100644 index d178722..0000000 --- a/mod_files/bars.lua +++ /dev/null @@ -1,146 +0,0 @@ - -local function register_vertical_bar(name, description, barTexture, craft) - - - minetest.register_node("medieval:" ..name.. "_vertical_bar", { - description = description .. " Vertical bar", - tiles = { barTexture .. "^medieval_bars.png"}, - is_ground_content = true, - paramtype2 = "facedir", - groups = {cracky=3}, - sounds = default.node_sound_stone_defaults(), - }) - - minetest.register_craft({ - output = "medieval:" ..name.. "_vertical_bar 4", - recipe = { - {'default:stick', craft , 'default:stick'}, - {'default:stick', craft , 'default:stick'}, - {'default:stick', craft , 'default:stick'}, - } - }) - -end - -local function register_cross_bar(name, description, barTexture, craft) - - - minetest.register_node("medieval:" ..name.. "_cross_bar", { - description = description .. " Cross bar", - tiles = { barTexture .. "^medieval_bar_left.png^medieval_bar_right.png"}, - is_ground_content = true, - paramtype2 = "facedir", - groups = {cracky=3}, - sounds = default.node_sound_stone_defaults(), - }) - - minetest.register_craft({ - output = "medieval:" ..name.. "_cross_bar 5", - recipe = { - {'default:stick', craft, 'default:stick'}, - {craft, 'default:stick', craft}, - {'default:stick', craft, 'default:stick'}, - } - }) - -end - -local function register_slope_bar(name, description, barTexture, craft) - - - minetest.register_node("medieval:" ..name.. "_slope_bar", { - description = description .. " Slope bar", - tiles = { barTexture .. "^medieval_bar_left.png"}, - is_ground_content = true, - paramtype2 = "facedir", - groups = {cracky=3}, - sounds = default.node_sound_stone_defaults(), - }) - - minetest.register_craft({ - output = "medieval:" ..name.. "_slope_bar 6", - recipe = { - {craft, craft, 'default:stick'}, - {craft, 'default:stick', craft}, - {'default:stick', craft, craft}, - } - }) - -end - -local function register_arrow_bar(name, description, barTexture, craft) - - - minetest.register_node("medieval:" ..name.. "_arrow_bar", { - description = description .. "Arrow bar", - tiles = { barTexture .."^medieval_arrow_left.png" , barTexture .."^medieval_arrow_right.png" , - barTexture .."^medieval_arrow_right.png" , barTexture .."^medieval_arrow_left.png" , - barTexture .."^medieval_arrow_up.png" , barTexture .."^medieval_arrow_down.png"}, - is_ground_content = true, - paramtype2 = "facedir", - groups = {cracky=3}, - sounds = default.node_sound_stone_defaults(), - }) - - minetest.register_craft({ - output = "medieval:" ..name.. "_arrow_bar 5", - recipe = { - {craft, 'default:stick', craft}, - {'default:stick', craft , 'default:stick'}, - {'default:stick', craft, 'default:stick'}, - } - }) - -end - - - - - -- todo register craft reziep for round box here - - -textures = { - -- RGB Prime Colours -- - {name="aspenWood", tiles="default_aspen_wood.png", description="Aspen Wood", craft="default:aspen_wood"}, - {name="jungleWood", tiles="default_junglewood.png", description="Jungle Wood", craft="default:junglewood"}, - {name="pineWood", tiles="default_pine_wood.png", description="Pine_Wood", craft="default:pine_wood"}, - - --[[{name="stone", tiles="default_stone.png", description="Stone"}, - {name="desertStone", tiles="default_desert_stone.png", description="Desert Stone"}, - {name="sandStone", tiles="default_sandstone.png", description="Sand Stone"},]]-- - - {name="mossyCobble", tiles="default_mossycobble.png", description="Mossy Cobble", craft="default:mossycobble"}, - {name="desertCobble", tiles="default_desert_cobble.png", description="Desert Cobble", craft="default:desert_cobble"}, - - - {name="brick", tiles="default_brick.png", description="Brick", craft="default:brick"}, - {name="desertBrick", tiles="default_desert_stone_brick.png", description="Desert Brick", craft="default:desert_stone_brick"}, - {name="sandBrick", tiles="default_sandstone_brick.png", description="Sandstone Brick", craft="default:sandstone_brick"}, - {name="stoneBrick", tiles="default_stone_brick.png", description="Stone Brick,", craft="default:stone_brick" }, - - {name="DSBrick", tiles="darkage_stone_brick.png", description="Darkage Stone Brick,", craft="darkage:stone_brick"}, - {name="orsCobble", tiles="darkage_ors_cobble.png", description="Old Red Sandstone Cobble,", craft="darkage:ors_cobble"}, - {name="slateCobble", tiles="darkage_slate_cobble.png", description="Slate Cobble,", craft="darkage:slate_cobble"}, - {name="gneissCobble", tiles="darkage_gneiss_cobble.png", description="Gneiss Cobble,", craft="darkage:gneiss_cobble"}, - {name="basaltCobble", tiles="darkage_basalt_cobble.png", description="Basalt Cobble", craft="darkage:basalt_cobble"} - -} - -for i,texture in ipairs(textures) do - - register_vertical_bar(texture.name, texture.description, texture.tiles, texture.craft) - register_cross_bar(texture.name, texture.description, texture.tiles, texture.craft) - register_slope_bar(texture.name, texture.description, texture.tiles, texture.craft) - register_arrow_bar(texture.name, texture.description, texture.tiles, texture.craft) - -end - --- misk -- - -minetest.register_node("medieval:plaster_rose_bar", { - description = "Plaster Rose Bar ", - tiles = {"medieval_plaster.png^medieval_rose_bar.png"}, - is_ground_content = true, - groups = {cracky=3}, - sounds = default.node_sound_stone_defaults(), -}) diff --git a/mod_files/boxes.lua b/mod_files/boxes.lua deleted file mode 100644 index 72527c9..0000000 --- a/mod_files/boxes.lua +++ /dev/null @@ -1,56 +0,0 @@ - -local function register_box(name, description, boxTexture, nameCraft) - - - minetest.register_node("medieval:box_" ..name, { - description = description .. " Box", - drawtype = "nodebox", - tiles = { boxTexture .. '' ,'darkage_box.png', 'darkage_box.png', - 'darkage_box.png', 'darkage_box.png', 'darkage_box.png' - }, - paramtype = "light", - paramtype2 = "facedir", - is_ground_content = true, - groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 3, wood = 1}, - sounds = default.node_sound_wood_defaults(), - on_construct = function(pos) - local meta = minetest.get_meta(pos) - meta:set_string("infotext", "Box") - end, - node_box = { - type = "fixed", - fixed = { - {-0.5, -0.5, 0.5, 0.5, 0.5, 0.375}, -- side f - {-0.5, -0.5, -0.5, 0.5, 0.4, 0.5}, -- bottom - {-0.5, -0.5, -0.5, -0.375, 0.5, 0.5}, -- side l - {0.375, -0.5, -0.5, 0.5, 0.5, 0.5}, -- side r - {-0.5, -0.5, -0.375, 0.5, 0.5, -0.5}, -- frount - - }, - }, - selection_box = { - type = "fixed", - fixed = { - {-0.5, -0.5, -0.5, 0.5, 0.5, 0.5}, - }, - }, - }) - - -- todo register craft reziep for round box here -end - -textures = { - -- RGB Prime Colours -- - {name="potato", tiles="medieval_box_potato.png", description="Potato"}, - {name="carrot", tiles="medieval_box_carrot.png", description="Carrot"}, - {name="fish", tiles="medieval_box_fish.png", description="Fish"}, - {name="apple", tiles="medieval_box_apple.png", description="Apple"}, - {name="wheat", tiles="medieval_box_wheat.png", description="Wheat"}, - {name="mushroom", tiles="medieval_box_mushroom.png", description="Mushroom"} - -} - -for i,texture in ipairs(textures) do - register_box(texture.name, texture.description, texture.tiles) - -- register whatever here -end diff --git a/mod_files/medieval_tools.lua b/mod_files/medieval_tools.lua index 892ea2d..fbe6225 100644 --- a/mod_files/medieval_tools.lua +++ b/mod_files/medieval_tools.lua @@ -37,6 +37,22 @@ minetest.register_tool("medieval:sickle_steel", { }, }) +minetest.register_tool("medieval:fish", { + description = "<0{{{{{><", + inventory_image = "medieval_fish.png", + tool_capabilities = { + full_punch_interval = 0.9, + max_drop_level=3, + groupcaps={ + cracky = {times={[1]=2.0, [2]=1.0, [3]=0.50}, uses=30, maxlevel=3}, + crumbly = {times={[1]=1.10, [2]=0.50, [3]=0.30}, uses=30, maxlevel=3}, + choppy={times={[1]=2.10, [2]=0.90, [3]=0.50}, uses=30, maxlevel=2}, + fleshy = {times={[2]=0.6, [3]=0.5}, uses=80, maxlevel=1} + }, + damage_groups = {fleshy=5}, + }, +}) + minetest.register_craft({ output = 'medieval:sickle_wood', recipe = { diff --git a/mod_files/nodes.lua b/mod_files/nodes.lua index e59e964..7698c65 100644 --- a/mod_files/nodes.lua +++ b/mod_files/nodes.lua @@ -1,64 +1,8 @@ -local function register_box(name, description, boxTexture) - - - minetest.register_node("medieval:box_" ..name, { - description = description .. " Box", - drawtype = "nodebox", - tiles = { boxTexture .. '' ,'darkage_box.png', 'darkage_box.png', - 'darkage_box.png', 'darkage_box.png', 'darkage_box.png' - }, - paramtype = "light", - paramtype2 = "facedir", - is_ground_content = true, - groups = {cracky=2}, - sounds = default.node_sound_wood_defaults(), - on_construct = function(pos) - local meta = minetest.get_meta(pos) - meta:set_string("infotext", "Box") - end, - node_box = { - type = "fixed", - fixed = { - {-0.5, -0.5, 0.5, 0.5, 0.5, 0.375}, -- side f - {-0.5, -0.5, -0.5, 0.5, 0.4, 0.5}, -- bottom - {-0.5, -0.5, -0.5, -0.375, 0.5, 0.5}, -- side l - {0.375, -0.5, -0.5, 0.5, 0.5, 0.5}, -- side r - {-0.5, -0.5, -0.375, 0.5, 0.5, -0.5}, -- frount - - }, - }, - selection_box = { - type = "fixed", - fixed = { - {-0.5, -0.5, -0.5, 0.5, 0.5, 0.5}, - }, - }, - }) - - -- todo register craft reziep for round box here -end - -textures = { - -- RGB Prime Colours -- - {name="potato", tiles="medieval_box_potato.png", description="Potato"}, - {name="carrot", tiles="medieval_box_carrot.png", description="Carrot"}, - {name="fish", tiles="medieval_box_fish.png", description="Fish"}, - {name="apple", tiles="medieval_box_apple.png", description="Apple"}, - {name="wheat", tiles="medieval_box_wheat.png", description="Wheat"}, - {name="mushroom", tiles="medieval_box_mushroom.png", description="Mushroom"} - -} - -for i,texture in ipairs(textures) do - register_box(texture.name, texture.description, texture.tiles) - -- register whatever here -end - ------------ --- nodes -- ------------ + -- ===== -- + -- nodes -- + -- ===== -- minetest.register_alias("medieval_craft:glow_stone", "medieval:glowing_stone") @@ -76,7 +20,7 @@ minetest.register_node("medieval:glowing_stone", { }) minetest.register_alias("medieval_craft:glow_stone_lamp", "medieval:glowing_lamp") - + minetest.register_node("medieval:glowing_lamp", { description = "Glowing Stone Lamp", @@ -89,10 +33,24 @@ minetest.register_node("medieval:glowing_lamp", { sounds = default.node_sound_glass_defaults(), }) -minetest.register_alias("medieval_craft:rope", "medieval:rope") - +minetest.register_node("medieval:walkable_lamp", { + description = "Glowing Walkable Lamp ", + drawtype = "glasslike", + tiles = {"medieval_glowing_lamp.png"}, + paramtype = "light", + climbable = true, + walkable = false, + light_source = 1, + sunlight_propagates = true, + groups = {cracky=3,oddly_breakable_by_hand=3}, + sounds = default.node_sound_glass_defaults(), +}) +-- ==== -- -- rope -- +-- ==== -- + +minetest.register_alias("medieval_craft:rope", "medieval:rope") minetest.register_node("medieval:rope", { description = "Rope", @@ -110,4 +68,64 @@ minetest.register_node("medieval:rope", { groups = {bendy=2,dig_immediate=2,attached_node=1}, }) + -- ===== -- + -- boxes -- + -- ===== -- + +local function register_box(name, description, boxTexture, nameCraft) + + + minetest.register_node("medieval:box_" ..name, { + description = description .. " Box", + drawtype = "nodebox", + tiles = { boxTexture .. '' ,'darkage_box.png', 'darkage_box.png', + 'darkage_box.png', 'darkage_box.png', 'darkage_box.png' + }, + paramtype = "light", + paramtype2 = "facedir", + is_ground_content = true, + groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 3, wood = 1}, + sounds = default.node_sound_wood_defaults(), + on_construct = function(pos) + local meta = minetest.get_meta(pos) + meta:set_string("infotext", "Box") + end, + node_box = { + type = "fixed", + fixed = { + {-0.5, -0.5, 0.5, 0.5, 0.5, 0.375}, -- side f + {-0.5, -0.5, -0.5, 0.5, 0.4, 0.5}, -- bottom + {-0.5, -0.5, -0.5, -0.375, 0.5, 0.5}, -- side l + {0.375, -0.5, -0.5, 0.5, 0.5, 0.5}, -- side r + {-0.5, -0.5, -0.375, 0.5, 0.5, -0.5}, -- frount + + }, + }, + selection_box = { + type = "fixed", + fixed = { + {-0.5, -0.5, -0.5, 0.5, 0.5, 0.5}, + }, + }, + }) + +end + +textures = { + -- RGB Prime Colours -- + {name="box", tiles="medieval_box_bottom.png", description="Box"}, + {name="potato", tiles="medieval_box_potato.png", description="Potato"}, + {name="carrot", tiles="medieval_box_carrot.png", description="Carrot"}, + {name="fish", tiles="medieval_box_fish.png", description="Fish"}, + {name="apple", tiles="medieval_box_apple.png", description="Apple"}, + {name="wheat", tiles="medieval_box_wheat.png", description="Wheat"}, + {name="mushroom", tiles="medieval_box_mushroom.png", description="Mushroom"} + +} + + +for i,texture in ipairs(textures) do + register_box(texture.name, texture.description, texture.tiles) + -- register whatever here +end diff --git a/mod_files/plaster_node.lua b/mod_files/plaster_node.lua deleted file mode 100644 index 1ea6159..0000000 --- a/mod_files/plaster_node.lua +++ /dev/null @@ -1,80 +0,0 @@ - -local function register_plaster(name, description, plasterTexture, craft) - - - minetest.register_node("medieval:" ..name.. "_with_plaster", { - description = description .. " With Plaster", - tiles = { plasterTexture .. "^medieval_plaster_D.png", plasterTexture .. "^medieval_plaster_B.png", plasterTexture .. "^medieval_plaster_C.png", plasterTexture .. "^medieval_plaster_A.png", plasterTexture .. "", "medieval_plaster.png"}, - is_ground_content = true, - paramtype2 = "facedir", - groups = {cracky=3},groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3}, - sounds = default.node_sound_stone_defaults(), - }) - - minetest.register_craft({ - output = "medieval:" ..name.. "_with_plaster 2", - recipe = { - {craft ,"darkage:chalk_powder"}, - {craft ,"darkage:chalk_powder"}, - } - }) - -end - -local function register_plaster_corner (name, description, plasterTexture, craft) - minetest.register_node("medieval:" ..name.. "_corner_plaster", { - description = description .. " With Plaster", - tiles = { plasterTexture .. "^medieval_plaster_D.png^medieval_plaster_C.png", plasterTexture .. "^medieval_plaster_B.png^medieval_plaster_C.png", plasterTexture .. "^medieval_plaster_C.png", "medieval_plaster.png", plasterTexture .. "^medieval_plaster_A.png", "medieval_plaster.png"}, - is_ground_content = true, - paramtype2 = "facedir", - groups = {cracky=3},groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3}, - sounds = default.node_sound_stone_defaults(), - }) - - minetest.register_craft({ - output = "medieval:" ..name.. "_corner_plaster 2", - recipe = { - {craft ,"darkage:chalk_powder"}, - {craft ,"darkage:chalk_powder"}, - {"darkage:chalk_powder" ,"darkage:chalk_powder"}, - } - }) - - - - -- todo register craft reziep for round box here -end - -textures = { - -- RGB Prime Colours -- - {name="wood", tiles="default_wood.png", description="Wood", craft="default:wood"}, - {name="aspenWood", tiles="default_aspen_wood.png", description="Aspen Wood", craft="default:aspen_wood"}, - {name="jungleWood", tiles="default_junglewood.png", description="Jungle Wood", craft="default:junglewood"}, - {name="pineWood", tiles="default_pine_wood.png", description="Pine_Wood", craft="default:pine_wood"}, - - --[[{name="stone", tiles="default_stone.png", description="Stone"}, - {name="desertStone", tiles="default_desert_stone.png", description="Desert Stone"}, - {name="sandStone", tiles="default_sandstone.png", description="Sand Stone"},]]-- - - {name="mossyCobble", tiles="default_mossycobble.png", description="Mossy Cobble", craft="default:mossycobble"}, - {name="desertCobble", tiles="default_desert_cobble.png", description="Desert Cobble", craft="default:desert_cobble"}, - - - {name="brick", tiles="default_brick.png", description="Brick", craft="default:brick"}, - {name="desertBrick", tiles="default_desert_stone_brick.png", description="Desert Brick", craft="default:desert_stone_brick"}, - {name="sandBrick", tiles="default_sandstone_brick.png", description="Sandstone Brick", craft="default:sandstone_brick"}, - {name="stoneBrick", tiles="default_stone_brick.png", description="Stone Brick,", craft="default:stone_brick" }, - - {name="DSBrick", tiles="darkage_stone_brick.png", description="Darkage Stone Brick,", craft="darkage:stone_brick"}, - {name="orsCobble", tiles="darkage_ors_cobble.png", description="Old Red Sandstone Cobble,", craft="darkage:ors_cobble"}, - {name="slateCobble", tiles="darkage_slate_cobble.png", description="Slate Cobble,", craft="darkage:slate_cobble"}, - {name="gneissCobble", tiles="darkage_gneiss_cobble.png", description="Gneiss Cobble,", craft="darkage:gneiss_cobble"}, - {name="basaltCobble", tiles="darkage_basalt_cobble.png", description="Basalt Cobble", craft="darkage:basalt_cobble"} - -} - -for i,texture in ipairs(textures) do - register_plaster(texture.name, texture.description, texture.tiles, texture.craft) - register_plaster_corner(texture.name, texture.description, texture.tiles, texture.craft) - -- register whatever here -end diff --git a/textures/fish.png b/textures/fish.png deleted file mode 100644 index 46eb817..0000000 Binary files a/textures/fish.png and /dev/null differ diff --git a/textures/medieval_dimond_glass_colour.png b/textures/medieval_dimond_glass_colour.png index 0590723..c7607a4 100644 Binary files a/textures/medieval_dimond_glass_colour.png and b/textures/medieval_dimond_glass_colour.png differ diff --git a/textures/medieval_round_glass_colour.png b/textures/medieval_round_glass_colour.png index 0590723..781b235 100644 Binary files a/textures/medieval_round_glass_colour.png and b/textures/medieval_round_glass_colour.png differ diff --git a/textures/medieval_square_glass_colour.png b/textures/medieval_square_glass_colour.png index 0590723..9c36d35 100644 Binary files a/textures/medieval_square_glass_colour.png and b/textures/medieval_square_glass_colour.png differ