From 11e8e7d4cc82760a2c3731cd00760ebeec5cd359 Mon Sep 17 00:00:00 2001 From: cora Date: Tue, 24 May 2022 13:24:22 +0200 Subject: [PATCH] Add soul_group to s.soil&sand, torch fix recpipe --- GROUPS.md | 1 + mods/ITEMS/mcl_blackstone/init.lua | 10 +++++----- mods/ITEMS/mcl_nether/init.lua | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/GROUPS.md b/GROUPS.md index 60d452ecdd..3c954111f1 100644 --- a/GROUPS.md +++ b/GROUPS.md @@ -103,6 +103,7 @@ Please read to learn how digging times * `enchantability=X`: How good the enchantments are the item gets (1 equals book) * `enchanted=1`: The item is already enchanted, meaning that it can't be enchanted using an enchanting table * `cobble=1`: Cobblestone of any kind +* `soul_block`: Fire burning on these blocks turns to soul fire, can be used to craft soul torch ### Material groups diff --git a/mods/ITEMS/mcl_blackstone/init.lua b/mods/ITEMS/mcl_blackstone/init.lua index bad755958e..0fa71ca817 100644 --- a/mods/ITEMS/mcl_blackstone/init.lua +++ b/mods/ITEMS/mcl_blackstone/init.lua @@ -124,7 +124,7 @@ minetest.register_node("mcl_blackstone:soul_soil", { tiles = {"mcl_blackstone_soul_soil.png"}, is_ground_content = false, sounds = mcl_sounds.node_sound_sand_defaults(), - groups = {cracky = 3, handy=1, shovely=1}, + groups = { cracky = 3, handy = 1, shovely = 1, soul_block = 1 }, _mcl_blast_resistance = 0.5, _mcl_hardness = 0.5, }) @@ -154,13 +154,13 @@ minetest.register_node("mcl_blackstone:soul_fire", { groups = {fire = 1, dig_immediate = 3, not_in_creative_inventory = 1, dig_by_piston = 1, destroys_items = 1, set_on_fire=8}, floodable = true, on_flood = function(pos, oldnode, newnode) - if minetest.get_item_group(newnode.name, "water") ~= 0 then + if minetest.get_item_group(newnode.name, "water") > 0 then minetest.sound_play("fire_extinguish_flame", {pos = pos, gain = 0.25, max_hear_distance = 16}, true) end end, on_construct=function(pos) local under = minetest.get_node(vector.offset(pos,0,-1,0)).name - if under ~= "mcl_nether:soul_sand" and under ~= "mcl_blackstone:soul_soil" then + if minetest.get_item_group(under,"soul_block") > 0 then minetest.swap_node(pos, {name = "air"}) end end @@ -169,7 +169,7 @@ minetest.register_node("mcl_blackstone:soul_fire", { local old_onconstruct=minetest.registered_nodes["mcl_fire:fire"].on_construct minetest.registered_nodes["mcl_fire:fire"].on_construct=function(pos) local under = minetest.get_node(vector.offset(pos,0,-1,0)).name - if under == "mcl_nether:soul_sand" or under == "mcl_blackstone:soul_soil" then + if minetest.get_item_group(under,"soul_block") > 0 then minetest.swap_node(pos, {name = "mcl_blackstone:soul_fire"}) end old_onconstruct(pos) @@ -366,7 +366,7 @@ minetest.register_craft({ output = "mcl_blackstone:soul_torch 4", recipe = { {"group:coal"}, - { "mcl_nether:soul_sand" }, { "mcl_core:stick" }, + { "group:soul_block" }, } }) diff --git a/mods/ITEMS/mcl_nether/init.lua b/mods/ITEMS/mcl_nether/init.lua index b474065a5a..2d8def90d0 100644 --- a/mods/ITEMS/mcl_nether/init.lua +++ b/mods/ITEMS/mcl_nether/init.lua @@ -130,7 +130,7 @@ minetest.register_node("mcl_nether:soul_sand", { stack_max = 64, tiles = {"mcl_nether_soul_sand.png"}, is_ground_content = true, - groups = {handy=1,shovely=1, building_block=1,soil_nether_wart=1, material_sand=1}, + groups = {handy = 1, shovely = 1, building_block = 1, soil_nether_wart = 1, material_sand = 1, soul_block = 1 }, collision_box = { type = "fixed", fixed = { -0.5, -0.5, -0.5, 0.5, 0.5 - 2/16, 0.5 },