merged config.txt into settingtypes.txt

master
NathanSalapat 2019-01-09 09:03:39 -06:00
parent 1d66d269fa
commit bf8d6ba18e
6 changed files with 10 additions and 16 deletions

View File

@ -1,9 +1,7 @@
minetest.register_craft({ --recycle old torches minetest.register_craft({ --recycle old torches.
output = 'default:stick 1', type = 'shapeless',
recipe = { output = 'default:stick',
{'more_fire:torch_stub', 'more_fire:torch_stub', 'more_fire:torch_stub'}, recipe = {'more_fire:torch_stub', 'more_fire:torch_stub', 'more_fire:torch_stub', 'more_fire:torch_stub'},
{'more_fire:torch_stub', '', ''},
}
}) })
minetest.register_craft({ minetest.register_craft({

View File

@ -7,7 +7,6 @@ default.gui_slots = 'listcolors[#00000069;#5A5A5A;#141318;#30434C;#FFF]'
more_fire = {} more_fire = {}
dofile(minetest.get_modpath('more_fire')..'/config.txt') dofile(minetest.get_modpath('more_fire')..'/config.txt')
dofile(minetest.get_modpath('more_fire')..'/functions.lua') dofile(minetest.get_modpath('more_fire')..'/functions.lua')
dofile(minetest.get_modpath('more_fire')..'/abms.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')..'/craftitems.lua')
dofile(minetest.get_modpath('more_fire')..'/crafts.lua') dofile(minetest.get_modpath('more_fire')..'/crafts.lua')
dofile(minetest.get_modpath('more_fire')..'/tools.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')..'/molotov.lua')
dofile(minetest.get_modpath('more_fire')..'/smokebomb.lua') dofile(minetest.get_modpath('more_fire')..'/smokebomb.lua')
end end

View File

@ -1,5 +1,5 @@
name = more_fire name = more_fire
depends=default,farming,fire,vessels depends=default,farming,fire,vessels
description = This is a Minetest mod that adds more/better fire related stuff. description = This is a Minetest mod that adds more/better fire related stuff.
author = Napiophelios author = Nathan, Napiophelios
optional_depends = ethereal optional_depends = ethereal

View File

@ -29,7 +29,7 @@ minetest.register_node(':default:torch', {
groups = {choppy = 2, dig_immediate = 3, flammable = 1, attached_node = 1, hot = 2, kindling=1}, groups = {choppy = 2, dig_immediate = 3, flammable = 1, attached_node = 1, hot = 2, kindling=1},
sounds = default.node_sound_wood_defaults(), sounds = default.node_sound_wood_defaults(),
on_construct = function(pos) 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) local timer = minetest.get_node_timer(pos)
timer:start(minetest.settings:get("more_fire.torch_burn_time") or 960) timer:start(minetest.settings:get("more_fire.torch_burn_time") or 960)
end 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}, groups = {choppy = 2, dig_immediate = 3, flammable = 1, attached_node = 1, hot = 2, kindling=1},
sounds = default.node_sound_wood_defaults(), sounds = default.node_sound_wood_defaults(),
on_construct = function(pos) 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) local timer = minetest.get_node_timer(pos)
timer:start(minetest.settings:get("more_fire.torch_burn_time")/2 or 480) timer:start(minetest.settings:get("more_fire.torch_burn_time")/2 or 480)
end end

View File

@ -19,7 +19,6 @@ CC0
- fire - fire
- vessels - vessels
# #
Items currently included: Items currently included:
- Campfires - Campfires
@ -30,7 +29,3 @@ Items currently included:
- charcoal, much like coal, but made by cooking wood - charcoal, much like coal, but made by cooking wood
- a smoke bomb - a smoke bomb
- molotov cocktail - molotov cocktail
#
Planned:
Cooking capabilities in the campfires.

View File

@ -1,2 +1,4 @@
more_fire.torch_burn_time (Burn time of new torches) int 960 100 10000 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.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