Merge branch 'master' into stuck_arrow

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

1
description.txt Normal file

@ -0,0 +1 @@
A survival sandbox game. Survive, gather, hunt, mine, build, explore, and do much more. Faithful clone of Minecraft 1.11. This is a work in progress! Expect bugs!

@ -443,7 +443,8 @@ register_minecart(
"mcl_minecarts_minecart_chest.b3d",
{ "mcl_chests_normal.png", "mcl_minecarts_minecart.png" },
"mcl_minecarts_minecart_chest.png",
{"mcl_minecarts:minecart", "mcl_chests:chest"})
{"mcl_minecarts:minecart", "mcl_chests:chest"},
nil, nil, false)
-- Minecart with Furnace
register_minecart(
@ -485,7 +486,7 @@ register_minecart(
-- DEBUG
minetest.chat_send_player(clicker:get_player_name(), "Fuel: " .. tostring(self._fueltime))
end
end
end, nil, false
)
-- Minecart with Command Block
@ -506,8 +507,7 @@ register_minecart(
},
"mcl_minecarts_minecart_command_block.png",
{"mcl_minecarts:minecart"},
nil,
false
nil, nil, false
)
-- Minecart with Hopper
@ -524,7 +524,8 @@ register_minecart(
"mcl_hoppers_hopper_top.png",
},
"mcl_minecarts_minecart_hopper.png",
{"mcl_minecarts:minecart", "mcl_hoppers:hopper"}
{"mcl_minecarts:minecart", "mcl_hoppers:hopper"},
nil, nil, false
)
-- Minecart with TNT
@ -544,7 +545,8 @@ register_minecart(
"mcl_minecarts_minecart.png",
},
"mcl_minecarts_minecart_tnt.png",
{"mcl_minecarts:minecart", "mcl_tnt:tnt"}
{"mcl_minecarts:minecart", "mcl_tnt:tnt"},
nil, nil, false
)
@ -556,6 +558,8 @@ minetest.register_craft({
},
})
-- TODO: Re-enable crafting of special minecarts when they have been implemented
if false then
minetest.register_craft({
output = "mcl_minecarts:hopper_minecart",
recipe = {
@ -587,3 +591,4 @@ minetest.register_craft({
{"mcl_minecarts:minecart"},
},
})
end

@ -115,7 +115,10 @@ register_rail("mcl_minecarts:activator_rail",
rules = rail_rules_long,
},
},
}
},
-- Hidden from creative because no cart is using this rail so far.
-- TODO: Remove this when the activator rail has become useful.
false
)
-- Activator rail (on)
@ -188,6 +191,9 @@ minetest.register_craft({
}
})
-- Activator rail crafting is disabled until it becomes useful.
-- TODO: Enable crafting as needed.
if false then
minetest.register_craft({
output = "mcl_minecarts:activator_rail 6",
recipe = {
@ -196,6 +202,7 @@ minetest.register_craft({
{"mcl_core:iron_ingot", "mcl_core:stick", "mcl_core:iron_ingot"},
}
})
end
minetest.register_craft({
output = "mcl_minecarts:detector_rail 6",

@ -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,
})

@ -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,

BIN
screenshot.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 93 KiB