mirror of
https://git.minetest.land/MineClone2/MineClone2.git
synced 2024-11-28 13:53:45 +01:00
Merge pull request 'Add Smooth Basalt node, Fix several hardness and blast_resistance values' (#2300) from smooth_basalt into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2300 Reviewed-by: MysticTempest <mystictempest@noreply.git.minetest.land>
This commit is contained in:
commit
38a99d99ed
@ -21,7 +21,7 @@ local function register_rail(itemstring, tiles, def_extras, creative)
|
||||
stack_max = 64,
|
||||
groups = groups,
|
||||
sounds = mcl_sounds.node_sound_metal_defaults(),
|
||||
_mcl_blast_resistance = 3.5,
|
||||
_mcl_blast_resistance = 0.7,
|
||||
_mcl_hardness = 0.7,
|
||||
after_destruct = function(pos)
|
||||
-- Scan for minecarts in this pos and force them to execute their "floating" check.
|
||||
|
@ -35,7 +35,7 @@ minetest.register_node("mcl_bells:bell", {
|
||||
is_ground_content = false,
|
||||
groups = {pickaxey=2, deco_block=1 },
|
||||
sounds = mcl_sounds.node_sound_metal_defaults(),
|
||||
_mcl_blast_resistance = 6,
|
||||
_mcl_blast_resistance = 5,
|
||||
_mcl_hardness = 5,
|
||||
on_rightclick = mcl_bells.ring_once,
|
||||
use_texture_alpha = "clip",
|
||||
|
@ -13,8 +13,8 @@ minetest.register_node("mcl_blackstone:blackstone", {
|
||||
sounds = mcl_sounds.node_sound_stone_defaults(),
|
||||
is_ground_content = false,
|
||||
groups = {cracky = 3, pickaxey=2, material_stone=1, cobble=1},
|
||||
_mcl_blast_resistance = 2,
|
||||
_mcl_hardness = 2,
|
||||
_mcl_blast_resistance = 6,
|
||||
_mcl_hardness = 1.5,
|
||||
})
|
||||
minetest.register_node("mcl_blackstone:blackstone_gilded", {
|
||||
description = S("Gilded Blackstone"),
|
||||
@ -53,8 +53,8 @@ minetest.register_node("mcl_blackstone:nether_gold", {
|
||||
{items = {"mcl_blackstone:nether_gold"}, rarity = 8},
|
||||
}
|
||||
},
|
||||
_mcl_blast_resistance = 2,
|
||||
_mcl_hardness = 2,
|
||||
_mcl_blast_resistance = 3,
|
||||
_mcl_hardness = 3,
|
||||
_mcl_silk_touch_drop = true,
|
||||
_mcl_fortune_drop = mcl_core.fortune_drop_ore,
|
||||
})
|
||||
@ -67,8 +67,8 @@ minetest.register_node("mcl_blackstone:basalt_polished", {
|
||||
on_rotate = on_rotate,
|
||||
is_ground_content = false,
|
||||
groups = {cracky = 3, pickaxey=2, material_stone=1},
|
||||
_mcl_blast_resistance = 2,
|
||||
_mcl_hardness = 2,
|
||||
_mcl_blast_resistance = 4.2,
|
||||
_mcl_hardness = 1.25,
|
||||
})
|
||||
minetest.register_node("mcl_blackstone:basalt", {
|
||||
description = S("Basalt"),
|
||||
@ -79,8 +79,17 @@ minetest.register_node("mcl_blackstone:basalt", {
|
||||
on_rotate = on_rotate,
|
||||
is_ground_content = false,
|
||||
groups = {cracky = 3, pickaxey=2, material_stone=1},
|
||||
_mcl_blast_resistance = 2,
|
||||
_mcl_hardness = 2,
|
||||
_mcl_blast_resistance = 4.2,
|
||||
_mcl_hardness = 1.25,
|
||||
})
|
||||
minetest.register_node("mcl_blackstone:basalt_smooth", {
|
||||
description = S("Smooth Basalt"),
|
||||
tiles = {"mcl_blackstone_basalt_smooth.png"},
|
||||
sounds = mcl_sounds.node_sound_stone_defaults(),
|
||||
is_ground_content = false,
|
||||
groups = {cracky = 3, pickaxey=2, material_stone=1},
|
||||
_mcl_blast_resistance = 4.2,
|
||||
_mcl_hardness = 1.25,
|
||||
})
|
||||
minetest.register_node("mcl_blackstone:blackstone_polished", {
|
||||
description = S("Polished Blackstone"),
|
||||
@ -88,7 +97,7 @@ minetest.register_node("mcl_blackstone:blackstone_polished", {
|
||||
sounds = mcl_sounds.node_sound_stone_defaults(),
|
||||
is_ground_content = false,
|
||||
groups = {cracky = 3, pickaxey=2, material_stone=1},
|
||||
_mcl_blast_resistance = 2,
|
||||
_mcl_blast_resistance = 6,
|
||||
_mcl_hardness = 2,
|
||||
})
|
||||
minetest.register_node("mcl_blackstone:blackstone_chiseled_polished", {
|
||||
@ -97,8 +106,8 @@ minetest.register_node("mcl_blackstone:blackstone_chiseled_polished", {
|
||||
sounds = mcl_sounds.node_sound_stone_defaults(),
|
||||
is_ground_content = false,
|
||||
groups = {cracky = 3, pickaxey=2, material_stone=1},
|
||||
_mcl_blast_resistance = 2,
|
||||
_mcl_hardness = 2,
|
||||
_mcl_blast_resistance = 6,
|
||||
_mcl_hardness = 1.5,
|
||||
})
|
||||
minetest.register_node("mcl_blackstone:blackstone_brick_polished", {
|
||||
description = S("Polished Blackstone Bricks"),
|
||||
@ -106,8 +115,8 @@ minetest.register_node("mcl_blackstone:blackstone_brick_polished", {
|
||||
sounds = mcl_sounds.node_sound_stone_defaults(),
|
||||
is_ground_content = false,
|
||||
groups = {cracky = 3, pickaxey=2, material_stone=1},
|
||||
_mcl_blast_resistance = 2,
|
||||
_mcl_hardness = 2,
|
||||
_mcl_blast_resistance = 6,
|
||||
_mcl_hardness = 1.5,
|
||||
})
|
||||
minetest.register_node("mcl_blackstone:quartz_brick", {
|
||||
description = S("Quartz Bricks"),
|
||||
@ -116,8 +125,8 @@ minetest.register_node("mcl_blackstone:quartz_brick", {
|
||||
is_ground_content = false,
|
||||
sounds = mcl_sounds.node_sound_stone_defaults(),
|
||||
groups = {cracky = 3, pickaxey=2, material_stone=1},
|
||||
_mcl_blast_resistance = 2,
|
||||
_mcl_hardness = 2,
|
||||
_mcl_blast_resistance = 0.8,
|
||||
_mcl_hardness = 0.8,
|
||||
})
|
||||
minetest.register_node("mcl_blackstone:soul_soil", {
|
||||
description = S("Soul Soil"),
|
||||
|
@ -34,7 +34,7 @@ minetest.register_node("mcl_copper:block", {
|
||||
groups = {pickaxey = 2, building_block = 1},
|
||||
sounds = mcl_sounds.node_sound_metal_defaults(),
|
||||
_mcl_blast_resistance = 6,
|
||||
_mcl_hardness = 5,
|
||||
_mcl_hardness = 3,
|
||||
})
|
||||
|
||||
minetest.register_node("mcl_copper:block_exposed", {
|
||||
|
@ -389,7 +389,7 @@ minetest.register_node("mcl_core:dirt_with_grass", {
|
||||
return mcl_core.on_snowable_construct(pos)
|
||||
end,
|
||||
_mcl_snowed = "mcl_core:dirt_with_grass_snow",
|
||||
_mcl_blast_resistance = 0.5,
|
||||
_mcl_blast_resistance = 0.6,
|
||||
_mcl_hardness = 0.6,
|
||||
_mcl_silk_touch_drop = true,
|
||||
})
|
||||
@ -434,7 +434,7 @@ minetest.register_node("mcl_core:mycelium", {
|
||||
|
||||
on_construct = mcl_core.on_snowable_construct,
|
||||
_mcl_snowed = "mcl_core:mycelium_snow",
|
||||
_mcl_blast_resistance = 0.5,
|
||||
_mcl_blast_resistance = 0.6,
|
||||
_mcl_hardness = 0.6,
|
||||
_mcl_silk_touch_drop = true,
|
||||
})
|
||||
@ -451,8 +451,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.5,
|
||||
_mcl_hardness = 0.6,
|
||||
_mcl_blast_resistance = 0.8,
|
||||
_mcl_hardness = 0.8,
|
||||
_mcl_silk_touch_drop = true,
|
||||
})
|
||||
mcl_core.register_snowed_node("mcl_core:podzol_snow", "mcl_core:podzol", nil, nil, false, S("Podzol with Snow"))
|
||||
@ -556,8 +556,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 = 0.8,
|
||||
_mcl_hardness = 0.8,
|
||||
_mcl_blast_resistance = 6,
|
||||
_mcl_hardness = 2,
|
||||
})
|
||||
|
||||
minetest.register_node("mcl_core:sandstonecarved", {
|
||||
@ -581,8 +581,8 @@ minetest.register_node("mcl_core:sandstonesmooth2", {
|
||||
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 = 0.8,
|
||||
_mcl_hardness = 0.8,
|
||||
_mcl_blast_resistance = 6,
|
||||
_mcl_hardness = 2,
|
||||
})
|
||||
|
||||
-- red sandstone --
|
||||
@ -775,7 +775,7 @@ minetest.register_node("mcl_core:goldblock", {
|
||||
groups = {pickaxey=4, building_block=1},
|
||||
sounds = mcl_sounds.node_sound_metal_defaults(),
|
||||
_mcl_blast_resistance = 6,
|
||||
_mcl_hardness = 5,
|
||||
_mcl_hardness = 3,
|
||||
})
|
||||
|
||||
minetest.register_node("mcl_core:diamondblock", {
|
||||
@ -1062,8 +1062,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.2,
|
||||
_mcl_hardness = 0.2,
|
||||
_mcl_blast_resistance = 0.1,
|
||||
_mcl_hardness = 0.1,
|
||||
_mcl_silk_touch_drop = true,
|
||||
})
|
||||
|
||||
|
@ -29,7 +29,7 @@ minetest.register_node("mcl_end:end_bricks", {
|
||||
groups = {pickaxey=1, building_block=1, material_stone=1},
|
||||
sounds = mcl_sounds.node_sound_stone_defaults(),
|
||||
_mcl_blast_resistance = 9,
|
||||
_mcl_hardness = 0.8,
|
||||
_mcl_hardness = 3,
|
||||
})
|
||||
|
||||
minetest.register_node("mcl_end:purpur_block", {
|
||||
|
@ -21,7 +21,7 @@ minetest.register_node("mcl_farming:soil", {
|
||||
end,
|
||||
groups = {handy=1,shovely=1, dirtifies_below_solid=1, dirtifier=1, soil=2, soil_sapling=1, deco_block=1 },
|
||||
sounds = mcl_sounds.node_sound_dirt_defaults(),
|
||||
_mcl_blast_resistance = 0.5,
|
||||
_mcl_blast_resistance = 0.6,
|
||||
_mcl_hardness = 0.6,
|
||||
})
|
||||
|
||||
|
@ -782,7 +782,7 @@ minetest.register_node("mcl_ocean:dried_kelp_block", {
|
||||
on_place = mcl_util.rotate_axis,
|
||||
on_rotate = on_rotate,
|
||||
_mcl_hardness = 0.5,
|
||||
_mcl_blast_resistance = 12.5,
|
||||
_mcl_blast_resistance = 2.5,
|
||||
})
|
||||
|
||||
minetest.register_craft({
|
||||
|
@ -40,7 +40,7 @@ minetest.register_node("mcl_ocean:prismarine", {
|
||||
tiles = {{name="mcl_ocean_prismarine_anim.png", animation={type="vertical_frames", aspect_w=32, aspect_h=32, length=45.0}}},
|
||||
groups = {pickaxey=1, building_block=1, material_stone=1},
|
||||
sounds = mcl_sounds.node_sound_stone_defaults(),
|
||||
_mcl_blast_resistance = 1.5,
|
||||
_mcl_blast_resistance = 6,
|
||||
_mcl_hardness = 1.5,
|
||||
})
|
||||
|
||||
|
@ -99,7 +99,7 @@ minetest.register_node("mcl_portals:portal_end", {
|
||||
groups = {portal=1, not_in_creative_inventory = 1, disable_jump = 1},
|
||||
|
||||
_mcl_hardness = -1,
|
||||
_mcl_blast_resistance = 36000000,
|
||||
_mcl_blast_resistance = 3600000,
|
||||
})
|
||||
|
||||
-- Obsidian platform at the End portal destination in the End
|
||||
|
Loading…
Reference in New Issue
Block a user