Added cooking

README.md

@@ -1,6 +1,6 @@
 Minetest mod "New Campfire"
 ======================
-Version: 0.2.4
+Version: 0.3.0
 
 # License of source code:
 - Copyright (C) 2017 Pavel Litvinoff <googolgl@gmail.com>
@@ -40,10 +40,15 @@ stairs:slab_cobble      default:stick     stairs:slab_cobble
 - added: sound file, new textures, changed model, config_file
 - added campfire life time
 
-#### [0.2.4] - 2017-03-15
+#### [0.2.4] - 2017-04-20
 - added: fireplace, ash
-- Now if there is something near the campfire. It may catch fire.
+- flamable nodes around the campfire can fire
 - removed config_file
+- changed recipe
+
+#### [0.3.0] - 2017-
+- added: cooking
+
 
 # Links:
 - Forum Topic:

init.lua

@@ -1,5 +1,6 @@
 -- VARIABLES
-new_campfire_limit = 1;         -- Values: 0 - unlimit campfire, 1 - limit
+new_campfire_cooking = 1;       -- nil - can`t cooked, 1 - can cooked
+new_campfire_limit = 1;         -- nil - unlimited campfire, 1 - limited
 new_campfire_ttl = 30;          -- Time in sec
 new_campfire_stick_time = new_campfire_ttl/2;   -- How long does the stick increase. In sec.
 
@@ -13,50 +14,50 @@ new_campfire = {}
 local function fire_particles_on(pos) -- 3 layers of fire
     local meta = minetest.get_meta(pos)
     local id = minetest.add_particlespawner({ -- 1 layer big particles fire
-        amount = 26,
+        amount = 9,
-        time = 3.3,
+        time = 1.3,
         minpos = {x = pos.x - 0.2, y = pos.y - 0.4, z = pos.z - 0.2},
         maxpos = {x = pos.x + 0.2, y = pos.y - 0.1, z = pos.z + 0.2},
         minvel = {x= 0, y= 0, z= 0},
         maxvel = {x= 0, y= 0.1, z= 0},
         minacc = {x= 0, y= 0, z= 0},
-        maxacc = {x= 0, y= 0.5, z= 0},
+        maxacc = {x= 0, y= 0.7, z= 0},
-        minexptime = 0.3,
+        minexptime = 0.5,
-        maxexptime = 0.6,
+        maxexptime = 0.7,
         minsize = 2,
         maxsize = 5,
         collisiondetection = false,
         vertical = true,
         texture = "new_campfire_anim_fire.png",
-        animation = {type="vertical_frames", aspect_w=16, aspect_h=16, length = 0.7,},
+        animation = {type="vertical_frames", aspect_w=16, aspect_h=16, length = 0.8,},
 --      playername = "singleplayer"
     })
     meta:set_int("layer_1", id)
 
     local id = minetest.add_particlespawner({ -- 2 layer smol particles fire
-        amount = 3,
+        amount = 1,
-        time = 3.3,
+        time = 1.3,
         minpos = {x = pos.x - 0.1, y = pos.y, z = pos.z - 0.1},
         maxpos = {x = pos.x + 0.1, y = pos.y + 0.4, z = pos.z + 0.1},
         minvel = {x= 0, y= 0, z= 0},
         maxvel = {x= 0, y= 0.1, z= 0},
         minacc = {x= 0, y= 0, z= 0},
         maxacc = {x= 0, y= 1, z= 0},
-        minexptime = 0.3,
+        minexptime = 0.4,
-        maxexptime = 0.5,
+        maxexptime = 0.6,
         minsize = 0.5,
         maxsize = 0.7,
         collisiondetection = false,
         vertical = true,
         texture = "new_campfire_anim_fire.png",
-        animation = {type="vertical_frames", aspect_w=16, aspect_h=16, length = 0.6,},
+        animation = {type="vertical_frames", aspect_w=16, aspect_h=16, length = 0.7,},
      -- playername = "singleplayer"
     })
     meta:set_int("layer_2", id)
 
     local id = minetest.add_particlespawner({ --3 layer smoke
-        amount = 6,
+        amount = 1,
-        time = 3.3,
+        time = 1.3,
         minpos = {x = pos.x - 0.1, y = pos.y - 0.2, z = pos.z - 0.1},
         maxpos = {x = pos.x + 0.2, y = pos.y + 0.4, z = pos.z + 0.2},
         minvel = {x= 0, y= 0, z= 0},
@@ -64,13 +65,13 @@ local function fire_particles_on(pos) -- 3 layers of fire
         minacc = {x= 0, y= 0, z= 0},
         maxacc = {x= 0, y= 1, z= 0},
         minexptime = 0.6,
-        maxexptime = 0.6,
+        maxexptime = 0.8,
         minsize = 1,
         maxsize = 4,
         collisiondetection = true,
         vertical = true,
         texture = "new_campfire_anim_smoke.png",
-        animation = {type="vertical_frames", aspect_w=16, aspect_h=16, length = 0.7,},
+        animation = {type="vertical_frames", aspect_w=16, aspect_h=16, length = 0.9,},
         -- playername = "singleplayer"
     })
     meta:set_int("layer_3", id)
@@ -101,19 +102,94 @@ local function indicator(maxVal, curVal)
     return "\n"..progress.." "..percent_val.."%"
 end
 
-local function effect(pos, texture)
+local function effect(pos, texture, vlc, acc, time, size)
     local id = minetest.add_particle({
-        pos = {x = pos.x, y = pos.y+0.5, z = pos.z},
+        pos = pos,
-        velocity = {x=0, y=-1, z=0},
+        velocity = vlc,
-        acceleration = {x=0, y=0, z=0},
+        acceleration = acc,
-        expirationtime = 1,
+        expirationtime = time,
-        size = 6,
+        size = size,
         collisiondetection = true,
         vertical = true,
         texture = texture,
     })
 end
 
+local function infotext_edit(meta)
+    local infotext = S("Active campfire")
+
+    if new_campfire_limit and new_campfire_ttl > 0 then
+        local it_val = meta:get_int("it_val");
+        infotext = infotext..indicator(new_campfire_ttl, it_val)
+    end
+
+    local cooked_time = meta:get_int('cooked_time');
+    if new_campfire_cooking and cooked_time ~= 0 then
+        local cooked_cur_time = meta:get_int('cooked_cur_time');
+        infotext = infotext.."\n"..S("Cooking")..indicator(cooked_time, cooked_cur_time)
+    end
+
+    meta:set_string('infotext', infotext)
+end
+
+local function cooking(pos, itemstack)
+    local meta = minetest.get_meta(pos)
+    local cooked, _ = minetest.get_craft_result({method = "cooking", width = 1, items = {itemstack}})
+    local cookable = cooked.time ~= 0
+
+    if cookable and new_campfire_cooking then
+        local eat_y = ItemStack(cooked.item:to_table().name):get_definition().on_use
+        if string.find(minetest.serialize(eat_y), "do_item_eat") and meta:get_int("cooked_time") == 0 then
+            meta:set_int('cooked_time', cooked.time);
+            meta:set_int('cooked_cur_time', 0);
+            local name = itemstack:to_table().name
+            local texture = itemstack:get_definition().inventory_image
+
+            infotext_edit(meta)
+
+            effect(
+                {x = pos.x, y = pos.y+0.4, z = pos.z},
+                texture,
+                {x=0, y=-1/cooked.time, z=0},
+                {x=0, y=0, z=0},
+                cooked.time/2,
+                4
+            )
+
+            minetest.after(cooked.time/2, function()
+                if meta:get_int("it_val") > 0 then
+                    effect(
+                        {x = pos.x, y = pos.y-0.1, z = pos.z},
+                        texture,
+                        {x=0, y=1/cooked.time, z=0},
+                        {x=0, y=0, z=0},
+                        cooked.time/2,
+                        4
+                    )
+
+                    local item = cooked.item:to_table().name
+                    minetest.after(cooked.time/2, function(item)
+                        if meta:get_int("it_val") > 0 then
+                            minetest.add_item({x=pos.x, y=pos.y+0.5, z=pos.z}, item)
+                            meta:set_int('cooked_time', 0);
+                            meta:set_int('cooked_cur_time', 0);
+                        else
+                            minetest.add_item({x=pos.x, y=pos.y+0.5, z=pos.z}, name)
+                        end
+                    end, item)
+                else
+                    minetest.add_item({x=pos.x, y=pos.y+0.5, z=pos.z}, name)
+                end
+            end)
+
+            if not minetest.setting_getbool("creative_mode") then
+                itemstack:take_item()
+                return itemstack
+            end
+        end
+    end
+end
+
 -- NODES
 minetest.register_node('new_campfire:fireplace', {
     description = S("Fireplace"),
@@ -130,7 +206,7 @@ minetest.register_node('new_campfire:fireplace', {
         fixed = { -0.48, -0.5, -0.48, 0.48, -0.4, 0.48 },
     },
     sounds = default.node_sound_stone_defaults(),
-    drop = {max_items = 3, items = {{items = {"stairs:slab_cobble","stairs:slab_cobble","stairs:slab_cobble"}}}},
+    drop = {max_items = 3, items = {{items = {"stairs:slab_cobble 3"}}}},
 
     on_construct = function(pos)
         local meta = minetest.get_meta(pos)
@@ -205,26 +281,19 @@ minetest.register_node('new_campfire:campfire_active', {
 
     on_rightclick = function(pos, node, player, itemstack, pointed_thing)
         local meta = minetest.get_meta(pos)
-
+        cooking(pos, itemstack)
-    --    local cooked, _ = minetest.get_craft_result({method = "cooking", width = 1, items = {itemstack}})
-    --    local cookable = cooked.time ~= 0
-
---        if cookable then
---            local eat_y = ItemStack(cooked.item:to_table().name):get_definition().on_use
---            print(string.find(minetest.serialize(eat_y), "do_item_eat"))
---            if string.find(minetest.serialize(eat_y), "do_item_eat") then
---                minetest.add_item({x=pos.x, y=pos.y+0.5, z=pos.z}, itemstack:get_name())
-    --            print(dump(itemstack:get_definition()))
-    --            effect(pos, itemstack:get_definition().inventory_image)
---                itemstack:take_item()
---                return itemstack
---            end
---        end
-
          if itemstack:get_definition().groups.stick == 1 then
             local it_val = meta:get_int("it_val") + (new_campfire_ttl);
             meta:set_int('it_val', it_val);
-            effect(pos, "default_stick.png")
+            effect(
+                {x = pos.x, y = pos.y+0.4, z = pos.z},
+                "default_stick.png",
+                {x=0, y=-1, z=0},
+                {x=0, y=0, z=0},
+                1,
+                6
+            )
+            infotext_edit(meta)
             if not minetest.setting_getbool("creative_mode") then
                 itemstack:take_item()
                 return itemstack
@@ -234,12 +303,8 @@ minetest.register_node('new_campfire:campfire_active', {
 
     on_construct = function(pos)
         local meta = minetest.get_meta(pos)
-        if new_campfire_limit == 1 and new_campfire_ttl > 0 then
+        meta:set_int('it_val', new_campfire_ttl);
-            meta:set_int('it_val', new_campfire_ttl);
+        infotext_edit(meta)
-            meta:set_string('infotext', S("Active campfire")..indicator(1, 1));
-        else
-            meta:set_string('infotext', S("Active campfire"));
-        end
         minetest.get_node_timer(pos):start(2)
     end,
 
@@ -262,7 +327,7 @@ minetest.register_node('new_campfire:campfire_active', {
 minetest.register_abm({
     nodenames = {"new_campfire:campfire_active"},
 --    neighbors = {"group:puts_out_fire"},
-    interval = 3.0, -- Run every 3 seconds
+    interval = 1.0, -- Run every 3 seconds
     chance = 1, -- Select every 1 in 1 nodes
     catch_up = false,
 
@@ -276,9 +341,10 @@ minetest.register_abm({
             minetest.set_node(pos, {name = 'new_campfire:campfire'})
             minetest.sound_play("fire_extinguish_flame",{pos = pos, max_hear_distance = 16, gain = 0.15})
         else
-            if new_campfire_limit == 1 and new_campfire_ttl > 0 then
+            local meta = minetest.get_meta(pos)
-                local meta = minetest.get_meta(pos)
+            local it_val = meta:get_int("it_val") - 1;
-                local it_val = meta:get_int("it_val") - 3;
+
+            if new_campfire_limit and new_campfire_ttl > 0 then
                 if it_val <= 0 then
                     minetest.remove_node(pos)
                     minetest.set_node(pos, {name = 'new_campfire:fireplace'})
@@ -286,8 +352,18 @@ minetest.register_abm({
                     return
                 end
                 meta:set_int('it_val', it_val);
-                meta:set_string('infotext', S("Active campfire")..indicator(new_campfire_ttl, it_val));
             end
+
+            if new_campfire_cooking then
+                if meta:get_int('cooked_cur_time') < meta:get_int('cooked_time') then
+                    meta:set_int('cooked_cur_time', meta:get_int('cooked_cur_time') + 1);
+                else
+                    meta:set_int('cooked_time', 0);
+                    meta:set_int('cooked_cur_time', 0);
+                end
+            end
+
+            infotext_edit(meta)
             fire_particles_on(pos)
         end
     end

locale/ru.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-08 16:03+0200\n"
+"POT-Creation-Date: 2017-04-22 20:24+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,10 +17,22 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: init.lua:89 init.lua:109
+#: init.lua:119 init.lua:260
+msgid "Active campfire"
+msgstr "Горящий костер"
+
+#: init.lua:129
+msgid "Cooking"
+msgstr "Приготовление еды"
+
+#: init.lua:193 init.lua:211
+msgid "Fireplace"
+msgstr "Кострище"
+
+#: init.lua:216 init.lua:236
 msgid "Campfire"
 msgstr "Костер"
 
-#: init.lua:138 init.lua:161
+#: init.lua:382
-msgid "Active campfire"
+msgid "Ash"
-msgstr "Горящий костер"
+msgstr "Пепел"

locale/template.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-08 16:06+0200\n"
+"POT-Creation-Date: 2017-04-22 20:24+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,10 +17,22 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: init.lua:89 init.lua:109
+#: init.lua:119 init.lua:260
+msgid "Active campfire"
+msgstr ""
+
+#: init.lua:129
+msgid "Cooking"
+msgstr ""
+
+#: init.lua:193 init.lua:211
+msgid "Fireplace"
+msgstr ""
+
+#: init.lua:216 init.lua:236
 msgid "Campfire"
 msgstr ""
 
-#: init.lua:138 init.lua:161
+#: init.lua:382
-msgid "Active campfire"
+msgid "Ash"
 msgstr ""

locale/ua.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-08 16:03+0200\n"
+"POT-Creation-Date: 2017-04-22 20:24+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,10 +17,22 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: init.lua:89 init.lua:109
+#: init.lua:119 init.lua:260
+msgid "Active campfire"
+msgstr "Палаюче багаття"
+
+#: init.lua:129
+msgid "Cooking"
+msgstr "Готування їжи"
+
+#: init.lua:193 init.lua:211
+msgid "Fireplace"
+msgstr "Місце від багаття"
+
+#: init.lua:216 init.lua:236
 msgid "Campfire"
 msgstr "Багаття"
 
-#: init.lua:138 init.lua:161
+#: init.lua:382
-msgid "Active campfire"
+msgid "Ash"
-msgstr "Палаюче багаття"
+msgstr "Попіл"