From 98ca66bf09dadad7a89aa9b8db4658ebfaf336d4 Mon Sep 17 00:00:00 2001 From: seventeenthShulker Date: Tue, 19 Sep 2023 23:26:32 +0200 Subject: [PATCH] Update hardness and blast res for value not matching the wiki - Notably, smooth sandstone (and red) is much more durable than other sandstone variants - Ender chest isn't actually more explosion resistant than obsidian, hmm --- mods/ITEMS/REDSTONE/mcl_observers/init.lua | 12 +++---- mods/ITEMS/REDSTONE/mesecons_pistons/init.lua | 24 +++++++------- mods/ITEMS/mcl_bamboo/bamboo_base.lua | 4 +-- mods/ITEMS/mcl_beds/api.lua | 2 +- mods/ITEMS/mcl_brewing/init.lua | 32 +++++++++---------- mods/ITEMS/mcl_chests/init.lua | 4 +-- mods/ITEMS/mcl_colorblocks/init.lua | 2 +- mods/ITEMS/mcl_core/nodes_base.lua | 18 +++++------ mods/ITEMS/mcl_crimson/init.lua | 6 ++-- mods/ITEMS/mcl_end/chorus_plant.lua | 4 +-- mods/ITEMS/mcl_farming/soil.lua | 2 +- mods/ITEMS/mcl_lectern/init.lua | 4 +-- mods/ITEMS/mcl_sculk/init.lua | 2 +- 13 files changed, 57 insertions(+), 59 deletions(-) diff --git a/mods/ITEMS/REDSTONE/mcl_observers/init.lua b/mods/ITEMS/REDSTONE/mcl_observers/init.lua index 6045b5677..dfdbeb8a9 100644 --- a/mods/ITEMS/REDSTONE/mcl_observers/init.lua +++ b/mods/ITEMS/REDSTONE/mcl_observers/init.lua @@ -113,8 +113,8 @@ mesecon.register_node("mcl_observers:observer", { sounds = mcl_sounds.node_sound_stone_defaults(), paramtype2 = "facedir", on_rotate = false, - _mcl_blast_resistance = 3.5, - _mcl_hardness = 3.5, + _mcl_blast_resistance = 3, + _mcl_hardness = 3, }, { description = S("Observer"), _tt_help = S("Emits redstone pulse when block in front changes"), @@ -172,8 +172,8 @@ mesecon.register_node("mcl_observers:observer_down", { sounds = mcl_sounds.node_sound_stone_defaults(), groups = {pickaxey=1, material_stone=1, not_opaque=1, not_in_creative_inventory=1 }, on_rotate = false, - _mcl_blast_resistance = 3.5, - _mcl_hardness = 3.5, + _mcl_blast_resistance = 3, + _mcl_hardness = 3, drop = "mcl_observers:observer_off", }, { tiles = { @@ -224,8 +224,8 @@ mesecon.register_node("mcl_observers:observer_up", { sounds = mcl_sounds.node_sound_stone_defaults(), groups = {pickaxey=1, material_stone=1, not_opaque=1, not_in_creative_inventory=1 }, on_rotate = false, - _mcl_blast_resistance = 3.5, - _mcl_hardness = 3.5, + _mcl_blast_resistance = 3, + _mcl_hardness = 3, drop = "mcl_observers:observer_off", }, { tiles = { diff --git a/mods/ITEMS/REDSTONE/mesecons_pistons/init.lua b/mods/ITEMS/REDSTONE/mesecons_pistons/init.lua index 93b8df96d..85ffb4350 100644 --- a/mods/ITEMS/REDSTONE/mesecons_pistons/init.lua +++ b/mods/ITEMS/REDSTONE/mesecons_pistons/init.lua @@ -217,7 +217,7 @@ minetest.register_node("mesecons_pistons:piston_normal_off", { }, }, _mcl_blast_resistance = 0.5, - _mcl_hardness = 0.5, + _mcl_hardness = 1.5, on_rotate = function(pos, node, user, mode) if mode == screwdriver.ROTATE_AXIS then minetest.set_node(pos, {name="mesecons_pistons:piston_up_normal_off"}) @@ -254,7 +254,7 @@ minetest.register_node("mesecons_pistons:piston_normal_on", { }, }, _mcl_blast_resistance = 0.5, - _mcl_hardness = 0.5, + _mcl_hardness = 1.5, on_rotate = false, }) @@ -325,7 +325,7 @@ minetest.register_node("mesecons_pistons:piston_sticky_off", { }, }, _mcl_blast_resistance = 0.5, - _mcl_hardness = 0.5, + _mcl_hardness = 1.5, on_rotate = function(pos, node, user, mode) if mode == screwdriver.ROTATE_AXIS then minetest.set_node(pos, {name="mesecons_pistons:piston_up_sticky_off"}) @@ -362,7 +362,7 @@ minetest.register_node("mesecons_pistons:piston_sticky_on", { }, }, _mcl_blast_resistance = 0.5, - _mcl_hardness = 0.5, + _mcl_hardness = 1.5, on_rotate = false, }) @@ -448,7 +448,7 @@ minetest.register_node("mesecons_pistons:piston_up_normal_off", { footstep = mcl_sounds.node_sound_wood_defaults().footstep }), _mcl_blast_resistance = 0.5, - _mcl_hardness = 0.5, + _mcl_hardness = 1.5, on_rotate = function(pos, node, user, mode) if mode == screwdriver.ROTATE_AXIS then minetest.set_node(pos, {name="mesecons_pistons:piston_down_normal_off"}) @@ -486,7 +486,7 @@ minetest.register_node("mesecons_pistons:piston_up_normal_on", { }, }, _mcl_blast_resistance = 0.5, - _mcl_hardness = 0.5, + _mcl_hardness = 1.5, on_rotate = false, }) @@ -555,7 +555,7 @@ minetest.register_node("mesecons_pistons:piston_up_sticky_off", { }, }, _mcl_blast_resistance = 0.5, - _mcl_hardness = 0.5, + _mcl_hardness = 1.5, on_rotate = function(pos, node, user, mode) if mode == screwdriver.ROTATE_AXIS then minetest.set_node(pos, {name="mesecons_pistons:piston_down_sticky_off"}) @@ -593,7 +593,7 @@ minetest.register_node("mesecons_pistons:piston_up_sticky_on", { }, }, _mcl_blast_resistance = 0.5, - _mcl_hardness = 0.5, + _mcl_hardness = 1.5, on_rotate = false, }) @@ -679,7 +679,7 @@ minetest.register_node("mesecons_pistons:piston_down_normal_off", { }, }, _mcl_blast_resistance = 0.5, - _mcl_hardness = 0.5, + _mcl_hardness = 1.5, on_rotate = function(pos, node, user, mode) if mode == screwdriver.ROTATE_AXIS then minetest.set_node(pos, {name="mesecons_pistons:piston_normal_off"}) @@ -717,7 +717,7 @@ minetest.register_node("mesecons_pistons:piston_down_normal_on", { }, }, _mcl_blast_resistance = 0.5, - _mcl_hardness = 0.5, + _mcl_hardness = 1.5, on_rotate = false, }) @@ -781,7 +781,7 @@ minetest.register_node("mesecons_pistons:piston_down_sticky_off", { }, }, _mcl_blast_resistance = 0.5, - _mcl_hardness = 0.5, + _mcl_hardness = 1.5, on_rotate = function(pos, node, user, mode) if mode == screwdriver.ROTATE_AXIS then minetest.set_node(pos, {name="mesecons_pistons:piston_sticky_off"}) @@ -819,7 +819,7 @@ minetest.register_node("mesecons_pistons:piston_down_sticky_on", { }, }, _mcl_blast_resistance = 0.5, - _mcl_hardness = 0.5, + _mcl_hardness = 1.5, on_rotate = false, }) diff --git a/mods/ITEMS/mcl_bamboo/bamboo_base.lua b/mods/ITEMS/mcl_bamboo/bamboo_base.lua index 4ccb9bb1b..6d8726df4 100644 --- a/mods/ITEMS/mcl_bamboo/bamboo_base.lua +++ b/mods/ITEMS/mcl_bamboo/bamboo_base.lua @@ -62,7 +62,7 @@ local bamboo_def = { inventory_image = "mcl_bamboo_bamboo_shoot.png", wield_image = "mcl_bamboo_bamboo_shoot.png", _mcl_blast_resistance = 1, - _mcl_hardness = 1.5, + _mcl_hardness = 1, node_box = { type = "fixed", fixed = { @@ -272,7 +272,7 @@ local bamboo_block_def = { sounds = node_sound, paramtype2 = "facedir", drops = "mcl_bamboo:bamboo_block", - _mcl_blast_resistance = 3, + _mcl_blast_resistance = 2, _mcl_hardness = 2, _mcl_stripped_variant = "mcl_bamboo:bamboo_block_stripped", -- this allows us to use the built in Axe's strip block. on_place = function(itemstack, placer, pointed_thing) diff --git a/mods/ITEMS/mcl_beds/api.lua b/mods/ITEMS/mcl_beds/api.lua index 9d46eca39..72f7dac03 100644 --- a/mods/ITEMS/mcl_beds/api.lua +++ b/mods/ITEMS/mcl_beds/api.lua @@ -237,7 +237,7 @@ function mcl_beds.register_bed(name, def) -- FIXME: Should be bouncy=66, but this would be a higher bounciness than slime blocks! groups = {handy = 1, flammable = -1, bed = 2, dig_by_piston=1, bouncy=33, fall_damage_add_percent=-50, not_in_creative_inventory = 1}, _mcl_hardness = 0.2, - _mcl_blast_resistance = 1, + _mcl_blast_resistance = 0.2, sounds = def.sounds or default_sounds, drop = def.recipe and name or "", selection_box = common_box, diff --git a/mods/ITEMS/mcl_brewing/init.lua b/mods/ITEMS/mcl_brewing/init.lua index 9c6879430..183dfafc6 100644 --- a/mods/ITEMS/mcl_brewing/init.lua +++ b/mods/ITEMS/mcl_brewing/init.lua @@ -416,8 +416,8 @@ minetest.register_node("mcl_brewing:stand_000", { } }, sounds = mcl_sounds.node_sound_metal_defaults(), - _mcl_blast_resistance = 1, - _mcl_hardness = 1, + _mcl_blast_resistance = 0.5, + _mcl_hardness = 0.5, on_destruct = on_destruct, allow_metadata_inventory_take = allow_take, allow_metadata_inventory_put = allow_put, @@ -489,8 +489,8 @@ minetest.register_node("mcl_brewing:stand_100", { } }, sounds = mcl_sounds.node_sound_metal_defaults(), - _mcl_blast_resistance = 1, - _mcl_hardness = 1, + _mcl_blast_resistance = 0.5, + _mcl_hardness = 0.5, on_destruct = on_destruct, allow_metadata_inventory_take = allow_take, allow_metadata_inventory_put = allow_put, @@ -561,8 +561,8 @@ minetest.register_node("mcl_brewing:stand_010", { } }, sounds = mcl_sounds.node_sound_metal_defaults(), - _mcl_blast_resistance = 1, - _mcl_hardness = 1, + _mcl_blast_resistance = 0.5, + _mcl_hardness = 0.5, on_destruct = on_destruct, allow_metadata_inventory_take = allow_take, allow_metadata_inventory_put = allow_put, @@ -628,8 +628,8 @@ minetest.register_node("mcl_brewing:stand_001", { } }, sounds = mcl_sounds.node_sound_metal_defaults(), - _mcl_blast_resistance = 1, - _mcl_hardness = 1, + _mcl_blast_resistance = 0.5, + _mcl_hardness = 0.5, on_destruct = on_destruct, allow_metadata_inventory_take = allow_take, allow_metadata_inventory_put = allow_put, @@ -705,8 +705,8 @@ minetest.register_node("mcl_brewing:stand_110", { } }, sounds = mcl_sounds.node_sound_metal_defaults(), - _mcl_blast_resistance = 1, - _mcl_hardness = 1, + _mcl_blast_resistance = 0.5, + _mcl_hardness = 0.5, on_destruct = on_destruct, allow_metadata_inventory_take = allow_take, allow_metadata_inventory_put = allow_put, @@ -778,8 +778,8 @@ minetest.register_node("mcl_brewing:stand_101", { } }, sounds = mcl_sounds.node_sound_metal_defaults(), - _mcl_blast_resistance = 1, - _mcl_hardness = 1, + _mcl_blast_resistance = 0.5, + _mcl_hardness = 0.5, on_destruct = on_destruct, allow_metadata_inventory_take = allow_take, allow_metadata_inventory_put = allow_put, @@ -851,8 +851,8 @@ minetest.register_node("mcl_brewing:stand_011", { } }, sounds = mcl_sounds.node_sound_metal_defaults(), - _mcl_blast_resistance = 1, - _mcl_hardness = 1, + _mcl_blast_resistance = 0.5, + _mcl_hardness = 0.5, on_destruct = on_destruct, allow_metadata_inventory_take = allow_take, allow_metadata_inventory_put = allow_put, @@ -931,8 +931,8 @@ minetest.register_node("mcl_brewing:stand_111", { } }, sounds = mcl_sounds.node_sound_metal_defaults(), - _mcl_blast_resistance = 1, - _mcl_hardness = 1, + _mcl_blast_resistance = 0.5, + _mcl_hardness = 0.5, on_destruct = on_destruct, allow_metadata_inventory_take = allow_take, allow_metadata_inventory_put = allow_put, diff --git a/mods/ITEMS/mcl_chests/init.lua b/mods/ITEMS/mcl_chests/init.lua index 59ed2ba09..05395da98 100644 --- a/mods/ITEMS/mcl_chests/init.lua +++ b/mods/ITEMS/mcl_chests/init.lua @@ -1164,7 +1164,7 @@ minetest.register_node("mcl_chests:ender_chest_small", { player_chest_close(sender) end end, - _mcl_blast_resistance = 3000, + _mcl_blast_resistance = 600, _mcl_hardness = 22.5, _mcl_silk_touch_drop = { "mcl_chests:ender_chest" }, on_rotate = simple_rotate, @@ -1466,7 +1466,7 @@ for color, desc in pairs(boxtypes) do return 0 end end, - _mcl_blast_resistance = 6, + _mcl_blast_resistance = 2, _mcl_hardness = 2, }) diff --git a/mods/ITEMS/mcl_colorblocks/init.lua b/mods/ITEMS/mcl_colorblocks/init.lua index 6eec8a9df..8d578b5ec 100644 --- a/mods/ITEMS/mcl_colorblocks/init.lua +++ b/mods/ITEMS/mcl_colorblocks/init.lua @@ -158,7 +158,7 @@ for _, row in ipairs(block.dyes) do stack_max = 64, is_ground_content = false, sounds = mcl_sounds.node_sound_stone_defaults(), - _mcl_blast_resistance = 4.2, + _mcl_blast_resistance = 1.4, _mcl_hardness = 1.4, on_rotate = on_rotate, }) diff --git a/mods/ITEMS/mcl_core/nodes_base.lua b/mods/ITEMS/mcl_core/nodes_base.lua index 25bd145c2..3cd4dd79c 100644 --- a/mods/ITEMS/mcl_core/nodes_base.lua +++ b/mods/ITEMS/mcl_core/nodes_base.lua @@ -424,7 +424,7 @@ minetest.register_node("mcl_core:grass_path", { footstep = {name="default_grass_footstep", gain=0.1}, }), _mcl_blast_resistance = 0.65, - _mcl_hardness = 0.6, + _mcl_hardness = 0.65, }) -- TODO: Add particles @@ -497,8 +497,8 @@ minetest.register_node("mcl_core:podzol", { sounds = mcl_sounds.node_sound_dirt_defaults(), on_construct = mcl_core.on_snowable_construct, _mcl_snowed = "mcl_core:podzol_snow", - _mcl_blast_resistance = 0.8, - _mcl_hardness = 0.8, + _mcl_blast_resistance = 0.5, + _mcl_hardness = 0.5, _mcl_silk_touch_drop = true, }) mcl_core.register_snowed_node("mcl_core:podzol_snow", "mcl_core:podzol", nil, nil, false, S("Podzol with Snow")) @@ -600,8 +600,8 @@ minetest.register_node("mcl_core:sandstonesmooth", { stack_max = 64, groups = {pickaxey=1, sandstone=1, normal_sandstone=1, building_block=1, material_stone=1}, sounds = mcl_sounds.node_sound_stone_defaults(), - _mcl_blast_resistance = 6, - _mcl_hardness = 2, + _mcl_blast_resistance = 0.8, + _mcl_hardness = 0.8, }) minetest.register_node("mcl_core:sandstonecarved", { @@ -687,8 +687,8 @@ minetest.register_node("mcl_core:redsandstonesmooth2", { stack_max = 64, groups = {pickaxey=1, sandstone=1, red_sandstone=1, building_block=1, material_stone=1}, sounds = mcl_sounds.node_sound_stone_defaults(), - _mcl_blast_resistance = 0.8, - _mcl_hardness = 0.8, + _mcl_blast_resistance = 6, + _mcl_hardness = 2, }) --- @@ -1119,8 +1119,8 @@ minetest.register_node("mcl_core:snowblock", { on_construct = mcl_core.on_snow_construct, after_destruct = mcl_core.after_snow_destruct, drop = "mcl_throwing:snowball 4", - _mcl_blast_resistance = 0.1, - _mcl_hardness = 0.1, + _mcl_blast_resistance = 0.2, + _mcl_hardness = 0.2, _mcl_silk_touch_drop = true, }) diff --git a/mods/ITEMS/mcl_crimson/init.lua b/mods/ITEMS/mcl_crimson/init.lua index cd9c9354c..f24e35694 100644 --- a/mods/ITEMS/mcl_crimson/init.lua +++ b/mods/ITEMS/mcl_crimson/init.lua @@ -175,8 +175,7 @@ minetest.register_node("mcl_crimson:twisting_vines", { "mcl_crimson:twisting_vines", "mcl_crimson:twisting_vines", }, - _mcl_blast_resistance = 0.2, - _mcl_hardness = 0.2, + _mcl_blast_resistance = 0, }) minetest.register_node("mcl_crimson:weeping_vines", { @@ -250,8 +249,7 @@ minetest.register_node("mcl_crimson:weeping_vines", { "mcl_crimson:weeping_vines", "mcl_crimson:weeping_vines", }, - _mcl_blast_resistance = 0.2, - _mcl_hardness = 0.2, + _mcl_blast_resistance = 0, }) minetest.register_node("mcl_crimson:nether_sprouts", { diff --git a/mods/ITEMS/mcl_end/chorus_plant.lua b/mods/ITEMS/mcl_end/chorus_plant.lua index 4dc54db18..0f551b207 100644 --- a/mods/ITEMS/mcl_end/chorus_plant.lua +++ b/mods/ITEMS/mcl_end/chorus_plant.lua @@ -229,7 +229,7 @@ minetest.register_node("mcl_end:chorus_flower_dead", { groups = {handy=1,axey=1, deco_block = 1, dig_by_piston = 1, destroy_by_lava_flow = 1,chorus_plant = 1, not_in_creative_inventory=1}, after_dig_node = mcl_end.check_detach_chorus_plant, on_blast = mcl_end.check_blast_chorus_plant, - _mcl_blast_resistance = 2, + _mcl_blast_resistance = 0.4, _mcl_hardness = 0.4, }) @@ -307,7 +307,7 @@ minetest.register_node("mcl_end:chorus_plant", { end, after_dig_node = mcl_end.check_detach_chorus_plant, on_blast = mcl_end.check_blast_chorus_plant, - _mcl_blast_resistance = 2, + _mcl_blast_resistance = 0.4, _mcl_hardness = 0.4, }) diff --git a/mods/ITEMS/mcl_farming/soil.lua b/mods/ITEMS/mcl_farming/soil.lua index a6721cc26..e91feb1e8 100644 --- a/mods/ITEMS/mcl_farming/soil.lua +++ b/mods/ITEMS/mcl_farming/soil.lua @@ -44,7 +44,7 @@ minetest.register_node("mcl_farming:soil_wet", { end, groups = {handy=1,shovely=1, not_in_creative_inventory=1, dirtifies_below_solid=1, dirtifier=1, soil=3, soil_sapling=1 }, sounds = mcl_sounds.node_sound_dirt_defaults(), - _mcl_blast_resistance = 0.5, + _mcl_blast_resistance = 0.6, _mcl_hardness = 0.6, }) diff --git a/mods/ITEMS/mcl_lectern/init.lua b/mods/ITEMS/mcl_lectern/init.lua index 98366b7b8..d86b6f4b9 100644 --- a/mods/ITEMS/mcl_lectern/init.lua +++ b/mods/ITEMS/mcl_lectern/init.lua @@ -31,8 +31,8 @@ local lectern_def = { walkable = true, is_ground_content = false, node_placement_prediction = "", - _mcl_blast_resistance = 3, - _mcl_hardness = 2, + _mcl_blast_resistance = 2.5, + _mcl_hardness = 2.5, selection_box = { type = "fixed", fixed = { diff --git a/mods/ITEMS/mcl_sculk/init.lua b/mods/ITEMS/mcl_sculk/init.lua index b2ef04152..ce230a271 100644 --- a/mods/ITEMS/mcl_sculk/init.lua +++ b/mods/ITEMS/mcl_sculk/init.lua @@ -194,7 +194,7 @@ minetest.register_node("mcl_sculk:sculk", { is_ground_content = false, on_destruct = sculk_on_destruct, _mcl_blast_resistance = 0.2, - _mcl_hardness = 0.6, + _mcl_hardness = 0.2, _mcl_silk_touch_drop = true, })