Rebalance EVERYTHING

diff --git a/README.md b/README.md
index 195d95d648ff7618280f0389e718487a4ddc1e8c..701be52c24030dbc549999a83a2f86fae3d6e777 100644 (file)
--- a/README.md
+++ b/README.md
@@ -69,6 +69,7 @@
 - make redstone dust an attached node
 - Fixed treecaptitator not cutting down part of tree when lever is powering one of it's nodes
 - Added command for users with "server" privelage to control weather
+- Added craft recipe to shears
 ---
 
 

diff --git a/mods/buildtest/init.lua b/mods/buildtest/init.lua
index c27a751db4b53b2b56cbb7ff86674a7df01c5bcd..01850da6368dae1719100c904911fc9f0b032ca6 100644 (file)
--- a/mods/buildtest/init.lua
+++ b/mods/buildtest/init.lua
@@ -1,7 +1,7 @@
 minetest.register_node("buildtest:glass_pipe", {
        description = "Glass Pipe",
        tiles = {"glass_pipe.png"},
-       groups = {stone = 1, hard = 1, pickaxe = 1, hand = 4},
+       groups = {glass = 1},
        sounds = main.stoneSound(),
        drawtype = "nodebox",
        paramtype = "light",

diff --git a/mods/farming/init.lua b/mods/farming/init.lua
index 835779ed78d9260c12af808f83c2a51c831cd2d5..a8fb4be46a44d20cbe3e614520095ca898467f77 100644 (file)
--- a/mods/farming/init.lua
+++ b/mods/farming/init.lua
@@ -12,20 +12,58 @@ local function till_soil(pos)
 end
 
 for level,material in pairs(material) do
-       local wear = 5000-(950*level)
-       print(wear)
+       local wear = 100*(6-level)
+       local groupcaps2
+       if material == "wood" then
+               groupcaps2={
+                       dirt =  {times={[1]=0.4,[2]=1.5,[3]=3,[4]=6,[5]=12},    uses=59, maxlevel=1},
+                       snow =  {times={[1]=0.4,[2]=1.5,[3]=3,[4]=6,[5]=12},    uses=59, maxlevel=1},
+                       grass = {times={[1]=0.45,[2]=1.5,[3]=3,[4]=6,[5]=12},   uses=59, maxlevel=1},
+                       sand =  {times={[1]=0.4,[2]=1.5,[3]=3,[4]=6,[5]=12},    uses=59, maxlevel=1},
+               }
+               damage = 2.5
+       elseif material == "stone" then
+               groupcaps2={
+                       dirt =  {times={[1]=0.2,[2]=0.2,[3]=1.5,[4]=3,[5]=6},   uses=131, maxlevel=1},
+                       snow =  {times={[1]=0.2,[2]=0.2,[3]=1.5,[4]=3,[5]=6},   uses=131, maxlevel=1},
+                       grass = {times={[1]=0.25,[2]=0.25,[3]=1.5,[4]=3,[5]=6}, uses=131, maxlevel=1},
+                       sand =  {times={[1]=0.2,[2]=0.2,[3]=1.5,[4]=3,[5]=6},   uses=131, maxlevel=1},
+               }
+               damage = 3.5
+       elseif material == "iron" then
+               groupcaps2={
+                       dirt =  {times={[1]=0.15,[2]=0.15,[3]=0.15,[4]=1.5,[5]=3}, uses=250, maxlevel=1},
+                       snow =  {times={[1]=0.15,[2]=0.15,[3]=0.15,[4]=1.5,[5]=3}, uses=250, maxlevel=1},
+                       grass = {times={[1]=0.15,[2]=0.15,[3]=0.15,[4]=1.5,[5]=3}, uses=250, maxlevel=1},
+                       sand =  {times={[1]=0.15,[2]=0.15,[3]=0.15,[4]=1.5,[5]=3}, uses=250, maxlevel=1},
+               }
+               damage = 4.5
+       elseif material == "gold" then
+               groupcaps2={
+                       dirt =  {times={[1]=0.1,[2]=0.1,[3]=0.1,[4]=0.1,[5]=1.5}, uses=32, maxlevel=1},
+                       snow =  {times={[1]=0.1,[2]=0.1,[3]=0.1,[4]=0.1,[5]=1.5}, uses=32, maxlevel=1},
+                       grass = {times={[1]=0.1,[2]=0.1,[3]=0.1,[4]=0.1,[5]=1.5}, uses=32, maxlevel=1},
+                       sand =  {times={[1]=0.1,[2]=0.1,[3]=0.1,[4]=0.1,[5]=1.5}, uses=32, maxlevel=1},
+               }
+               damage = 2.5
+       elseif material == "diamond" then
+               groupcaps2={
+                       dirt =  {times={[1]= 0.1,[2]=0.1,[3]=0.1,[4]=0.1,[5]=1.5},     uses=1561, maxlevel=1},
+                       snow =  {times={[1]= 0.1,[2]=0.1,[3]=0.1,[4]=0.1,[5]=1.5},     uses=1561, maxlevel=1},
+                       grass = {times={[1]= 0.15,[2]=0.15,[3]=0.15,[4]=0.15,[5]=1.5}, uses=1561, maxlevel=1},
+                       sand =  {times={[1]= 0.1,[2]=0.1,[3]=0.1,[4]=0.1,[5]=1.5},     uses=1561, maxlevel=1},
+               }
+               damage = 5.5
+       end
        minetest.register_tool("farming:"..material.."hoe", {
                description = material:gsub("^%l", string.upper).." Hoe",
                inventory_image = material.."hoe.png",
                tool_capabilities = {
-                       --full_punch_interval = 1.2,
-                       --max_drop_level=0,
-                       groupcaps={
-                       dirt = {times={[4]=4-level/4,[3]=3.5-level/4,[2]=3.0-level/4,[1]=2.8-level/4}, uses=(level/2)*3, maxlevel=level},
-                       sand = {times={[4]=4-level/4,[3]=3.5-level/4,[2]=3.0-level/4,[1]=2.8-level/4}, uses=(level/2)*3, maxlevel=level},
+                               --full_punch_interval = 1.2,
+                               --max_drop_level=0,
+                               groupcaps=groupcaps2,
+                               damage_groups = {damage=damage},
                        },
-                       damage_groups = {fleshy=1},
-               },
                sound = {breaks = {name="tool_break",gain=0.4}}, -- change this
                groups = {flammable = 2, tool=1 },
                

diff --git a/mods/hand/init.lua b/mods/hand/init.lua
index a079ba9c27bd432a1ed02c96a03681cf3e609aa4..d7cd6aec1f8c0e5c2e13e669dd119a62d259ba3b 100644 (file)
--- a/mods/hand/init.lua
+++ b/mods/hand/init.lua
@@ -8,17 +8,21 @@ minetest.register_item(":", {
        tool_capabilities = {
                full_punch_interval = 0.9,
                max_drop_level = 0,
-               groupcaps = {
-                       stone = {times={[4]=11.5,[3]=8.5,[2]=6.70,[1]=5.5}, uses=0, maxlevel=1},
-                       dirt = {times={[4]=11.0,[3]=8.4,[2]=6.40,[1]=4.2}, uses=0, maxlevel=1},
-                       sand = {times={[4]=11.0,[3]=8.4,[2]=6.40,[1]=4.2}, uses=0, maxlevel=1},
-                       wood = {times={[4]=11.5,[3]=8.5,[2]=6.70,[1]=5.5}, uses=0, maxlevel=1},
-                       leaves = {times={[4]=4.5,[3]=3.2,[2]=2.20,[1]=1.2}, uses=0, maxlevel=0},
-                       wool = {times={[4]=4.5,[3]=3.2,[2]=2.20,[1]=1.2}, uses=0, maxlevel=0},
-                       instant = {times={[1]=0.1,},uses=0,maxlevel=1},
+               groupcaps = {           
+                       stone = {times={[1]=7.5,[2]=16,[3]=32,[4]=64,[5]=128},  uses=0, maxlevel=1}, --
+                       dirt =  {times={[1]=0.75,[2]=1.5,[3]=3,[4]=6,[5]=12},   uses=0, maxlevel=1}, --
+                       snow =  {times={[1]=0.75,[2]=1.5,[3]=3,[4]=6,[5]=12},   uses=0, maxlevel=1}, --
+                       grass = {times={[1]=0.9,[2]=1.5,[3]=3,[4]=6,[5]=12},    uses=0, maxlevel=1}, --
+                       sand =  {times={[1]=0.75,[2]=1.5,[3]=3,[4]=6,[5]=12},   uses=0, maxlevel=1}, --
+                       wood =  {times={[1]=3,[2]=6,[3]=9,[4]=12,[5]=15},       uses=0, maxlevel=1}, --
+                       leaves ={times={[1]=0.75,[2]=1.5,[3]=3,[4]=6,[5]=12},   uses=0, maxlevel=1}, --
+                       wool =  {times={[1]=0.75,[2]=1.5,[3]=3,[4]=6,[5]=12},   uses=0, maxlevel=1}, --
+                       glass = {times={[1]=0.75,[2]=1.5,[3]=3,[4]=6,[5]=12},   uses=0, maxlevel=1}, --
+                       
+                       --instant = {times={[1]=0.1,},uses=0,maxlevel=1},
                        dig_immediate = {times={[2]=0,[3]=0,[1]=0,},uses=0,maxlevel=1},
                },
-               damage_groups = {fleshy=1},
+               damage_groups = {damage=1},
        }
 })
 

diff --git a/mods/main/craft_recipes.lua b/mods/main/craft_recipes.lua
index 75a2222df4e9e0cb8321c537b80fcb3cc41f06aa..72309fc0a79fbce801e66e6e93801fe2aa714963 100644 (file)
--- a/mods/main/craft_recipes.lua
+++ b/mods/main/craft_recipes.lua
@@ -149,3 +149,13 @@ minetest.register_craft({
                {"main:stick", "", "main:stick"}
        }
 })
+
+minetest.register_craft({
+       output = "main:shears",
+       recipe = {
+               {"","main:iron"},
+               {"main:iron",""},
+       }
+})
+
+

diff --git a/mods/main/nodes.lua b/mods/main/nodes.lua
index bec5fcca503e762cf2aaf58dc0ee18f2289b07ad..d87ac59105e3fecde01e895e05b66b27b338f44f 100644 (file)
--- a/mods/main/nodes.lua
+++ b/mods/main/nodes.lua
@@ -12,11 +12,12 @@ for id,ore in pairs(ores) do
        local drops = {"main:"..ore.."ore"}
        if ore == "diamond" then drops = {"main:diamond"} elseif ore == "coal" then drops = {"main:coal"} end
        
+       print(ore,id)
        
        minetest.register_node("main:"..ore.."ore", {
                description = ore:gsub("^%l", string.upper).." Ore",
                tiles = {"stone.png^"..ore.."ore.png"},
-               groups = {stone = id, hard = id, pickaxe = 1, hand = 4,pathable = 1},
+               groups = {stone = id, pathable = 1},
                sounds = main.stoneSound(),
                --light_source = 14,--debugging ore spawn
                drop = {
@@ -35,7 +36,7 @@ end
 minetest.register_node("main:stone", {
     description = "Stone",
     tiles = {"stone.png"},
-    groups = {stone = 1, hard = 1, pickaxe = 1, hand = 4,pathable = 1},
+    groups = {stone = 1, hand = 1,pathable = 1},
     sounds = main.stoneSound(),
     --[[
     redstone_activation = function(pos)
@@ -60,7 +61,7 @@ minetest.register_node("main:stone", {
 minetest.register_node("main:cobble", {
     description = "Cobblestone",
     tiles = {"cobble.png"},
-    groups = {stone = 2, hard = 1, pickaxe = 2, hand = 4,pathable = 1},
+    groups = {stone = 1, pathable = 1},
     sounds = main.stoneSound(),
     --[[
     redstone_activation = function(pos)
@@ -87,10 +88,9 @@ minetest.register_node("main:glass", {
     tiles = {"glass.png"},
     drawtype = "glasslike",
        paramtype = "light",
-       --paramtype2 = "glasslikeliquidlevel",
        sunlight_propagates = true,
        is_ground_content = false,
-    groups = {stone = 1, hard = 1, pickaxe = 1, hand = 4,pathable = 1},
+    groups = {glass = 1, pathable = 1},
     sounds = main.stoneSound({
                footstep = {name = "glass_footstep", gain = 0.4},
         dug =  {name = "break_glass", gain = 0.4},
@@ -101,7 +101,7 @@ minetest.register_node("main:glass", {
 minetest.register_node("main:dirt", {
     description = "Dirt",
     tiles = {"dirt.png"},
-    groups = {dirt = 1, soft = 1, shovel = 1, hand = 1, soil=1,pathable = 1, farm_tillable=1},
+    groups = {dirt = 1, soil=1,pathable = 1, farm_tillable=1},
     sounds = main.dirtSound(),
     paramtype = "light",
 })
@@ -109,7 +109,7 @@ minetest.register_node("main:dirt", {
 minetest.register_node("main:grass", {
     description = "Grass",
     tiles = {"grass.png"},
-    groups = {dirt = 1, soft = 1, shovel = 1, hand = 1, soil=1,pathable = 1, farm_tillable=1},
+    groups = {grass = 1, soil=1,pathable = 1, farm_tillable=1},
     sounds = main.dirtSound(),
     drop="main:dirt",
 })
@@ -117,14 +117,14 @@ minetest.register_node("main:grass", {
 minetest.register_node("main:sand", {
     description = "Sand",
     tiles = {"sand.png"},
-    groups = {sand = 1, soft = 1, shovel = 1, hand = 1, falling_node = 1,pathable = 1},
+    groups = {sand = 1, falling_node = 1,pathable = 1},
     sounds = main.sandSound(),
 })
 
 minetest.register_node("main:tree", {
     description = "Tree",
     tiles = {"treeCore.png","treeCore.png","treeOut.png","treeOut.png","treeOut.png","treeOut.png"},
-    groups = {wood = 2, tree = 1, hard = 1, axe = 1, hand = 3,pathable = 1},
+    groups = {wood = 1, tree = 1, pathable = 1},
     sounds = main.woodSound(),
     --set metadata so treecapitator doesn't destroy houses
     on_place = function(itemstack, placer, pointed_thing)
@@ -169,7 +169,7 @@ minetest.register_node("main:tree", {
 minetest.register_node("main:wood", {
     description = "Wood",
     tiles = {"wood.png"},
-    groups = {wood = 1, hard = 1, axe = 1, hand = 3,pathable = 1},
+    groups = {wood = 1, pathable = 1},
     sounds = main.woodSound(),
 })
 
@@ -182,7 +182,7 @@ minetest.register_node("main:leaves", {
        paramtype = "light",
        is_ground_content = false,      
     tiles = {"leaves.png"},
-    groups = {leaves = 1, plant = 1, axe = 1, hand = 0, leafdecay = 1},
+    groups = {leaves = 1, leafdecay = 1},
     sounds = main.grassSound(),
     drop = {
                max_items = 1,
@@ -438,7 +438,7 @@ minetest.register_node("main:ladder", {
                --wall_bottom = = <default>
                --wall_side = = <default>
        },
-       groups = {wood = 2, flammable = 2, attached_node=1},
+       groups = {wood = 1, flammable = 1, attached_node=1},
        sounds = main.woodSound(),
        on_place = function(itemstack, placer, pointed_thing)
                --copy from torch

diff --git a/mods/main/tools.lua b/mods/main/tools.lua
index a7bdcd2d62ceda75508a64485cbd7a0d8c40fde1..901869b079e9c4af7ef11d21c76eeffea3ce7258 100644 (file)
--- a/mods/main/tools.lua
+++ b/mods/main/tools.lua
@@ -1,24 +1,123 @@
 --Quick definition of tools
 local tool = {"shovel","axe","pick"}
-local group = {[1]="dirt",[2]="wood",[3]="stone"}
 local material = {"wood","stone","iron","gold","diamond"}
 
-for level,material in pairs(material) do
+for _,material in pairs(material) do
        for id,tool in pairs(tool) do
 
                --print(id,tool,level,material)
                local groupcaps
-               if group[id] == "dirt" then
-                       groupcaps2={
-                       dirt = {times={[4]=4-level/2,[3]=3.5-level/2,[2]=3.0-level/2,[1]=2.8-level/2}, uses=(level/2)*5, maxlevel=level},
-                       sand = {times={[4]=4-level/2,[3]=3.5-level/2,[2]=3.0-level/2,[1]=2.8-level/2}, uses=(level/2)*5, maxlevel=level},
-                       }
+               local damage
+               --shovel
+               if tool == "shovel" then
+                       if material == "wood" then
+                               groupcaps2={
+                                       dirt =  {times={[1]=0.4,[2]=1.5,[3]=3,[4]=6,[5]=12},    uses=59, maxlevel=1},
+                                       snow =  {times={[1]=0.4,[2]=1.5,[3]=3,[4]=6,[5]=12},    uses=59, maxlevel=1},
+                                       grass = {times={[1]=0.45,[2]=1.5,[3]=3,[4]=6,[5]=12},   uses=59, maxlevel=1},
+                                       sand =  {times={[1]=0.4,[2]=1.5,[3]=3,[4]=6,[5]=12},    uses=59, maxlevel=1},
+                               }
+                               damage = 2.5
+                       elseif material == "stone" then
+                               groupcaps2={
+                                       dirt =  {times={[1]=0.2,[2]=0.2,[3]=1.5,[4]=3,[5]=6},   uses=131, maxlevel=1},
+                                       snow =  {times={[1]=0.2,[2]=0.2,[3]=1.5,[4]=3,[5]=6},   uses=131, maxlevel=1},
+                                       grass = {times={[1]=0.25,[2]=0.25,[3]=1.5,[4]=3,[5]=6}, uses=131, maxlevel=1},
+                                       sand =  {times={[1]=0.2,[2]=0.2,[3]=1.5,[4]=3,[5]=6},   uses=131, maxlevel=1},
+                               }
+                               damage = 3.5
+                       elseif material == "iron" then
+                               groupcaps2={
+                                       dirt =  {times={[1]=0.15,[2]=0.15,[3]=0.15,[4]=1.5,[5]=3}, uses=250, maxlevel=1},
+                                       snow =  {times={[1]=0.15,[2]=0.15,[3]=0.15,[4]=1.5,[5]=3}, uses=250, maxlevel=1},
+                                       grass = {times={[1]=0.15,[2]=0.15,[3]=0.15,[4]=1.5,[5]=3}, uses=250, maxlevel=1},
+                                       sand =  {times={[1]=0.15,[2]=0.15,[3]=0.15,[4]=1.5,[5]=3}, uses=250, maxlevel=1},
+                               }
+                               damage = 4.5
+                       elseif material == "gold" then
+                               groupcaps2={
+                                       dirt =  {times={[1]=0.1,[2]=0.1,[3]=0.1,[4]=0.1,[5]=1.5}, uses=32, maxlevel=1},
+                                       snow =  {times={[1]=0.1,[2]=0.1,[3]=0.1,[4]=0.1,[5]=1.5}, uses=32, maxlevel=1},
+                                       grass = {times={[1]=0.1,[2]=0.1,[3]=0.1,[4]=0.1,[5]=1.5}, uses=32, maxlevel=1},
+                                       sand =  {times={[1]=0.1,[2]=0.1,[3]=0.1,[4]=0.1,[5]=1.5}, uses=32, maxlevel=1},
+                               }
+                               damage = 2.5
+                       elseif material == "diamond" then
+                               groupcaps2={
+                                       dirt =  {times={[1]= 0.1,[2]=0.1,[3]=0.1,[4]=0.1,[5]=1.5},     uses=1561, maxlevel=1},
+                                       snow =  {times={[1]= 0.1,[2]=0.1,[3]=0.1,[4]=0.1,[5]=1.5},     uses=1561, maxlevel=1},
+                                       grass = {times={[1]= 0.15,[2]=0.15,[3]=0.15,[4]=0.15,[5]=1.5}, uses=1561, maxlevel=1},
+                                       sand =  {times={[1]= 0.1,[2]=0.1,[3]=0.1,[4]=0.1,[5]=1.5},     uses=1561, maxlevel=1},
+                               }
+                               damage = 5.5
+                       end
                end
-               if group[id] == "wood" then
-                       groupcaps2={wood = {times={[4]=4-level/2,[3]=3.5-level/2,[2]=3.0-level/2,[1]=2.8-level/2}, uses=(level/2)*5, maxlevel=level},}
+               --axe
+               if tool == "axe" then
+                       if material == "wood" then
+                               groupcaps2={
+                                       wood = {times={[1]=1.5,[2]=3,[3]=6,[4]=9,[5]=12}, uses=59, maxlevel=1}
+                               }
+                               damage = 7
+                       elseif material == "stone" then
+                               groupcaps2={
+                                       wood = {times={[1]=0.75,[2]=0.75,[3]=3,[4]=6,[5]=9}, uses=131, maxlevel=1}
+                               }
+                               damage=9
+                       elseif material == "iron" then
+                               groupcaps2={
+                                       wood = {times={[1]=0.5,[2]=0.5,[3]=0.5,[4]=3,[5]=6}, uses=250, maxlevel=1}
+                               }
+                               damage = 9
+                       elseif material == "gold" then
+                               groupcaps2={
+                                       wood = {times={[1]=0.25,[2]=0.25,[3]=0.25,[4]=0.25,[5]=3}, uses=32, maxlevel=1}
+                               }
+                               damage = 7
+                       elseif material == "diamond" then
+                               groupcaps2={
+                                       wood = {times={[1]= 0.4,[2]=0.4,[3]=0.4,[4]=0.4,[5]=3}, uses=1561, maxlevel=1}
+                               }
+                               damage = 9
+                       end
                end
-               if group[id] == "stone" then
-                       groupcaps2={stone = {times={[4]=4-level/2,[3]=3.5-level/2,[2]=3.0-level/2,[1]=2.8-level/2}, uses=(level/2)*5, maxlevel=level},}
+               
+               
+               --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}, uses=59, maxlevel=1},
+                                       glass = {times={[1]=1.15,[2]=16,[3]=32,[4]=64,[5]=128}, uses=59, maxlevel=1},
+                               }
+                               damage = 3
+                       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},
+                               }
+                               damage=4
+                       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},
+                               }
+                               damage = 5
+                       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},
+                               }
+                               damage = 3
+                       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},
+                               }
+                               damage = 6
+                       end
                end
                minetest.register_tool("main:"..material..tool, {
                        description = material:gsub("^%l", string.upper).." "..tool:gsub("^%l", string.upper),
@@ -27,7 +126,7 @@ for level,material in pairs(material) do
                                --full_punch_interval = 1.2,
                                --max_drop_level=0,
                                groupcaps=groupcaps2,
-                               damage_groups = {fleshy=1},
+                               damage_groups = {damage=damage},
                        },
                        sound = {breaks = {name="tool_break",gain=0.4}}, -- change this
                        groups = {flammable = 2, tool=1 },
@@ -63,6 +162,21 @@ for level,material in pairs(material) do
                        end,
                })
        end
+       
+       
+       
+       if material == "wood" then
+               damage = 4
+       elseif material == "stone" then
+               damage = 5
+       elseif material == "iron" then
+               damage = 6
+       elseif material == "gold" then
+               damage = 4
+       elseif material == "diamond" then
+               damage = 7
+       end
+       
        --add swords
        minetest.register_tool("main:"..material.."sword", {
                description = material:gsub("^%l", string.upper).." Sword",
@@ -70,23 +184,22 @@ for level,material in pairs(material) do
                tool_capabilities = {
                        --full_punch_interval = 1.2,
                        --max_drop_level=0,
-                       groupcaps={leaves = {times={[4]=0.7,[3]=0.7,[2]=0.7,[1]=0.7}, uses=level*20, maxlevel=4},},
-                       damage_groups = {fleshy=level},
+                       groupcaps={leaves = {times={[4]=0.7,[3]=0.7,[2]=0.7,[1]=0.7}, uses=10, maxlevel=1},},
+                       damage_groups = {damage = damage},
                },
                sound = {breaks = {name="tool_break",gain=0.4}}, -- change this
-               groups = {weapon=1 }
+               groups = {damage=damage }
        })
 end
 
 minetest.register_tool("main:shears", {
-               description = "Shears",
-               inventory_image = "shears.png",
-               tool_capabilities = {
-                       --full_punch_interval = 1.2,
-                       --max_drop_level=0,
-                       groupcaps={leaves = {times={[4]=0.2,[3]=0.2,[2]=0.2,[1]=0.2}, uses=300, maxlevel=4},},
-                       --damage_groups = {fleshy=2},
-               },
-               sound = {breaks = "default_tool_breaks"}, -- change this
-               groups = {shears = 1}
-       })
+       description = "Shears",
+       inventory_image = "shears.png",
+       tool_capabilities = {
+               groupcaps = {
+               leaves = {times={[1]= 0.05,[2]=0.05,[3]=0.05,[4]=0.05,[5]=0.05}, uses=500, maxlevel=1},
+               }
+       },
+       sound = {breaks = "default_tool_breaks"}, -- change this
+       groups = {shears = 1}
+})

diff --git a/mods/minecart/depends.txt b/mods/minecart/depends.txt
new file mode 100644 (file)
index 0000000..ba2906d
--- /dev/null
+++ b/mods/minecart/depends.txt
@@ -0,0 +1 @@
+main

diff --git a/mods/minecart/rail.lua b/mods/minecart/rail.lua
index c926b08854325133ed8d99cae053becd1a4c1bd0..fb1296ad4a650fe7547bd27f7f1a3d2a4d19019e 100644 (file)
--- a/mods/minecart/rail.lua
+++ b/mods/minecart/rail.lua
@@ -15,6 +15,7 @@ minetest.register_node("minecart:rail",{
                type = "fixed",
                fixed = {-1/2, -1/2, -1/2, 1/2, -1/2+1/16, 1/2},
        },
+       sounds = main.stoneSound(),
        on_place = function(itemstack, placer, pointed_thing)
                if not pointed_thing.type == "node" then
                        return
@@ -41,11 +42,11 @@ minetest.register_node("minecart:rail",{
                if minetest.registered_nodes[minetest.get_node({x=pos.x,y=pos.y-1,z=pos.z}).name].walkable and minetest.get_node(pointed_thing.above).name == "air" then
                        minetest.set_node(pointed_thing.above, {name="minecart:rail"})
                        itemstack:take_item(1)
-                       --print(minetest.get_node(pointed_thing.above).param1)
+                       minetest.sound_play("stone",{pos=pointed_thing.above})
                        return(itemstack)
                end
        end,
-       groups={instant=1,rail=1},
+       groups={stone=1,wood=1,rail=1},
 })
 
 minetest.register_craft({

diff --git a/mods/mob/movement_code.lua b/mods/mob/movement_code.lua
index 3b6791d4a87881941dce041854f44d69e577377b..8df229c5510c9b4d1f666438f58dda2a018d8565 100644 (file)
--- a/mods/mob/movement_code.lua
+++ b/mods/mob/movement_code.lua
@@ -45,7 +45,6 @@ pig.jump = function(self)
                                                if walkable then
                                                        local distance = vector.subtract(collision_point,pos).y-self.object:get_properties().collisionbox[2]+0.4
                                                        if distance >= -0.11 then
-                                                               print("Jumping")
                                                                local vel = self.object:get_velocity()
                                                                self.jump_timer = 0.5
                                                                self.object:add_velocity(vector.new(vel.x,5,vel.z))

diff --git a/mods/music/sounds/8bit.ogg b/mods/music/sounds/8bit.ogg
new file mode 100644 (file)
index 0000000..bd1114b
Binary files /dev/null and b/mods/music/sounds/8bit.ogg differ

diff --git a/mods/music/sounds/night.ogg b/mods/music/sounds/night.ogg
new file mode 100644 (file)
index 0000000..178ac97
Binary files /dev/null and b/mods/music/sounds/night.ogg differ

diff --git a/mods/music/sounds/simple.ogg b/mods/music/sounds/simple.ogg
new file mode 100644 (file)
index 0000000..d5ea499
Binary files /dev/null and b/mods/music/sounds/simple.ogg differ

diff --git a/mods/walls/init.lua b/mods/walls/init.lua
index 96a4371c84374ad84ec7bd2044cbde0db86e7500..1707ec7804644c7a1e2be36de7f78e8c0bb0219e 100644 (file)
--- a/mods/walls/init.lua
+++ b/mods/walls/init.lua
@@ -140,7 +140,7 @@ def2.node_box = {
        connect_right = { -1/16,   -1/2, -1/16,  1/2,   1/2,  1/16},
 }
 
-def2.connects_to = {"group:fence", "group:wood", "group:tree", "group:wall", "group:stone", "group:sand"}
+def2.connects_to = {"group:fence", "group:wood", "group:wall", "group:stone", "group:sand","group:glass"}
 def2.sunlight_propagates = true
 minetest.register_node(newname,def2)
 

diff --git a/mods/weather/init.lua b/mods/weather/init.lua
index 5ec9e95c4deb61b56fcc6da6dd384d02052fd55f..32d427a6510fb449814c5c6dd9ba2131cddb9442 100644 (file)
--- a/mods/weather/init.lua
+++ b/mods/weather/init.lua
@@ -186,7 +186,7 @@ end
 minetest.register_node("weather:snow", {
     description = "Snow",
     tiles = {"snow_block.png"},
-    groups = {soft = 1, shovel = 1, hand = 1,pathable = 1,wool=1,dirt=1,falling_node=1},
+    groups = {pathable = 1,snow = 1, falling_node=1},
     sounds = main.woolSound(),
     paramtype = "light",
        drawtype = "nodebox",