projects / oweals / minetest.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Fixed water mesh generation acting weird next to sand
[oweals/minetest.git] / src / content_mapnode.cpp
diff --git a/src/content_mapnode.cpp b/src/content_mapnode.cpp
index e2aed24581e208ca1bbe2772c8c3bf6465e10bc1..f45853c4a3e0815e008e368ad26f0d31017bb291 100644 (file)
--- a/src/content_mapnode.cpp
+++ b/src/content_mapnode.cpp
@@ -24,6 +24,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "mapnode.h"
 #include "content_nodemeta.h"
 
+#define WATER_ALPHA 160
+
+#define WATER_VISC 1
+#define LAVA_VISC 7
+
 // TODO: Get rid of these and set up some attributes like toughness,
 //       fluffyness, and a funciton to calculate time and durability loss
 //       (and sound? and whatever else) from them
@@ -31,7 +36,7 @@ void setStoneLikeDiggingProperties(DiggingPropertiesList &list, float toughness)
 void setDirtLikeDiggingProperties(DiggingPropertiesList &list, float toughness);
 void setWoodLikeDiggingProperties(DiggingPropertiesList &list, float toughness);
 
-content_t trans_table_19[][2] = {
+content_t trans_table_19[21][2] = {
        {CONTENT_GRASS, 1},
        {CONTENT_TREE, 4},
        {CONTENT_LEAVES, 5},
@@ -47,6 +52,12 @@ content_t trans_table_19[][2] = {
        {CONTENT_GLASS, 20},
        {CONTENT_MOSSYCOBBLE, 22},
        {CONTENT_GRAVEL, 23},
+       {CONTENT_SANDSTONE, 24},
+       {CONTENT_CACTUS, 25},
+       {CONTENT_BRICK, 26},
+       {CONTENT_CLAY, 27},
+       {CONTENT_PAPYRUS, 28},
+       {CONTENT_BOOKSHELF, 29},
 };
 
 MapNode mapnode_translate_from_internal(MapNode n_from, u8 version)
@@ -100,7 +111,7 @@ void content_mapnode_init()
        f->setInventoryTextureCube("stone.png", "stone.png", "stone.png");
        f->param_type = CPT_MINERAL;
        f->is_ground_content = true;
-       f->dug_item = std::string("MaterialItem ")+itos(CONTENT_COBBLE)+" 1";
+       f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_COBBLE)+" 1";
        setStoneLikeDiggingProperties(f->digging_properties, 1.0);
        if(invisible_stone)
                f->solidness = 0; // For debugging, hides regular stone
@@ -112,7 +123,7 @@ void content_mapnode_init()
        f->setTexture(1, "mud.png");
        f->param_type = CPT_MINERAL;
        f->is_ground_content = true;
-       f->dug_item = std::string("MaterialItem ")+itos(CONTENT_MUD)+" 1";
+       f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_MUD)+" 1";
        setDirtLikeDiggingProperties(f->digging_properties, 1.0);
        
        i = CONTENT_GRASS_FOOTSTEPS;
@@ -122,7 +133,7 @@ void content_mapnode_init()
        f->setTexture(1, "mud.png");
        f->param_type = CPT_MINERAL;
        f->is_ground_content = true;
-       f->dug_item = std::string("MaterialItem ")+itos(CONTENT_MUD)+" 1";
+       f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_MUD)+" 1";
        setDirtLikeDiggingProperties(f->digging_properties, 1.0);
        
        i = CONTENT_MUD;
@@ -131,7 +142,7 @@ void content_mapnode_init()
        f->setInventoryTextureCube("mud.png", "mud.png", "mud.png");
        f->param_type = CPT_MINERAL;
        f->is_ground_content = true;
-       f->dug_item = std::string("MaterialItem ")+itos(i)+" 1";
+       f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
        setDirtLikeDiggingProperties(f->digging_properties, 1.0);
        
        i = CONTENT_SAND;
