diff --git a/crafts.lua b/crafts.lua index d4be1a1..bd3b15e 100644 --- a/crafts.lua +++ b/crafts.lua @@ -1,9 +1,7 @@ -minetest.register_craft({ --recycle old torches - output = 'default:stick 1', - recipe = { - {'more_fire:torch_stub', 'more_fire:torch_stub', 'more_fire:torch_stub'}, - {'more_fire:torch_stub', '', ''}, - } +minetest.register_craft({ --recycle old torches. + type = 'shapeless', + output = 'default:stick', + recipe = {'more_fire:torch_stub', 'more_fire:torch_stub', 'more_fire:torch_stub', 'more_fire:torch_stub'}, }) minetest.register_craft({ diff --git a/init.lua b/init.lua index 97cb8b6..bc56c53 100644 --- a/init.lua +++ b/init.lua @@ -7,7 +7,6 @@ default.gui_slots = 'listcolors[#00000069;#5A5A5A;#141318;#30434C;#FFF]' more_fire = {} - dofile(minetest.get_modpath('more_fire')..'/config.txt') dofile(minetest.get_modpath('more_fire')..'/functions.lua') dofile(minetest.get_modpath('more_fire')..'/abms.lua') @@ -15,7 +14,7 @@ dofile(minetest.get_modpath('more_fire')..'/nodes.lua') dofile(minetest.get_modpath('more_fire')..'/craftitems.lua') dofile(minetest.get_modpath('more_fire')..'/crafts.lua') dofile(minetest.get_modpath('more_fire')..'/tools.lua') -if pyromania then +if minetest.settings:get_bool('more_fire.pyromania') then dofile(minetest.get_modpath('more_fire')..'/molotov.lua') dofile(minetest.get_modpath('more_fire')..'/smokebomb.lua') end diff --git a/mod.conf b/mod.conf index 95e3333..69db98c 100644 --- a/mod.conf +++ b/mod.conf @@ -1,5 +1,5 @@ name = more_fire depends=default,farming,fire,vessels description = This is a Minetest mod that adds more/better fire related stuff. -author = Napiophelios +author = Nathan, Napiophelios optional_depends = ethereal diff --git a/nodes.lua b/nodes.lua index fee3f16..13101b5 100644 --- a/nodes.lua +++ b/nodes.lua @@ -29,7 +29,7 @@ minetest.register_node(':default:torch', { groups = {choppy = 2, dig_immediate = 3, flammable = 1, attached_node = 1, hot = 2, kindling=1}, sounds = default.node_sound_wood_defaults(), on_construct = function(pos) - if finite_torches == true then + if minetest.settings:get_bool('more_fire.finite_torches') == true then local timer = minetest.get_node_timer(pos) timer:start(minetest.settings:get("more_fire.torch_burn_time") or 960) end @@ -73,7 +73,7 @@ minetest.register_node('more_fire:torch_weak', { groups = {choppy = 2, dig_immediate = 3, flammable = 1, attached_node = 1, hot = 2, kindling=1}, sounds = default.node_sound_wood_defaults(), on_construct = function(pos) - if finite_torches == true then + if minetest.settings:get_bool('more_fire.finite_torches') == true then local timer = minetest.get_node_timer(pos) timer:start(minetest.settings:get("more_fire.torch_burn_time")/2 or 480) end diff --git a/readme.md b/readme.md index 5db7f10..85aca59 100644 --- a/readme.md +++ b/readme.md @@ -19,7 +19,6 @@ CC0 - fire - vessels - # Items currently included: - Campfires @@ -30,7 +29,3 @@ Items currently included: - charcoal, much like coal, but made by cooking wood - a smoke bomb - molotov cocktail - -# -Planned: -Cooking capabilities in the campfires. diff --git a/settingtypes.txt b/settingtypes.txt index 37f42ef..5b9127d 100644 --- a/settingtypes.txt +++ b/settingtypes.txt @@ -1,2 +1,4 @@ more_fire.torch_burn_time (Burn time of new torches) int 960 100 10000 more_fire.oillamp_burn_time (Burn time of oil lamp) int 720 100 10000 +more_fire.finite_torches (Should torches burn out?) bool true +more_fire.pyromania (Enable molotov cocktails?) bool false