Athemis/MineClone2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' into stuck_arrow

Browse source
This commit is contained in:
Wuzzy 2018-05-08 13:08:04 +02:00
commit 467018128a
6 changed files with 33 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

23
mods/ITEMS/REDSTONE/mesecons_button/init.lua
View file

@ -98,20 +98,11 @@ mesecon.register_button = function(basename, description, texture, recipeitem, s
on_place = on_button_place,
node_placement_prediction = "",
on_rightclick = function (pos, node)
minetest.swap_node(pos, {name="mesecons_button:button_"..basename.."_on", param2=node.param2})
minetest.set_node(pos, {name="mesecons_button:button_"..basename.."_on", param2=node.param2})
mesecon.receptor_on(pos, button_get_output_rules(node))
minetest.sound_play("mesecons_button_push", {pos=pos})
local button_turnoff = function(a)
local pos = a.pos
local node = minetest.get_node(pos)
local basename = a.basename
if node.name=="mesecons_button:button_"..basename.."_on" then --has not been dug
minetest.swap_node(pos, {name="mesecons_button:button_"..basename.."_off",param2=node.param2})
minetest.sound_play("mesecons_button_pop", {pos=pos})
mesecon.receptor_off(pos, button_get_output_rules(node))
end
end
minetest.after(button_timer, button_turnoff, {pos=pos, basename=basename})
local timer = minetest.get_node_timer(pos)
timer:start(button_timer)
end,
sounds = sounds,
mesecons = {receptor = {
@ -143,6 +134,14 @@ mesecon.register_button = function(basename, description, texture, recipeitem, s
state = mesecon.state.on,
rules = button_get_output_rules
}},
on_timer = function(pos, elapsed)
local node = minetest.get_node(pos)
if node.name=="mesecons_button:button_"..basename.."_on" then --has not been dug
minetest.set_node(pos, {name="mesecons_button:button_"..basename.."_off",param2=node.param2})
minetest.sound_play("mesecons_button_pop", {pos=pos})
mesecon.receptor_off(pos, button_get_output_rules(node))
end
end,
_mcl_blast_resistance = 2.5,
_mcl_hardness = 0.5,
})

3
mods/ITEMS/mcl_fishing/init.lua
View file

@ -86,7 +86,8 @@ minetest.register_tool("mcl_fishing:fishing_rod", {
description = "Fishing Rod",
_doc_items_longdesc = "Fishing rods can be used to catch fish.",
_doc_items_usagehelp = "Rightclick a water source to try to go fishing. Who knows what you're going to catch?",
groups = { tool=1 },
-- This item is incomplete, hide it from creative inventory
groups = { tool=1, not_in_creative_inventory=1 },
inventory_image = "mcl_fishing_fishing_rod.png",
stack_max = 1,
liquids_pointable = true,