@@ -140,7 +151,7 @@ void content_mapnode_init()
        f->setInventoryTextureCube("sand.png", "sand.png", "sand.png");
        f->param_type = CPT_MINERAL;
        f->is_ground_content = true;
-       f->dug_item = std::string("MaterialItem ")+itos(i)+" 1";
+       f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
        setDirtLikeDiggingProperties(f->digging_properties, 1.0);
        
        i = CONTENT_GRAVEL;
@@ -149,9 +160,36 @@ void content_mapnode_init()
        f->setInventoryTextureCube("gravel.png", "gravel.png", "gravel.png");
        f->param_type = CPT_MINERAL;
        f->is_ground_content = true;
-       f->dug_item = std::string("MaterialItem ")+itos(i)+" 1";
+       f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
        setDirtLikeDiggingProperties(f->digging_properties, 1.75);
        
+       i = CONTENT_SANDSTONE;
+       f = &content_features(i);
+       f->setAllTextures("sandstone.png");
+       f->setInventoryTextureCube("sandstone.png", "sandstone.png", "sandstone.png");
+       f->param_type = CPT_MINERAL;
+       f->is_ground_content = true;
+       f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_SAND)+" 1";
+       setDirtLikeDiggingProperties(f->digging_properties, 1.0);
+
+       i = CONTENT_CLAY;
+       f = &content_features(i);
+       f->setAllTextures("clay.png");
+       f->setInventoryTextureCube("clay.png", "clay.png", "clay.png");
+       f->param_type = CPT_MINERAL;
+       f->is_ground_content = true;
+       f->dug_item = std::string("CraftItem lump_of_clay 4");
+       setDirtLikeDiggingProperties(f->digging_properties, 1.0);
+
+       i = CONTENT_BRICK;
+       f = &content_features(i);
+       f->setAllTextures("brick.png");
+       f->setInventoryTextureCube("brick.png", "brick.png", "brick.png");
+       f->param_type = CPT_MINERAL;
+       f->is_ground_content = true;
+       f->dug_item = std::string("CraftItem clay_brick 4");
+       setStoneLikeDiggingProperties(f->digging_properties, 1.0);
+
        i = CONTENT_TREE;
        f = &content_features(i);
        f->setAllTextures("tree.png");
@@ -159,15 +197,37 @@ void content_mapnode_init()
        f->setTexture(1, "tree_top.png");
        f->param_type = CPT_MINERAL;
        f->is_ground_content = true;
-       f->dug_item = std::string("MaterialItem ")+itos(i)+" 1";
+       f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
+       setWoodLikeDiggingProperties(f->digging_properties, 1.0);
+       
+       i = CONTENT_JUNGLETREE;
+       f = &content_features(i);
+       f->setAllTextures("jungletree.png");
+       f->setTexture(0, "jungletree_top.png");
+       f->setTexture(1, "jungletree_top.png");
+       f->param_type = CPT_MINERAL;
+       //f->is_ground_content = true;
+       f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
        setWoodLikeDiggingProperties(f->digging_properties, 1.0);
        
+       i = CONTENT_JUNGLEGRASS;
+       f = &content_features(i);
+       f->setInventoryTexture("junglegrass.png");
+       f->light_propagates = true;
+       f->param_type = CPT_LIGHT;
+       //f->is_ground_content = true;
+       f->air_equivalent = false; // grass grows underneath
+       f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
+       f->solidness = 0; // drawn separately, makes no faces
+       f->walkable = false;
+       setWoodLikeDiggingProperties(f->digging_properties, 0.10);
+
        i = CONTENT_LEAVES;
        f = &content_features(i);
        f->light_propagates = true;
        //f->param_type = CPT_MINERAL;
        f->param_type = CPT_LIGHT;
