rebalance ores/pickaxes

diff --git a/mods/main/nodes.lua b/mods/main/nodes.lua
index 32a059231f5d17ebe52f95a326317914b43434d0..256ebf4ab8ab0857cbcf57f2e96272c100e36690 100644 (file)
--- a/mods/main/nodes.lua
+++ b/mods/main/nodes.lua
@@ -1,3 +1,4 @@
+local minetest,pairs = minetest,pairs
 --ore def with required tool
 local tool = {"main:woodpick","main:coalpick","main:stonepick","main:ironpick","main:lapispick","main:goldpick","main:diamondpick","main:emeraldpick","main:sapphirepick","main:rubypick"}
 local ores = {
@@ -25,14 +26,43 @@ local drops ={
 local levels = {
        ["coal"]=1,
        ["iron"]=2,
-       ["lapis"]=2,
-       ["gold"]=2,
-       ["diamond"]=3,
-       ["emerald"]=4,
-       ["sapphire"]=5,
-       ["ruby"]=6,
+       ["lapis"]=3,
+       ["gold"]=3,
+       ["diamond"]=4,
+       ["emerald"]=5,
+       ["sapphire"]=6,
+       ["ruby"]=7,
 }
 
+minetest.register_chatcommand("ore", {
+       params = "nil",
+       description = "Spawn x amount of a mob, used as /spawn 'mob' 10 or /spawn 'mob' for one",
+       privs = {server=true},
+       func = function(name)
+               local player = minetest.get_player_by_name(name)
+               local pos = player:get_pos()
+               pos.y = pos.y + 1.5
+               for ore,_ in pairs(ores) do
+                       minetest.add_item(pos,"main:"..ore.."ore")
+               end
+       end,
+})
+
+minetest.register_chatcommand("tooltime", {
+       params = "nil",
+       description = "Spawn x amount of a mob, used as /spawn 'mob' 10 or /spawn 'mob' for one",
+       privs = {server=true},
+       func = function(name)
+               local player = minetest.get_player_by_name(name)
+               local pos = player:get_pos()
+               pos.y = pos.y + 1.5
+               for _,tool_ in pairs(tool) do
+                       minetest.add_item(pos,tool_)
+               end
+       end,
+})
+
+
 local level = 0
 local experience
 for ore,tool_required in pairs(ores) do

diff --git a/mods/main/tools.lua b/mods/main/tools.lua
index b0ab0eeda9c82308de72f4f9687e60d1d0306893..0ba4b7503343a260bcaf7672699edc0acd5e5976 100644 (file)
--- a/mods/main/tools.lua
+++ b/mods/main/tools.lua
@@ -3,6 +3,15 @@ local tool = {"shovel","axe","pick"}
 local material =        {"coal","wood","stone","lapis","iron","gold","diamond","emerald","sapphire","ruby"}
 local sword_durability ={10    ,52    ,131    ,200    ,250    ,32    ,1561    ,2300     ,3000      ,5000  }
 
+--unbreakable time definition
+--this is used so ores still have sounds
+--and particles but don't drop anything or
+--finish mining, 32 bit integer limit
+--32 bit integer limit so that the initial
+--mining texture does not show up until a week
+--after you've continuously held down the button
+local ub = 2147483647 -- unbreakable 
+
 for level_id,material in pairs(material) do
        for id,tool in pairs(tool) do
 
@@ -10,7 +19,14 @@ for level_id,material in pairs(material) do
                local groupcaps
                local damage
                local wear
-               --shovel
+--[[
+███████╗██╗  ██╗ ██████╗ ██╗   ██╗███████╗██╗     
+██╔════╝██║  ██║██╔═══██╗██║   ██║██╔════╝██║     
+███████╗███████║██║   ██║██║   ██║█████╗  ██║     
+╚════██║██╔══██║██║   ██║╚██╗ ██╔╝██╔══╝  ██║     
+███████║██║  ██║╚██████╔╝ ╚████╔╝ ███████╗███████╗
+╚══════╝╚═╝  ╚═╝ ╚═════╝   ╚═══╝  ╚══════╝╚══════╝
+]]--
                if tool == "shovel" then
                        if material == "wood" then
                                groupcaps2={
@@ -104,7 +120,14 @@ for level_id,material in pairs(material) do
                                wear = 10
                        end
                end             
-               --axe
+--[[
+ █████╗ ██╗  ██╗███████╗
+██╔══██╗╚██╗██╔╝██╔════╝
+███████║ ╚███╔╝ █████╗  
+██╔══██║ ██╔██╗ ██╔══╝  
+██║  ██║██╔╝ ██╗███████╗
+╚═╝  ╚═╝╚═╝  ╚═╝╚══════╝
+]]--
                if tool == "axe" then
                        if material == "wood" then
                                groupcaps2={
@@ -168,87 +191,105 @@ for level_id,material in pairs(material) do
                                wear = 10
                        end
                end             
-               --pickaxe
+               
+--[[
+██████╗ ██╗ ██████╗██╗  ██╗ █████╗ ██╗  ██╗███████╗
+██╔══██╗██║██╔════╝██║ ██╔╝██╔══██╗╚██╗██╔╝██╔════╝
+██████╔╝██║██║     █████╔╝ ███████║ ╚███╔╝ █████╗  
+██╔═══╝ ██║██║     ██╔═██╗ ██╔══██║ ██╔██╗ ██╔══╝  
+██║     ██║╚██████╗██║  ██╗██║  ██║██╔╝ ██╗███████╗
+╚═╝     ╚═╝ ╚═════╝╚═╝  ╚═╝╚═╝  ╚═╝╚═╝  ╚═╝╚══════╝                                     
+]]--                            
                if tool == "pick" then
                        if material == "wood" then
                                groupcaps2={
                                        --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,[6]=512}, uses=59, maxlevel=1},
-                                       glass = {times={[1]=0.575,[2]=16,[3]=32,[4]=64,[5]=128,[6]=512}, uses=59, maxlevel=1},
-                                       netherrack = {times={[1]=0.2875,[2]=16,[3]=32,[4]=64,[5]=128,[6]=512}, uses=59, maxlevel=1},
+                                       stone =     {times={ [1]=1.15   ,[2]=ub ,[3]=ub ,[4]=ub ,[5]=ub ,[6]=ub ,[7]=ub ,[8]=ub ,[9]=ub ,[10]=ub} ,uses=59 ,maxlevel=1},
+                                       glass =     {times={ [1]=0.575  ,[2]=ub ,[3]=ub ,[4]=ub ,[5]=ub ,[6]=ub ,[7]=ub ,[8]=ub ,[9]=ub ,[10]=ub} ,uses=59 ,maxlevel=1},
+                                       netherrack= {times={ [1]=0.2875 ,[2]=ub ,[3]=ub ,[4]=ub ,[5]=ub ,[6]=ub ,[7]=ub ,[8]=ub ,[9]=ub ,[10]=ub} ,uses=59 ,maxlevel=1},
+                                       obsidian=   {times={ [1]=ub     ,[2]=ub ,[3]=ub ,[4]=ub ,[5]=ub ,[6]=ub ,[7]=ub ,[8]=ub ,[9]=ub ,[10]=ub} ,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,[6]=512}, uses=131, maxlevel=1},
-                                       glass = {times={[1]=0.3,[2]=0.3,[3]=32,[4]=64,[5]=128,[6]=512}, uses=131, maxlevel=1},
-                                       netherrack = {times={[1]=0.15,[2]=0.15,[3]=32,[4]=64,[5]=128,[6]=512}, uses=131, maxlevel=1},
+                                       stone =     {times={ [1]=0.6  ,[2]=0.6  ,[3]=ub ,[4]=ub ,[5]=ub ,[6]=ub ,[7]=ub ,[8]=ub ,[9]=ub ,[10]=ub} ,uses=131 ,maxlevel=1},
+                                       glass =     {times={ [1]=0.3  ,[2]=0.3  ,[3]=ub ,[4]=ub ,[5]=ub ,[6]=ub ,[7]=ub ,[8]=ub ,[9]=ub ,[10]=ub} ,uses=131 ,maxlevel=1},
+                                       netherrack= {times={ [1]=0.15 ,[2]=0.15 ,[3]=ub ,[4]=ub ,[5]=ub ,[6]=ub ,[7]=ub ,[8]=ub ,[9]=ub ,[10]=ub} ,uses=131 ,maxlevel=1},
+                                       obsidian=   {times={ [1]=ub   ,[2]=ub   ,[3]=ub ,[4]=ub ,[5]=ub ,[6]=ub ,[7]=ub ,[8]=ub ,[9]=ub ,[10]=ub} ,uses=131 ,maxlevel=1},
                                }
                                damage=4
                                wear = 400
                        elseif material == "coal" then
                                groupcaps2={
-                                       stone = {times={[1]=0.6,[2]=0.6,[3]=32,[4]=64,[5]=128,[6]=512}, uses=10, maxlevel=1},
-                                       glass = {times={[1]=0.3,[2]=0.3,[3]=32,[4]=64,[5]=128,[6]=512}, uses=10, maxlevel=1},
-                                       netherrack = {times={[1]=0.15,[2]=0.15,[3]=32,[4]=64,[5]=128,[6]=512}, uses=10, maxlevel=1},
+                                       stone =     {times={ [1]=0.3  ,[2]=0.3  ,[3]=ub ,[4]=ub ,[5]=ub ,[6]=ub ,[7]=ub ,[8]=ub ,[9]=ub ,[10]=ub} ,uses=10 ,maxlevel=1},
+                                       glass =     {times={ [1]=0.2  ,[2]=0.2  ,[3]=ub ,[4]=ub ,[5]=ub ,[6]=ub ,[7]=ub ,[8]=ub ,[9]=ub ,[10]=ub} ,uses=10 ,maxlevel=1},
+                                       netherrack= {times={ [1]=0.15 ,[2]=0.15 ,[3]=ub ,[4]=ub ,[5]=ub ,[6]=ub ,[7]=ub ,[8]=ub ,[9]=ub ,[10]=ub} ,uses=10 ,maxlevel=1},
+                                       obsidian=   {times={ [1]=ub   ,[2]=ub   ,[3]=ub ,[4]=ub ,[5]=ub ,[6]=ub ,[7]=ub ,[8]=ub ,[9]=ub ,[10]=ub} ,uses=10 ,maxlevel=1},
                                }
                                damage=2
                                wear = 2000
                        elseif material == "lapis" then
                                groupcaps2={
-                                       stone = {times={[1]=0.5,[2]=0.5,[3]=4,[4]=64,[5]=128,[6]=512},     uses=200, maxlevel=1},
-                                       glass = {times={[1]=0.25,[2]=0.25,[3]=2.5,[4]=64,[5]=128,[6]=512}, uses=200, maxlevel=1},
-                                       netherrack = {times={[1]=0.125,[2]=0.125,[3]=3,[4]=64,[5]=128,[6]=512}, uses=200, maxlevel=1},
+                                       stone =     {times={ [1]=0.5   ,[2]=0.5   ,[3]=0.5   ,[4]=ub ,[5]=ub ,[6]=ub ,[7]=ub ,[8]=ub ,[9]=ub ,[10]=ub} ,uses=200 ,maxlevel=1},
+                                       glass =     {times={ [1]=0.25  ,[2]=0.25  ,[3]=0.25  ,[4]=ub ,[5]=ub ,[6]=ub ,[7]=ub ,[8]=ub ,[9]=ub ,[10]=ub} ,uses=200 ,maxlevel=1},
+                                       netherrack= {times={ [1]=0.125 ,[2]=0.125 ,[3]=0.125 ,[4]=ub ,[5]=ub ,[6]=ub ,[7]=ub ,[8]=ub ,[9]=ub ,[10]=ub} ,uses=200 ,maxlevel=1},
+                                       obsidian=   {times={ [1]=ub    ,[2]=ub    ,[3]=ub    ,[4]=ub ,[5]=ub ,[6]=ub ,[7]=ub ,[8]=ub ,[9]=ub ,[10]=ub} ,uses=200 ,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,[6]=512}, uses=250, maxlevel=1},
-                                       glass = {times={[1]=0.2,[2]=0.2,[3]=0.2,[4]=32,[5]=64,[6]=512}, uses=250, maxlevel=1},
-                                       netherrack = {times={[1]=0.1,[2]=0.1,[3]=0.1,[4]=32,[5]=64,[6]=512}, uses=250, maxlevel=1},
+                                       stone =     {times={ [1]=0.4 ,[2]=0.4 ,[3]=0.4 ,[4]=0.4 ,[5]=ub ,[6]=ub ,[7]=ub ,[8]=ub ,[9]=ub ,[10]=ub} ,uses=250 ,maxlevel=1},
+                                       glass =     {times={ [1]=0.2 ,[2]=0.2 ,[3]=0.2 ,[4]=0.2 ,[5]=ub ,[6]=ub ,[7]=ub ,[8]=ub ,[9]=ub ,[10]=ub} ,uses=250 ,maxlevel=1},
+                                       netherrack= {times={ [1]=0.1 ,[2]=0.1 ,[3]=0.1 ,[4]=0.1 ,[5]=ub ,[6]=ub ,[7]=ub ,[8]=ub ,[9]=ub ,[10]=ub} ,uses=250 ,maxlevel=1},
+                                       obsidian=   {times={ [1]=ub  ,[2]=ub  ,[3]=ub  ,[4]=ub  ,[5]=ub ,[6]=ub ,[7]=ub ,[8]=ub ,[9]=ub ,[10]=ub} ,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]=32,[5]=32,[6]=512}, uses=32, maxlevel=1},
-                                       glass = {times={[1]=0.1,[2]=0.1,[3]=0.1,[4]=32,[5]=32,[6]=512}, uses=32, maxlevel=1},
-                                       netherrack = {times={[1]=0.05,[2]=0.05,[3]=0.05,[4]=0.05,[5]=32,[6]=512}, uses=32, maxlevel=1},
+                                       stone =     {times={ [1]=0.2  ,[2]=0.2  ,[3]=0.2  ,[4]=ub ,[5]=ub ,[6]=ub ,[7]=ub ,[8]=ub ,[9]=ub ,[10]=ub} ,uses=32 ,maxlevel=1},
+                                       glass =     {times={ [1]=0.1  ,[2]=0.1  ,[3]=0.1  ,[4]=ub ,[5]=ub ,[6]=ub ,[7]=ub ,[8]=ub ,[9]=ub ,[10]=ub} ,uses=32 ,maxlevel=1},
+                                       netherrack= {times={ [1]=0.05 ,[2]=0.05 ,[3]=0.05 ,[4]=ub ,[5]=ub ,[6]=ub ,[7]=ub ,[8]=ub ,[9]=ub ,[10]=ub} ,uses=32 ,maxlevel=1},
+                                       obsidian=   {times={ [1]=ub   ,[2]=ub   ,[3]=ub   ,[4]=ub ,[5]=ub ,[6]=ub ,[7]=ub ,[8]=ub ,[9]=ub ,[10]=ub} ,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,[6]=32}, uses=1561, maxlevel=1},
-                                       glass =      {times={[1]= 0.15,[2]=0.15,[3]=0.15,[4]=0.15,[5]=4,[6]=32}, uses=1561, maxlevel=1},
-                                       netherrack = {times={[1]= 0.075,[2]=0.075,[3]=0.075,[4]=0.075,[5]=4,[6]=32}, uses=1561, maxlevel=1},
+                                       stone =     {times={ [1]=0.3  ,[2]=0.3  ,[3]=0.3  ,[4]=0.3  ,[5]=0.3  ,[6]=ub ,[7]=ub ,[8]=ub ,[9]=ub ,[10]=ub} ,uses=1561 ,maxlevel=1},
+                                       glass =     {times={ [1]=0.15 ,[2]=0.15 ,[3]=0.15 ,[4]=0.15 ,[5]=0.15 ,[6]=ub ,[7]=ub ,[8]=ub ,[9]=ub ,[10]=ub} ,uses=1561 ,maxlevel=1},
+                                       netherrack= {times={ [1]=0.8  ,[2]=0.8  ,[3]=0.8  ,[4]=0.8  ,[5]=0.8  ,[6]=ub ,[7]=ub ,[8]=ub ,[9]=ub ,[10]=ub} ,uses=1561 ,maxlevel=1},
+                                       obsidian=   {times={ [1]=10   ,[2]=ub   ,[3]=ub   ,[4]=ub   ,[5]=ub   ,[6]=ub ,[7]=ub ,[8]=ub ,[9]=ub ,[10]=ub} ,uses=1561 ,maxlevel=1},
                                }
                                damage = 6
                                wear = 100
                        elseif material == "emerald" then
                                groupcaps2={
-                                       stone = {times={[1]= 0.15,[2]=0.15,[3]=0.15,[4]=0.15,[5]=0.15,[6]=5},       uses=2300, maxlevel=1},
-                                       glass = {times={[1]= 0.05,[2]=0.05,[3]=0.05,[4]=0.05,[5]=2,[6]=5},          uses=2300, maxlevel=1},
-                                       netherrack = {times={[1]= 0.05,[2]=0.05,[3]=0.05,[4]=0.05,[5]=2,[6]=5}, uses=2300, maxlevel=1},
+                                       stone =     {times={ [1]=0.15 ,[2]=0.15 ,[3]=0.15 ,[4]=0.15 ,[5]=0.15 ,[6]=0.15 ,[7]=ub ,[8]=ub ,[9]=ub ,[10]=ub} ,uses=2300 ,maxlevel=1},
+                                       glass =     {times={ [1]=0.05 ,[2]=0.05 ,[3]=0.05 ,[4]=0.05 ,[5]=0.05 ,[6]=0.05 ,[7]=ub ,[8]=ub ,[9]=ub ,[10]=ub} ,uses=2300 ,maxlevel=1},
+                                       netherrack= {times={ [1]=0.05 ,[2]=0.05 ,[3]=0.05 ,[4]=0.05 ,[5]=0.05 ,[6]=0.05 ,[7]=ub ,[8]=ub ,[9]=ub ,[10]=ub} ,uses=2300 ,maxlevel=1},
+                                       obsidian=   {times={ [1]=5    ,[2]=5    ,[3]=ub   ,[4]=ub   ,[5]=ub   ,[6]=ub   ,[7]=ub ,[8]=ub ,[9]=ub ,[10]=ub} ,uses=2300 ,maxlevel=1},
                                }
                                damage = 8
                                wear = 50
                        elseif material == "sapphire" then
                                groupcaps2={
-                                       stone = {times={[1]= 0.05,[2]=0.05,[3]=0.05,[4]=0.05,[5]=0.05,[6]=1},       uses=3000, maxlevel=1},
-                                       glass = {times={[1]= 0.025,[2]=0.025,[3]=0.025,[4]=0.025,[5]=1,[6]=1},          uses=3000, maxlevel=1},
-                                       netherrack = {times={[1]= 0.025,[2]=0.025,[3]=0.025,[4]=0.025,[5]=0.025,[6]=1}, uses=3000, maxlevel=1},
+                                       stone =     {times={ [1]=0.05  ,[2]=0.05  ,[3]=0.05  ,[4]=0.05  ,[5]=0.05  ,[6]=0.05  ,[7]=0.05  ,[8]=ub ,[9]=ub ,[10]=ub} ,uses=3000 ,maxlevel=1},
+                                       glass =     {times={ [1]=0.025 ,[2]=0.025 ,[3]=0.025 ,[4]=0.025 ,[5]=0.025 ,[6]=0.025 ,[7]=0.025 ,[8]=ub ,[9]=ub ,[10]=ub} ,uses=3000 ,maxlevel=1},
+                                       netherrack= {times={ [1]=0.025 ,[2]=0.025 ,[3]=0.025 ,[4]=0.025 ,[5]=0.025 ,[6]=0.025 ,[7]=0.025 ,[8]=ub ,[9]=ub ,[10]=ub} ,uses=3000 ,maxlevel=1},
+                                       obsidian=   {times={ [1]=2     ,[2]=2     ,[3]=2     ,[4]=ub    ,[5]=ub    ,[6]=ub    ,[7]=ub    ,[8]=ub ,[9]=ub ,[10]=ub} ,uses=3000 ,maxlevel=1},
                                }
                                damage = 10
                                wear = 25
                        elseif material == "ruby" then
                                groupcaps2={
-                                       stone = {times={[1]= 0.025,[2]=0.025,[3]=0.025,[4]=0.025,[5]=0.025,[6]=0.25},       uses=5000, maxlevel=1},
-                                       glass = {times={[1]= 0.025,[2]=0.025,[3]=0.025,[4]=0.025,[5]=0.025,[6]=0.25},          uses=5000, maxlevel=1},
-                                       netherrack = {times={[1]= 0.025,[2]=0.025,[3]=0.025,[4]=0.025,[5]=0.025,[6]=0.25}, uses=5000, maxlevel=1},
+                                       stone =     {times={ [1]=0.03 ,[2]=0.03 ,[3]=0.03 ,[4]=0.03 ,[5]=0.03 ,[6]=0.03 ,[7]=0.03 ,[8]=0.03 ,[9]=ub ,[10]=ub} ,uses=5000 ,maxlevel=1},
+                                       glass =     {times={ [1]=0.02 ,[2]=0.02 ,[3]=0.02 ,[4]=0.02 ,[5]=0.02 ,[6]=0.02 ,[7]=0.02 ,[8]=0.02 ,[9]=ub ,[10]=ub} ,uses=5000 ,maxlevel=1},
+                                       netherrack= {times={ [1]=0.02 ,[2]=0.02 ,[3]=0.02 ,[4]=0.02 ,[5]=0.02 ,[6]=0.02 ,[7]=0.02 ,[8]=0.02 ,[9]=ub ,[10]=ub} ,uses=5000 ,maxlevel=1},
+                                       obsidian=   {times={ [1]=1    ,[2]=1    ,[3]=1    ,[4]=1    ,[5]=ub   ,[6]=ub   ,[7]=ub   ,[8]=ub   ,[9]=ub ,[10]=ub} ,uses=5000 ,maxlevel=1},
                                }
                                damage = 16
                                wear = 10

