diff --git a/README.md b/README.md index 21cc800..bb124b5 100644 --- a/README.md +++ b/README.md @@ -91,6 +91,7 @@ Mods by D00Med: Mods by minenux * bucket https://codeberg.org/minenux/minetest-mod-bucket/commit/1d9f32295aba3ef2a86be302050f34c1766e93d5 +* fire (with fake flame feature) https://codeberg.org/minenux/minetest-mod-fire/commit/4e5f7ad55314bd9b126fb133cfc5a32fa58b20d2 Default ones (not upgradable due nature modifications) diff --git a/README.txt b/README.txt index 21cc800..bb124b5 100644 --- a/README.txt +++ b/README.txt @@ -91,6 +91,7 @@ Mods by D00Med: Mods by minenux * bucket https://codeberg.org/minenux/minetest-mod-bucket/commit/1d9f32295aba3ef2a86be302050f34c1766e93d5 +* fire (with fake flame feature) https://codeberg.org/minenux/minetest-mod-fire/commit/4e5f7ad55314bd9b126fb133cfc5a32fa58b20d2 Default ones (not upgradable due nature modifications) diff --git a/mods/fire/README.md b/mods/fire/README.md new file mode 100644 index 0000000..6ed3f81 --- /dev/null +++ b/mods/fire/README.md @@ -0,0 +1,80 @@ +minetest mod fire +========================== + +Fire featured mod + +Information +----------- + +This mod is named `fire`, it features work from original mod. +This is improved for Chest drops and /fire (on|off) command too to +disable propagation of fire destruction. + +![screenshot.png](screenshot.png) + +Technical informaton +-------------------- + +#### Dependencies + +* default + +#### Configuration + +* `enable_fire` - taken from minetest config file, bool type +* `disable_fire` - taken from minetest config file, bool type + +The `disable_fire` is checked only if `enable_fire` is not defined, +if configure enables or disables usage of fire and flames. + +#### nodes and tools + +| Name | node | notes | +| --------------- | -------------------- | ----- | +| Basic flame | fire:basic_flame | it flames fro a while | +| Permanent flame | fire:permanent_flame | always flaming | +| Flint and Steel | fire:flint_and_steel | it burns flamable things | + +#### chat command + +| Command format | Description | privilegies need | +| ---------------- | -------------------------------------- | ---------------- | +| `/fire ` | Disbles fire spreading when set to OFF | server | + +Licence +------ + +**Source code** + +Originally by Perttu Ahola (celeron55) (LGPL 2.1) +Various Minetest developers and contributors (LGPL 2.1) +Chest drops and /fire (on|off) command additions by TenPlus1 (MIT) + +**Media (textures and model)** + +Everything not listed in here: +Copyright (C) 2012 Perttu Ahola (celeron55) (CC BY-SA 3.0) + +Muadtralk (CC BY-SA 3.0) + fire_basic_flame_animated.png + +Gambit (CC BY-SA 3.0) + fire_flint_steel.png + +dobroide (CC BY 3.0) +http://www.freesound.org/people/dobroide/sounds/4211/ + fire_small.ogg + +Dynamicell (CC BY 3.0) +http://www.freesound.org/people/Dynamicell/sounds/17548/ + fire_large.ogg + fire_fire.*.ogg + +fire_small.ogg and fire_large.ogg are unused but kept temporarily to not break +other mods that may use them. + +Benboncan (CC BY 3.0) +https://www.freesound.org/people/Benboncan/sounds/66457/ + fire_flint_and_steel.ogg + +Check [lisence.txt](lisence.txt) diff --git a/mods/fire/README.txt b/mods/fire/README.txt index a6ede0a..6ed3f81 100644 --- a/mods/fire/README.txt +++ b/mods/fire/README.txt @@ -1,32 +1,80 @@ -Minetest Game mod: fire -======================= -See license.txt for license information. +minetest mod fire +========================== + +Fire featured mod + +Information +----------- + +This mod is named `fire`, it features work from original mod. +This is improved for Chest drops and /fire (on|off) command too to +disable propagation of fire destruction. + +![screenshot.png](screenshot.png) + +Technical informaton +-------------------- + +#### Dependencies + +* default + +#### Configuration + +* `enable_fire` - taken from minetest config file, bool type +* `disable_fire` - taken from minetest config file, bool type + +The `disable_fire` is checked only if `enable_fire` is not defined, +if configure enables or disables usage of fire and flames. + +#### nodes and tools + +| Name | node | notes | +| --------------- | -------------------- | ----- | +| Basic flame | fire:basic_flame | it flames fro a while | +| Permanent flame | fire:permanent_flame | always flaming | +| Flint and Steel | fire:flint_and_steel | it burns flamable things | + +#### chat command + +| Command format | Description | privilegies need | +| ---------------- | -------------------------------------- | ---------------- | +| `/fire ` | Disbles fire spreading when set to OFF | server | + +Licence +------ + +**Source code** -Authors of source code ----------------------- Originally by Perttu Ahola (celeron55) (LGPL 2.1) Various Minetest developers and contributors (LGPL 2.1) +Chest drops and /fire (on|off) command additions by TenPlus1 (MIT) + +**Media (textures and model)** -Authors of media (textures and sounds) --------------------------------------- Everything not listed in here: Copyright (C) 2012 Perttu Ahola (celeron55) (CC BY-SA 3.0) -fire_flint_steel.png - Gambit (CC BY-SA 3.0) - -fire_small.ogg sampled from: - http://www.freesound.org/people/dobroide/sounds/4211/ (CC BY 3.0) - -fire_large.ogg sampled from: - http://www.freesound.org/people/Dynamicell/sounds/17548/ (CC BY 3.0) - -fire_flint_and_steel.ogg - https://www.freesound.org/people/Benboncan/sounds/66457/ (CC BY 3.0) -D00Med (CC BY-SA 3.0): +Muadtralk (CC BY-SA 3.0) fire_basic_flame_animated.png - -D00Med (CC BY-SA 3.0): - fire_basic_flame.png +Gambit (CC BY-SA 3.0) + fire_flint_steel.png +dobroide (CC BY 3.0) +http://www.freesound.org/people/dobroide/sounds/4211/ + fire_small.ogg + +Dynamicell (CC BY 3.0) +http://www.freesound.org/people/Dynamicell/sounds/17548/ + fire_large.ogg + fire_fire.*.ogg + +fire_small.ogg and fire_large.ogg are unused but kept temporarily to not break +other mods that may use them. + +Benboncan (CC BY 3.0) +https://www.freesound.org/people/Benboncan/sounds/66457/ + fire_flint_and_steel.ogg + +Check [lisence.txt](lisence.txt) diff --git a/mods/fire/init.lua b/mods/fire/init.lua index 5e254b7..605d864 100644 --- a/mods/fire/init.lua +++ b/mods/fire/init.lua @@ -1,11 +1,64 @@ --- minetest/fire/init.lua --- Global namespace for functions +fire = { + mod = "redo", + spread = true -- fire spreads by default (when enabled) +} -fire = {} +-- 'Enable fire' setting +local fire_enabled = minetest.settings:get_bool("enable_fire") --- Register flame nodes +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 + +-- Particle effects + +local function add_effect(pos) + + minetest.add_particlespawner({ + amount = 1, + time = 0.25, + minpos = pos, + maxpos = pos, + minvel = {x = -1, y = 2, z = -1}, + maxvel = {x = 1, y = 4, z = 1}, + minacc = {x = 0, y = 0, z = 0}, + maxacc = {x = 0, y = 0, z = 0}, + minexptime = 1, + maxexptime = 3, + minsize = 2, + maxsize = 5, + texture = "tnt_smoke.png" + }) +end + +-- Flood flame function + +local function flood_flame(pos, oldnode, newnode) + + -- Play flame extinguish sound if liquid is not an 'igniter' + 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}, true) + end + + -- Remove the flame + return false +end + +-- Flame nodes minetest.register_node("fire:basic_flame", { drawtype = "firelike", @@ -22,34 +75,43 @@ minetest.register_node("fire:basic_flame", { }, inventory_image = "fire_basic_flame.png", paramtype = "light", - light_source = 14, + light_source = 13, walkable = false, buildable_to = true, 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, not_in_creative_inventory = 1}, + drop = {}, + on_timer = function(pos) + local f = minetest.find_node_near(pos, 1, {"group:flammable"}) - if not f then - minetest.remove_node(pos) + + if not fire_enabled or not f then + + minetest.swap_node(pos, {name = "air"}) + return end - -- restart timer + + -- Restart timer return true end, - drop = "", on_construct = function(pos) - minetest.get_node_timer(pos):start(math.random(30, 60)) - minetest.after(0, fire.update_sounds_around, pos) + + local n = 0 + + -- if fire not enabled then reduce amount of time flame stays in world + if not fire_enabled then + n = 29 + end + + minetest.get_node_timer(pos):start(math.random(30 - n, 60 - n)) end, - on_destruct = function(pos) - minetest.after(0, fire.update_sounds_around, pos) - end, - - on_blast = function() - end, -- unaffected by explosions + on_flood = flood_flame }) minetest.register_node("fire:permanent_flame", { @@ -68,16 +130,16 @@ minetest.register_node("fire:permanent_flame", { }, inventory_image = "fire_basic_flame.png", paramtype = "light", - light_source = 14, + light_source = 13, walkable = false, buildable_to = true, sunlight_propagates = true, + floodable = true, damage_per_second = 4, - groups = {igniter = 2, dig_immediate = 3}, - drop = "", + groups = {igniter = 2, fire = 1, dig_immediate = 3}, + drop = {}, - on_blast = function() - end, + on_flood = flood_flame }) minetest.register_node("fire:fake_flame", { @@ -108,7 +170,6 @@ minetest.register_node("fire:fake_flame", { end, }) - -- Flint and steel minetest.register_tool("fire:flint_and_steel", { @@ -117,37 +178,55 @@ minetest.register_tool("fire:flint_and_steel", { sound = {breaks = "default_tool_breaks"}, on_use = function(itemstack, user, pointed_thing) - local pt = pointed_thing - minetest.sound_play( - "fire_flint_and_steel", - {pos = pt.above, gain = 0.5, max_hear_distance = 8} - ) - if pt.type == "node" then - local node_under = minetest.get_node(pt.under).name + + 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}, true) + + local player_name = user:get_player_name() + + if pointed_thing.type == "node" then + + local node_under = minetest.get_node(pointed_thing.under).name local nodedef = minetest.registered_nodes[node_under] + if not nodedef then return end - local player_name = user:get_player_name() - if minetest.is_protected(pt.under, player_name) then + + if minetest.is_protected(pointed_thing.under, player_name) then + minetest.chat_send_player(player_name, "This area is protected") + return end + if nodedef.on_ignite then - nodedef.on_ignite(pt.under, user) + nodedef.on_ignite(pointed_thing.under, user) + elseif minetest.get_item_group(node_under, "flammable") >= 1 - and minetest.get_node(pt.above).name == "air" then - minetest.set_node(pt.above, {name = "fire:basic_flame"}) + and minetest.get_node(pointed_thing.above).name == "air" then + + minetest.set_node(pointed_thing.above, {name = "fire:basic_flame"}) end end - if not minetest.setting_getbool("creative_mode") then - -- wear tool + + if not (creative and creative.is_enabled_for + and creative.is_enabled_for(player_name)) then + + -- Wear tool local wdef = itemstack:get_definition() + itemstack:add_wear(1000) - -- tool break sound + + -- Tool break sound if itemstack:get_count() == 0 and wdef.sound and wdef.sound.breaks then - minetest.sound_play(wdef.sound.breaks, {pos = pt.above, gain = 0.5}) + + minetest.sound_play(wdef.sound.breaks, + {pos = sound_pos, gain = 0.5}, true) end + return itemstack end end @@ -160,131 +239,38 @@ 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) + 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) + 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"}) + minetest.swap_node(flame_pos, {name = "fire:permanent_flame"}) end - end, + end }) --- Get sound area of position - -fire.D = 6 -- size of sound areas - -function fire.get_area_p0p1(pos) - local p0 = { - x = math.floor(pos.x / fire.D) * fire.D, - y = math.floor(pos.y / fire.D) * fire.D, - z = math.floor(pos.z / fire.D) * fire.D, - } - local p1 = { - x = p0.x + fire.D - 1, - y = p0.y + fire.D - 1, - z = p0.z + fire.D - 1 - } - return p0, p1 -end - - --- Fire sounds table --- key: position hash of low corner of area --- value: {handle=sound handle, name=sound name} -fire.sounds = {} - - --- Update fire sounds in sound area of position +-- Deprecated function kept temporarily to avoid crashes if mod fire nodes call it function fire.update_sounds_around(pos) - local p0, p1 = fire.get_area_p0p1(pos) - local cp = {x = (p0.x + p1.x) / 2, y = (p0.y + p1.y) / 2, z = (p0.z + p1.z) / 2} - local flames_p = minetest.find_nodes_in_area(p0, p1, {"fire:basic_flame"}) - --print("number of flames at "..minetest.pos_to_string(p0).."/" - -- ..minetest.pos_to_string(p1)..": "..#flames_p) - local should_have_sound = (#flames_p > 0) - local wanted_sound = nil - if #flames_p >= 9 then - wanted_sound = {name = "fire_large", gain = 0.7} - elseif #flames_p > 0 then - wanted_sound = {name = "fire_small", gain = 0.9} - end - local p0_hash = minetest.hash_node_position(p0) - local sound = fire.sounds[p0_hash] - if not sound then - if should_have_sound then - fire.sounds[p0_hash] = { - handle = minetest.sound_play(wanted_sound, - {pos = cp, max_hear_distance = 16, loop = true}), - name = wanted_sound.name, - } - end - else - if not wanted_sound then - minetest.sound_stop(sound.handle) - fire.sounds[p0_hash] = nil - elseif sound.name ~= wanted_sound.name then - minetest.sound_stop(sound.handle) - fire.sounds[p0_hash] = { - handle = minetest.sound_play(wanted_sound, - {pos = cp, max_hear_distance = 16, loop = true}), - name = wanted_sound.name, - } - end - end end - --- Extinguish all flames quickly with water, snow, ice - -minetest.register_abm({ - label = "Extinguish flame", - nodenames = {"fire:basic_flame", "fire:permanent_flame"}, - neighbors = {"group:puts_out_fire"}, - interval = 3, - chance = 1, - catch_up = false, - action = function(pos, node, active_object_count, active_object_count_wider) - minetest.remove_node(pos) - minetest.sound_play("fire_extinguish_flame", - {pos = pos, max_hear_distance = 16, gain = 0.25}) - end, -}) - - -- Enable the following ABMs according to 'enable fire' setting -local fire_enabled = minetest.setting_getbool("enable_fire") -if fire_enabled == nil then - -- New setting not specified, check for old setting. - -- If old setting is also not specified, 'not nil' is true. - fire_enabled = not minetest.setting_getbool("disable_fire") -end - -if not fire_enabled then - - -- Remove basic flames only - - minetest.register_abm({ - label = "Remove disabled fire", - nodenames = {"fire:basic_flame"}, - interval = 7, - chance = 1, - catch_up = false, - action = minetest.remove_node, - }) - -else -- Fire enabled +if fire_enabled then -- Ignite neighboring nodes, add basic flames @@ -295,19 +281,23 @@ else -- Fire enabled interval = 7, chance = 12, catch_up = false, + action = function(pos, node, active_object_count, active_object_count_wider) - -- If there is water or stuff like that around node, don't ignite - if minetest.find_node_near(pos, 1, {"group:puts_out_fire"}) then + + if fire.spread == false + or minetest.find_node_near(pos, 1, {"group:puts_out_fire"}) then return end + local p = minetest.find_node_near(pos, 1, {"air"}) + if p then minetest.set_node(p, {name = "fire:basic_flame"}) end end, }) - -- Remove flammable nodes + -- Remove flammable nodes around basic flame minetest.register_abm({ label = "Remove flammable nodes", @@ -316,52 +306,105 @@ else -- Fire enabled interval = 5, chance = 18, catch_up = false, + action = function(pos, node, active_object_count, active_object_count_wider) + + if fire.spread == false + or minetest.find_node_near(pos, 1, {"group:puts_out_fire"}) then + + minetest.remove_node(pos) + + return + end + local p = minetest.find_node_near(pos, 1, {"group:flammable"}) + if p then - -- remove flammable nodes around flame + 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) + + add_effect(p) + minetest.check_for_falling(p) end end - end, + end }) - end +-- used to drop items inside a chest or container --- Rarely ignite things from far +function fire.drop_items(pos, invstring) ---[[ Currently disabled to reduce the chance of uncontrollable spreading - fires that disrupt servers. Also for less lua processing load. + local meta = minetest.get_meta(pos) + local inv = meta:get_inventory() -minetest.register_abm({ - nodenames = {"group:igniter"}, - neighbors = {"air"}, - interval = 5, - chance = 10, - action = function(pos, node, active_object_count, active_object_count_wider) - local reg = minetest.registered_nodes[node.name] - if not reg or not reg.groups.igniter or reg.groups.igniter < 2 then - return + for i = 1, inv:get_size(invstring) do + + local m_stack = inv:get_stack(invstring, i) + local obj = minetest.add_item(pos, m_stack) + + if obj then + + obj:set_velocity({ + x = math.random(-10, 10) / 9, + y = 1, + z = math.random(-10, 10) / 9 + }) end - local d = reg.groups.igniter - local p = minetest.find_node_near(pos, d, {"group:flammable"}) - if p then - -- If there is water or stuff like that around flame, don't ignite - if fire.flame_should_extinguish(p) then - return - end - local p2 = fire.find_pos_for_flame_around(p) - if p2 then - minetest.set_node(p2, {name = "fire:basic_flame"}) - end + end +end + +-- override default chest to drop contents on burn + +if minetest.registered_nodes["default:chest"] then + + local groups = minetest.registered_nodes["default:chest"].groups + + groups.flammable = 3 + + minetest.override_item("default:chest", { + groups = groups, + + on_burn = function(p) + + fire.drop_items(p, "main") + + minetest.remove_node(p) end - end, + }) +end + +-- /fire [on/off] command to quickly stop flames spreading without reset + +minetest.register_chatcommand("fire", { + params = "", + description = "Disbles fire spreading when set to OFF", + privs = {server = true}, + + func = function (name, param) + + if not param or param == "" then + return false, "No paramater set, use /fire (on|off)" + end + + if param == "on" or param == "ON" then + + fire.spread = true + + return false, "fire spreading is ON" + + elseif param == "off" or param == "OFF" then + + fire.spread = false + + return false, "fire spreading is OFF" + end + end }) ---]] diff --git a/mods/fire/mod.conf b/mods/fire/mod.conf new file mode 100644 index 0000000..c305576 --- /dev/null +++ b/mods/fire/mod.conf @@ -0,0 +1,2 @@ +name = fire +depends = default diff --git a/mods/fire/screenshot.png b/mods/fire/screenshot.png new file mode 100644 index 0000000..b0f99a8 Binary files /dev/null and b/mods/fire/screenshot.png differ