-       f->is_ground_content = true;
+       //f->is_ground_content = true;
        if(new_style_leaves)
        {
                f->solidness = 0; // drawn separately, makes no faces
@@ -177,15 +237,50 @@ void content_mapnode_init()
        {
                f->setAllTextures("[noalpha:leaves.png");
        }
-       f->dug_item = std::string("MaterialItem ")+itos(i)+" 1";
+       f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
        setWoodLikeDiggingProperties(f->digging_properties, 0.15);
 
+       i = CONTENT_CACTUS;
+       f = &content_features(i);
+       f->setAllTextures("cactus_side.png");
+       f->setTexture(0, "cactus_top.png");
+       f->setTexture(1, "cactus_top.png");
+       f->setInventoryTextureCube("cactus_top.png", "cactus_side.png", "cactus_side.png");
+       f->param_type = CPT_MINERAL;
+       f->is_ground_content = true;
+       f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
+       setWoodLikeDiggingProperties(f->digging_properties, 0.75);
+
+       i = CONTENT_PAPYRUS;
+       f = &content_features(i);
+       f->setInventoryTexture("papyrus.png");
+       f->light_propagates = true;
+       f->param_type = CPT_LIGHT;
+       f->is_ground_content = true;
+       f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
+       f->solidness = 0; // drawn separately, makes no faces
+       f->walkable = false;
+       setWoodLikeDiggingProperties(f->digging_properties, 0.25);
+
+       i = CONTENT_BOOKSHELF;
+       f = &content_features(i);
+       f->setAllTextures("bookshelf.png");
+       f->setTexture(0, "wood.png");
+       f->setTexture(1, "wood.png");
+       // FIXME: setInventoryTextureCube() only cares for the first texture
+       f->setInventoryTextureCube("bookshelf.png", "bookshelf.png", "bookshelf.png");
+       //f->setInventoryTextureCube("wood.png", "bookshelf.png", "bookshelf.png");
+       f->param_type = CPT_MINERAL;
+       f->is_ground_content = true;
+       setWoodLikeDiggingProperties(f->digging_properties, 0.75);
+
        i = CONTENT_GLASS;
        f = &content_features(i);
        f->light_propagates = true;
+       f->sunlight_propagates = true;
        f->param_type = CPT_LIGHT;
        f->is_ground_content = true;
-       f->dug_item = std::string("MaterialItem ")+itos(i)+" 1";
+       f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
        f->solidness = 0; // drawn separately, makes no faces
        f->setInventoryTextureCube("glass.png", "glass.png", "glass.png");
        setWoodLikeDiggingProperties(f->digging_properties, 0.15);
@@ -195,12 +290,38 @@ void content_mapnode_init()
        f->light_propagates = true;
        f->param_type = CPT_LIGHT;
        f->is_ground_content = true;
-       f->dug_item = std::string("MaterialItem ")+itos(i)+" 1";
+       f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
        f->solidness = 0; // drawn separately, makes no faces
        f->air_equivalent = true; // grass grows underneath
        f->setInventoryTexture("item_fence.png");
        setWoodLikeDiggingProperties(f->digging_properties, 0.75);
 
+       i = CONTENT_RAIL;
+       f = &content_features(i);
+       f->setInventoryTexture("rail.png");
+       f->light_propagates = true;
+       f->param_type = CPT_LIGHT;
+       f->is_ground_content = true;
+       f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
+       f->solidness = 0; // drawn separately, makes no faces
+       f->air_equivalent = true; // grass grows underneath
+       f->walkable = false;
+       setDirtLikeDiggingProperties(f->digging_properties, 0.75);
+
+       i = CONTENT_LADDER;
+       f = &content_features(i);
+       f->setInventoryTexture("ladder.png");
+       f->light_propagates = true;
+       f->param_type = CPT_LIGHT;
+       f->is_ground_content = true;
+       f->dug_item = std::string("MaterialItem ")+itos(i)+" 1";
+       f->wall_mounted = true;
+       f->solidness = 0;
+       f->air_equivalent = true;
+       f->walkable = false;
+       f->climbable = true;
+       setWoodLikeDiggingProperties(f->digging_properties, 0.5);
+
        // Deprecated
        i = CONTENT_COALSTONE;
        f = &content_features(i);
@@ -213,7 +334,7 @@ void content_mapnode_init()
        f->setAllTextures("wood.png");
        f->setInventoryTextureCube("wood.png", "wood.png", "wood.png");
        f->is_ground_content = true;
-       f->dug_item = std::string("MaterialItem ")+itos(i)+" 1";
+       f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
        setWoodLikeDiggingProperties(f->digging_properties, 0.75);
        
        i = CONTENT_MESE;
@@ -221,7 +342,7 @@ void content_mapnode_init()
        f->setAllTextures("mese.png");
        f->setInventoryTextureCube("mese.png", "mese.png", "mese.png");
        f->is_ground_content = true;
-       f->dug_item = std::string("MaterialItem ")+itos(i)+" 1";
+       f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
        setStoneLikeDiggingProperties(f->digging_properties, 0.5);
        
        i = CONTENT_CLOUD;
@@ -229,7 +350,7 @@ void content_mapnode_init()
        f->setAllTextures("cloud.png");
        f->setInventoryTextureCube("cloud.png", "cloud.png", "cloud.png");
        f->is_ground_content = true;
-       f->dug_item = std::string("MaterialItem ")+itos(i)+" 1";
+       f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
        
        i = CONTENT_AIR;
        f = &content_features(i);
@@ -255,6 +376,23 @@ void content_mapnode_init()
        f->buildable_to = true;
        f->liquid_type = LIQUID_FLOWING;
        f->liquid_alternative_flowing = CONTENT_WATER;
+       f->liquid_alternative_source = CONTENT_WATERSOURCE;
+       f->liquid_viscosity = WATER_VISC;
+       f->vertex_alpha = WATER_ALPHA;
+       if(f->special_material == NULL && g_texturesource)
+       {
+               // Flowing water material
+               f->special_material = new video::SMaterial;
+               f->special_material->setFlag(video::EMF_LIGHTING, false);
+               f->special_material->setFlag(video::EMF_BACK_FACE_CULLING, false);
+               f->special_material->setFlag(video::EMF_BILINEAR_FILTER, false);
+               f->special_material->setFlag(video::EMF_FOG_ENABLE, true);
+               f->special_material->MaterialType = video::EMT_TRANSPARENT_VERTEX_ALPHA;
+               AtlasPointer *pa_water1 = new AtlasPointer(g_texturesource->getTexture(
+                               g_texturesource->getTextureId("water.png")));
+               f->special_material->setTexture(0, pa_water1->atlas);
+               f->special_atlas = pa_water1;
+       }
        
        i = CONTENT_WATERSOURCE;
        f = &content_features(i);
@@ -284,8 +422,106 @@ void content_mapnode_init()
        f->diggable = false;
        f->buildable_to = true;
        f->liquid_type = LIQUID_SOURCE;
-       f->dug_item = std::string("MaterialItem ")+itos(i)+" 1";
+       f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
        f->liquid_alternative_flowing = CONTENT_WATER;
+       f->liquid_alternative_source = CONTENT_WATERSOURCE;
+       f->liquid_viscosity = WATER_VISC;
+       f->vertex_alpha = WATER_ALPHA;
+       if(f->special_material == NULL && g_texturesource)
+       {
+               // Flowing water material
+               f->special_material = new video::SMaterial;
+               f->special_material->setFlag(video::EMF_LIGHTING, false);
+               f->special_material->setFlag(video::EMF_BACK_FACE_CULLING, false);
+               f->special_material->setFlag(video::EMF_BILINEAR_FILTER, false);
+               f->special_material->setFlag(video::EMF_FOG_ENABLE, true);
+               f->special_material->MaterialType = video::EMT_TRANSPARENT_VERTEX_ALPHA;
+               AtlasPointer *pa_water1 = new AtlasPointer(g_texturesource->getTexture(
+                               g_texturesource->getTextureId("water.png")));
+               f->special_material->setTexture(0, pa_water1->atlas);
+               f->special_atlas = pa_water1;
+       }
+       
+       i = CONTENT_LAVA;
+       f = &content_features(i);
+       f->setInventoryTextureCube("lava.png", "lava.png", "lava.png");
+       f->param_type = CPT_LIGHT;
+       f->light_propagates = false;
+       f->light_source = LIGHT_MAX-1;
+       f->solidness = 0; // Drawn separately, makes no faces
+       f->walkable = false;
+       f->pointable = false;
+       f->diggable = false;
+       f->buildable_to = true;
+       f->liquid_type = LIQUID_FLOWING;
+       f->liquid_alternative_flowing = CONTENT_LAVA;
+       f->liquid_alternative_source = CONTENT_LAVASOURCE;
+       f->liquid_viscosity = LAVA_VISC;
+       f->damage_per_second = 4*2;
+       if(f->special_material == NULL && g_texturesource)
+       {
+               // Flowing lava material
+               f->special_material = new video::SMaterial;
+               f->special_material->setFlag(video::EMF_LIGHTING, false);
+               f->special_material->setFlag(video::EMF_BACK_FACE_CULLING, false);
+               f->special_material->setFlag(video::EMF_BILINEAR_FILTER, false);
+               f->special_material->setFlag(video::EMF_FOG_ENABLE, true);
+               f->special_material->MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF;
+               AtlasPointer *pa_lava1 = new AtlasPointer(
+                       g_texturesource->getTexture(
+                               g_texturesource->getTextureId("lava.png")));
+               f->special_material->setTexture(0, pa_lava1->atlas);
+               f->special_atlas = pa_lava1;
+       }
+       
+       i = CONTENT_LAVASOURCE;
+       f = &content_features(i);
+       f->setInventoryTextureCube("lava.png", "lava.png", "lava.png");
+       if(new_style_water)
+       {
+               f->solidness = 0; // drawn separately, makes no faces
+       }
+       else // old style
+       {
+               f->solidness = 2;
+
+               TileSpec t;
+               if(g_texturesource)
+                       t.texture = g_texturesource->getTexture("lava.png");
+               
+               //t.alpha = 255;
+               //t.material_type = MATERIAL_ALPHA_VERTEX;
+               //t.material_flags &= ~MATERIAL_FLAG_BACKFACE_CULLING;
+               f->setAllTiles(t);
+       }
+       f->param_type = CPT_LIGHT;
+       f->light_propagates = false;
+       f->light_source = LIGHT_MAX-1;
+       f->walkable = false;
+       f->pointable = false;
+       f->diggable = false;
+       f->buildable_to = true;
+       f->liquid_type = LIQUID_SOURCE;
+       f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
+       f->liquid_alternative_flowing = CONTENT_LAVA;
+       f->liquid_alternative_source = CONTENT_LAVASOURCE;
+       f->liquid_viscosity = LAVA_VISC;
+       f->damage_per_second = 4*2;
+       if(f->special_material == NULL && g_texturesource)
+       {
+               // Flowing lava material
+               f->special_material = new video::SMaterial;
+               f->special_material->setFlag(video::EMF_LIGHTING, false);
+               f->special_material->setFlag(video::EMF_BACK_FACE_CULLING, false);
+               f->special_material->setFlag(video::EMF_BILINEAR_FILTER, false);
+               f->special_material->setFlag(video::EMF_FOG_ENABLE, true);
+               f->special_material->MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF;
+               AtlasPointer *pa_lava1 = new AtlasPointer(
+                       g_texturesource->getTexture(
+                               g_texturesource->getTextureId("lava.png")));
+               f->special_material->setTexture(0, pa_lava1->atlas);
+               f->special_atlas = pa_lava1;
+       }
        
        i = CONTENT_TORCH;
        f = &content_features(i);
@@ -297,7 +533,7 @@ void content_mapnode_init()
        f->walkable = false;
        f->wall_mounted = true;
        f->air_equivalent = true;
-       f->dug_item = std::string("MaterialItem ")+itos(i)+" 1";
+       f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
        f->light_source = LIGHT_MAX-1;
        f->digging_properties.set("", DiggingProperties(true, 0.0, 0));
        
@@ -311,7 +547,7 @@ void content_mapnode_init()
        f->walkable = false;
        f->wall_mounted = true;
        f->air_equivalent = true;
-       f->dug_item = std::string("MaterialItem ")+itos(i)+" 1";
+       f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
        if(f->initial_metadata == NULL)
                f->initial_metadata = new SignNodeMetadata("Some sign");
        f->digging_properties.set("", DiggingProperties(true, 0.5, 0));
@@ -325,7 +561,7 @@ void content_mapnode_init()
        f->setTexture(5, "chest_front.png"); // Z-
        f->setInventoryTexture("chest_top.png");
        //f->setInventoryTextureCube("chest_top.png", "chest_side.png", "chest_side.png");
-       f->dug_item = std::string("MaterialItem ")+itos(i)+" 1";
+       f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
        if(f->initial_metadata == NULL)
                f->initial_metadata = new ChestNodeMetadata();
        setWoodLikeDiggingProperties(f->digging_properties, 1.0);
@@ -336,8 +572,8 @@ void content_mapnode_init()
        f->setAllTextures("furnace_side.png");
        f->setTexture(5, "furnace_front.png"); // Z-
        f->setInventoryTexture("furnace_front.png");
-       //f->dug_item = std::string("MaterialItem ")+itos(i)+" 1";
-       f->dug_item = std::string("MaterialItem ")+itos(CONTENT_COBBLE)+" 6";
+       //f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
+       f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_COBBLE)+" 6";
        if(f->initial_metadata == NULL)
                f->initial_metadata = new FurnaceNodeMetadata();
        setStoneLikeDiggingProperties(f->digging_properties, 3.0);