diff --git a/mods/nether/nodes.lua b/mods/nether/nodes.lua
index 663f27ea9876fe716dd2dd73a9cd15c4f2200a7c..108da053544dfa7d1990773a7496257dbc8d945b 100644 (file)
--- a/mods/nether/nodes.lua
+++ b/mods/nether/nodes.lua
@@ -21,7 +21,7 @@ minetest.register_node("nether:netherrack", {
                        items= {
                                {
                                        rarity = 0,
-                                       tools = {"main:woodpick","main:stonepick","main:ironpick","main:goldpick","main:diamondpick"},
+                                       tools = {"main:woodpick","main:coalpick","main:stonepick","main:ironpick","main:lapispick","main:goldpick","main:diamondpick","main:emeraldpick","main:sapphirepick","main:rubypick"},
                                        items = {"nether:netherrack"},
                                },
                                },
@@ -44,24 +44,24 @@ minetest.register_node("nether:glowstone", {
                        max_items = 5,
                        items= {
                                {
-                                       tools = {"main:ironpick","main:goldpick","main:diamondpick"},
+                                       tools = {"main:woodpick","main:coalpick","main:stonepick","main:ironpick","main:lapispick","main:goldpick","main:diamondpick","main:emeraldpick","main:sapphirepick","main:rubypick"},
                                        items = {"nether:glowstone_dust"},
                                },
                                {
-                                       tools = {"main:ironpick","main:goldpick","main:diamondpick"},
+                                       tools = {"main:woodpick","main:coalpick","main:stonepick","main:ironpick","main:lapispick","main:goldpick","main:diamondpick","main:emeraldpick","main:sapphirepick","main:rubypick"},
                                        items = {"nether:glowstone_dust"},
                                },
                                {
-                                       tools = {"main:ironpick","main:goldpick","main:diamondpick"},
+                                       tools = {"main:woodpick","main:coalpick","main:stonepick","main:ironpick","main:lapispick","main:goldpick","main:diamondpick","main:emeraldpick","main:sapphirepick","main:rubypick"},
                                        items = {"nether:glowstone_dust"},
                                },
                                {
-                                       tools = {"main:ironpick","main:goldpick","main:diamondpick"},
+                                       tools = {"main:woodpick","main:coalpick","main:stonepick","main:ironpick","main:lapispick","main:goldpick","main:diamondpick","main:emeraldpick","main:sapphirepick","main:rubypick"},
                                        items = {"nether:glowstone_dust"},
                                },
                                {
                                        rarity = 5,
-                                       tools = {"main:ironpick","main:goldpick","main:diamondpick"},
+                                       tools = {"main:woodpick","main:coalpick","main:stonepick","main:ironpick","main:lapispick","main:goldpick","main:diamondpick","main:emeraldpick","main:sapphirepick","main:rubypick"},
                                        items = {"nether:glowstone_dust"},
                                },
                        },
@@ -71,7 +71,7 @@ minetest.register_node("nether:glowstone", {
 minetest.register_node("nether:obsidian", {
     description = "Obsidian",
     tiles = {"obsidian.png"},
-    groups = {stone = 5, pathable = 1},
+    groups = {obsidian = 1, pathable = 1},
     --groups = {stone = 1, pathable = 1}, --leave this here for debug
     sounds = main.stoneSound(),
     is_ground_content = false,

diff --git a/mods/player_api/models/player.blend b/mods/player_api/models/player.blend
index 015f424600a0cedf389bd4dc4e1bf9fb5643cf2e..530f9eb4a1ad1d1ac8b296b5476c2afb0da436ad 100644 (file)
Binary files a/mods/player_api/models/player.blend and b/mods/player_api/models/player.blend differ

diff --git a/mods/player_api/models/player.blend1 b/mods/player_api/models/player.blend1
index fe6cbc5dfc00d5162675fe57168a3b3e63d06a53..dddb71c680d94602a10f12daa25e28e19a6d84d7 100644 (file)
Binary files a/mods/player_api/models/player.blend1 and b/mods/player_api/models/player.blend1 differ

diff --git a/mods/too_many_items/init.lua b/mods/too_many_items/init.lua
index bab0477676d72b063eecb63d777f892834c13a20..f7cdb9e4d4cee389bd6d84f3b95f8ad84da2eebd 100644 (file)
--- a/mods/too_many_items/init.lua
+++ b/mods/too_many_items/init.lua
@@ -232,6 +232,7 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
 
                        minetest.show_formspec(name,id, form..tmi_master_inventory["page_"..temp_pool.page]..cheat_button(name))
                        minetest.sound_play("lever", {to_player = name,gain=0.7})
+                       player:set_inventory_formspec(base_inv..tmi_master_inventory["page_"..temp_pool.page]..cheat_button(name))
                else
                        minetest.chat_send_player(name, "Sorry m8, server says I can't let you do that :(")
                        minetest.sound_play("lever", {to_player = name,gain=0.7,pitch=0.7})