diff --git a/abms.lua b/abms.lua index 5b4a8c5..a8e0c25 100644 --- a/abms.lua +++ b/abms.lua @@ -52,8 +52,6 @@ minetest.register_abm({ -- Controls non-contained fire item_percent = math.floor(src_time / cooked.time * 100) item_state = item_percent .. "%" end - - meta:set_string("formspec", more_fire.fire_formspec(item_percent)) local fuel = nil local cooked = nil @@ -78,6 +76,7 @@ minetest.register_abm({ -- Controls non-contained fire local stack = inv:get_stack("fuel", 1) stack:take_item() inv:set_stack("fuel", 1, stack) + meta:set_string("formspec", more_fire.fire_formspec(item_percent)) end, }) @@ -136,8 +135,6 @@ minetest.register_abm({ -- Controls the contained fires. item_percent = math.floor(src_time / cooked.time * 100) item_state = item_percent .. "%" end - - meta:set_string("formspec", more_fire.fire_formspec(item_percent)) local fuel = nil local cooked = nil @@ -162,6 +159,7 @@ minetest.register_abm({ -- Controls the contained fires. local stack = inv:get_stack("fuel", 1) stack:take_item() inv:set_stack("fuel", 1, stack) + meta:set_string("formspec", more_fire.fire_formspec(item_percent)) end, }) diff --git a/functions.lua b/functions.lua index b8c3cc1..f2e0344 100644 --- a/functions.lua +++ b/functions.lua @@ -25,6 +25,21 @@ function more_fire.fire_formspec(item_percent) return formspec end +more_fire.embers_formspec = +'size[8,6.75]'.. +default.gui_slots.. +'listcolors[#00000069;#5A5A5A;#141318;#30434C;#FFF]'.. +'background[8,6.75;0,0;more_fire_campfire_bg.png;true]'.. +'label[2,.75;< Add More Wood]'.. +'label[1.25,2; Cook Something >]'.. +'list[current_name;fuel;1,.5;1,1;]'.. +'list[current_name;src;4,1.75;1,1;]'.. +'image[5,1.75;1,1;gui_furnace_arrow_bg.png^[transformR270]'.. +'list[current_name;dst;6,1.75;2,1;]'.. +'list[current_player;main;0,2.75;8,1;]'.. +'list[current_player;main;0,4;8,3;8]'.. +default.get_hotbar_bg(0,2.75) + function burn(pointed_thing) --kindling doesn't always start from the first spark local ignite_chance = math.random(5) if ignite_chance == 1 diff --git a/init.lua b/init.lua index 9cd049f..97cb8b6 100644 --- a/init.lua +++ b/init.lua @@ -7,21 +7,6 @@ default.gui_slots = 'listcolors[#00000069;#5A5A5A;#141318;#30434C;#FFF]' more_fire = {} --- formspecs -more_fire.embers_formspec = -'size[8,6.75]'.. -default.gui_slots.. -'listcolors[#00000069;#5A5A5A;#141318;#30434C;#FFF]'.. -'background[8,6.75;0,0;more_fire_campfire_bg.png;true]'.. -'label[2,.75;< Add More Wood]'.. -'label[1.25,2; Cook Something >]'.. -'list[current_name;fuel;1,.5;1,1;]'.. -'list[current_name;src;4,1.75;1,1;]'.. -'image[5,1.75;1,1;gui_furnace_arrow_bg.png^[transformR270]'.. -'list[current_name;dst;6,1.75;2,1;]'.. -'list[current_player;main;0,2.75;8,1;]'.. -'list[current_player;main;0,4;8,3;8]'.. -default.get_hotbar_bg(0,2.75) dofile(minetest.get_modpath('more_fire')..'/config.txt') dofile(minetest.get_modpath('more_fire')..'/functions.lua') diff --git a/textures/more_fire_grass_dried.png b/textures/more_fire_grass_dried.png new file mode 100644 index 0000000..df19c16 Binary files /dev/null and b/textures/more_fire_grass_dried.png differ