@@ -348,7 +584,7 @@ void content_mapnode_init()
        f->setInventoryTextureCube("cobble.png", "cobble.png", "cobble.png");
        f->param_type = CPT_NONE;
        f->is_ground_content = true;
-       f->dug_item = std::string("MaterialItem ")+itos(i)+" 1";
+       f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
        setStoneLikeDiggingProperties(f->digging_properties, 0.9);
 
        i = CONTENT_MOSSYCOBBLE;
@@ -357,7 +593,7 @@ void content_mapnode_init()
        f->setInventoryTextureCube("mossycobble.png", "mossycobble.png", "mossycobble.png");
        f->param_type = CPT_NONE;
        f->is_ground_content = true;
-       f->dug_item = std::string("MaterialItem ")+itos(i)+" 1";
+       f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
        setStoneLikeDiggingProperties(f->digging_properties, 0.8);
        
        i = CONTENT_STEEL;
@@ -367,16 +603,33 @@ void content_mapnode_init()
                        "steel_block.png");
        f->param_type = CPT_NONE;
        f->is_ground_content = true;
-       f->dug_item = std::string("MaterialItem ")+itos(i)+" 1";
+       f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
        setStoneLikeDiggingProperties(f->digging_properties, 5.0);
        
+       i = CONTENT_NC;
+       f = &content_features(i);
+       f->param_type = CPT_FACEDIR_SIMPLE;
+       f->setAllTextures("nc_side.png");
+       f->setTexture(5, "nc_front.png"); // Z-
+       f->setTexture(4, "nc_back.png"); // Z+
+       f->setInventoryTexture("nc_front.png");
+       f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
+       setStoneLikeDiggingProperties(f->digging_properties, 3.0);
+       
+       i = CONTENT_NC_RB;
+       f = &content_features(i);
+       f->setAllTextures("nc_rb.png");
+       f->setInventoryTexture("nc_rb.png");
+       f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
+       setStoneLikeDiggingProperties(f->digging_properties, 3.0);
+       
        // NOTE: Remember to add frequently used stuff to the texture atlas in tile.cpp
        
 
        /*
                Add MesePick to everything
        */
-       for(u16 i=0; i<256; i++)
+       for(u16 i=0; i<=MAX_CONTENT; i++)
        {
                content_features(i).digging_properties.set("MesePick",
                                DiggingProperties(true, 0.0, 65535./1337));
Unnamed repository; edit this file 'description' to name the repository.