mirror of
https://github.com/luanti-org/minetest_game.git
synced 2025-05-31 02:56:26 -04:00
Merge 2c787dd2b1
into ea7b04a712
This commit is contained in:
commit
e826ed3a9e
8 changed files with 42 additions and 1 deletions
|
@ -75,7 +75,7 @@ function bucket.register_liquid(source, flowing, itemname, inventory_image, name
|
||||||
"place "..source) then
|
"place "..source) then
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
minetest.add_node(pos, {name=source})
|
minetest.place_node(pos, {name=source})
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Check if pointing to a buildable node
|
-- Check if pointing to a buildable node
|
||||||
|
@ -123,6 +123,7 @@ minetest.register_craftitem("bucket:bucket_empty", {
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
|
minetest.dig_node(pointed_thing.under)
|
||||||
minetest.add_node(pointed_thing.under, {name="air"})
|
minetest.add_node(pointed_thing.under, {name="air"})
|
||||||
|
|
||||||
return ItemStack(liquiddef.itemname)
|
return ItemStack(liquiddef.itemname)
|
||||||
|
|
|
@ -196,3 +196,11 @@ Gambit (WTFPL):
|
||||||
default_coal.png
|
default_coal.png
|
||||||
default_grass_*.png
|
default_grass_*.png
|
||||||
default_paper.png
|
default_paper.png
|
||||||
|
|
||||||
|
Michel Baradari (CC BY 3.0):
|
||||||
|
default_water_footstep.1.ogg
|
||||||
|
default_water_footstep.2.ogg
|
||||||
|
|
||||||
|
mikhog (CC BY 3.0):
|
||||||
|
default_lava_footstep.1.ogg
|
||||||
|
default_lava_footstep.2.ogg
|
||||||
|
|
|
@ -83,6 +83,34 @@ function default.node_sound_glass_defaults(table)
|
||||||
return table
|
return table
|
||||||
end
|
end
|
||||||
|
|
||||||
|
function default.node_sound_water_defaults(table)
|
||||||
|
table = table or {}
|
||||||
|
table.footstep = table.footstep or
|
||||||
|
{name="default_water_footstep", gain=0.25}
|
||||||
|
table.dug = table.dug or
|
||||||
|
{name="default_water_footstep", gain=0.4}
|
||||||
|
table.dig = table.dig or
|
||||||
|
{name="default_water_footstep", gain=0.4}
|
||||||
|
table.place = table.place or
|
||||||
|
{name="default_water_footstep", gain=0.4}
|
||||||
|
default.node_sound_defaults(table)
|
||||||
|
return table
|
||||||
|
end
|
||||||
|
|
||||||
|
function default.node_sound_lava_defaults(table)
|
||||||
|
table = table or {}
|
||||||
|
table.footstep = table.footstep or
|
||||||
|
{name="default_lava_footstep", gain=0.25}
|
||||||
|
table.dug = table.dug or
|
||||||
|
{name="default_lava_footstep", gain=0.4}
|
||||||
|
table.dig = table.dig or
|
||||||
|
{name="default_lava_footstep", gain=0.4}
|
||||||
|
table.place = table.place or
|
||||||
|
{name="default_lava_footstep", gain=0.4}
|
||||||
|
default.node_sound_defaults(table)
|
||||||
|
return table
|
||||||
|
end
|
||||||
|
|
||||||
--
|
--
|
||||||
-- Lavacooling
|
-- Lavacooling
|
||||||
--
|
--
|
||||||
|
|
|
@ -901,6 +901,7 @@ minetest.register_node("default:water_source", {
|
||||||
liquid_viscosity = 1,
|
liquid_viscosity = 1,
|
||||||
post_effect_color = {a=64, r=100, g=100, b=200},
|
post_effect_color = {a=64, r=100, g=100, b=200},
|
||||||
groups = {water=3, liquid=3, puts_out_fire=1},
|
groups = {water=3, liquid=3, puts_out_fire=1},
|
||||||
|
sounds = default.node_sound_water_defaults(),
|
||||||
})
|
})
|
||||||
|
|
||||||
minetest.register_node("default:water_flowing", {
|
minetest.register_node("default:water_flowing", {
|
||||||
|
@ -945,6 +946,7 @@ minetest.register_node("default:water_flowing", {
|
||||||
liquid_viscosity = 1,
|
liquid_viscosity = 1,
|
||||||
post_effect_color = {a=64, r=100, g=100, b=200},
|
post_effect_color = {a=64, r=100, g=100, b=200},
|
||||||
groups = {water=3, liquid=3, puts_out_fire=1, not_in_creative_inventory=1},
|
groups = {water=3, liquid=3, puts_out_fire=1, not_in_creative_inventory=1},
|
||||||
|
sounds = default.node_sound_water_defaults(),
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
||||||
|
@ -993,6 +995,7 @@ minetest.register_node("default:lava_source", {
|
||||||
damage_per_second = 4 * 2,
|
damage_per_second = 4 * 2,
|
||||||
post_effect_color = {a=192, r=255, g=64, b=0},
|
post_effect_color = {a=192, r=255, g=64, b=0},
|
||||||
groups = {lava=3, liquid=2, hot=3, igniter=1},
|
groups = {lava=3, liquid=2, hot=3, igniter=1},
|
||||||
|
sounds = default.node_sound_lava_defaults(),
|
||||||
})
|
})
|
||||||
|
|
||||||
minetest.register_node("default:lava_flowing", {
|
minetest.register_node("default:lava_flowing", {
|
||||||
|
@ -1039,6 +1042,7 @@ minetest.register_node("default:lava_flowing", {
|
||||||
damage_per_second = 4 * 2,
|
damage_per_second = 4 * 2,
|
||||||
post_effect_color = {a=192, r=255, g=64, b=0},
|
post_effect_color = {a=192, r=255, g=64, b=0},
|
||||||
groups = {lava=3, liquid=2, hot=3, igniter=1, not_in_creative_inventory=1},
|
groups = {lava=3, liquid=2, hot=3, igniter=1, not_in_creative_inventory=1},
|
||||||
|
sounds = default.node_sound_lava_defaults(),
|
||||||
})
|
})
|
||||||
|
|
||||||
--
|
--
|
||||||
|
|
BIN
mods/default/sounds/default_lava_footstep.1.ogg
Normal file
BIN
mods/default/sounds/default_lava_footstep.1.ogg
Normal file
Binary file not shown.
BIN
mods/default/sounds/default_lava_footstep.2.ogg
Normal file
BIN
mods/default/sounds/default_lava_footstep.2.ogg
Normal file
Binary file not shown.
BIN
mods/default/sounds/default_water_footstep.1.ogg
Normal file
BIN
mods/default/sounds/default_water_footstep.1.ogg
Normal file
Binary file not shown.
BIN
mods/default/sounds/default_water_footstep.2.ogg
Normal file
BIN
mods/default/sounds/default_water_footstep.2.ogg
Normal file
Binary file not shown.
Loading…
Add table
Reference in a new issue