From 36b0f2c757ad2f07c7273b972b35f32c8bd03994 Mon Sep 17 00:00:00 2001 From: Dirkfried <> Date: Sat, 18 Sep 2021 22:41:24 +0200 Subject: [PATCH 1/8] Different fleshy damage, mithril level=3, sword full snappy --- init.lua | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/init.lua b/init.lua index 73cf0ea..9bca517 100644 --- a/init.lua +++ b/init.lua @@ -185,25 +185,25 @@ local function add_ore(modname, description, mineral_name, oredef) if tool_name == "sword" then tdef.tool_capabilities.full_punch_interval = oredef.full_punch_interval - tdef.tool_capabilities.damage_groups = oredef.damage_groups + tdef.tool_capabilities.damage_groups = oredef.tools.sword.damage_groups tdef.description = S("@1 Sword", S(description)) end if tool_name == "pick" then tdef.tool_capabilities.full_punch_interval = oredef.full_punch_interval - tdef.tool_capabilities.damage_groups = oredef.damage_groups + tdef.tool_capabilities.damage_groups = oredef.tools.pick.damage_groups tdef.description = S("@1 Pickaxe", S(description)) end if tool_name == "axe" then tdef.tool_capabilities.full_punch_interval = oredef.full_punch_interval - tdef.tool_capabilities.damage_groups = oredef.damage_groups + tdef.tool_capabilities.damage_groups = oredef.tools.axe.damage_groups tdef.description = S("@1 Axe", S(description)) end if tool_name == "shovel" then tdef.full_punch_interval = oredef.full_punch_interval - tdef.tool_capabilities.damage_groups = oredef.damage_groups + tdef.tool_capabilities.damage_groups = oredef.tools.shovel.damage_groups tdef.description = S("@1 Shovel", S(description)) tdef.wield_image = toolimg_base .. tool_name .. ".png^[transformR90" end @@ -260,25 +260,28 @@ local oredefs = { tools = { pick = { cracky = {times = {[1] = 2.60, [2] = 1.00, [3] = 0.60}, uses = 100, maxlevel = 1}, + damage_groups = {fleshy = 4}, }, hoe = { uses = 300, }, shovel = { crumbly = {times = {[1] = 1.10, [2] = 0.40, [3] = 0.25}, uses = 100, maxlevel = 1}, + damage_groups = {fleshy = 3}, }, axe = { choppy = {times = {[1] = 2.50, [2] = 0.80, [3] = 0.50}, uses = 100, maxlevel = 1}, - fleshy = {times = {[2] = 1.10, [3] = 0.60}, uses = 100, maxlevel = 1} + fleshy = {times = {[2] = 1.10, [3] = 0.60}, uses = 100, maxlevel = 1}, + damage_groups = {fleshy = 5}, }, sword = { fleshy = {times = {[2] = 0.70, [3] = 0.30}, uses = 100, maxlevel = 1}, - snappy = {times = {[2] = 0.70, [3] = 0.30}, uses = 100, maxlevel = 1}, + snappy = {times = {[1] = 1.70, [2] = 0.70, [3] = 0.30}, uses = 100, maxlevel = 1}, choppy = {times = {[3] = 0.80}, uses = 100, maxlevel = 0}, + damage_groups = {fleshy = 6}, }, }, full_punch_interval = 1.0, - damage_groups = {fleshy = 6}, }, mithril = { description = "Mithril", @@ -292,26 +295,29 @@ local oredefs = { }, tools = { pick = { - cracky = {times = {[1] = 2.25, [2] = 0.55, [3] = 0.35}, uses = 200, maxlevel = 2} + cracky = {times = {[1] = 2.25, [2] = 0.55, [3] = 0.35}, uses = 200, maxlevel = 3}, + damage_groups = {fleshy = 6}, }, hoe = { uses = 1000, }, shovel = { - crumbly = {times = {[1] = 0.70, [2] = 0.35, [3] = 0.20}, uses = 200, maxlevel = 2}, + crumbly = {times = {[1] = 0.70, [2] = 0.35, [3] = 0.20}, uses = 200, maxlevel = 3}, + damage_groups = {fleshy = 5}, }, axe = { - choppy = {times = {[1] = 1.75, [2] = 0.45, [3] = 0.45}, uses = 200, maxlevel = 2}, - fleshy = {times = {[2] = 0.95, [3] = 0.30}, uses = 200, maxlevel = 1} + choppy = {times = {[1] = 1.75, [2] = 0.45, [3] = 0.45}, uses = 200, maxlevel = 3}, + fleshy = {times = {[2] = 0.95, [3] = 0.30}, uses = 200, maxlevel = 2}, + damage_groups = {fleshy = 8}, }, sword = { fleshy = {times = {[2] = 0.65, [3] = 0.25}, uses = 200, maxlevel = 2}, - snappy = {times = {[2] = 0.70, [3] = 0.25}, uses = 200, maxlevel = 2}, + snappy = {times = {[1] = 1.70, [2] = 0.70, [3] = 0.25}, uses = 200, maxlevel = 3}, choppy = {times = {[3] = 0.65}, uses = 200, maxlevel = 0}, + damage_groups = {fleshy = 10}, }, }, full_punch_interval = 0.45, - damage_groups = {fleshy = 9}, } } From 3bd0143a84da04e285dc6180f7a58cb83ea29b19 Mon Sep 17 00:00:00 2001 From: Hugo Locurcio Date: Sat, 18 Sep 2021 23:52:03 +0200 Subject: [PATCH 2/8] Apply suggestions from code review --- init.lua | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/init.lua b/init.lua index 9bca517..de6e009 100644 --- a/init.lua +++ b/init.lua @@ -260,25 +260,25 @@ local oredefs = { tools = { pick = { cracky = {times = {[1] = 2.60, [2] = 1.00, [3] = 0.60}, uses = 100, maxlevel = 1}, - damage_groups = {fleshy = 4}, + damage_groups = {fleshy = 4}, }, hoe = { uses = 300, }, shovel = { crumbly = {times = {[1] = 1.10, [2] = 0.40, [3] = 0.25}, uses = 100, maxlevel = 1}, - damage_groups = {fleshy = 3}, + damage_groups = {fleshy = 3}, }, axe = { choppy = {times = {[1] = 2.50, [2] = 0.80, [3] = 0.50}, uses = 100, maxlevel = 1}, fleshy = {times = {[2] = 1.10, [3] = 0.60}, uses = 100, maxlevel = 1}, - damage_groups = {fleshy = 5}, + damage_groups = {fleshy = 5}, }, sword = { fleshy = {times = {[2] = 0.70, [3] = 0.30}, uses = 100, maxlevel = 1}, snappy = {times = {[1] = 1.70, [2] = 0.70, [3] = 0.30}, uses = 100, maxlevel = 1}, choppy = {times = {[3] = 0.80}, uses = 100, maxlevel = 0}, - damage_groups = {fleshy = 6}, + damage_groups = {fleshy = 6}, }, }, full_punch_interval = 1.0, @@ -296,25 +296,25 @@ local oredefs = { tools = { pick = { cracky = {times = {[1] = 2.25, [2] = 0.55, [3] = 0.35}, uses = 200, maxlevel = 3}, - damage_groups = {fleshy = 6}, + damage_groups = {fleshy = 6}, }, hoe = { uses = 1000, }, shovel = { crumbly = {times = {[1] = 0.70, [2] = 0.35, [3] = 0.20}, uses = 200, maxlevel = 3}, - damage_groups = {fleshy = 5}, + damage_groups = {fleshy = 5}, }, axe = { choppy = {times = {[1] = 1.75, [2] = 0.45, [3] = 0.45}, uses = 200, maxlevel = 3}, fleshy = {times = {[2] = 0.95, [3] = 0.30}, uses = 200, maxlevel = 2}, - damage_groups = {fleshy = 8}, + damage_groups = {fleshy = 8}, }, sword = { fleshy = {times = {[2] = 0.65, [3] = 0.25}, uses = 200, maxlevel = 2}, snappy = {times = {[1] = 1.70, [2] = 0.70, [3] = 0.25}, uses = 200, maxlevel = 3}, choppy = {times = {[3] = 0.65}, uses = 200, maxlevel = 0}, - damage_groups = {fleshy = 10}, + damage_groups = {fleshy = 10}, }, }, full_punch_interval = 0.45, From b6ba8cd52918db54f401524dd6db67b8eee44eb1 Mon Sep 17 00:00:00 2001 From: Hugo Locurcio Date: Sun, 19 Sep 2021 00:01:03 +0200 Subject: [PATCH 3/8] Apply suggestions from code review --- init.lua | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/init.lua b/init.lua index de6e009..7a6303e 100644 --- a/init.lua +++ b/init.lua @@ -260,25 +260,25 @@ local oredefs = { tools = { pick = { cracky = {times = {[1] = 2.60, [2] = 1.00, [3] = 0.60}, uses = 100, maxlevel = 1}, - damage_groups = {fleshy = 4}, + damage_groups = {fleshy = 4}, }, hoe = { uses = 300, }, shovel = { crumbly = {times = {[1] = 1.10, [2] = 0.40, [3] = 0.25}, uses = 100, maxlevel = 1}, - damage_groups = {fleshy = 3}, + damage_groups = {fleshy = 3}, }, axe = { choppy = {times = {[1] = 2.50, [2] = 0.80, [3] = 0.50}, uses = 100, maxlevel = 1}, fleshy = {times = {[2] = 1.10, [3] = 0.60}, uses = 100, maxlevel = 1}, - damage_groups = {fleshy = 5}, + damage_groups = {fleshy = 5}, }, sword = { fleshy = {times = {[2] = 0.70, [3] = 0.30}, uses = 100, maxlevel = 1}, snappy = {times = {[1] = 1.70, [2] = 0.70, [3] = 0.30}, uses = 100, maxlevel = 1}, choppy = {times = {[3] = 0.80}, uses = 100, maxlevel = 0}, - damage_groups = {fleshy = 6}, + damage_groups = {fleshy = 6}, }, }, full_punch_interval = 1.0, @@ -296,25 +296,25 @@ local oredefs = { tools = { pick = { cracky = {times = {[1] = 2.25, [2] = 0.55, [3] = 0.35}, uses = 200, maxlevel = 3}, - damage_groups = {fleshy = 6}, + damage_groups = {fleshy = 6}, }, hoe = { uses = 1000, }, shovel = { crumbly = {times = {[1] = 0.70, [2] = 0.35, [3] = 0.20}, uses = 200, maxlevel = 3}, - damage_groups = {fleshy = 5}, + damage_groups = {fleshy = 5}, }, axe = { choppy = {times = {[1] = 1.75, [2] = 0.45, [3] = 0.45}, uses = 200, maxlevel = 3}, fleshy = {times = {[2] = 0.95, [3] = 0.30}, uses = 200, maxlevel = 2}, - damage_groups = {fleshy = 8}, + damage_groups = {fleshy = 8}, }, sword = { fleshy = {times = {[2] = 0.65, [3] = 0.25}, uses = 200, maxlevel = 2}, snappy = {times = {[1] = 1.70, [2] = 0.70, [3] = 0.25}, uses = 200, maxlevel = 3}, choppy = {times = {[3] = 0.65}, uses = 200, maxlevel = 0}, - damage_groups = {fleshy = 10}, + damage_groups = {fleshy = 10}, }, }, full_punch_interval = 0.45, From 293267f4c542973e5d88809399a5ffb9d64d206a Mon Sep 17 00:00:00 2001 From: Dirkfried <> Date: Wed, 29 Dec 2021 22:36:01 +0100 Subject: [PATCH 4/8] differentiate blocks, mineral and cooktime and mithril level=4 and group rating=0 and adjust uses and digging times --- init.lua | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/init.lua b/init.lua index e1cf2a4..41e54bf 100644 --- a/init.lua +++ b/init.lua @@ -87,7 +87,7 @@ local function add_ore(modname, description, mineral_name, oredef) minetest.register_node(modname .. ":mineral_" .. mineral_name, { description = S("@1 Ore", S(description)), tiles = {"default_stone.png^" .. modname .. "_mineral_" .. mineral_name .. ".png"}, - groups = {cracky = 2}, + groups = oredef.mineral.groups, sounds = default_stone_sounds, drop = lump_item, }) @@ -102,7 +102,7 @@ local function add_ore(modname, description, mineral_name, oredef) minetest.register_node(block_item, { description = S("@1 Block", S(description)), tiles = {img_base .. "_block.png"}, - groups = {snappy = 1, bendy = 2, cracky = 1, melty = 2, level = 2}, + groups = oredef.block.groups, -- {snappy = 1, bendy = 2, cracky = 1, melty = 2, level = 2}, sounds = default_metal_sounds, }) minetest.register_alias(mineral_name.."_block", block_item) @@ -134,6 +134,7 @@ local function add_ore(modname, description, mineral_name, oredef) type = "cooking", output = ingot, recipe = lump_item, + cooktime = oredef.lump.cooktime, }) end if use_frame then @@ -251,6 +252,9 @@ local oredefs = { y_min = moreores.silver_min_depth, y_max = moreores.silver_max_depth, }, + mineral = {groups = {cracky = 2}}, + block = {groups = {cracky = 1, level = 2}}, + lump = {cooktime = 2}, tools = { pick = { groupcaps = { @@ -295,10 +299,13 @@ local oredefs = { y_min = moreores.mithril_min_depth, y_max = moreores.mithril_max_depth, }, + mineral = {groups = {cracky = 1}}, + block = {groups = {cracky = 0, level = 4}}, + lump = {cooktime = 10}, tools = { pick = { groupcaps = { - cracky = {times = {[1] = 2.25, [2] = 0.55, [3] = 0.35}, uses = 200, maxlevel = 3}, + cracky = {times = {[0] = 5.00, [1] = 1.90, [2] = 0.90, [3] = 0.45}, uses = 66, maxlevel = 4}, }, damage_groups = {fleshy = 6}, }, @@ -307,21 +314,21 @@ local oredefs = { }, shovel = { groupcaps = { - crumbly = {times = {[1] = 0.70, [2] = 0.35, [3] = 0.20}, uses = 200, maxlevel = 3}, + crumbly = {times = {[0] = 2.00, [1] = 1.00, [2] = 0.45, [3] = 0.25}, uses = 66, maxlevel = 4}, }, damage_groups = {fleshy = 5}, }, axe = { groupcaps = { - choppy = {times = {[1] = 1.75, [2] = 0.45, [3] = 0.45}, uses = 200, maxlevel = 3}, + choppy = {times = {[0] = 3.00, [1] = 2.00, [2] = 0.80, [3] = 0.45}, uses = 66, maxlevel = 4}, fleshy = {times = {[2] = 0.95, [3] = 0.30}, uses = 200, maxlevel = 2}, }, damage_groups = {fleshy = 8}, }, sword = { groupcaps = { - fleshy = {times = {[2] = 0.65, [3] = 0.25}, uses = 200, maxlevel = 2}, - snappy = {times = {[1] = 1.70, [2] = 0.70, [3] = 0.25}, uses = 200, maxlevel = 3}, + fleshy = {times = {[2] = 0.65, [3] = 0.25}, uses = 66, maxlevel = 3}, + snappy = {times = {[0] = 3.00, [1] = 1.80, [2] = 0.80, [3] = 0.25}, uses = 66, maxlevel = 4}, choppy = {times = {[3] = 0.65}, uses = 200, maxlevel = 0}, }, damage_groups = {fleshy = 10}, From 6ac32ee67732736909d1823f7648c8b03a7e3cd2 Mon Sep 17 00:00:00 2001 From: Dirkfried <> Date: Thu, 30 Dec 2021 14:22:15 +0100 Subject: [PATCH 5/8] include tin, oredef.mineral/ block in register_node and tnt resistance for mithril --- init.lua | 64 ++++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 41 insertions(+), 23 deletions(-) diff --git a/init.lua b/init.lua index 41e54bf..9d011e8 100644 --- a/init.lua +++ b/init.lua @@ -83,28 +83,43 @@ local function add_ore(modname, description, mineral_name, oredef) local ingot = item_base .. "_ingot" local lump_item = item_base .. "_lump" - if oredef.makes.ore then - minetest.register_node(modname .. ":mineral_" .. mineral_name, { - description = S("@1 Ore", S(description)), - tiles = {"default_stone.png^" .. modname .. "_mineral_" .. mineral_name .. ".png"}, - groups = oredef.mineral.groups, - sounds = default_stone_sounds, - drop = lump_item, - }) - + if oredef.mineral then + if oredef.mineral.description == nil then + oredef.mineral.description = S("@1 Ore", S(description)) + end + if oredef.mineral.tiles == nil then + oredef.mineral.tiles = {"default_stone.png^" .. modname .. "_mineral_" .. mineral_name .. ".png"} + end + if oredef.mineral.groups == nil then + oredef.mineral.groups = {cracky = 2} + end + if oredef.mineral.sounds == nil then + oredef.mineral.sounds = default_stone_sounds + end + if oredef.mineral.drop == nil then + oredef.mineral.drop = lump_item + end + minetest.register_node(modname .. ":mineral_" .. mineral_name, oredef.mineral) if use_frame then frame.register(modname .. ":mineral_" .. mineral_name) end end - if oredef.makes.block then + if oredef.block then local block_item = item_base .. "_block" - minetest.register_node(block_item, { - description = S("@1 Block", S(description)), - tiles = {img_base .. "_block.png"}, - groups = oredef.block.groups, -- {snappy = 1, bendy = 2, cracky = 1, melty = 2, level = 2}, - sounds = default_metal_sounds, - }) + if oredef.block.description == nil then + oredef.block.description = S("@1 Block", S(description)) + end + if oredef.block.tiles == nil then + oredef.block.tiles = {img_base .. "_block.png"} + end + if oredef.block.groups == nil then + oredef.block.groups = {cracky = 1, level = 2} + end + if oredef.block.sounds == nil then + oredef.block.sounds = default_metal_sounds + end + minetest.register_node(block_item, oredef.block) minetest.register_alias(mineral_name.."_block", block_item) if oredef.makes.ingot then minetest.register_craft( { @@ -134,7 +149,7 @@ local function add_ore(modname, description, mineral_name, oredef) type = "cooking", output = ingot, recipe = lump_item, - cooktime = oredef.lump.cooktime, + cooktime = oredef.craftingot.cooktime, }) end if use_frame then @@ -244,7 +259,7 @@ end local oredefs = { silver = { description = "Silver", - makes = {ore = true, block = true, lump = true, ingot = true, chest = true}, + makes = {lump = true, ingot = true, chest = true}, oredef = { clust_scarcity = moreores.silver_chunk_size ^ 3, clust_num_ores = moreores.silver_ore_per_chunk, @@ -254,7 +269,7 @@ local oredefs = { }, mineral = {groups = {cracky = 2}}, block = {groups = {cracky = 1, level = 2}}, - lump = {cooktime = 2}, + craftingot = {cooktime = 2}, tools = { pick = { groupcaps = { @@ -291,7 +306,7 @@ local oredefs = { }, mithril = { description = "Mithril", - makes = {ore = true, block = true, lump = true, ingot = true, chest = false}, + makes = {lump = true, ingot = true, chest = false}, oredef = { clust_scarcity = moreores.mithril_chunk_size ^ 3, clust_num_ores = moreores.mithril_ore_per_chunk, @@ -300,8 +315,8 @@ local oredefs = { y_max = moreores.mithril_max_depth, }, mineral = {groups = {cracky = 1}}, - block = {groups = {cracky = 0, level = 4}}, - lump = {cooktime = 10}, + block = {groups = {cracky = 0, level = 4}, on_blast = function() end}, + craftingot = {cooktime = 10}, tools = { pick = { groupcaps = { @@ -354,7 +369,7 @@ if default_tin then else oredefs.tin = { description = "Tin", - makes = {ore = true, block = true, lump = true, ingot = true, chest = false}, + makes = {lump = true, ingot = true, chest = false}, oredef = { clust_scarcity = moreores.tin_chunk_size ^ 3, clust_num_ores = moreores.tin_ore_per_chunk, @@ -362,6 +377,9 @@ else y_min = moreores.tin_min_depth, y_max = moreores.tin_max_depth, }, + mineral = {groups = {cracky = 2}}, + block = {groups = {cracky = 1, level = 2}}, + craftingot = {cooktime = 3}, tools = {}, } From 21a166eef45f969de75429fa70411e2d8dbb4816 Mon Sep 17 00:00:00 2001 From: Dirkfried <> Date: Sat, 1 Jan 2022 18:16:35 +0100 Subject: [PATCH 6/8] replace if with or (less code) --- init.lua | 36 +++++++++--------------------------- 1 file changed, 9 insertions(+), 27 deletions(-) diff --git a/init.lua b/init.lua index 9d011e8..b18c808 100644 --- a/init.lua +++ b/init.lua @@ -84,21 +84,11 @@ local function add_ore(modname, description, mineral_name, oredef) local lump_item = item_base .. "_lump" if oredef.mineral then - if oredef.mineral.description == nil then - oredef.mineral.description = S("@1 Ore", S(description)) - end - if oredef.mineral.tiles == nil then - oredef.mineral.tiles = {"default_stone.png^" .. modname .. "_mineral_" .. mineral_name .. ".png"} - end - if oredef.mineral.groups == nil then - oredef.mineral.groups = {cracky = 2} - end - if oredef.mineral.sounds == nil then - oredef.mineral.sounds = default_stone_sounds - end - if oredef.mineral.drop == nil then - oredef.mineral.drop = lump_item - end + oredef.mineral.description = oredef.mineral.description or S("@1 Ore", S(description)) + oredef.mineral.tiles = oredef.mineral.tiles or {"default_stone.png^" .. modname .. "_mineral_" .. mineral_name .. ".png"} + oredef.mineral.groups = oredef.mineral.groups or {cracky = 2} + oredef.mineral.sounds = oredef.mineral.sounds or default_stone_sounds + oredef.mineral.drop = oredef.mineral.drop or lump_item minetest.register_node(modname .. ":mineral_" .. mineral_name, oredef.mineral) if use_frame then frame.register(modname .. ":mineral_" .. mineral_name) @@ -107,18 +97,10 @@ local function add_ore(modname, description, mineral_name, oredef) if oredef.block then local block_item = item_base .. "_block" - if oredef.block.description == nil then - oredef.block.description = S("@1 Block", S(description)) - end - if oredef.block.tiles == nil then - oredef.block.tiles = {img_base .. "_block.png"} - end - if oredef.block.groups == nil then - oredef.block.groups = {cracky = 1, level = 2} - end - if oredef.block.sounds == nil then - oredef.block.sounds = default_metal_sounds - end + oredef.block.description = oredef.block.description or S("@1 Block", S(description)) + oredef.block.tiles = oredef.block.tiles or {img_base .. "_block.png"} + oredef.block.groups = oredef.block.groups or {cracky = 1, level = 2} + oredef.block.sounds = oredef.block.sounds or default_metal_sounds minetest.register_node(block_item, oredef.block) minetest.register_alias(mineral_name.."_block", block_item) if oredef.makes.ingot then From 2a02fff63e116ab746d75cca52cd676a503cb6f6 Mon Sep 17 00:00:00 2001 From: Dirkfried <> Date: Sun, 2 Jan 2022 20:25:41 +0100 Subject: [PATCH 7/8] no group ranking 0, but level=5 and fine tuning digging times --- init.lua | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/init.lua b/init.lua index b18c808..9ccde3f 100644 --- a/init.lua +++ b/init.lua @@ -297,12 +297,12 @@ local oredefs = { y_max = moreores.mithril_max_depth, }, mineral = {groups = {cracky = 1}}, - block = {groups = {cracky = 0, level = 4}, on_blast = function() end}, + block = {groups = {cracky = 1, level = 5}, on_blast = function() end}, craftingot = {cooktime = 10}, tools = { pick = { groupcaps = { - cracky = {times = {[0] = 5.00, [1] = 1.90, [2] = 0.90, [3] = 0.45}, uses = 66, maxlevel = 4}, + cracky = {times = {[1] = 3.00, [2] = 1.40, [3] = 0.65}, uses = 23, maxlevel = 5}, }, damage_groups = {fleshy = 6}, }, @@ -311,21 +311,21 @@ local oredefs = { }, shovel = { groupcaps = { - crumbly = {times = {[0] = 2.00, [1] = 1.00, [2] = 0.45, [3] = 0.25}, uses = 66, maxlevel = 4}, + crumbly = {times = {[1] = 1.65, [2] = 0.70, [3] = 0.40}, uses = 23, maxlevel = 5}, }, damage_groups = {fleshy = 5}, }, axe = { groupcaps = { - choppy = {times = {[0] = 3.00, [1] = 2.00, [2] = 0.80, [3] = 0.45}, uses = 66, maxlevel = 4}, + choppy = {times = {[1] = 3.20, [2] = 1.20, [3] = 0.65}, uses = 23, maxlevel = 5}, fleshy = {times = {[2] = 0.95, [3] = 0.30}, uses = 200, maxlevel = 2}, }, damage_groups = {fleshy = 8}, }, sword = { groupcaps = { - fleshy = {times = {[2] = 0.65, [3] = 0.25}, uses = 66, maxlevel = 3}, - snappy = {times = {[0] = 3.00, [1] = 1.80, [2] = 0.80, [3] = 0.25}, uses = 66, maxlevel = 4}, + fleshy = {times = {[2] = 0.65, [3] = 0.25}, uses = 67, maxlevel = 3}, + snappy = {times = {[1] = 2.80, [2] = 1.20, [3] = 0.40}, uses = 23, maxlevel = 5}, choppy = {times = {[3] = 0.65}, uses = 200, maxlevel = 0}, }, damage_groups = {fleshy = 10}, From c80c4b1b3794f52c42cec8dd96adeed42547984c Mon Sep 17 00:00:00 2001 From: Dirkfried <> Date: Mon, 3 Jan 2022 21:03:40 +0100 Subject: [PATCH 8/8] solve remaining merge conflicts --- init.lua | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/init.lua b/init.lua index be78fc2..d4aa2a3 100644 --- a/init.lua +++ b/init.lua @@ -252,6 +252,13 @@ local oredefs = { silver = { description = "Silver", makes = {lump = true, ingot = true, chest = true}, + oredef_high= { + clust_scarcity = moreores.silver_chunk_size_high ^ 3, + clust_num_ores = moreores.silver_ore_per_chunk_high, + clust_size = moreores.silver_clust_size_high, + y_min = moreores.silver_min_depth_high, + y_max = moreores.silver_max_depth_high, + }, oredef = { clust_scarcity = moreores.silver_chunk_size ^ 3, clust_num_ores = moreores.silver_ore_per_chunk, @@ -259,6 +266,13 @@ local oredefs = { y_min = moreores.silver_min_depth, y_max = moreores.silver_max_depth, }, + oredef_deep = { + clust_scarcity = moreores.silver_chunk_size_deep ^ 3, + clust_num_ores = moreores.silver_ore_per_chunk_deep, + clust_size = moreores.silver_clust_size_deep, + y_min = moreores.silver_min_depth_deep, + y_max = moreores.silver_max_depth_deep, + }, mineral = {groups = {cracky = 2}}, block = {groups = {cracky = 1, level = 2}}, craftingot = {cooktime = 2}, @@ -299,6 +313,13 @@ local oredefs = { mithril = { description = "Mithril", makes = {lump = true, ingot = true, chest = false}, + oredef_high = { + clust_scarcity = moreores.mithril_chunk_size_high ^ 3, + clust_num_ores = moreores.mithril_ore_per_chunk_high, + clust_size = moreores.mithril_clust_size_high, + y_min = moreores.mithril_min_depth_high, + y_max = moreores.mithril_max_depth_high, + }, oredef = { clust_scarcity = moreores.mithril_chunk_size ^ 3, clust_num_ores = moreores.mithril_ore_per_chunk, @@ -306,6 +327,13 @@ local oredefs = { y_min = moreores.mithril_min_depth, y_max = moreores.mithril_max_depth, }, + oredef_deep = { + clust_scarcity = moreores.mithril_chunk_size_deep ^ 3, + clust_num_ores = moreores.mithril_ore_per_chunk_deep, + clust_size = moreores.mithril_clust_size_deep, + y_min = moreores.mithril_min_depth_deep, + y_max = moreores.mithril_max_depth_deep, + }, mineral = {groups = {cracky = 1}}, block = {groups = {cracky = 1, level = 5}, on_blast = function() end}, craftingot = {cooktime = 10}, @@ -362,6 +390,13 @@ else oredefs.tin = { description = "Tin", makes = {lump = true, ingot = true, chest = false}, + oredef_high = { + clust_scarcity = moreores.tin_chunk_size_high ^ 3, + clust_num_ores = moreores.tin_ore_per_chunk_high, + clust_size = moreores.tin_clust_size_high, + y_min = moreores.tin_min_depth_high, + y_max = moreores.tin_max_depth_high, + }, oredef = { clust_scarcity = moreores.tin_chunk_size ^ 3, clust_num_ores = moreores.tin_ore_per_chunk, @@ -369,6 +404,13 @@ else y_min = moreores.tin_min_depth, y_max = moreores.tin_max_depth, }, + oredef_deep = { + clust_scarcity = moreores.tin_chunk_size_deep ^ 3, + clust_num_ores = moreores.tin_ore_per_chunk_deep, + clust_size = moreores.tin_clust_size_deep, + y_min = moreores.tin_min_depth_deep, + y_max = moreores.tin_max_depth_deep, + }, mineral = {groups = {cracky = 2}}, block = {groups = {cracky = 1, level = 2}}, craftingot = {cooktime = 3},