diff --git a/minetestforfun_game/mods/default/crafting.lua b/minetestforfun_game/mods/default/crafting.lua index 0a2bbd15..89779149 100755 --- a/minetestforfun_game/mods/default/crafting.lua +++ b/minetestforfun_game/mods/default/crafting.lua @@ -784,6 +784,20 @@ minetest.register_craft({ } }) +minetest.register_craft({ + output = "default:cactus 2", + recipe = { + {"default:cactus_spiky", "default:cactus_spiky"}, + }, +}) + +minetest.register_craft({ + output = "default:cactus_spiky 2", + recipe = { + {"default:cactus", "default:cactus"}, + }, +}) + minetest.register_craft({ output = 'default:clay', recipe = { diff --git a/minetestforfun_game/mods/default/nodes.lua b/minetestforfun_game/mods/default/nodes.lua index 331aa1bc..5ed8ecbb 100755 --- a/minetestforfun_game/mods/default/nodes.lua +++ b/minetestforfun_game/mods/default/nodes.lua @@ -1449,6 +1449,25 @@ minetest.register_node("default:cactus", { end, }) +minetest.register_node("default:cactus_spiky", { + description = "Spiky Cactus", + tiles = {"default_cactus_top.png", "default_cactus_top.png", + "default_cactus_spiky.png"}, + paramtype2 = "facedir", + groups = {snappy = 1, choppy = 3, flammable = 2}, + drop = { + items = { + {items = {"default:cactus_spiky"}}, + }, + }, + sounds = default.node_sound_wood_defaults(), + on_place = minetest.rotate_node, + + after_dig_node = function(pos, node, metadata, digger) + default.dig_up(pos, node, digger) + end, +}) + minetest.register_node("default:papyrus", { description = "Papyrus", drawtype = "plantlike", diff --git a/minetestforfun_game/mods/default/textures/default_cactus_side.png b/minetestforfun_game/mods/default/textures/default_cactus_side.png old mode 100755 new mode 100644 index e5c10c33..530316a4 Binary files a/minetestforfun_game/mods/default/textures/default_cactus_side.png and b/minetestforfun_game/mods/default/textures/default_cactus_side.png differ diff --git a/minetestforfun_game/mods/default/textures/default_cactus_spiky.png b/minetestforfun_game/mods/default/textures/default_cactus_spiky.png new file mode 100644 index 00000000..cdceed2f Binary files /dev/null and b/minetestforfun_game/mods/default/textures/default_cactus_spiky.png differ diff --git a/minetestforfun_game/mods/default/textures/default_cactus_top.png b/minetestforfun_game/mods/default/textures/default_cactus_top.png index cf46aa2d..6a11d9b9 100755 Binary files a/minetestforfun_game/mods/default/textures/default_cactus_top.png and b/minetestforfun_game/mods/default/textures/default_cactus_top.png differ diff --git a/mods/sprint/esprint.lua b/mods/sprint/esprint.lua index 0c2c8ce0..fc1569cd 100755 --- a/mods/sprint/esprint.lua +++ b/mods/sprint/esprint.lua @@ -104,9 +104,9 @@ minetest.register_globalstep(function(dtime) if gameTime > 0.4 then local pos = player:getpos() -- From playerplus : - -- am I near a cactus? + -- am I near a spiky cactus? pos.y = pos.y + 0.1 - if minetest.find_node_near(pos, 1, "default:cactus") and player:get_hp() > 0 then + if minetest.find_node_near(pos, 1, "default:cactus_spiky") and player:get_hp() > 0 then player:set_hp(player:get_hp()-1) end