+ paper, book, bookshelf

[oweals/minetest.git] / src / materials.cpp

diff --git a/src/materials.cpp b/src/materials.cpp
index bc39619fcf0abed0f21ae14953d418d6ffa2b49d..7815f593ebecaa36d27ef3872f486efc9893c63e 100644 (file)
--- a/src/materials.cpp
+++ b/src/materials.cpp
@@ -13,14 +13,42 @@ void setStoneLikeDiggingProperties(u8 material, float toughness)
                        DiggingProperties(true, 15.0*toughness, 0));
        
        g_material_properties[material].setDiggingProperties("WPick",
-                       DiggingProperties(true, 1.5*toughness, 65535./30.*toughness));
+                       DiggingProperties(true, 1.3*toughness, 65535./30.*toughness));
        g_material_properties[material].setDiggingProperties("STPick",
-                       DiggingProperties(true, 0.7*toughness, 65535./100.*toughness));
+                       DiggingProperties(true, 0.75*toughness, 65535./100.*toughness));
+       g_material_properties[material].setDiggingProperties("SteelPick",
+                       DiggingProperties(true, 0.50*toughness, 65535./333.*toughness));
 
        /*g_material_properties[material].setDiggingProperties("MesePick",
                        DiggingProperties(true, 0.0*toughness, 65535./20.*toughness));*/
 }
 
+void setDirtLikeDiggingProperties(u8 material, float toughness)
+{
+       g_material_properties[material].setDiggingProperties("",
+                       DiggingProperties(true, 0.75*toughness, 0));
+       
+       g_material_properties[material].setDiggingProperties("WShovel",
+                       DiggingProperties(true, 0.4*toughness, 65535./50.*toughness));
+       g_material_properties[material].setDiggingProperties("STShovel",
+                       DiggingProperties(true, 0.2*toughness, 65535./150.*toughness));
+       g_material_properties[material].setDiggingProperties("SteelShovel",
+                       DiggingProperties(true, 0.15*toughness, 65535./400.*toughness));
+}
+
+void setWoodLikeDiggingProperties(u8 material, float toughness)
+{
+       g_material_properties[material].setDiggingProperties("",
+                       DiggingProperties(true, 3.0*toughness, 0));
+       
+       g_material_properties[material].setDiggingProperties("WAxe",
+                       DiggingProperties(true, 1.5*toughness, 65535./30.*toughness));
+       g_material_properties[material].setDiggingProperties("STAxe",
+                       DiggingProperties(true, 0.75*toughness, 65535./100.*toughness));
+       g_material_properties[material].setDiggingProperties("SteelAxe",
+                       DiggingProperties(true, 0.5*toughness, 65535./333.*toughness));
+}
+
 void initializeMaterialProperties()
 {
        /*
@@ -29,33 +57,36 @@ void initializeMaterialProperties()
 
                Add some digging properties to them.
        */
-       
-       setStoneLikeDiggingProperties(CONTENT_STONE, 1.0);
 
-       g_material_properties[CONTENT_GRASS].setDiggingProperties("",
+       setStoneLikeDiggingProperties(CONTENT_STONE, 1.0);
+       setStoneLikeDiggingProperties(CONTENT_SANDSTONE, 1.0);
+       setStoneLikeDiggingProperties(CONTENT_BRICK, 3.0);
+       setStoneLikeDiggingProperties(CONTENT_MESE, 0.5);
+       setStoneLikeDiggingProperties(CONTENT_COALSTONE, 1.5);
+       setStoneLikeDiggingProperties(CONTENT_FURNACE, 3.0);
+       setStoneLikeDiggingProperties(CONTENT_COBBLE, 1.0);
+       setStoneLikeDiggingProperties(CONTENT_STEEL, 5.0);
+
+       setDirtLikeDiggingProperties(CONTENT_MUD, 1.0);
+       setDirtLikeDiggingProperties(CONTENT_GRASS, 1.0);
+       setDirtLikeDiggingProperties(CONTENT_GRASS_FOOTSTEPS, 1.0);
+       setDirtLikeDiggingProperties(CONTENT_SAND, 1.0);
+       setDirtLikeDiggingProperties(CONTENT_CLAY, 1.0);
+       
+       setWoodLikeDiggingProperties(CONTENT_TREE, 1.0);
+       setWoodLikeDiggingProperties(CONTENT_LEAVES, 0.15);
+       setWoodLikeDiggingProperties(CONTENT_CACTUS, 0.75);
+       setWoodLikeDiggingProperties(CONTENT_PAPYRUS, 0.25);
+       setWoodLikeDiggingProperties(CONTENT_GLASS, 0.15);
+       setWoodLikeDiggingProperties(CONTENT_FENCE, 0.75);
+       setWoodLikeDiggingProperties(CONTENT_WOOD, 0.75);
+       setWoodLikeDiggingProperties(CONTENT_BOOKSHELF, 0.75);
+       setWoodLikeDiggingProperties(CONTENT_CHEST, 1.0);
+
+       g_material_properties[CONTENT_SIGN_WALL].setDiggingProperties("",
                        DiggingProperties(true, 0.5, 0));
-
        g_material_properties[CONTENT_TORCH].setDiggingProperties("",
                        DiggingProperties(true, 0.0, 0));
-
-       g_material_properties[CONTENT_TREE].setDiggingProperties("",
-                       DiggingProperties(true, 1.5, 0));
-
-       g_material_properties[CONTENT_LEAVES].setDiggingProperties("",
-                       DiggingProperties(true, 0.5, 0));
-
-       g_material_properties[CONTENT_GRASS_FOOTSTEPS].setDiggingProperties("",
-                       DiggingProperties(true, 0.5, 0));
-
-       setStoneLikeDiggingProperties(CONTENT_MESE, 0.5);
-
-       g_material_properties[CONTENT_MUD].setDiggingProperties("",
-                       DiggingProperties(true, 0.5, 0));
-
-       setStoneLikeDiggingProperties(CONTENT_COALSTONE, 1.5);
-
-       g_material_properties[CONTENT_WOOD].setDiggingProperties("",
-                       DiggingProperties(true, 1.0, 0));
        
        /*
                Add MesePick to everything