Add in prototype fire entity

[Crafter.git] / mods / main / tools.lua

diff --git a/mods/main/tools.lua b/mods/main/tools.lua
index 07a0e520208a65ae23ae78c95f8d653e3cd773e4..df5988ef2804f35c2e7b88c90bb0dd83c2577122 100644 (file)
--- a/mods/main/tools.lua
+++ b/mods/main/tools.lua
@@ -1,8 +1,9 @@
 --Quick definition of tools
 local tool = {"shovel","axe","pick"}
 local material = {"wood","stone","iron","gold","diamond"}
+local sword_durability ={52,131,250,32,1561}
 
-for _,material in pairs(material) do
+for level_id,material in pairs(material) do
        for id,tool in pairs(tool) do
 
                --print(id,tool,level,material)
@@ -99,35 +100,40 @@ for _,material in pairs(material) do
                                        --ore hardness
                                        --1 stone, 1 coal, 2 iron, 3 gold, 4 diamond, 5 obsidian
                                        stone = {times={[1]=1.15,[2]=16,[3]=32,[4]=64,[5]=128}, uses=59, maxlevel=1},
-                                       glass = {times={[1]=1.15,[2]=16,[3]=32,[4]=64,[5]=128}, uses=59, maxlevel=1},
+                                       glass = {times={[1]=0.575,[2]=16,[3]=32,[4]=64,[5]=128}, uses=59, maxlevel=1},
+                                       netherrack = {times={[1]=0.2875,[2]=16,[3]=32,[4]=64,[5]=128}, uses=59, maxlevel=1},
                                }
                                damage = 3
                                wear = 500
                        elseif material == "stone" then
                                groupcaps2={
                                        stone = {times={[1]=0.6,[2]=0.6,[3]=32,[4]=64,[5]=128}, uses=131, maxlevel=1},
-                                       glass = {times={[1]=0.6,[2]=0.6,[3]=32,[4]=64,[5]=128}, uses=131, maxlevel=1},
+                                       glass = {times={[1]=0.3,[2]=0.3,[3]=32,[4]=64,[5]=128}, uses=131, maxlevel=1},
+                                       netherrack = {times={[1]=0.15,[2]=0.15,[3]=32,[4]=64,[5]=128}, uses=131, maxlevel=1},
                                }
                                damage=4
                                wear = 400
                        elseif material == "iron" then
                                groupcaps2={
                                        stone = {times={[1]=0.4,[2]=0.4,[3]=0.4,[4]=32,[5]=64}, uses=250, maxlevel=1},
-                                       glass = {times={[1]=0.4,[2]=0.4,[3]=0.4,[4]=32,[5]=64}, uses=250, maxlevel=1},
+                                       glass = {times={[1]=0.2,[2]=0.2,[3]=0.2,[4]=32,[5]=64}, uses=250, maxlevel=1},
+                                       netherrack = {times={[1]=0.1,[2]=0.1,[3]=0.1,[4]=32,[5]=64}, uses=250, maxlevel=1},
                                }
                                damage = 5
                                wear = 300
                        elseif material == "gold" then
                                groupcaps2={
                                        stone = {times={[1]=0.2,[2]=0.2,[3]=0.2,[4]=0.2,[5]=32}, uses=32, maxlevel=1},
-                                       glass = {times={[1]=0.2,[2]=0.2,[3]=0.2,[4]=0.2,[5]=32}, uses=32, maxlevel=1},
+                                       glass = {times={[1]=0.1,[2]=0.1,[3]=0.1,[4]=0.1,[5]=32}, uses=32, maxlevel=1},
+                                       netherrack = {times={[1]=0.05,[2]=0.05,[3]=0.05,[4]=0.05,[5]=32}, uses=32, maxlevel=1},
                                }
                                damage = 3
                                wear = 1000
                        elseif material == "diamond" then
                                groupcaps2={
                                        stone = {times={[1]= 0.3,[2]=0.3,[3]=0.3,[4]=0.3,[5]=4}, uses=1561, maxlevel=1},
-                                       glass = {times={[1]= 0.3,[2]=0.3,[3]=0.3,[4]=0.3,[5]=4}, uses=1561, maxlevel=1},
+                                       glass = {times={[1]= 0.15,[2]=0.15,[3]=0.15,[4]=0.15,[5]=4}, uses=1561, maxlevel=1},
+                                       netherrack = {times={[1]= 0.075,[2]=0.075,[3]=0.075,[4]=0.075,[5]=4}, uses=1561, maxlevel=1},
                                }
                                damage = 6
                                wear = 100
@@ -137,7 +143,7 @@ for _,material in pairs(material) do
                        description = material:gsub("^%l", string.upper).." "..tool:gsub("^%l", string.upper),
                        inventory_image = material..tool..".png",
                        tool_capabilities = {
-                               --full_punch_interval = 1.2,
+                               full_punch_interval = 0,
                                --max_drop_level=0,
                                groupcaps=groupcaps2,
                                damage_groups = {damage=damage},
@@ -204,9 +210,9 @@ for _,material in pairs(material) do
                description = material:gsub("^%l", string.upper).." Sword",
                inventory_image = material.."sword.png",
                tool_capabilities = {
-                       --full_punch_interval = 1.2,
+                       full_punch_interval = 0,
                        --max_drop_level=0,
-                       groupcaps={leaves = {times={[4]=0.7,[3]=0.7,[2]=0.7,[1]=0.7}, uses=10, maxlevel=1},},
+                       groupcaps={leaves = {times={[4]=0.7,[3]=0.7,[2]=0.7,[1]=0.7}, uses=sword_durability[level_id], maxlevel=1},},
                        damage_groups = {damage = damage},
                },
                mob_hit_wear = wear,
@@ -215,6 +221,7 @@ for _,material in pairs(material) do
        })
 end
 
+--shears
 minetest.register_tool("main:shears", {
        description = "Shears",
        inventory_image = "shears.png",