]> git.lizzy.rs Git - dragonfireclient.git/blobdiff - src/content_mapnode.cpp
projects / dragonfireclient.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Always return from non-void functions
[dragonfireclient.git] / src / content_mapnode.cpp
diff --git a/src/content_mapnode.cpp b/src/content_mapnode.cpp
index 2e7a240f308aea55e15639f4ddf20cfe181a67da..b164033db6e8669a3d2f0f2c2152e2af2695def5 100644 (file)
--- a/src/content_mapnode.cpp
+++ b/src/content_mapnode.cpp
@@ -31,6 +31,65 @@ void setStoneLikeDiggingProperties(DiggingPropertiesList &list, float toughness)
 void setDirtLikeDiggingProperties(DiggingPropertiesList &list, float toughness);
 void setWoodLikeDiggingProperties(DiggingPropertiesList &list, float toughness);
 
+content_t trans_table_19[21][2] = {
+       {CONTENT_GRASS, 1},
+       {CONTENT_TREE, 4},
+       {CONTENT_LEAVES, 5},
+       {CONTENT_GRASS_FOOTSTEPS, 6},
+       {CONTENT_MESE, 7},
+       {CONTENT_MUD, 8},
+       {CONTENT_CLOUD, 10},
+       {CONTENT_COALSTONE, 11},
+       {CONTENT_WOOD, 12},
+       {CONTENT_SAND, 13},
+       {CONTENT_COBBLE, 18},
+       {CONTENT_STEEL, 19},
+       {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)
+{
+       MapNode result = n_from;
+       if(version <= 19)
+       {
+               content_t c_from = n_from.getContent();
+               for(u32 i=0; i<sizeof(trans_table_19)/sizeof(trans_table_19[0]); i++)
+               {
+                       if(trans_table_19[i][0] == c_from)
+                       {
+                               result.setContent(trans_table_19[i][1]);
+                               break;
+                       }
+               }
+       }
+       return result;
+}
+MapNode mapnode_translate_to_internal(MapNode n_from, u8 version)
+{
+       MapNode result = n_from;
+       if(version <= 19)
+       {
+               content_t c_from = n_from.getContent();
+               for(u32 i=0; i<sizeof(trans_table_19)/sizeof(trans_table_19[0]); i++)
+               {
+                       if(trans_table_19[i][1] == c_from)
+                       {
+                               result.setContent(trans_table_19[i][0]);
+                               break;
+                       }
+               }
+       }
+       return result;
+}
+
 void content_mapnode_init()
 {
        // Read some settings
@@ -38,7 +97,7 @@ void content_mapnode_init()
        bool new_style_leaves = g_settings.getBool("new_style_leaves");
        bool invisible_stone = g_settings.getBool("invisible_stone");
 
-       u8 i;
+       content_t i;
        ContentFeatures *f = NULL;
 
        i = CONTENT_STONE;
@@ -47,7 +106,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
@@ -59,7 +118,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;
@@ -69,7 +128,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;
@@ -78,7 +137,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;
@@ -87,7 +146,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;
@@ -96,7 +155,7 @@ 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;
@@ -105,7 +164,7 @@ void content_mapnode_init()
        f->setInventoryTextureCube("sandstone.png", "sandstone.png", "sandstone.png");
        f->param_type = CPT_MINERAL;
        f->is_ground_content = true;
-       f->dug_item = std::string("MaterialItem ")+itos(CONTENT_SAND)+" 1";
+       f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_SAND)+" 1";
        setDirtLikeDiggingProperties(f->digging_properties, 1.0);
 
        i = CONTENT_CLAY;
@@ -133,15 +192,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
@@ -151,7 +232,7 @@ 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;
@@ -162,7 +243,7 @@ void content_mapnode_init()
        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("MaterialItem ")+itos(i)+" 1";
+       f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
        setWoodLikeDiggingProperties(f->digging_properties, 0.75);
 
        i = CONTENT_PAPYRUS;
@@ -171,7 +252,7 @@ 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->walkable = false;
        setWoodLikeDiggingProperties(f->digging_properties, 0.25);
@@ -191,9 +272,10 @@ void content_mapnode_init()
        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);
@@ -203,7 +285,7 @@ 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");
@@ -215,16 +297,29 @@ 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->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);
-       //f->translate_to = new MapNode(CONTENT_STONE, MINERAL_COAL);
        f->setAllTextures("stone.png^mineral_coal.png");
        f->is_ground_content = true;
        setStoneLikeDiggingProperties(f->digging_properties, 1.5);
@@ -234,7 +329,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;
@@ -242,7 +337,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;
@@ -250,7 +345,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);
@@ -276,6 +371,7 @@ 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;
        
        i = CONTENT_WATERSOURCE;
        f = &content_features(i);
@@ -305,8 +401,9 @@ 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;
        
        i = CONTENT_TORCH;
        f = &content_features(i);
@@ -318,7 +415,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));
        
@@ -332,7 +429,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));
@@ -346,7 +443,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);
@@ -357,8 +454,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);
@@ -369,7 +466,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;
@@ -378,7 +475,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;
@@ -388,16 +485,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));
Dragonfireclient is an utility client for the Voxelengine minetest (http://minetest.net/). The client was created by Elias Fleckenstein and is inspired by the Minecraft clients Liquid Bounce and Impact. Discord: https://discord.gg/kab99uu for more information.