mirror of
https://git.minetest.land/VoxeLibre/VoxeLibre.git
synced 2024-12-23 08:29:34 +01:00
Merge branch 'master' of https://git.minetest.land/epCode/MineClone2
This commit is contained in:
commit
adbfd6b55d
2 changed files with 7 additions and 3 deletions
|
@ -334,6 +334,10 @@ ARROW_ENTITY.on_step = function(self, dtime)
|
||||||
|
|
||||||
minetest.sound_play({name="mcl_bows_hit_other", gain=0.3}, {pos=self.object:get_pos(), max_hear_distance=16}, true)
|
minetest.sound_play({name="mcl_bows_hit_other", gain=0.3}, {pos=self.object:get_pos(), max_hear_distance=16}, true)
|
||||||
|
|
||||||
|
if mcl_burning.is_burning(self.object) and snode.name == "mcl_tnt:tnt" then
|
||||||
|
tnt.ignite(self._stuckin)
|
||||||
|
end
|
||||||
|
|
||||||
-- Push the button! Push, push, push the button!
|
-- Push the button! Push, push, push the button!
|
||||||
if mod_button and minetest.get_item_group(node.name, "button") > 0 and minetest.get_item_group(node.name, "button_push_by_arrow") == 1 then
|
if mod_button and minetest.get_item_group(node.name, "button") > 0 and minetest.get_item_group(node.name, "button_push_by_arrow") == 1 then
|
||||||
local bdir = minetest.wallmounted_to_dir(node.param2)
|
local bdir = minetest.wallmounted_to_dir(node.param2)
|
||||||
|
|
|
@ -822,7 +822,7 @@ minetest.register_node("mcl_core:ice", {
|
||||||
paramtype = "light",
|
paramtype = "light",
|
||||||
use_texture_alpha = translucent_ice,
|
use_texture_alpha = translucent_ice,
|
||||||
stack_max = 64,
|
stack_max = 64,
|
||||||
groups = {handy=1,pickaxey=1, slippery=3, building_block=1},
|
groups = {handy=1,pickaxey=1, slippery=3, building_block=1, ice=1},
|
||||||
drop = "",
|
drop = "",
|
||||||
sounds = mcl_sounds.node_sound_glass_defaults(),
|
sounds = mcl_sounds.node_sound_glass_defaults(),
|
||||||
node_dig_prediction = "mcl_core:water_source",
|
node_dig_prediction = "mcl_core:water_source",
|
||||||
|
@ -840,7 +840,7 @@ minetest.register_node("mcl_core:packed_ice", {
|
||||||
tiles = {"mcl_core_ice_packed.png"},
|
tiles = {"mcl_core_ice_packed.png"},
|
||||||
is_ground_content = true,
|
is_ground_content = true,
|
||||||
stack_max = 64,
|
stack_max = 64,
|
||||||
groups = {handy=1,pickaxey=1, slippery=3, building_block=1},
|
groups = {handy=1,pickaxey=1, slippery=3, building_block=1, ice=1},
|
||||||
drop = "",
|
drop = "",
|
||||||
sounds = mcl_sounds.node_sound_glass_defaults(),
|
sounds = mcl_sounds.node_sound_glass_defaults(),
|
||||||
_mcl_blast_resistance = 0.5,
|
_mcl_blast_resistance = 0.5,
|
||||||
|
@ -888,7 +888,7 @@ for i=0,3 do
|
||||||
paramtype = "light",
|
paramtype = "light",
|
||||||
use_texture_alpha = translucent_ice,
|
use_texture_alpha = translucent_ice,
|
||||||
stack_max = 64,
|
stack_max = 64,
|
||||||
groups = {handy=1, frosted_ice=1, slippery=3, not_in_creative_inventory=1},
|
groups = {handy=1, frosted_ice=1, slippery=3, not_in_creative_inventory=1, ice=1},
|
||||||
drop = "",
|
drop = "",
|
||||||
sounds = mcl_sounds.node_sound_glass_defaults(),
|
sounds = mcl_sounds.node_sound_glass_defaults(),
|
||||||
on_construct = function(pos)
|
on_construct = function(pos)
|
||||||
|
|
Loading…
Reference in a new issue