update fire and see if slowfire works
This commit is contained in:
parent
8fcd9a2eaf
commit
1a54b2de73
@ -1,10 +1,13 @@
|
||||
-- Global namespace for functions
|
||||
-- fire/init.lua
|
||||
|
||||
-- Global namespace for functions
|
||||
fire = {}
|
||||
|
||||
-- 'Enable fire' setting
|
||||
-- Load support for MT game translation.
|
||||
local S = minetest.get_translator("fire")
|
||||
|
||||
local fire_enabled = minetest.settings:get_bool("enable_fire") or true
|
||||
-- 'Enable fire' setting
|
||||
local fire_enabled = minetest.settings:get_bool("enable_fire")
|
||||
if fire_enabled == nil then
|
||||
-- enable_fire setting not specified, check for disable_fire
|
||||
local fire_disabled = minetest.settings:get_bool("disable_fire")
|
||||
@ -21,33 +24,27 @@ end
|
||||
--
|
||||
|
||||
-- Flood flame function
|
||||
|
||||
local function flood_flame(pos, oldnode, newnode)
|
||||
local function flood_flame(pos, _, newnode)
|
||||
-- Play flame extinguish sound if liquid is not an 'igniter'
|
||||
local nodedef = minetest.registered_items[newnode.name]
|
||||
if not (nodedef and nodedef.groups and
|
||||
nodedef.groups.igniter and nodedef.groups.igniter > 0) then
|
||||
if minetest.get_item_group(newnode.name, "igniter") == 0 then
|
||||
minetest.sound_play("fire_extinguish_flame",
|
||||
{pos = pos, max_hear_distance = 16, gain = 0.15})
|
||||
{pos = pos, max_hear_distance = 16, gain = 0.15}, true)
|
||||
end
|
||||
-- Remove the flame
|
||||
return false
|
||||
end
|
||||
|
||||
-- Flame nodes
|
||||
|
||||
minetest.register_node("fire:basic_flame", {
|
||||
local fire_node = {
|
||||
drawtype = "firelike",
|
||||
tiles = {
|
||||
{
|
||||
name = "fire_basic_flame_animated.png",
|
||||
animation = {
|
||||
type = "vertical_frames",
|
||||
aspect_w = 16,
|
||||
aspect_h = 16,
|
||||
length = 1
|
||||
},
|
||||
},
|
||||
tiles = {{
|
||||
name = "fire_basic_flame_animated.png",
|
||||
animation = {
|
||||
type = "vertical_frames",
|
||||
aspect_w = 16,
|
||||
aspect_h = 16,
|
||||
length = 1
|
||||
}}
|
||||
},
|
||||
inventory_image = "fire_basic_flame.png",
|
||||
paramtype = "light",
|
||||
@ -57,72 +54,45 @@ minetest.register_node("fire:basic_flame", {
|
||||
sunlight_propagates = true,
|
||||
floodable = true,
|
||||
damage_per_second = 4,
|
||||
groups = {igniter = 2, dig_immediate = 3, not_in_creative_inventory = 1},
|
||||
groups = {igniter = 2, dig_immediate = 3, fire = 1},
|
||||
drop = "",
|
||||
on_flood = flood_flame
|
||||
}
|
||||
|
||||
on_timer = function(pos)
|
||||
local f = minetest.find_node_near(pos, 1, {"group:flammable"})
|
||||
if not fire_enabled or not f or minetest.find_node_near(f, 1, {"group:water"}) then
|
||||
minetest.remove_node(pos)
|
||||
return
|
||||
end
|
||||
-- Restart timer
|
||||
return true
|
||||
end,
|
||||
-- Basic flame node
|
||||
local flame_fire_node = table.copy(fire_node)
|
||||
flame_fire_node.description = S("Fire")
|
||||
flame_fire_node.groups.not_in_creative_inventory = 1
|
||||
flame_fire_node.on_timer = function(pos)
|
||||
if not minetest.find_node_near(pos, 1, {"group:flammable"}) then
|
||||
minetest.remove_node(pos)
|
||||
return
|
||||
end
|
||||
-- Restart timer
|
||||
return true
|
||||
end
|
||||
flame_fire_node.on_construct = function(pos)
|
||||
minetest.get_node_timer(pos):start(math.random(30, 60))
|
||||
end
|
||||
|
||||
on_construct = function(pos)
|
||||
if not fire_enabled then
|
||||
minetest.remove_node(pos)
|
||||
else
|
||||
minetest.get_node_timer(pos):start(math.random(10, 30))
|
||||
end
|
||||
end,
|
||||
minetest.register_node("fire:basic_flame", flame_fire_node)
|
||||
|
||||
on_flood = flood_flame,
|
||||
})
|
||||
-- Permanent flame node
|
||||
local permanent_fire_node = table.copy(fire_node)
|
||||
permanent_fire_node.description = S("Permanent Fire")
|
||||
|
||||
minetest.register_node("fire:permanent_flame", {
|
||||
description = "Permanent Flame",
|
||||
drawtype = "firelike",
|
||||
tiles = {
|
||||
{
|
||||
name = "fire_basic_flame_animated.png",
|
||||
animation = {
|
||||
type = "vertical_frames",
|
||||
aspect_w = 16,
|
||||
aspect_h = 16,
|
||||
length = 1
|
||||
},
|
||||
},
|
||||
},
|
||||
inventory_image = "fire_basic_flame.png",
|
||||
paramtype = "light",
|
||||
light_source = 13,
|
||||
walkable = false,
|
||||
buildable_to = true,
|
||||
sunlight_propagates = true,
|
||||
floodable = true,
|
||||
damage_per_second = 4,
|
||||
groups = {igniter = 2, dig_immediate = 3},
|
||||
drop = "",
|
||||
|
||||
on_flood = flood_flame,
|
||||
})
|
||||
|
||||
|
||||
-- Flint and steel
|
||||
minetest.register_node("fire:permanent_flame", permanent_fire_node)
|
||||
|
||||
-- Flint and Steel
|
||||
minetest.register_tool("fire:flint_and_steel", {
|
||||
description = "Flint and Steel",
|
||||
description = S("Flint and Steel"),
|
||||
inventory_image = "fire_flint_steel.png",
|
||||
sound = {breaks = "default_tool_breaks"},
|
||||
|
||||
on_use = function(itemstack, user, pointed_thing)
|
||||
local sound_pos = pointed_thing.above or user:get_pos()
|
||||
minetest.sound_play(
|
||||
"fire_flint_and_steel",
|
||||
{pos = sound_pos, gain = 0.5, max_hear_distance = 8}
|
||||
)
|
||||
minetest.sound_play("fire_flint_and_steel",
|
||||
{pos = sound_pos, gain = 0.5, max_hear_distance = 8}, true)
|
||||
local player_name = user:get_player_name()
|
||||
if pointed_thing.type == "node" then
|
||||
local node_under = minetest.get_node(pointed_thing.under).name
|
||||
@ -146,9 +116,11 @@ minetest.register_tool("fire:flint_and_steel", {
|
||||
-- Wear tool
|
||||
local wdef = itemstack:get_definition()
|
||||
itemstack:add_wear(1000)
|
||||
|
||||
-- Tool break sound
|
||||
if itemstack:get_count() == 0 and wdef.sound and wdef.sound.breaks then
|
||||
minetest.sound_play(wdef.sound.breaks, {pos = sound_pos, gain = 0.5})
|
||||
minetest.sound_play(wdef.sound.breaks,
|
||||
{pos = sound_pos, gain = 0.5}, true)
|
||||
end
|
||||
return itemstack
|
||||
end
|
||||
@ -162,23 +134,21 @@ minetest.register_craft({
|
||||
}
|
||||
})
|
||||
|
||||
|
||||
-- Override coalblock to enable permanent flame above
|
||||
-- Coalblock is non-flammable to avoid unwanted basic_flame nodes
|
||||
|
||||
minetest.override_item("default:coalblock", {
|
||||
after_destruct = function(pos, oldnode)
|
||||
after_destruct = function(pos)
|
||||
pos.y = pos.y + 1
|
||||
if minetest.get_node(pos).name == "fire:permanent_flame" then
|
||||
minetest.remove_node(pos)
|
||||
end
|
||||
end,
|
||||
on_ignite = function(pos, igniter)
|
||||
on_ignite = function(pos)
|
||||
local flame_pos = {x = pos.x, y = pos.y + 1, z = pos.z}
|
||||
if minetest.get_node(flame_pos).name == "air" then
|
||||
minetest.set_node(flame_pos, {name = "fire:permanent_flame"})
|
||||
end
|
||||
end,
|
||||
end
|
||||
})
|
||||
|
||||
|
||||
@ -186,24 +156,18 @@ minetest.override_item("default:coalblock", {
|
||||
-- Sound
|
||||
--
|
||||
|
||||
local flame_sound = minetest.settings:get_bool("flame_sound")
|
||||
if flame_sound == nil then
|
||||
-- Enable if no setting present
|
||||
flame_sound = true
|
||||
end
|
||||
-- Enable if no setting present
|
||||
local flame_sound = minetest.settings:get_bool("flame_sound", true)
|
||||
|
||||
if flame_sound then
|
||||
|
||||
local handles = {}
|
||||
local timer = 0
|
||||
|
||||
-- Parameters
|
||||
|
||||
local radius = 8 -- Flame node search radius around player
|
||||
local cycle = 3 -- Cycle time for sound updates
|
||||
|
||||
-- Update sound for player
|
||||
|
||||
function fire.update_player_sound(player)
|
||||
local player_name = player:get_player_name()
|
||||
-- Search for flame nodes in radius around player
|
||||
@ -255,16 +219,13 @@ if flame_sound then
|
||||
fposmid = vector.divide(vector.add(fposmin, fposmax), 2)
|
||||
end
|
||||
-- Play sound
|
||||
local handle = minetest.sound_play(
|
||||
"fire_fire",
|
||||
{
|
||||
pos = fposmid,
|
||||
to_player = player_name,
|
||||
gain = math.min(0.06 * (1 + flames * 0.125), 0.18),
|
||||
max_hear_distance = 32,
|
||||
loop = true, -- In case of lag
|
||||
}
|
||||
)
|
||||
local handle = minetest.sound_play("fire_fire", {
|
||||
pos = fposmid,
|
||||
to_player = player_name,
|
||||
gain = math.min(0.06 * (1 + flames * 0.125), 0.18),
|
||||
max_hear_distance = 32,
|
||||
loop = true -- In case of lag
|
||||
})
|
||||
-- Store sound handle for this player
|
||||
if handle then
|
||||
handles[player_name] = handle
|
||||
@ -273,7 +234,6 @@ if flame_sound then
|
||||
end
|
||||
|
||||
-- Cycle for updating players sounds
|
||||
|
||||
minetest.register_globalstep(function(dtime)
|
||||
timer = timer + dtime
|
||||
if timer < cycle then
|
||||
@ -288,7 +248,6 @@ if flame_sound then
|
||||
end)
|
||||
|
||||
-- Stop sound and clear handle on player leave
|
||||
|
||||
minetest.register_on_leaveplayer(function(player)
|
||||
local player_name = player:get_player_name()
|
||||
if handles[player_name] then
|
||||
@ -300,69 +259,50 @@ end
|
||||
|
||||
|
||||
-- Deprecated function kept temporarily to avoid crashes if mod fire nodes call it
|
||||
|
||||
function fire.update_sounds_around(pos)
|
||||
end
|
||||
|
||||
function fire.update_sounds_around() end
|
||||
|
||||
--
|
||||
-- ABMs
|
||||
--
|
||||
|
||||
if fire_enabled then
|
||||
|
||||
-- Ignite neighboring nodes, add basic flames
|
||||
|
||||
minetest.register_abm({
|
||||
label = "Ignite flame",
|
||||
nodenames = {"group:flammable"},
|
||||
neighbors = {"group:igniter"},
|
||||
interval = 18,
|
||||
chance = 24,
|
||||
interval = 7,
|
||||
chance = 12,
|
||||
catch_up = false,
|
||||
action = function(pos, node, active_object_count, active_object_count_wider)
|
||||
action = function(pos)
|
||||
local p = minetest.find_node_near(pos, 1, {"air"})
|
||||
if p and not minetest.find_node_near(p, 1, {"group:water"}) then
|
||||
if p then
|
||||
minetest.set_node(p, {name = "fire:basic_flame"})
|
||||
end
|
||||
end,
|
||||
})
|
||||
|
||||
minetest.register_abm({
|
||||
label = "Remove random flames",
|
||||
nodenames = {"fire:basic_flame"},
|
||||
interval = 12,
|
||||
chance = 4,
|
||||
catch_up = false,
|
||||
action = function(p0, node, _, _)
|
||||
minetest.remove_node(p0)
|
||||
--minetest.sound_play("fire_extinguish_flame",
|
||||
--{pos = p0, max_hear_distance = 16, gain = 0.25})
|
||||
end,
|
||||
end
|
||||
})
|
||||
|
||||
-- Remove flammable nodes around basic flame
|
||||
|
||||
minetest.register_abm({
|
||||
label = "Remove flammable nodes",
|
||||
nodenames = {"fire:basic_flame"},
|
||||
neighbors = "group:flammable",
|
||||
interval = 12,
|
||||
chance = 12,
|
||||
interval = 5,
|
||||
chance = 18,
|
||||
catch_up = false,
|
||||
action = function(pos, node, active_object_count, active_object_count_wider)
|
||||
action = function(pos)
|
||||
local p = minetest.find_node_near(pos, 1, {"group:flammable"})
|
||||
if p and not minetest.find_node_near(p, 1, {"group:water"}) then
|
||||
local flammable_node = minetest.get_node(p)
|
||||
local def = minetest.registered_nodes[flammable_node.name]
|
||||
if def.on_burn then
|
||||
def.on_burn(p)
|
||||
else
|
||||
minetest.remove_node(p)
|
||||
minetest.check_for_falling(p)
|
||||
end
|
||||
if not p then
|
||||
return
|
||||
end
|
||||
end,
|
||||
local flammable_node = minetest.get_node(p)
|
||||
local def = minetest.registered_nodes[flammable_node.name]
|
||||
if def.on_burn then
|
||||
def.on_burn(p)
|
||||
else
|
||||
minetest.remove_node(p)
|
||||
minetest.check_for_falling(p)
|
||||
end
|
||||
end
|
||||
})
|
||||
|
||||
end
|
||||
|
4
mods/fire/locale/fire.de.tr
Normal file
4
mods/fire/locale/fire.de.tr
Normal file
@ -0,0 +1,4 @@
|
||||
# textdomain: fire
|
||||
Fire=Feuer
|
||||
Permanent Fire=Permanentes Feuer
|
||||
Flint and Steel=Feuerstein und Stahl
|
3
mods/fire/locale/fire.es.tr
Normal file
3
mods/fire/locale/fire.es.tr
Normal file
@ -0,0 +1,3 @@
|
||||
# textdomain: fire
|
||||
Permanent Flame=Llama permanente
|
||||
Flint and Steel=Yesca y pedernal
|
3
mods/fire/locale/fire.fr.tr
Normal file
3
mods/fire/locale/fire.fr.tr
Normal file
@ -0,0 +1,3 @@
|
||||
# textdomain: fire
|
||||
Permanent Flame=Flamme permanente
|
||||
Flint and Steel=Briquet à silex en acier
|
4
mods/fire/locale/fire.id.tr
Normal file
4
mods/fire/locale/fire.id.tr
Normal file
@ -0,0 +1,4 @@
|
||||
# textdomain: fire
|
||||
Fire=Api
|
||||
Permanent Fire=Api Abadi
|
||||
Flint and Steel=Pemantik
|
3
mods/fire/locale/fire.it.tr
Normal file
3
mods/fire/locale/fire.it.tr
Normal file
@ -0,0 +1,3 @@
|
||||
# textdomain: fire
|
||||
Permanent Flame=Fiamma permanente
|
||||
Flint and Steel=Acciarino
|
3
mods/fire/locale/fire.ms.tr
Normal file
3
mods/fire/locale/fire.ms.tr
Normal file
@ -0,0 +1,3 @@
|
||||
# textdomain: fire
|
||||
Permanent Flame=Api Abadi
|
||||
Flint and Steel=Pemetik Api
|
3
mods/fire/locale/fire.ru.tr
Normal file
3
mods/fire/locale/fire.ru.tr
Normal file
@ -0,0 +1,3 @@
|
||||
# textdomain: fire
|
||||
Permanent Flame=Вечный Огонь
|
||||
Flint and Steel=Огниво и Сталь
|
3
mods/fire/locale/fire.se.tr
Normal file
3
mods/fire/locale/fire.se.tr
Normal file
@ -0,0 +1,3 @@
|
||||
# textdomain: fire
|
||||
Permanent Flame=Permanent Eld
|
||||
Flint and Steel=Flinta och Stål
|
4
mods/fire/locale/fire.zh_CN.tr
Normal file
4
mods/fire/locale/fire.zh_CN.tr
Normal file
@ -0,0 +1,4 @@
|
||||
# textdomain: fire
|
||||
Permanent Fire=永久火焰
|
||||
Flint and Steel=火石和钢
|
||||
Fire=火焰
|
4
mods/fire/locale/fire.zh_TW.tr
Normal file
4
mods/fire/locale/fire.zh_TW.tr
Normal file
@ -0,0 +1,4 @@
|
||||
# textdomain: fire
|
||||
Permanent Fire=永久火焰
|
||||
Flint and Steel=火石和鋼
|
||||
Fire=火焰
|
4
mods/fire/locale/template.txt
Normal file
4
mods/fire/locale/template.txt
Normal file
@ -0,0 +1,4 @@
|
||||
# textdomain: fire
|
||||
Fire=
|
||||
Permanent Fire=
|
||||
Flint and Steel=
|
3
mods/fire/mod.conf
Normal file
3
mods/fire/mod.conf
Normal file
@ -0,0 +1,3 @@
|
||||
name = fire
|
||||
description = Minetest Game mod: fire
|
||||
depends = default
|
Binary file not shown.
Before Width: | Height: | Size: 640 B After Width: | Height: | Size: 594 B |
Binary file not shown.
Before Width: | Height: | Size: 1.0 KiB After Width: | Height: | Size: 1.0 KiB |
Binary file not shown.
Before Width: | Height: | Size: 237 B After Width: | Height: | Size: 205 B |
69
mods/slowfire/init.lua
Normal file
69
mods/slowfire/init.lua
Normal file
@ -0,0 +1,69 @@
|
||||
local fire_enabled = minetest.settings:get_bool("enable_fire")
|
||||
if fire_enabled == nil then
|
||||
-- enable_fire setting not specified, check for disable_fire
|
||||
local fire_disabled = minetest.settings:get_bool("disable_fire")
|
||||
if fire_disabled == nil then
|
||||
-- Neither setting specified, check whether singleplayer
|
||||
fire_enabled = minetest.is_singleplayer()
|
||||
else
|
||||
fire_enabled = not fire_disabled
|
||||
end
|
||||
end
|
||||
|
||||
if fire_enabled then
|
||||
|
||||
-- Ignite neighboring nodes, add basic flames
|
||||
|
||||
minetest.register_abm({
|
||||
label = "Ignite flame",
|
||||
nodenames = {"group:flammable"},
|
||||
neighbors = {"group:igniter"},
|
||||
interval = 18,
|
||||
chance = 24,
|
||||
catch_up = false,
|
||||
action = function(pos, node, active_object_count, active_object_count_wider)
|
||||
local p = minetest.find_node_near(pos, 1, {"air"})
|
||||
if p and not minetest.find_node_near(p, 1, {"group:water"}) then
|
||||
minetest.set_node(p, {name = "fire:basic_flame"})
|
||||
end
|
||||
end,
|
||||
})
|
||||
|
||||
minetest.register_abm({
|
||||
label = "Remove random flames",
|
||||
nodenames = {"fire:basic_flame"},
|
||||
interval = 12,
|
||||
chance = 4,
|
||||
catch_up = false,
|
||||
action = function(p0, node, _, _)
|
||||
minetest.remove_node(p0)
|
||||
--minetest.sound_play("fire_extinguish_flame",
|
||||
--{pos = p0, max_hear_distance = 16, gain = 0.25})
|
||||
end,
|
||||
})
|
||||
|
||||
-- Remove flammable nodes around basic flame
|
||||
|
||||
minetest.register_abm({
|
||||
label = "Remove flammable nodes",
|
||||
nodenames = {"fire:basic_flame"},
|
||||
neighbors = "group:flammable",
|
||||
interval = 12,
|
||||
chance = 12,
|
||||
catch_up = false,
|
||||
action = function(pos, node, active_object_count, active_object_count_wider)
|
||||
local p = minetest.find_node_near(pos, 1, {"group:flammable"})
|
||||
if p and not minetest.find_node_near(p, 1, {"group:water"}) then
|
||||
local flammable_node = minetest.get_node(p)
|
||||
local def = minetest.registered_nodes[flammable_node.name]
|
||||
if def.on_burn then
|
||||
def.on_burn(p)
|
||||
else
|
||||
minetest.remove_node(p)
|
||||
minetest.check_for_falling(p)
|
||||
end
|
||||
end
|
||||
end,
|
||||
})
|
||||
|
||||
end
|
Loading…
x
Reference in New Issue
Block a user