From a9c20c4a1dd0aff321aa594a6af6d90f6b7df078 Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Tue, 24 Sep 2019 02:34:19 +0200 Subject: [PATCH] Add "handy" group to replace dig_immediate=2 --- mods/default/nodes.lua | 8 ++++---- mods/default/sign.lua | 2 +- mods/default/tools.lua | 7 +++++-- mods/farming/nodes.lua | 16 ++++++++-------- mods/tnt/init.lua | 4 ++-- 5 files changed, 20 insertions(+), 17 deletions(-) diff --git a/mods/default/nodes.lua b/mods/default/nodes.lua index f99ad2f..3fcdd9d 100644 --- a/mods/default/nodes.lua +++ b/mods/default/nodes.lua @@ -408,7 +408,7 @@ minetest.register_node( type = "fixed", fixed = {-0.4, -0.5, -0.4, 0.4, 0.4, 0.4}, }, - groups = {snappy = 2, dig_immediate = 2, attached_node = 1, sapling = 1}, + groups = {snappy = 2, handy = 2, attached_node = 1, sapling = 1}, is_ground_content = false, sounds = default.node_sound_defaults(), @@ -439,7 +439,7 @@ minetest.register_node( type = "fixed", fixed = {-0.4, -0.5, -0.4, 0.4, 0.4, 0.4}, }, - groups = {snappy = 2, dig_immediate = 2, attached_node = 1, sapling = 1}, + groups = {snappy = 2, handy = 2, attached_node = 1, sapling = 1}, sounds = default.node_sound_defaults(), on_timer = function(pos) @@ -469,7 +469,7 @@ minetest.register_node( type = "fixed", fixed = {-0.4, -0.5, -0.4, 0.4, 0.4, 0.4}, }, - groups = {snappy = 2, dig_immediate = 2, attached_node = 1, sapling = 1}, + groups = {snappy = 2, handy = 2, attached_node = 1, sapling = 1}, is_ground_content = false, sounds = default.node_sound_defaults(), @@ -1098,7 +1098,7 @@ minetest.register_node( sunlight_propagates = true, walkable = false, floodable = true, - groups = {fleshy = 3, dig_immediate = 2, leafdecay = 3, leafdecay_drop = 1, food = 2}, + groups = {fleshy = 3, handy = 2, leafdecay = 3, leafdecay_drop = 1, food = 2}, on_use = minetest.item_eat({hp = 2, sat = 10}), sounds = default.node_sound_defaults(), }) diff --git a/mods/default/sign.lua b/mods/default/sign.lua index cc85f96..9cec79b 100644 --- a/mods/default/sign.lua +++ b/mods/default/sign.lua @@ -20,7 +20,7 @@ minetest.register_node( wall_bottom = {-0.5+(1/16), -0.5, -0.5+(4/16), 0.5-(1/16), -0.5+(1/16), 0.5-(4/16)}, wall_side = {-0.5, -0.5+(4/16), -0.5+(1/16), -0.5+(1/16), 0.5-(4/16), 0.5-(1/16)}, }, - groups = {choppy = 2,dig_immediate = 2,attached_node = 1}, + groups = {choppy = 2,handy = 2,attached_node = 1}, is_ground_content = false, sounds = default.node_sound_defaults(), on_construct = function(pos) diff --git a/mods/default/tools.lua b/mods/default/tools.lua index eaf0e7f..e43eacc 100644 --- a/mods/default/tools.lua +++ b/mods/default/tools.lua @@ -62,6 +62,7 @@ if minetest.settings:get_bool("creative_mode") == true then choppy = {times={[1]=creative_digtime, [2]=creative_digtime, [3]=creative_digtime}, uses=0, maxlevel=1}, cracky = {times={[1]=creative_digtime, [2]=creative_digtime, [3]=creative_digtime}, uses=0, maxlevel=1}, snappy = {times={[1]=creative_digtime, [2]=creative_digtime, [3]=creative_digtime}, uses=0, maxlevel=1}, + handy = {times={[1]=creative_digtime,[2]=creative_digtime,[3]=creative_digtime}, uses=0, maxlevel=1}, oddly_breakable_by_hand = {times={[1]=creative_digtime,[2]=creative_digtime,[3]=creative_digtime}, uses=0, maxlevel=3}, dig_immediate = {times={[2]=math.min(creative_digtime, 0.5), [3]=0}, uses=0, maxlevel=1}, }, @@ -203,12 +204,13 @@ else full_punch_interval = 1.0, max_drop_level = 0, groupcaps = { + fleshy = {times={[2]=1.6, [3]=1.0}, uses=0, maxlevel=1}, crumbly = {times={[2]=3.2, [3]=2.1}, uses=0, maxlevel=1}, choppy = {times={[2]=3.5, [3]=3.8}, uses=0, maxlevel=1}, cracky = {times={[3]=8.5}, uses=0, maxlevel=1}, snappy = {times={[1]=2.5, [2]=2.0, [3]=1.5}, uses=0, maxlevel=1}, - fleshy = {times={[2]=1.6, [3]=1.0}, uses=0, maxlevel=1}, - oddly_breakable_by_hand = {times={[1]=7.0,[2]=5.5,[3]=4.0}, uses=0, maxlevel=1}, + handy = {times={[1]=1.0,[2]=0.5,[3]=0.25}, uses=0, maxlevel=1}, + oddly_breakable_by_hand = {times={[1]=7.0,[2]=5.5,[3]=4.0}, uses=0, maxlevel=3}, }, damage_groups = {fleshy = 1} }, @@ -232,6 +234,7 @@ minetest.register_tool( choppy = {times={[1]=creative_digtime, [2]=creative_digtime, [3]=creative_digtime}, uses=0, maxlevel=1}, cracky = {times={[1]=creative_digtime, [2]=creative_digtime, [3]=creative_digtime}, uses=0, maxlevel=1}, snappy = {times={[1]=creative_digtime, [2]=creative_digtime, [3]=creative_digtime}, uses=0, maxlevel=1}, + handy = {times={[1]=creative_digtime,[2]=creative_digtime,[3]=creative_digtime}, uses=0, maxlevel=1}, oddly_breakable_by_hand = {times={[1]=creative_digtime,[2]=creative_digtime,[3]=creative_digtime}, uses=0, maxlevel=3}, dig_immediate = {times={[2]=math.min(creative_digtime, 0.5), [3]=0}, uses=0, maxlevel=1}, }, diff --git a/mods/farming/nodes.lua b/mods/farming/nodes.lua index d6105d0..061f0e3 100644 --- a/mods/farming/nodes.lua +++ b/mods/farming/nodes.lua @@ -26,7 +26,7 @@ minetest.register_node( type = "fixed", fixed = {-0.5, -0.5, -0.5, 0.5, -0.5+(4/16), 0.5} }, - groups = {dig_immediate=2, attached_node=1, seed=1}, + groups = {handy=2, attached_node=1, seed=1}, sounds=default.node_sound_leaves_defaults() } ) @@ -53,7 +53,7 @@ minetest.register_node( type = "fixed", fixed = {-0.5, -0.5, -0.5, 0.5, -0.5+(4/16), 0.5} }, - groups = {dig_immediate=2, attached_node=1, not_in_craft_guide = 1, not_in_creative_inventory = 1}, + groups = {handy=2, attached_node=1, not_in_craft_guide = 1, not_in_creative_inventory = 1}, sounds=default.node_sound_leaves_defaults() } ) @@ -80,7 +80,7 @@ minetest.register_node( type = "fixed", fixed = {-0.5, -0.5, -0.5, 0.5, -0.5+(4/16), 0.5} }, - groups = {dig_immediate=2, attached_node=1, not_in_craft_guide = 1, not_in_creative_inventory = 1}, + groups = {handy=2, attached_node=1, not_in_craft_guide = 1, not_in_creative_inventory = 1}, sounds=default.node_sound_leaves_defaults() } ) @@ -110,7 +110,7 @@ minetest.register_node( type = "fixed", fixed = {-0.5, -0.5, -0.5, 0.5, -0.5+(4/16), 0.5} }, - groups = {dig_immediate=2, attached_node=1, not_in_craft_guide = 1, not_in_creative_inventory = 1}, + groups = {handy=2, attached_node=1, not_in_craft_guide = 1, not_in_creative_inventory = 1}, sounds=default.node_sound_leaves_defaults() } ) @@ -138,7 +138,7 @@ minetest.register_node( type = "fixed", fixed = {-0.5, -0.5, -0.5, 0.5, -0.5+(4/16), 0.5} }, - groups = {dig_immediate=2, attached_node=1, seed=1}, + groups = {handy=2, attached_node=1, seed=1}, sounds=default.node_sound_leaves_defaults() } ) @@ -165,7 +165,7 @@ minetest.register_node( type = "fixed", fixed = {-0.5, -0.5, -0.5, 0.5, -0.5+(4/16), 0.5} }, - groups = {dig_immediate=2, attached_node=1, not_in_craft_guide = 1, not_in_creative_inventory = 1}, + groups = {handy=2, attached_node=1, not_in_craft_guide = 1, not_in_creative_inventory = 1}, sounds=default.node_sound_leaves_defaults() } ) @@ -192,7 +192,7 @@ minetest.register_node( type = "fixed", fixed = {-0.5, -0.5, -0.5, 0.5, -0.5+(4/16), 0.5} }, - groups = {dig_immediate=2, attached_node=1, not_in_craft_guide = 1, not_in_creative_inventory = 1}, + groups = {handy=2, attached_node=1, not_in_craft_guide = 1, not_in_creative_inventory = 1}, sounds=default.node_sound_leaves_defaults() } ) @@ -222,7 +222,7 @@ minetest.register_node( type = "fixed", fixed = {-0.5, -0.5, -0.5, 0.5, -0.5+(4/16), 0.5} }, - groups = {dig_immediate=2, attached_node=1, not_in_craft_guide = 1, not_in_creative_inventory = 1}, + groups = {handy=2, attached_node=1, not_in_craft_guide = 1, not_in_creative_inventory = 1}, sounds=default.node_sound_leaves_defaults(), on_punch = function(pos, node, player) local name = player:get_wielded_item():get_name() diff --git a/mods/tnt/init.lua b/mods/tnt/init.lua index 11af8ee..2c7980d 100644 --- a/mods/tnt/init.lua +++ b/mods/tnt/init.lua @@ -254,7 +254,7 @@ minetest.register_node( description = desc, tiles = {top_tex, "tnt_bottom.png", "tnt_sides.png"}, is_ground_content = false, - groups = {dig_immediate = 2}, + groups = {handy = 2}, sounds = default.node_sound_wood_defaults(), on_punch = function(pos, node, puncher) @@ -294,7 +294,7 @@ minetest.register_node( light_source = 5, drop = "tnt:tnt", is_ground_content = false, - groups = {dig_immediate = 2}, + groups = {handy = 2}, sounds = default.node_sound_wood_defaults(), on_timer = tnt.boom, -- unaffected by explosions