diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e43b0f9 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.DS_Store diff --git a/api.lua b/api.lua index 9c0719f..b03cea5 100644 --- a/api.lua +++ b/api.lua @@ -319,31 +319,73 @@ function obsidianmese.shovel_place(itemstack, placer, pointed_thing) -- grass path elseif (under.name == "default:dirt_with_grass" or - under.name == "default:dirt_with_grass_footsteps" or - under.name == "default:dirt_with_dry_grass" or - under.name == "default:dirt_with_snow" or - under.name == "default:dirt_with_rainforest_litter") and - under.name ~= "obsidianmese:path_grass" then + under.name == "default:dirt_with_grass_footsteps") and + under.name ~= "obsidianmese:path_grass" then minetest.set_node(pt.under, {name = "obsidianmese:path_grass"}) + -- rainforest litter path + elseif under.name == "default:dirt_with_rainforest_litter" and + under.name ~= "obsidianmese:path_dirt_with_rainforest_litter" then + minetest.set_node(pt.under, {name = "obsidianmese:path_dirt_with_rainforest_litter"}) + + -- dirt with snow path + elseif under.name == "default:dirt_with_snow" and + under.name ~= "obsidianmese:path_dirt_with_snow" then + minetest.set_node(pt.under, {name = "obsidianmese:path_dirt_with_snow"}) + + -- dirt with dry grass path + elseif under.name == "default:dirt_with_dry_grass" and + under.name ~= "obsidianmese:path_dirt_with_dry_grass" then + minetest.set_node(pt.under, {name = "obsidianmese:path_dirt_with_dry_grass"}) + + -- dirt with coniferous litter path + elseif under.name == "default:dirt_with_coniferous_litter" and + under.name ~= "obsidianmese:path_dirt_with_coniferous_litter" then + minetest.set_node(pt.under, {name = "obsidianmese:path_dirt_with_coniferous_litter"}) + + -- dry dirt path + elseif under.name == "default:dry_dirt" and + under.name ~= "obsidianmese:path_dry_dirt" then + minetest.set_node(pt.under, {name = "obsidianmese:path_dry_dirt"}) + + -- dry dirt with dry grass path + elseif under.name == "default:dry_dirt_with_dry_grass" and + under.name ~= "obsidianmese:path_dry_dirt_with_dry_grass" then + minetest.set_node(pt.under, {name = "obsidianmese:path_dry_dirt_with_dry_grass"}) + + -- permafrost path + elseif under.name == "default:permafrost" and + under.name ~= "obsidianmese:path_permafrost" then + minetest.set_node(pt.under, {name = "obsidianmese:path_permafrost"}) + + -- permafrost with stones path + elseif under.name == "default:permafrost_with_stones" and + under.name ~= "obsidianmese:path_permafrost_with_stones" then + minetest.set_node(pt.under, {name = "obsidianmese:path_permafrost_with_stones"}) + + -- permafrost with moss path + elseif under.name == "default:permafrost_with_moss" and + under.name ~= "obsidianmese:path_permafrost_with_moss" then + minetest.set_node(pt.under, {name = "obsidianmese:path_permafrost_with_moss"}) + -- sand path elseif under.name == "default:sand" and - under.name ~= "obsidianmese:path_sand" then + under.name ~= "obsidianmese:path_sand" then minetest.set_node(pt.under, {name = "obsidianmese:path_sand"}) -- desert sand path elseif under.name == "default:desert_sand" and - under.name ~= "obsidianmese:path_desert_sand" then + under.name ~= "obsidianmese:path_desert_sand" then minetest.set_node(pt.under, {name = "obsidianmese:path_desert_sand"}) -- silver sand path elseif under.name == "default:silver_sand" and - under.name ~= "obsidianmese:path_silver_sand" then + under.name ~= "obsidianmese:path_silver_sand" then minetest.set_node(pt.under, {name = "obsidianmese:path_silver_sand"}) -- snow path elseif under.name == "default:snowblock" and - under.name ~= "obsidianmese:path_snowblock" then + under.name ~= "obsidianmese:path_snowblock" then minetest.set_node(pt.under, {name = "obsidianmese:path_snowblock"}) else diff --git a/depends.txt b/depends.txt deleted file mode 100644 index ecb02a0..0000000 --- a/depends.txt +++ /dev/null @@ -1,2 +0,0 @@ -default -tnt? diff --git a/description.txt b/description.txt deleted file mode 100644 index 460a6da..0000000 --- a/description.txt +++ /dev/null @@ -1 +0,0 @@ -This MOD for Minetest adds obsidian and mese tools and items. diff --git a/mod.conf b/mod.conf index 03e35b6..7485422 100644 --- a/mod.conf +++ b/mod.conf @@ -1 +1,4 @@ -name = obsidianmese \ No newline at end of file +name = obsidianmese +description = This MOD for Minetest adds obsidian and mese tools and items. +depends = default +optional_depends = tnt \ No newline at end of file diff --git a/nodes.lua b/nodes.lua index 5deeb4e..81bce22 100644 --- a/nodes.lua +++ b/nodes.lua @@ -2,6 +2,8 @@ -- Nodes -- +-- invimg = "mobs_chicken_egg.png^(" .. invimg .. "^[mask:mobs_chicken_egg_overlay.png)" + -- dirt path minetest.register_node("obsidianmese:path_dirt", { description = "Dirt Path", @@ -31,7 +33,7 @@ minetest.register_node("obsidianmese:path_dirt", { minetest.register_node("obsidianmese:path_grass", { description = "Grass Path", drawtype = "nodebox", - tiles = {"obsidianmese_grass_path_top.png", "obsidianmese_dirt_path_top.png", "obsidianmese_dirt_path_side.png"}, + tiles = {"obsidianmese_path_dirt_base.png^(default_grass.png^[mask:obsidianmese_path_overlay.png)", "obsidianmese_dirt_path_top.png", "obsidianmese_dirt_path_side.png"}, is_ground_content = false, paramtype = "light", node_box = { @@ -54,6 +56,243 @@ minetest.register_node("obsidianmese:path_grass", { }), }) +-- rainforest litter path +minetest.register_node("obsidianmese:path_dirt_with_rainforest_litter", { + description = "Rainforest Litter Path", + drawtype = "nodebox", + tiles = {"obsidianmese_path_dirt_base.png^(default_rainforest_litter.png^[mask:obsidianmese_path_overlay.png)", "obsidianmese_dirt_path_top.png", "obsidianmese_dirt_path_side.png"}, + is_ground_content = false, + paramtype = "light", + node_box = { + type = "fixed", + fixed = {-1/2, -1/2, -1/2, 1/2, 1/2-1/16, 1/2}, + }, + collision_box = { + type = "fixed", + fixed = {-1/2, -1/2, -1/2, 1/2, 1/2-1/16, 1/2}, + }, + selection_box = { + type = "fixed", + fixed = {-1/2, -1/2, -1/2, 1/2, 1/2-1/16, 1/2}, + }, + drop = "default:dirt", + is_ground_content = false, + groups = {crumbly = 3, not_in_creative_inventory = 1}, + sounds = default.node_sound_dirt_defaults({ + footstep = {name = "default_grass_footstep", gain = 0.25}, + }), +}) + +-- dirt with snow path +minetest.register_node("obsidianmese:path_dirt_with_snow", { + description = "Rainforest Litter Path", + drawtype = "nodebox", + tiles = {"obsidianmese_path_dirt_base.png^(default_snow.png^[mask:obsidianmese_path_overlay.png)", "obsidianmese_dirt_path_top.png", "obsidianmese_dirt_path_side.png"}, + is_ground_content = false, + paramtype = "light", + node_box = { + type = "fixed", + fixed = {-1/2, -1/2, -1/2, 1/2, 1/2-1/16, 1/2}, + }, + collision_box = { + type = "fixed", + fixed = {-1/2, -1/2, -1/2, 1/2, 1/2-1/16, 1/2}, + }, + selection_box = { + type = "fixed", + fixed = {-1/2, -1/2, -1/2, 1/2, 1/2-1/16, 1/2}, + }, + drop = "default:dirt", + is_ground_content = false, + groups = {crumbly = 3, not_in_creative_inventory = 1}, + sounds = default.node_sound_dirt_defaults({ + footstep = {name = "default_grass_footstep", gain = 0.25}, + }), +}) + +-- dirt with dry grass path +minetest.register_node("obsidianmese:path_dirt_with_dry_grass", { + description = "Rainforest Litter Path", + drawtype = "nodebox", + tiles = {"obsidianmese_path_dirt_base.png^(default_dry_grass.png^[mask:obsidianmese_path_overlay.png)", "obsidianmese_dirt_path_top.png", "obsidianmese_dirt_path_side.png"}, + is_ground_content = false, + paramtype = "light", + node_box = { + type = "fixed", + fixed = {-1/2, -1/2, -1/2, 1/2, 1/2-1/16, 1/2}, + }, + collision_box = { + type = "fixed", + fixed = {-1/2, -1/2, -1/2, 1/2, 1/2-1/16, 1/2}, + }, + selection_box = { + type = "fixed", + fixed = {-1/2, -1/2, -1/2, 1/2, 1/2-1/16, 1/2}, + }, + drop = "default:dirt", + is_ground_content = false, + groups = {crumbly = 3, not_in_creative_inventory = 1}, + sounds = default.node_sound_dirt_defaults({ + footstep = {name = "default_grass_footstep", gain = 0.25}, + }), +}) + +-- dirt with coniferous litter path +minetest.register_node("obsidianmese:path_dirt_with_coniferous_litter", { + description = "Rainforest Litter Path", + drawtype = "nodebox", + tiles = {"obsidianmese_path_dirt_base.png^(default_coniferous_litter.png^[mask:obsidianmese_path_overlay.png)", "obsidianmese_dirt_path_top.png", "obsidianmese_dirt_path_side.png"}, + is_ground_content = false, + paramtype = "light", + node_box = { + type = "fixed", + fixed = {-1/2, -1/2, -1/2, 1/2, 1/2-1/16, 1/2}, + }, + collision_box = { + type = "fixed", + fixed = {-1/2, -1/2, -1/2, 1/2, 1/2-1/16, 1/2}, + }, + selection_box = { + type = "fixed", + fixed = {-1/2, -1/2, -1/2, 1/2, 1/2-1/16, 1/2}, + }, + drop = "default:dirt", + is_ground_content = false, + groups = {crumbly = 3, not_in_creative_inventory = 1}, + sounds = default.node_sound_dirt_defaults({ + footstep = {name = "default_grass_footstep", gain = 0.25}, + }), +}) + +-- dry dirt path +minetest.register_node("obsidianmese:path_dry_dirt", { + description = "Rainforest Litter Path", + drawtype = "nodebox", + tiles = {"obsidianmese_path_dry_dirt_base.png", "obsidianmese_path_dry_dirt_base.png", "obsidianmese_dry_dirt_path_side.png"}, + is_ground_content = false, + paramtype = "light", + node_box = { + type = "fixed", + fixed = {-1/2, -1/2, -1/2, 1/2, 1/2-1/16, 1/2}, + }, + collision_box = { + type = "fixed", + fixed = {-1/2, -1/2, -1/2, 1/2, 1/2-1/16, 1/2}, + }, + selection_box = { + type = "fixed", + fixed = {-1/2, -1/2, -1/2, 1/2, 1/2-1/16, 1/2}, + }, + drop = "default:dry_dirt", + is_ground_content = false, + groups = {crumbly = 3, not_in_creative_inventory = 1}, + sounds = default.node_sound_dirt_defaults(), +}) + +-- dry dirt with dry grass path +minetest.register_node("obsidianmese:path_dry_dirt_with_dry_grass", { + description = "Rainforest Litter Path", + drawtype = "nodebox", + tiles = {"obsidianmese_path_dry_dirt_base.png^(default_dry_grass.png^[mask:obsidianmese_path_overlay.png)", "obsidianmese_path_dry_dirt_base.png", "obsidianmese_dry_dirt_path_side.png"}, + is_ground_content = false, + paramtype = "light", + node_box = { + type = "fixed", + fixed = {-1/2, -1/2, -1/2, 1/2, 1/2-1/16, 1/2}, + }, + collision_box = { + type = "fixed", + fixed = {-1/2, -1/2, -1/2, 1/2, 1/2-1/16, 1/2}, + }, + selection_box = { + type = "fixed", + fixed = {-1/2, -1/2, -1/2, 1/2, 1/2-1/16, 1/2}, + }, + drop = "default:dry_dirt", + is_ground_content = false, + groups = {crumbly = 3, not_in_creative_inventory = 1}, + sounds = default.node_sound_dirt_defaults({ + footstep = {name = "default_grass_footstep", gain = 0.25}, + }), +}) + +-- permafrost path +minetest.register_node("obsidianmese:path_permafrost", { + description = "Rainforest Litter Path", + drawtype = "nodebox", + tiles = {"obsidianmese_path_permafrost_base.png", "obsidianmese_path_permafrost_base.png", "obsidianmese_path_permafrost_side.png"}, + is_ground_content = false, + paramtype = "light", + node_box = { + type = "fixed", + fixed = {-1/2, -1/2, -1/2, 1/2, 1/2-1/16, 1/2}, + }, + collision_box = { + type = "fixed", + fixed = {-1/2, -1/2, -1/2, 1/2, 1/2-1/16, 1/2}, + }, + selection_box = { + type = "fixed", + fixed = {-1/2, -1/2, -1/2, 1/2, 1/2-1/16, 1/2}, + }, + drop = "default:permafrost", + is_ground_content = false, + groups = {cracky = 3, not_in_creative_inventory = 1}, + sounds = default.node_sound_dirt_defaults(), +}) + +-- permafrost with stones path +minetest.register_node("obsidianmese:path_permafrost_with_stones", { + description = "Rainforest Litter Path", + drawtype = "nodebox", + tiles = {"obsidianmese_path_permafrost_base.png^(default_stones.png^[mask:obsidianmese_path_overlay_2.png)", "obsidianmese_path_permafrost_base.png", "obsidianmese_path_permafrost_side.png"}, + is_ground_content = false, + paramtype = "light", + node_box = { + type = "fixed", + fixed = {-1/2, -1/2, -1/2, 1/2, 1/2-1/16, 1/2}, + }, + collision_box = { + type = "fixed", + fixed = {-1/2, -1/2, -1/2, 1/2, 1/2-1/16, 1/2}, + }, + selection_box = { + type = "fixed", + fixed = {-1/2, -1/2, -1/2, 1/2, 1/2-1/16, 1/2}, + }, + drop = "default:permafrost_with_stones", + is_ground_content = false, + groups = {cracky = 3, not_in_creative_inventory = 1}, + sounds = default.node_sound_gravel_defaults(), +}) + +-- permafrost with moss path +minetest.register_node("obsidianmese:path_permafrost_with_moss", { + description = "Rainforest Litter Path", + drawtype = "nodebox", + tiles = {"obsidianmese_path_permafrost_base.png^(default_moss.png^[mask:obsidianmese_path_overlay_2.png)", "obsidianmese_path_permafrost_base.png", "obsidianmese_path_permafrost_side.png"}, + is_ground_content = false, + paramtype = "light", + node_box = { + type = "fixed", + fixed = {-1/2, -1/2, -1/2, 1/2, 1/2-1/16, 1/2}, + }, + collision_box = { + type = "fixed", + fixed = {-1/2, -1/2, -1/2, 1/2, 1/2-1/16, 1/2}, + }, + selection_box = { + type = "fixed", + fixed = {-1/2, -1/2, -1/2, 1/2, 1/2-1/16, 1/2}, + }, + drop = "default:permafrost_with_moss", + is_ground_content = false, + groups = {cracky = 3, not_in_creative_inventory = 1}, + sounds = default.node_sound_dirt_defaults({ + footstep = {name = "default_grass_footstep", gain = 0.25}, + }), +}) + -- sand path minetest.register_node("obsidianmese:path_sand", { description = "Sand Path", diff --git a/textures/obsidianmese_apple.png b/textures/obsidianmese_apple.png index 374b7d0..4a4e915 100644 Binary files a/textures/obsidianmese_apple.png and b/textures/obsidianmese_apple.png differ diff --git a/textures/obsidianmese_dry_dirt_path_side.png b/textures/obsidianmese_dry_dirt_path_side.png new file mode 100644 index 0000000..0afe0f9 Binary files /dev/null and b/textures/obsidianmese_dry_dirt_path_side.png differ diff --git a/textures/obsidianmese_grass_path_top.png b/textures/obsidianmese_grass_path_top.png deleted file mode 100644 index a06d903..0000000 Binary files a/textures/obsidianmese_grass_path_top.png and /dev/null differ diff --git a/textures/obsidianmese_path_dirt_base.png b/textures/obsidianmese_path_dirt_base.png new file mode 100644 index 0000000..f20a6e9 Binary files /dev/null and b/textures/obsidianmese_path_dirt_base.png differ diff --git a/textures/obsidianmese_path_dry_dirt_base.png b/textures/obsidianmese_path_dry_dirt_base.png new file mode 100644 index 0000000..578505e Binary files /dev/null and b/textures/obsidianmese_path_dry_dirt_base.png differ diff --git a/textures/obsidianmese_path_overlay.png b/textures/obsidianmese_path_overlay.png new file mode 100644 index 0000000..c1ee8c0 Binary files /dev/null and b/textures/obsidianmese_path_overlay.png differ diff --git a/textures/obsidianmese_path_overlay_2.png b/textures/obsidianmese_path_overlay_2.png new file mode 100644 index 0000000..472eb5e Binary files /dev/null and b/textures/obsidianmese_path_overlay_2.png differ diff --git a/textures/obsidianmese_path_permafrost_base.png b/textures/obsidianmese_path_permafrost_base.png new file mode 100644 index 0000000..42e13d9 Binary files /dev/null and b/textures/obsidianmese_path_permafrost_base.png differ diff --git a/textures/obsidianmese_path_permafrost_side.png b/textures/obsidianmese_path_permafrost_side.png new file mode 100644 index 0000000..397bb23 Binary files /dev/null and b/textures/obsidianmese_path_permafrost_side.png differ diff --git a/tools.lua b/tools.lua index 0f046d7..1406f81 100644 --- a/tools.lua +++ b/tools.lua @@ -6,7 +6,7 @@ minetest.register_tool("obsidianmese:sword", { description = "Obsidian Mese Sword", inventory_image = "obsidianmese_sword.png", - wield_scale = {x=1.5, y=2, z=1}, + -- wield_scale = {x=1.5, y=2, z=1}, tool_capabilities = { full_punch_interval = 0.45, max_drop_level=1, @@ -204,7 +204,7 @@ minetest.register_entity("obsidianmese:sword_bullet", { minetest.register_tool("obsidianmese:sword_engraved", { description = "Obsidian Mese Sword Engraved - right click shoot 1 shot", inventory_image = "obsidianmese_sword_diamond_engraved.png", - wield_scale = {x=1.5, y=2, z=1}, + -- wield_scale = {x=1.5, y=2, z=1}, tool_capabilities = { full_punch_interval = 0.6, max_drop_level=1, @@ -255,7 +255,7 @@ minetest.register_tool("obsidianmese:shovel", { description = "Obsidian Mese Shovel - right click (secondary click) for creating a path", inventory_image = "obsidianmese_shovel.png", wield_image = "obsidianmese_shovel.png^[transformR90", - wield_scale = {x=1.5, y=1.5, z=1.5}, + -- wield_scale = {x=1.5, y=1.5, z=1.5}, tool_capabilities = { full_punch_interval = 0.9, max_drop_level=1, @@ -272,7 +272,7 @@ minetest.register_tool("obsidianmese:shovel", { minetest.register_tool("obsidianmese:axe", { description = "Obsidian Mese Axe - Tree Capitator", inventory_image = "obsidianmese_axe.png", - wield_scale = {x=1.5, y=2, z=1}, + -- wield_scale = {x=1.5, y=2, z=1}, tool_capabilities = { full_punch_interval = 0.9, max_drop_level=1,