Merge pull request 'mcl_copper_stuff' (#11) from mcl_copper_stuff into master

Reviewed-on: MineClone2/MineClone2-Plus#11
Reviewed-by: Michieal <michieal@noreply.git.minetest.land>
This commit is contained in:
Michieal 2023-02-10 08:40:38 +00:00
commit efb41b62bf
18 changed files with 327 additions and 0 deletions

View File

@ -0,0 +1,21 @@
# Mineclone 2 Copper Stuff [mcl_copper_stuff]
[![ContentDB](https://content.minetest.net/packages/SmokeyDope/mcl_copper_stuff/)
Adds copper tools and armor to Mineclone 2.
![Screenshot](https://content.minetest.net/uploads/c43925f718.png)
## License
Code licensed under GNU GPLv3 (see LICENSE file), media licensed under CC-BY-SA 4.0 (see [this](https://creativecommons.org/licenses/by-sa/4.0/))
## Credits
I used default Mineclone2 textures (from PixelPerfection, texture pack by xssheep) for gold tools and armor to create copper ones.
There are some more CC-attributions:
- Copper Pickaxe texture uses [default_tool_goldpick.png](https://git.minetest.land/MineClone2/MineClone2/src/branch/master/mods/ITEMS/mcl_tools/textures/default_tool_goldpick.png) by [XSSheep](https://github.com/XSSheep) under [CC-BY-SA 4.0](https://creativecommons.org/licenses/by-sa/4.0/) / Recolored (gold -> orange) from original
- Copper Shovel texture uses [default_tool_goldshovel.png](https://git.minetest.land/MineClone2/MineClone2/src/branch/master/mods/ITEMS/mcl_tools/textures/default_tool_goldshovel.png) by [XSSheep](https://github.com/XSSheep) under [CC-BY-SA 4.0](https://creativecommons.org/licenses/by-sa/4.0/) / Recolored (gold -> orange) from original
- Copper Axe texture uses [default_tool_goldaxe.png](https://git.minetest.land/MineClone2/MineClone2/src/branch/master/mods/ITEMS/mcl_tools/textures/default_tool_goldaxe.png) by [XSSheep](https://github.com/XSSheep) under [CC-BY-SA 4.0](https://creativecommons.org/licenses/by-sa/4.0/) / Recolored (gold -> orange) from original
- Copper Sword texture uses [default_tool_goldsword.png](https://git.minetest.land/MineClone2/MineClone2/src/branch/master/mods/ITEMS/mcl_tools/textures/default_tool_goldsword.png) by [XSSheep](https://github.com/XSSheep) under [CC-BY-SA 4.0](https://creativecommons.org/licenses/by-sa/4.0/) / Recolored (gold -> orange) from original
- Copper Boots (including inv/preview) texture uses [mcl_armor_boots_gold.png](https://git.minetest.land/MineClone2/MineClone2/src/branch/master/mods/ITEMS/mcl_armor/textures/mcl_armor_boots_gold.png), [mcl_armor_inv_boots_gold.png](https://git.minetest.land/MineClone2/MineClone2/src/branch/master/mods/ITEMS/mcl_armor/textures/mcl_armor_inv_boots_gold.png) and [mcl_armor_boots_gold_preview.png](https://git.minetest.land/MineClone2/MineClone2/src/branch/master/mods/ITEMS/mcl_armor/textures/mcl_armor_boots_gold_preview.png) by [XSSheep](https://github.com/XSSheep) under [CC-BY-SA 4.0](https://creativecommons.org/licenses/by-sa/4.0/) / Recolored (gold -> orange) from original
- Copper Chestplate (including inv/preview) texture uses [mcl_armor_chestplate_gold.png](https://git.minetest.land/MineClone2/MineClone2/src/branch/master/mods/ITEMS/mcl_armor/textures/mcl_armor_chestplate_gold.png), [mcl_armor_inv_chestplate_gold.png](https://git.minetest.land/MineClone2/MineClone2/src/branch/master/mods/ITEMS/mcl_armor/textures/mcl_armor_inv_chestplate_gold.png) and [mcl_armor_chestplate_gold_preview.png](https://git.minetest.land/MineClone2/MineClone2/src/branch/master/mods/ITEMS/mcl_armor/textures/mcl_armor_chestplate_gold_preview.png) by [XSSheep](https://github.com/XSSheep) under [CC-BY-SA 4.0](https://creativecommons.org/licenses/by-sa/4.0/) / Recolored (gold -> orange) from original
- Copper Helmet (including inv/preview) texture uses [mcl_armor_helmet_gold.png](https://git.minetest.land/MineClone2/MineClone2/src/branch/master/mods/ITEMS/mcl_armor/textures/mcl_armor_helmet_gold.png), [mcl_armor_inv_helmet_gold.png](https://git.minetest.land/MineClone2/MineClone2/src/branch/master/mods/ITEMS/mcl_armor/textures/mcl_armor_inv_helmet_gold.png) and [mcl_armor_helmet_gold_preview.png](https://git.minetest.land/MineClone2/MineClone2/src/branch/master/mods/ITEMS/mcl_armor/textures/mcl_armor_helmet_gold_preview.png) by [XSSheep](https://github.com/XSSheep) under [CC-BY-SA 4.0](https://creativecommons.org/licenses/by-sa/4.0/) / Recolored (gold -> orange) from original
- Copper Leggings (including inv/preview) texture uses [mcl_armor_leggings_gold.png](https://git.minetest.land/MineClone2/MineClone2/src/branch/master/mods/ITEMS/mcl_armor/textures/mcl_armor_leggings_gold.png), [mcl_armor_inv_leggings_gold.png](https://git.minetest.land/MineClone2/MineClone2/src/branch/master/mods/ITEMS/mcl_armor/textures/mcl_armor_inv_leggings_gold.png) and [mcl_armor_leggings_gold_preview.png](https://git.minetest.land/MineClone2/MineClone2/src/branch/master/mods/ITEMS/mcl_armor/textures/mcl_armor_leggings_gold_preview.png) by [XSSheep](https://github.com/XSSheep) under [CC-BY-SA 4.0](https://creativecommons.org/licenses/by-sa/4.0/) / Recolored (gold -> orange) from original

View File

@ -0,0 +1,18 @@
local modname = minetest.get_current_modname()
local modpath = minetest.get_modpath(modname)
local S = minetest.get_translator(modname)
mcl_armor.register_set({
name = "copper",
description = "Copper",
durability = 100,
enchantability = 10,
points = {
head = 1,
torso = 4,
legs = 3,
feet = 1,
},
toughness = 1,
craft_material = "mcl_copper:copper_ingot",
})

10
mcl_copper_stuff/init.lua Normal file
View File

@ -0,0 +1,10 @@
--- Created by SmokeyDope
--- See License.txt and Additional Terms.txt for licensing.
--- If you did not receive a copy of the license with this content package, please see:
--- https://www.gnu.org/licenses/gpl-3.0.en.html and https://creativecommons.org/licenses/by-sa/4.0/
local modname = minetest.get_current_modname()
local modpath = minetest.get_modpath(modname)
dofile(modpath.."/armor.lua")
dofile(modpath.."/tools.lua")

View File

@ -0,0 +1,4 @@
name = mcl_copper_stuff
title = MCL Copper Stuff
depends = mcl_core, mcl_sounds, mcl_armor
description = Adds copper tools and armor to Mineclone 2

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 KiB

274
mcl_copper_stuff/tools.lua Normal file
View File

@ -0,0 +1,274 @@
local modname = minetest.get_current_modname()
local modpath = minetest.get_modpath(modname)
local S = minetest.get_translator(modname)
-- Help texts (from mcl_tools)
local pickaxe_longdesc = S("Pickaxes are mining tools to mine hard blocks, such as stone. A pickaxe can also be used as weapon, but it is rather inefficient.")
local axe_longdesc = S("An axe is your tool of choice to cut down trees, wood-based blocks and other blocks. Axes deal a lot of damage as well, but they are rather slow.")
local sword_longdesc = S("Swords are great in melee combat, as they are fast, deal high damage and can endure countless battles. Swords can also be used to cut down a few particular blocks, such as cobwebs.")
local shovel_longdesc = S("Shovels are tools for digging coarse blocks, such as dirt, sand and gravel. They can also be used to turn grass blocks to grass paths. Shovels can be used as weapons, but they are very weak.")
local shovel_use = S("To turn a grass block into a grass path, hold the shovel in your hand, then use (rightclick) the top or side of a grass block. This only works when there's air above the grass block.")
local shears_longdesc = S("Shears are tools to shear sheep and to mine a few block types. Shears are a special mining tool and can be used to obtain the original item from grass, leaves and similar blocks that require cutting.")
local shears_use = S("To shear sheep or carve faceless pumpkins, use the “place” key on them. Faces can only be carved at the side of faceless pumpkins. Mining works as usual, but the drops are different for a few blocks.")
local wield_scale = mcl_vars.tool_wield_scale
-- Registering tools
-- Copper Pickaxe
minetest.register_tool("mcl_copper_stuff:pick_copper", {
description = S("Copper Pickaxe"),
_doc_items_longdesc = pickaxe_longdesc,
inventory_image = "mcl_copper_stuff_copper_pickaxe.png",
wield_scale = wield_scale,
groups = { tool=1, pickaxe=1, dig_speed_class=3, enchantability=9 },
tool_capabilities = {
-- 1/1.2
full_punch_interval = 0.83333333,
max_drop_level=3,
damage_groups = {fleshy=3},
punch_attack_uses = 96,
},
sound = { breaks = "default_tool_breaks" },
_repair_material = "mcl_copper:copper_ingot",
_mcl_toollike_wield = true,
_mcl_diggroups = {
pickaxey = { speed = 5, level = 3, uses = 192 }
},
})
-- Axe stripping wood logic
local function make_stripped_trunk(itemstack, placer, pointed_thing)
if pointed_thing.type ~= "node" then return end
local node = minetest.get_node(pointed_thing.under)
local noddef = minetest.registered_nodes[minetest.get_node(pointed_thing.under).name]
if not placer:get_player_control().sneak and noddef.on_rightclick then
return minetest.item_place(itemstack, placer, pointed_thing)
end
if minetest.is_protected(pointed_thing.under, placer:get_player_name()) then
minetest.record_protection_violation(pointed_thing.under, placer:get_player_name())
return itemstack
end
if noddef._mcl_stripped_variant == nil then
return itemstack
else
minetest.swap_node(pointed_thing.under, {name=noddef._mcl_stripped_variant, param2=node.param2})
if not minetest.is_creative_enabled(placer:get_player_name()) then
-- Add wear (as if digging a axey node)
local toolname = itemstack:get_name()
local wear = mcl_autogroup.get_wear(toolname, "axey")
itemstack:add_wear(wear)
end
end
return itemstack
end
-- Copper Axe
minetest.register_tool("mcl_copper_stuff:axe_copper", {
description = S("Copper Axe"),
_doc_items_longdesc = axe_longdesc,
inventory_image = "mcl_copper_stuff_copper_axe.png",
wield_scale = wield_scale,
groups = { tool=1, axe=1, dig_speed_class=3, enchantability=9 },
tool_capabilities = {
full_punch_interval = 1.25,
max_drop_level=3,
damage_groups = {fleshy=9},
punch_attack_uses = 96,
},
on_place = make_stripped_trunk,
sound = { breaks = "default_tool_breaks" },
_repair_material = "mcl_copper:copper_ingot",
_mcl_toollike_wield = true,
_mcl_diggroups = {
axey = { speed = 5, level = 3, uses = 192 }
},
})
-- Shovel path making function
local make_grass_path = function(itemstack, placer, pointed_thing)
-- Use pointed node's on_rightclick function first, if present
local node = minetest.get_node(pointed_thing.under)
if placer and not placer:get_player_control().sneak then
if minetest.registered_nodes[node.name] and minetest.registered_nodes[node.name].on_rightclick then
return minetest.registered_nodes[node.name].on_rightclick(pointed_thing.under, node, placer, itemstack) or itemstack
end
end
-- Only make grass path if tool used on side or top of target node
if pointed_thing.above.y < pointed_thing.under.y then
return itemstack
end
if (minetest.get_item_group(node.name, "path_creation_possible") == 1) then
local above = table.copy(pointed_thing.under)
above.y = above.y + 1
if minetest.get_node(above).name == "air" then
if minetest.is_protected(pointed_thing.under, placer:get_player_name()) then
minetest.record_protection_violation(pointed_thing.under, placer:get_player_name())
return itemstack
end
if not minetest.is_creative_enabled(placer:get_player_name()) then
-- Add wear (as if digging a shovely node)
local toolname = itemstack:get_name()
local wear = mcl_autogroup.get_wear(toolname, "shovely")
itemstack:add_wear(wear)
end
minetest.sound_play({name="default_grass_footstep", gain=1}, {pos = above}, true)
minetest.swap_node(pointed_thing.under, {name="mcl_core:grass_path"})
end
end
return itemstack
end
-- Copper Shovel
minetest.register_tool("mcl_copper_stuff:shovel_copper", {
description = S("Copper Shovel"),
_doc_items_longdesc = shovel_longdesc,
_doc_items_usagehelp = shovel_use,
inventory_image = "mcl_copper_stuff_copper_shovel.png",
wield_scale = wield_scale,
groups = { tool=1, shovel=1, dig_speed_class=3, enchantability=9 },
tool_capabilities = {
-- 1/1.2
full_punch_interval = 1,
max_drop_level=3,
damage_groups = {fleshy=3},
punch_attack_uses = 96,
},
on_place = make_grass_path,
sound = { breaks = "default_tool_breaks" },
_repair_material = "mcl_copper:copper_ingot",
_mcl_toollike_wield = true,
_mcl_diggroups = {
shovely = { speed = 5, level = 3, uses = 192 }
},
})
-- Copper Sword
minetest.register_tool("mcl_copper_stuff:sword_copper", {
description = S("Copper Sword"),
_doc_items_longdesc = sword_longdesc,
inventory_image = "mcl_copper_stuff_copper_sword.png",
wield_scale = wield_scale,
groups = { weapon=1, sword=1, dig_speed_class=3, enchantability=9 },
tool_capabilities = {
full_punch_interval = 0.625,
max_drop_level=3,
damage_groups = {fleshy=5},
punch_attack_uses = 192,
},
sound = { breaks = "default_tool_breaks" },
_repair_material = "mcl_copper:copper_ingot",
_mcl_toollike_wield = true,
_mcl_diggroups = {
swordy = { speed = 5, level = 3, uses = 192 },
swordy_cobweb = { speed = 5, level = 3, uses = 192 }
},
})
-- Shears Carving Function
local carve_pumpkin
if minetest.get_modpath("mcl_farming") then
function carve_pumpkin(itemstack, placer, pointed_thing)
-- Use pointed node's on_rightclick function first, if present
local node = minetest.get_node(pointed_thing.under)
if placer and not placer:get_player_control().sneak then
if minetest.registered_nodes[node.name] and minetest.registered_nodes[node.name].on_rightclick then
return minetest.registered_nodes[node.name].on_rightclick(pointed_thing.under, node, placer, itemstack) or itemstack
end
end
-- Only carve pumpkin if used on side
if pointed_thing.above.y ~= pointed_thing.under.y then
return
end
if node.name == "mcl_farming:pumpkin" then
if not minetest.is_creative_enabled(placer:get_player_name()) then
-- Add wear (as if digging a shearsy node)
local toolname = itemstack:get_name()
local wear = mcl_autogroup.get_wear(toolname, "shearsy")
itemstack:add_wear(wear)
end
minetest.sound_play({name="default_grass_footstep", gain=1}, {pos = pointed_thing.above}, true)
local dir = vector.subtract(pointed_thing.under, pointed_thing.above)
local param2 = minetest.dir_to_facedir(dir)
minetest.set_node(pointed_thing.under, {name="mcl_farming:pumpkin_face", param2 = param2})
minetest.add_item(pointed_thing.above, "mcl_farming:pumpkin_seeds 4")
end
return itemstack
end
end
-- Copper shears
minetest.register_tool("mcl_copper_stuff:shears_copper", {
description = S("Copper Shears"),
_doc_items_longdesc = shears_longdesc,
_doc_items_usagehelp = shears_use,
inventory_image = "mcl_copper_stuff_copper_shears.png",
wield_image = "mcl_copper_stuff_copper_shears.png",
stack_max = 1,
groups = { tool=1, shears=1, dig_speed_class=4, },
tool_capabilities = {
full_punch_interval = 0.5,
max_drop_level=1,
},
on_place = carve_pumpkin,
sound = { breaks = "default_tool_breaks" },
_mcl_toollike_wield = true,
_mcl_diggroups = {
shearsy = { speed = 1, level = 1, uses = 119 },
shearsy_wool = { speed = 3, level = 1, uses = 119 },
shearsy_cobweb = { speed = 10, level = 1, uses = 119 }
},
})
-- Registering crafts
minetest.register_craft({
output = "mcl_copper_stuff:pick_copper",
recipe = {
{"mcl_copper:copper_ingot", "mcl_copper:copper_ingot", "mcl_copper:copper_ingot"},
{"", "mcl_core:stick", ""},
{"", "mcl_core:stick", ""},
}
})
minetest.register_craft({
output = "mcl_copper_stuff:axe_copper",
recipe = {
{"mcl_copper:copper_ingot", "mcl_copper:copper_ingot"},
{"mcl_copper:copper_ingot", "mcl_core:stick"},
{"", "mcl_core:stick"},
}
})
minetest.register_craft({
output = "mcl_copper_stuff:shovel_copper",
recipe = {
{"mcl_copper:copper_ingot"},
{"mcl_core:stick"},
{"mcl_core:stick"},
}
})
minetest.register_craft({
output = "mcl_copper_stuff:sword_copper",
recipe = {
{"mcl_copper:copper_ingot"},
{"mcl_copper:copper_ingot"},
{"mcl_core:stick"},
}
})
minetest.register_craft({
output = "mcl_copper_stuff:shears_copper",
recipe = {
{ "", "mcl_copper:copper_ingot" },
{ "mcl_copper:copper_ingot", "" },
}
})