Futuray-pgm
/
voxelands
forked from oerkki/voxelands
1
1
Fork 0
Code Pull Requests Activity

get rid of old CraftItem drop strings

This commit is contained in:
darkrose 2017-06-23 03:01:58 +10:00
parent 12e24992bf
commit fddb5527c7
5 changed files with 139 additions and 242 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
src/content_mapnode.cpp
View File

@ -508,7 +508,7 @@ void content_mapnode_init(bool repeat)
f->draw_type = CDT_CUBELIKE;
f->is_ground_content = true;
f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_MUD)+" 1";
f->extra_dug_item = std::string("CraftItem snow_ball 1");
f->extra_dug_item = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_SNOW_BALL)+" 1";
f->extra_dug_item_rarity = 5;
f->type = CMT_DIRT;
f->hardness = 1.0;
@ -540,7 +540,7 @@ void content_mapnode_init(bool repeat)
f->setInventoryTextureCube("ash.png", "ash.png", "ash.png");
f->draw_type = CDT_CUBELIKE;
f->is_ground_content = true;
f->dug_item = std::string("CraftItem lump_of_ash 9");
f->dug_item = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_ASH)+" 9";
f->type = CMT_DIRT;
f->hardness = 0.5;
crafting::setHardBlockRecipe(CONTENT_CRAFTITEM_ASH,CONTENT_ASH);
@ -597,7 +597,7 @@ void content_mapnode_init(bool repeat)
f->is_ground_content = true;
f->pressure_type = CST_DROPABLE;
f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
f->extra_dug_item = std::string("CraftItem lump_of_flint 1");
f->extra_dug_item = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_FLINT)+" 1";
f->extra_dug_item_rarity = 10;
f->extra_dug_item_min_level = 1;
f->type = CMT_DIRT;
@ -660,7 +660,7 @@ void content_mapnode_init(bool repeat)
f->param_type = CPT_BLOCKDATA;
f->param2_type = CPT_PLANTGROWTH;
f->is_ground_content = true;
f->dug_item = std::string("CraftItem lump_of_clay 4");
f->dug_item = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_CLAY)+" 4";
f->cook_result = std::string("MaterialItem2 ")+itos(CONTENT_TERRACOTTA)+" 1";
f->type = CMT_DIRT;
f->hardness = 1.0;
@ -677,9 +677,9 @@ void content_mapnode_init(bool repeat)
f->setInventoryTextureCube("clay_blue.png", "clay_blue.png", "clay_blue.png");
f->draw_type = CDT_CUBELIKE;
f->is_ground_content = true;
f->dug_item = std::string("CraftItem lump_of_clay 4");
f->extra_dug_item = std::string("CraftItem dye_blue 1");
f->extra_dug_item_rarity = 4;
f->dug_item = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_CLAY)+" 4";
f->extra_dug_item = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_DYE_BLUE)+" 1";
f->extra_dug_item_rarity = 1;
f->type = CMT_DIRT;
f->hardness = 1.0;
crafting::set1Any2Recipe(CONTENT_CRAFTITEM_DYE_BLUE,CONTENT_CLAY,CONTENT_CLAY_BLUE);
@ -694,9 +694,9 @@ void content_mapnode_init(bool repeat)
f->setInventoryTextureCube("clay_green.png", "clay_green.png", "clay_green.png");
f->draw_type = CDT_CUBELIKE;
f->is_ground_content = true;
f->dug_item = std::string("CraftItem lump_of_clay 4");
f->extra_dug_item = std::string("CraftItem dye_green 1");
f->extra_dug_item_rarity = 4;
f->dug_item = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_CLAY)+" 4";
f->extra_dug_item = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_DYE_GREEN)+" 1";
f->extra_dug_item_rarity = 1;
f->type = CMT_DIRT;
f->hardness = 1.0;
crafting::set1Any2Recipe(CONTENT_CRAFTITEM_DYE_GREEN,CONTENT_CLAY,CONTENT_CLAY_GREEN);
@ -711,9 +711,9 @@ void content_mapnode_init(bool repeat)
f->setInventoryTextureCube("clay_orange.png", "clay_orange.png", "clay_orange.png");
f->draw_type = CDT_CUBELIKE;
f->is_ground_content = true;
f->dug_item = std::string("CraftItem lump_of_clay 4");
f->extra_dug_item = std::string("CraftItem dye_orange 1");
f->extra_dug_item_rarity = 4;
f->dug_item = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_CLAY)+" 4";
f->extra_dug_item = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_DYE_ORANGE)+" 1";
f->extra_dug_item_rarity = 1;
f->type = CMT_DIRT;
f->hardness = 1.0;
crafting::set1Any2Recipe(CONTENT_CRAFTITEM_DYE_ORANGE,CONTENT_CLAY,CONTENT_CLAY_ORANGE);
@ -728,9 +728,9 @@ void content_mapnode_init(bool repeat)
f->setInventoryTextureCube("clay_purple.png", "clay_purple.png", "clay_purple.png");
f->draw_type = CDT_CUBELIKE;
f->is_ground_content = true;
f->dug_item = std::string("CraftItem lump_of_clay 4");
f->extra_dug_item = std::string("CraftItem dye_purple 1");
f->extra_dug_item_rarity = 4;
f->dug_item = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_CLAY)+" 4";
f->extra_dug_item = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_DYE_PURPLE)+" 1";
f->extra_dug_item_rarity = 1;
f->type = CMT_DIRT;
f->hardness = 1.0;
crafting::set1Any2Recipe(CONTENT_CRAFTITEM_DYE_PURPLE,CONTENT_CLAY,CONTENT_CLAY_PURPLE);
@ -745,9 +745,10 @@ void content_mapnode_init(bool repeat)
f->setInventoryTextureCube("clay_red.png", "clay_red.png", "clay_red.png");
f->draw_type = CDT_CUBELIKE;
f->is_ground_content = true;
f->dug_item = std::string("CraftItem lump_of_clay 4");
f->extra_dug_item = std::string("CraftItem dye_red 1");
f->extra_dug_item_rarity = 4;
f->is_ground_content = true;
f->dug_item = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_CLAY)+" 4";
f->extra_dug_item = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_DYE_RED)+" 1";
f->extra_dug_item_rarity = 1;
f->type = CMT_DIRT;
f->hardness = 1.0;
crafting::set1Any2Recipe(CONTENT_CRAFTITEM_DYE_RED,CONTENT_CLAY,CONTENT_CLAY_RED);
@ -762,9 +763,9 @@ void content_mapnode_init(bool repeat)
f->setInventoryTextureCube("clay_yellow.png", "clay_yellow.png", "clay_yellow.png");
f->draw_type = CDT_CUBELIKE;
f->is_ground_content = true;
f->dug_item = std::string("CraftItem lump_of_clay 4");
f->extra_dug_item = std::string("CraftItem dye_yellow 1");
f->extra_dug_item_rarity = 4;
f->dug_item = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_CLAY)+" 4";
f->extra_dug_item = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_DYE_YELLOW)+" 1";
f->extra_dug_item_rarity = 1;
f->type = CMT_DIRT;
f->hardness = 1.0;
crafting::set1Any2Recipe(CONTENT_CRAFTITEM_DYE_YELLOW,CONTENT_CLAY,CONTENT_CLAY_YELLOW);
@ -779,9 +780,9 @@ void content_mapnode_init(bool repeat)
f->setInventoryTextureCube("clay_black.png", "clay_black.png", "clay_black.png");
f->draw_type = CDT_CUBELIKE;
f->is_ground_content = true;
f->dug_item = std::string("CraftItem lump_of_clay 4");
f->extra_dug_item = std::string("CraftItem dye_black 1");
f->extra_dug_item_rarity = 4;
f->dug_item = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_CLAY)+" 4";
f->extra_dug_item = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_DYE_BLACK)+" 1";
f->extra_dug_item_rarity = 1;
f->type = CMT_DIRT;
f->hardness = 1.0;
crafting::set1Any2Recipe(CONTENT_CRAFTITEM_DYE_BLACK,CONTENT_CLAY,CONTENT_CLAY_BLACK);
@ -800,7 +801,7 @@ void content_mapnode_init(bool repeat)
f->setInventoryTextureCube("brick_top.png", "brick.png", "brick_side.png");
f->draw_type = CDT_CUBELIKE;
f->is_ground_content = true;
f->dug_item = std::string("CraftItem clay_brick 4");
f->dug_item = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_CLAY_BRICK)+" 4";
f->type = CMT_STONE;
f->hardness = 1.0;
crafting::setSoftBlockRecipe(CONTENT_CRAFTITEM_CLAY_BRICK,CONTENT_BRICK);
@ -1485,7 +1486,7 @@ void content_mapnode_init(bool repeat)
f->sunlight_propagates = true;
content_nodebox_pie(f);
f->setInventoryTextureNodeBox(i, "apple_pie.png", "apple_pie.png", "apple_pie.png");
f->dug_item = std::string("CraftItem apple_pie_slice 1");
f->dug_item = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_APPLE_PIE_SLICE)+" 1";
f->ondig_replace_node = CONTENT_APPLE_PIE_3;
f->type = CMT_DIRT;
f->hardness = 0.1;
@ -1509,7 +1510,7 @@ void content_mapnode_init(bool repeat)
f->light_propagates = true;
f->sunlight_propagates = true;
content_nodebox_pie_3(f);
f->dug_item = std::string("CraftItem apple_pie_slice 1");
f->dug_item = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_APPLE_PIE_SLICE)+" 1";
f->ondig_replace_node=CONTENT_APPLE_PIE_2;
f->type = CMT_DIRT;
f->hardness = 0.1;
@ -1531,7 +1532,7 @@ void content_mapnode_init(bool repeat)
f->light_propagates = true;
f->sunlight_propagates = true;
content_nodebox_pie_2(f);
f->dug_item = std::string("CraftItem apple_pie_slice 1");
f->dug_item = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_APPLE_PIE_SLICE)+" 1";
f->ondig_replace_node=CONTENT_APPLE_PIE_1;
f->type = CMT_DIRT;
f->hardness = 0.1;
@ -1553,7 +1554,7 @@ void content_mapnode_init(bool repeat)
f->light_propagates = true;
f->sunlight_propagates = true;
content_nodebox_pie_1(f);
f->dug_item = std::string("CraftItem apple_pie_slice 1");
f->dug_item = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_APPLE_PIE_SLICE)+" 1";
f->type = CMT_DIRT;
f->hardness = 0.1;
f->pressure_type = CST_CRUSHABLE;
@ -1604,7 +1605,7 @@ void content_mapnode_init(bool repeat)
f->sunlight_propagates = true;
content_nodebox_pie(f);
f->setInventoryTextureNodeBox(i, "pumpkin_pie.png", "pumpkin_pie.png", "pumpkin_pie.png");
f->dug_item = std::string("CraftItem pumpkin_pie_slice 1");
f->dug_item = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_PUMPKIN_PIE_SLICE)+" 1";
f->ondig_replace_node=CONTENT_PUMPKIN_PIE_3;
f->type = CMT_DIRT;
f->hardness = 0.1;
@ -1628,7 +1629,7 @@ void content_mapnode_init(bool repeat)
f->light_propagates = true;
f->sunlight_propagates = true;
content_nodebox_pie_3(f);
f->dug_item = std::string("CraftItem pumpkin_pie_slice 1");
f->dug_item = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_PUMPKIN_PIE_SLICE)+" 1";
f->ondig_replace_node=CONTENT_PUMPKIN_PIE_2;
f->type = CMT_DIRT;
f->hardness = 0.1;
@ -1650,7 +1651,7 @@ void content_mapnode_init(bool repeat)
f->light_propagates = true;
f->sunlight_propagates = true;
content_nodebox_pie_2(f);
f->dug_item = std::string("CraftItem pumpkin_pie_slice 1");
f->dug_item = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_PUMPKIN_PIE_SLICE)+" 1";
f->ondig_replace_node=CONTENT_PUMPKIN_PIE_1;
f->type = CMT_DIRT;
f->hardness = 0.1;
@ -1672,7 +1673,7 @@ void content_mapnode_init(bool repeat)
f->light_propagates = true;
f->sunlight_propagates = true;
content_nodebox_pie_1(f);
f->dug_item = std::string("CraftItem pumpkin_pie_slice 1");
f->dug_item = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_PUMPKIN_PIE_SLICE)+" 1";
f->type = CMT_DIRT;
f->hardness = 0.1;
f->pressure_type = CST_CRUSHABLE;
@ -1685,7 +1686,7 @@ void content_mapnode_init(bool repeat)
f->setInventoryTextureCube("snow.png", "snow.png", "snow.png");
f->draw_type = CDT_CUBELIKE;
f->is_ground_content = true;
f->dug_item = std::string("CraftItem snow_ball 9");
f->dug_item = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_SNOW_BALL)+" 9";
f->type = CMT_DIRT;
f->hardness = 0.3;
f->warmth_per_second = 10;
@ -1704,8 +1705,8 @@ void content_mapnode_init(bool repeat)
f->setTexture(5,"snowman_front.png");
f->draw_type = CDT_NODEBOX;
f->is_ground_content = true;
f->dug_item = std::string("CraftItem snow_ball 18");
f->extra_dug_item = std::string("CraftItem Stick 3");
f->dug_item = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_SNOW_BALL)+" 18";
f->extra_dug_item = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_STICK)+" 3";
f->extra_dug_item_rarity = 1;
f->rotate_tile_with_nodebox = true;
f->type = CMT_DIRT;
@ -1768,7 +1769,7 @@ void content_mapnode_init(bool repeat)
f->walkable = false;
f->material_pointable = false;
f->sunlight_propagates = true;
f->dug_item = std::string("CraftItem snow_ball 1");
f->dug_item = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_SNOW_BALL)+" 1";
content_nodebox_carpet(f);
f->setInventoryTextureNodeBox(i,"snow.png", "snow.png", "snow.png");
f->type = CMT_DIRT;
@ -2718,7 +2719,7 @@ void content_mapnode_init(bool repeat)
f->param_type = CPT_LIGHT;
f->draw_type = CDT_NODEBOX;
f->is_ground_content = true;
f->dug_item = std::string("CraftItem clay_brick 4");
f->dug_item = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_CLAY_BRICK)+" 4";
f->air_equivalent = true; // grass grows underneath
f->light_propagates = true;
f->sunlight_propagates = true;
@ -2741,7 +2742,7 @@ void content_mapnode_init(bool repeat)
f->param_type = CPT_LIGHT;
f->draw_type = CDT_NODEBOX;
f->is_ground_content = true;
f->dug_item = std::string("CraftItem clay_brick 4");
f->dug_item = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_CLAY_BRICK)+" 4";
f->light_propagates = true;
f->sunlight_propagates = true;
content_nodebox_column_square_base(f);
@ -2756,7 +2757,7 @@ void content_mapnode_init(bool repeat)
f->param_type = CPT_LIGHT;
f->draw_type = CDT_NODEBOX;
f->is_ground_content = true;
f->dug_item = std::string("CraftItem clay_brick 4");
f->dug_item = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_CLAY_BRICK)+" 4";
f->air_equivalent = true; // grass grows underneath
f->light_propagates = true;
f->sunlight_propagates = true;
@ -3195,7 +3196,7 @@ void content_mapnode_init(bool repeat)
f->param_type = CPT_LIGHT;
f->draw_type = CDT_NODEBOX;
f->is_ground_content = true;
f->dug_item = std::string("CraftItem clay_brick 4");
f->dug_item = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_CLAY_BRICK)+" 4";
f->air_equivalent = true; // grass grows underneath
f->light_propagates = true;
f->sunlight_propagates = true;
@ -3211,7 +3212,7 @@ void content_mapnode_init(bool repeat)
f->param_type = CPT_LIGHT;
f->draw_type = CDT_NODEBOX;
f->is_ground_content = true;
f->dug_item = std::string("CraftItem clay_brick 4");
f->dug_item = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_CLAY_BRICK)+" 4";
f->light_propagates = true;
f->sunlight_propagates = true;
content_nodebox_column_cross_base(f);
@ -3226,7 +3227,7 @@ void content_mapnode_init(bool repeat)
f->param_type = CPT_LIGHT;
f->draw_type = CDT_NODEBOX;
f->is_ground_content = true;
f->dug_item = std::string("CraftItem clay_brick 4");
f->dug_item = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_CLAY_BRICK)+" 4";
f->air_equivalent = true; // grass grows underneath
f->light_propagates = true;
f->sunlight_propagates = true;

32
src/content_mapnode_plants.cpp
View File

@ -46,7 +46,7 @@ void content_mapnode_plants(bool repeat)
f->is_ground_content = true;
f->flammable = 2; // can be set on fire
f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
f->cook_result = std::string("CraftItem lump_of_charcoal 1");
f->cook_result = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_CHARCOAL)+" 1";
f->fuel_time = 30;
f->type = CMT_TREE;
f->hardness = 1.0;
@ -67,7 +67,7 @@ void content_mapnode_plants(bool repeat)
f->is_ground_content = true;
f->flammable = 2; // can be set on fire
f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
f->cook_result = std::string("CraftItem lump_of_charcoal 1");
f->cook_result = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_CHARCOAL)+" 1";
f->fuel_time = 30;
f->type = CMT_TREE;
f->hardness = 1.0;
@ -88,7 +88,7 @@ void content_mapnode_plants(bool repeat)
//f->is_ground_content = true;
f->flammable = 2; // can be set on fire
f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
f->cook_result = std::string("CraftItem lump_of_charcoal 1");
f->cook_result = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_CHARCOAL)+" 1";
f->fuel_time = 30;
f->type = CMT_TREE;
f->hardness = 1.0;
@ -108,7 +108,7 @@ void content_mapnode_plants(bool repeat)
f->is_ground_content = true;
f->flammable = 2; // can be set on fire
f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
f->cook_result = std::string("CraftItem lump_of_charcoal 1");
f->cook_result = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_CHARCOAL)+" 1";
f->fuel_time = 25;
f->type = CMT_TREE;
f->hardness = 0.8;
@ -256,7 +256,7 @@ void content_mapnode_plants(bool repeat)
#endif
f->flammable = 1; // can be replaced by fire if the node under it is set on fire
f->fuel_time = 30/16;
f->cook_result = std::string("CraftItem lump_of_resin 1");
f->cook_result = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_RESIN)+" 1";
f->extra_dug_item = std::string("MaterialItem2 ")+itos(CONTENT_SAPLING)+" 1";
f->extra_dug_item_rarity = 20;
f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
@ -288,7 +288,7 @@ void content_mapnode_plants(bool repeat)
#endif
f->flammable = 1; // can be replaced by fire if the node under it is set on fire
f->fuel_time = 30/16;
f->cook_result = std::string("CraftItem lump_of_resin 1");
f->cook_result = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_RESIN)+" 1";
f->extra_dug_item = std::string("MaterialItem2 ")+itos(CONTENT_SAPLING)+" 1";
f->extra_dug_item_rarity = 20;
f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
@ -385,7 +385,7 @@ void content_mapnode_plants(bool repeat)
#endif
f->flammable = 1; // can be replaced by fire if the node under it is set on fire
f->fuel_time = 30/16;
f->cook_result = std::string("CraftItem lump_of_resin 1");
f->cook_result = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_RESIN)+" 1";
f->extra_dug_item = std::string("MaterialItem2 ")+itos(CONTENT_APPLE_SAPLING)+" 1";
f->extra_dug_item_rarity = 20;
f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
@ -417,7 +417,7 @@ void content_mapnode_plants(bool repeat)
#endif
f->flammable = 1; // can be replaced by fire if the node under it is set on fire
f->fuel_time = 30/16;
f->cook_result = std::string("CraftItem lump_of_resin 1");
f->cook_result = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_RESIN)+" 1";
f->extra_dug_item = std::string("MaterialItem2 ")+itos(CONTENT_JUNGLESAPLING)+" 1";
f->extra_dug_item_rarity = 20;
f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
@ -449,7 +449,7 @@ void content_mapnode_plants(bool repeat)
#endif
f->flammable = 1; // can be replaced by fire if the node under it is set on fire
f->fuel_time = 30/16;
f->cook_result = std::string("CraftItem lump_of_resin 1");
f->cook_result = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_RESIN)+" 1";
f->extra_dug_item = std::string("MaterialItem2 ")+itos(CONTENT_CONIFER_SAPLING)+" 1";
f->extra_dug_item_rarity = 20;
f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
@ -481,7 +481,7 @@ void content_mapnode_plants(bool repeat)
f->setInventoryTextureCube("leaves.png", "leaves.png", "leaves.png");
f->flammable = 1; // can be replaced by fire if the node under it is set on fire
f->fuel_time = 30/16;
f->cook_result = std::string("CraftItem lump_of_resin 1");
f->cook_result = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_RESIN)+" 1";
f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
f->type = CMT_PLANT;
f->hardness = 0.15;
@ -506,7 +506,7 @@ void content_mapnode_plants(bool repeat)
f->setInventoryTextureCube("leaves_autumn.png", "leaves_autumn.png", "leaves_autumn.png");
f->flammable = 1; // can be replaced by fire if the node under it is set on fire
f->fuel_time = 30/16;
f->cook_result = std::string("CraftItem lump_of_resin 1");
f->cook_result = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_RESIN)+" 1";
f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
f->type = CMT_PLANT;
f->hardness = 0.15;
@ -556,7 +556,7 @@ void content_mapnode_plants(bool repeat)
f->setInventoryTextureCube("apple_leaves.png", "apple_leaves.png", "apple_leaves.png");
f->flammable = 1; // can be replaced by fire if the node under it is set on fire
f->fuel_time = 30/16;
f->cook_result = std::string("CraftItem lump_of_resin 1");
f->cook_result = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_RESIN)+" 1";
f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
f->type = CMT_PLANT;
f->hardness = 0.15;
@ -581,7 +581,7 @@ void content_mapnode_plants(bool repeat)
f->setInventoryTextureCube("jungleleaves.png", "jungleleaves.png", "jungleleaves.png");
f->flammable = 1; // can be replaced by fire if the node under it is set on fire
f->fuel_time = 30/16;
f->cook_result = std::string("CraftItem lump_of_resin 1");
f->cook_result = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_RESIN)+" 1";
f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
f->type = CMT_PLANT;
f->hardness = 0.15;
@ -606,7 +606,7 @@ void content_mapnode_plants(bool repeat)
f->setInventoryTextureCube("conifer_leaves.png", "conifer_leaves.png", "conifer_leaves.png");
f->flammable = 1; // can be replaced by fire if the node under it is set on fire
f->fuel_time = 30/16;
f->cook_result = std::string("CraftItem lump_of_resin 1");
f->cook_result = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_RESIN)+" 1";
f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
f->type = CMT_PLANT;
f->hardness = 0.15;
@ -631,7 +631,7 @@ void content_mapnode_plants(bool repeat)
f->setAllTextureFlags(0);
#endif
f->flammable = 1; // can be replaced by fire if the node under it is set on fire
f->extra_dug_item = std::string("CraftItem apple_blossom 1");
f->extra_dug_item = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_APPLE_BLOSSOM)+" 1";
f->extra_dug_item_rarity = 1;
f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_APPLE_LEAVES)+" 1";
f->type = CMT_PLANT;
@ -713,7 +713,7 @@ void content_mapnode_plants(bool repeat)
f->param_type = CPT_LIGHT;
f->draw_type = CDT_PLANTLIKE;
f->air_equivalent = true;
f->dug_item = std::string("CraftItem cactus_fruit 1");
f->dug_item = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_CACTUS_FRUIT)+" 1";
f->walkable = false;
f->flammable = 1; // can be replaced by fire if the node under it is set on fire
f->fuel_time = 30/32;

4
src/content_mapnode_slab.cpp
View File

@ -151,7 +151,7 @@ void content_mapnode_slab(bool repeat)
f->setTexture(3,"brick_side.png");
f->draw_type = CDT_NODEBOX;
f->is_ground_content = true;
f->dug_item = std::string("CraftItem clay_brick 4");
f->dug_item = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_CLAY_BRICK)+" 4";
f->special_alternate_node = CONTENT_BRICK;
content_nodebox_slab(f);
f->setInventoryTextureNodeBox(i,"brick_top.png", "brick.png", "brick_side.png");
@ -500,7 +500,7 @@ void content_mapnode_slab(bool repeat)
f->setTexture(3,"brick_side.png^[transformfy");
f->draw_type = CDT_SLABLIKE;
f->is_ground_content = true;
f->dug_item = std::string("CraftItem clay_brick 4");
f->dug_item = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_CLAY_BRICK)+" 4";
f->special_alternate_node = CONTENT_BRICK;
content_nodebox_slabud(f);
f->setInventoryTextureNodeBox(i,"brick_top.png", "brick.png^[transformfy", "brick_side.png^[transformfy");

2
src/content_mapnode_special.cpp
View File

@ -2129,7 +2129,7 @@ void content_mapnode_special(bool repeat)
f->setAllTextures("wood.png");
f->air_equivalent = true;
f->climbable = true;
f->cook_result = std::string("CraftItem lump_of_charcoal 1");
f->cook_result = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_CHARCOAL)+" 1";
f->draw_type = CDT_NODEBOX;
f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
f->flammable = 1;

252
src/content_mapnode_stair.cpp
View File

@ -157,7 +157,7 @@ void content_mapnode_stair(bool repeat)
f->setTexture(5,"brick_stair_front.png");
f->draw_type = CDT_STAIRLIKE;
f->is_ground_content = true;
f->dug_item = std::string("CraftItem clay_brick 4");
f->dug_item = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_CLAY_BRICK)+" 4";
content_nodebox_stair(f);
f->setInventoryTextureNodeBox(i,"brick_stair_top.png", "brick_stair_front.png", "brick_side.png");
f->type = CMT_STONE;
@ -310,7 +310,7 @@ void content_mapnode_stair(bool repeat)
f->setTexture(5,"brick_stair_front.png^[transformfy");
f->draw_type = CDT_STAIRLIKE;
f->is_ground_content = true;
f->dug_item = std::string("CraftItem clay_brick 4");
f->dug_item = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_CLAY_BRICK)+" 4";
content_nodebox_stairud(f);
f->setInventoryTextureNodeBox(i,"brick.png", "brick_front.png", "brick.png");
f->type = CMT_STONE;
@ -357,12 +357,9 @@ void content_mapnode_stair(bool repeat)
f->setAllTextures("roughstone.png");
f->draw_type = CDT_NODEBOX;
f->is_ground_content = true;
f->dug_item = std::string("MaterialItem2 ")+
itos(CONTENT_ROUGHSTONE_STAIR)+ " 1";
f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_ROUGHSTONE_STAIR)+" 1";
content_nodebox_stair_corner(f);
f->setInventoryTextureNodeBox(i,"roughstone.png",
"roughstone.png",
"roughstone.png");
f->setInventoryTextureNodeBox(i,"roughstone.png","roughstone.png","roughstone.png");
f->type = CMT_STONE;
f->hardness = 0.9;
f->onpunch_replace_node = CONTENT_ROUGHSTONE_INNER_STAIR_CORNER;
@ -375,12 +372,9 @@ void content_mapnode_stair(bool repeat)
f->setAllTextures("cobble.png");
f->draw_type = CDT_NODEBOX;
f->is_ground_content = true;
f->dug_item = std::string("MaterialItem2 ")+
itos(CONTENT_COBBLE_STAIR)+ " 1";
f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_COBBLE_STAIR)+" 1";
content_nodebox_stair_corner(f);
f->setInventoryTextureNodeBox(i,"cobble.png",
"cobble.png",
"cobble.png");
f->setInventoryTextureNodeBox(i,"cobble.png","cobble.png","cobble.png");
f->type = CMT_STONE;
f->hardness = 0.9;
f->onpunch_replace_node = CONTENT_COBBLE_INNER_STAIR_CORNER;
@ -393,12 +387,9 @@ void content_mapnode_stair(bool repeat)
f->setAllTextures("mossycobble.png");
f->draw_type = CDT_NODEBOX;
f->is_ground_content = true;
f->dug_item = std::string("MaterialItem2 ")+
itos(CONTENT_MOSSYCOBBLE_STAIR)+ " 1";
f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_MOSSYCOBBLE_STAIR)+" 1";
content_nodebox_stair_corner(f);
f->setInventoryTextureNodeBox(i,"mossycobble.png",
"mossycobble.png",
"mossycobble.png");
f->setInventoryTextureNodeBox(i,"mossycobble.png","mossycobble.png","mossycobble.png");
f->type = CMT_STONE;
f->hardness = 0.8;
f->onpunch_replace_node = CONTENT_MOSSYCOBBLE_INNER_STAIR_CORNER;
@ -411,12 +402,9 @@ void content_mapnode_stair(bool repeat)
f->setAllTextures("stone.png");
f->draw_type = CDT_NODEBOX;
f->is_ground_content = true;
f->dug_item = std::string("MaterialItem2 ")+
itos(CONTENT_STONE_STAIR)+ " 1";
f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_STONE_STAIR)+" 1";
content_nodebox_stair_corner(f);
f->setInventoryTextureNodeBox(i,"stone.png",
"stone.png",
"stone.png");
f->setInventoryTextureNodeBox(i,"stone.png","stone.png","stone.png");
f->type = CMT_STONE;
f->hardness = 1.0;
f->onpunch_replace_node = CONTENT_STONE_INNER_STAIR_CORNER;
@ -428,12 +416,9 @@ void content_mapnode_stair(bool repeat)
f->draw_type = CDT_NODEBOX;
f->setAllTextures("wood.png");
f->is_ground_content = true;
f->dug_item = std::string("MaterialItem2 ")+
itos(CONTENT_WOOD_STAIR)+ " 1";
f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_WOOD_STAIR)+" 1";
content_nodebox_stair_corner(f);
f->setInventoryTextureNodeBox(i,"wood.png",
"wood.png",
"wood.png");
f->setInventoryTextureNodeBox(i,"wood.png","wood.png","wood.png");
f->flammable = 1; // can be replaced by fire if the node under
// it is set on fire
f->fuel_time = 30;
@ -449,12 +434,9 @@ void content_mapnode_stair(bool repeat)
f->setAllTextures("junglewood.png");
f->draw_type = CDT_NODEBOX;
// f->is_ground_content = true;
f->dug_item = std::string("MaterialItem2 ")+
itos(CONTENT_JUNGLE_STAIR)+ " 1";
f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_JUNGLE_STAIR)+" 1";
content_nodebox_stair_corner(f);
f->setInventoryTextureNodeBox(i,"junglewood.png",
"junglewood.png",
"junglewood.png");
f->setInventoryTextureNodeBox(i,"junglewood.png","junglewood.png","junglewood.png");
f->flammable = 1; // can be replaced by fire if the node under
// it is set on fire
f->fuel_time = 30;
@ -472,11 +454,9 @@ void content_mapnode_stair(bool repeat)
f->setTexture(1,"brick_bottom.png");
f->draw_type = CDT_NODEBOX;
f->is_ground_content = true;
f->dug_item = std::string("CraftItem clay_brick 24");
f->dug_item = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_CLAY_BRICK)+" 4";
content_nodebox_stair_corner(f);
f->setInventoryTextureNodeBox(i,"brick.png",
"brick.png",
"brick.png");
f->setInventoryTextureNodeBox(i,"brick.png","brick.png","brick.png");
f->type = CMT_STONE;
f->hardness = 1.0;
f->onpunch_replace_node = CONTENT_BRICK_INNER_STAIR_CORNER;
@ -489,12 +469,9 @@ void content_mapnode_stair(bool repeat)
f->setAllTextures("sandstone.png");
f->draw_type = CDT_NODEBOX;
f->is_ground_content = true;
f->dug_item = std::string("MaterialItem2 ")+
itos(CONTENT_SAND)+ " 24";
f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_SAND)+" 4";
content_nodebox_stair_corner(f);
f->setInventoryTextureNodeBox(i,"sandstone.png",
"sandstone.png",
"sandstone.png");
f->setInventoryTextureNodeBox(i,"sandstone.png","sandstone.png","sandstone.png");
f->type = CMT_DIRT;
f->hardness = 1.0;
f->onpunch_replace_node = CONTENT_SANDSTONE_INNER_STAIR_CORNER;
@ -507,12 +484,9 @@ void content_mapnode_stair(bool repeat)
f->setAllTextures("limestone.png");
f->draw_type = CDT_NODEBOX;
f->is_ground_content = true;
f->dug_item = std::string("MaterialItem2 ")+
itos(CONTENT_LIMESTONE_STAIR)+ " 1";
f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_LIMESTONE_STAIR)+" 1";
content_nodebox_stair_corner(f);
f->setInventoryTextureNodeBox(i,"limestone.png",
"limestone.png",
"limestone.png");
f->setInventoryTextureNodeBox(i,"limestone.png","limestone.png","limestone.png");
f->type = CMT_STONE;
f->hardness = 0.9;
f->onpunch_replace_node = CONTENT_LIMESTONE_INNER_STAIR_CORNER;
@ -526,12 +500,9 @@ void content_mapnode_stair(bool repeat)
f->setAllTextures("roughstone.png");
f->draw_type = CDT_NODEBOX;
f->is_ground_content = true;
f->dug_item = std::string("MaterialItem2 ")+
itos(CONTENT_ROUGHSTONE_STAIR)+ " 1";
f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_ROUGHSTONE_STAIR)+" 1";
content_nodebox_stair_cornerud(f);
f->setInventoryTextureNodeBox(i,"roughstone.png",
"roughstone.png",
"roughstone.png");
f->setInventoryTextureNodeBox(i,"roughstone.png","roughstone.png","roughstone.png");
f->type = CMT_STONE;
f->hardness = 0.9;
f->onpunch_replace_node = CONTENT_ROUGHSTONE_INNER_STAIR_CORNER_UD;
@ -544,12 +515,9 @@ void content_mapnode_stair(bool repeat)
f->setAllTextures("cobble.png");
f->draw_type = CDT_NODEBOX;
f->is_ground_content = true;
f->dug_item = std::string("MaterialItem2 ")+
itos(CONTENT_COBBLE_STAIR)+ " 1";
f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_COBBLE_STAIR)+" 1";
content_nodebox_stair_cornerud(f);
f->setInventoryTextureNodeBox(i,"cobble.png",
"cobble.png",
"cobble.png");
f->setInventoryTextureNodeBox(i,"cobble.png","cobble.png","cobble.png");
f->type = CMT_STONE;
f->hardness = 0.9;
f->onpunch_replace_node = CONTENT_COBBLE_INNER_STAIR_CORNER_UD;
@ -561,12 +529,9 @@ void content_mapnode_stair(bool repeat)
f->setAllTextures("mossycobble.png");
f->draw_type = CDT_NODEBOX;
f->is_ground_content = true;
f->dug_item = std::string("MaterialItem2 ")+
itos(CONTENT_MOSSYCOBBLE_STAIR)+ " 1";
f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_MOSSYCOBBLE_STAIR)+" 1";
content_nodebox_stair_cornerud(f);
f->setInventoryTextureNodeBox(i,"mossycobble.png",
"mossycobble.png",
"mossycobble.png");
f->setInventoryTextureNodeBox(i,"mossycobble.png","mossycobble.png","mossycobble.png");
f->type = CMT_STONE;
f->hardness = 0.8;
f->onpunch_replace_node = CONTENT_MOSSYCOBBLE_INNER_STAIR_CORNER_UD;
@ -578,12 +543,9 @@ void content_mapnode_stair(bool repeat)
f->setAllTextures("stone.png");
f->draw_type = CDT_NODEBOX;
f->is_ground_content = true;
f->dug_item = std::string("MaterialItem2 ")+
itos(CONTENT_STONE_STAIR)+ " 1";
f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_STONE_STAIR)+" 1";
content_nodebox_stair_cornerud(f);
f->setInventoryTextureNodeBox(i,"stone.png",
"stone.png",
"stone.png");
f->setInventoryTextureNodeBox(i,"stone.png","stone.png","stone.png");
f->type = CMT_STONE;
f->hardness = 1.0;
f->onpunch_replace_node = CONTENT_STONE_INNER_STAIR_CORNER_UD;
@ -595,12 +557,9 @@ void content_mapnode_stair(bool repeat)
f->draw_type = CDT_NODEBOX;
f->setAllTextures("wood.png");
f->is_ground_content = true;
f->dug_item = std::string("MaterialItem2 ")+
itos(CONTENT_WOOD_STAIR)+ " 1";
f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_WOOD_STAIR)+" 1";
content_nodebox_stair_cornerud(f);
f->setInventoryTextureNodeBox(i,"wood.png",
"wood.png",
"wood.png");
f->setInventoryTextureNodeBox(i,"wood.png","wood.png","wood.png");
f->flammable = 1; // can be replaced by fire if the node under
// it is set on fire
f->fuel_time = 30;
@ -616,12 +575,9 @@ void content_mapnode_stair(bool repeat)
f->setAllTextures("junglewood.png");
f->draw_type = CDT_NODEBOX;
// f->is_ground_content = true;
f->dug_item = std::string("MaterialItem2 ")+
itos(CONTENT_JUNGLE_STAIR)+ " 1";
f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_JUNGLE_STAIR)+" 1";
content_nodebox_stair_cornerud(f);
f->setInventoryTextureNodeBox(i,"junglewood.png",
"junglewood.png",
"junglewood.png");
f->setInventoryTextureNodeBox(i,"junglewood.png","junglewood.png","junglewood.png");
f->flammable = 1; // can be replaced by fire if the node under
// it is set on fire
f->fuel_time = 30;
@ -638,11 +594,9 @@ void content_mapnode_stair(bool repeat)
f->setTexture(1,"brick_bottom.png");
f->draw_type = CDT_NODEBOX;
f->is_ground_content = true;
f->dug_item = std::string("CraftItem clay_brick 4");
f->dug_item = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_CLAY_BRICK)+" 4";
content_nodebox_stair_cornerud(f);
f->setInventoryTextureNodeBox(i,"brick.png",
"brick.png",
"brick.png");
f->setInventoryTextureNodeBox(i,"brick.png","brick.png","brick.png");
f->type = CMT_STONE;
f->hardness = 1.0;
f->onpunch_replace_node = CONTENT_BRICK_INNER_STAIR_CORNER_UD;
@ -654,12 +608,9 @@ void content_mapnode_stair(bool repeat)
f->setAllTextures("sandstone.png");
f->draw_type = CDT_NODEBOX;
f->is_ground_content = true;
f->dug_item = std::string("MaterialItem2 ")+
itos(CONTENT_SAND)+ " 4";
f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_SAND)+" 4";
content_nodebox_stair_cornerud(f);
f->setInventoryTextureNodeBox(i,"sandstone.png",
"sandstone.png",
"sandstone.png");
f->setInventoryTextureNodeBox(i,"sandstone.png","sandstone.png","sandstone.png");
f->type = CMT_DIRT;
f->hardness = 1.0;
f->onpunch_replace_node = CONTENT_SANDSTONE_INNER_STAIR_CORNER_UD;
@ -671,12 +622,9 @@ void content_mapnode_stair(bool repeat)
f->setAllTextures("limestone.png");
f->draw_type = CDT_NODEBOX;
f->is_ground_content = true;
f->dug_item = std::string("MaterialItem2 ")+
itos(CONTENT_LIMESTONE_STAIR)+ " 1";
f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_LIMESTONE_STAIR)+" 1";
content_nodebox_stair_cornerud(f);
f->setInventoryTextureNodeBox(i,"limestone.png",
"limestone.png",
"limestone.png");
f->setInventoryTextureNodeBox(i,"limestone.png","limestone.png","limestone.png");
f->type = CMT_STONE;
f->hardness = 0.9;
f->onpunch_replace_node = CONTENT_LIMESTONE_INNER_STAIR_CORNER_UD;
@ -690,12 +638,9 @@ void content_mapnode_stair(bool repeat)
f->setAllTextures("roughstone.png");
f->draw_type = CDT_NODEBOX;
f->is_ground_content = true;
f->dug_item = std::string("MaterialItem2 ")+
itos(CONTENT_ROUGHSTONE_STAIR)+ " 1";
f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_ROUGHSTONE_STAIR)+" 1";
content_nodebox_inner_stair_corner(f);
f->setInventoryTextureNodeBox(i,"roughstone.png",
"roughstone.png",
"roughstone.png");
f->setInventoryTextureNodeBox(i,"roughstone.png","roughstone.png","roughstone.png");
f->type = CMT_STONE;
f->hardness = 0.9;
f->onpunch_replace_node = CONTENT_ROUGHSTONE_STAIR;
@ -707,12 +652,9 @@ void content_mapnode_stair(bool repeat)
f->setAllTextures("cobble.png");
f->draw_type = CDT_NODEBOX;
f->is_ground_content = true;
f->dug_item = std::string("MaterialItem2 ")+
itos(CONTENT_COBBLE_STAIR)+ " 1";
f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_COBBLE_STAIR)+" 1";
content_nodebox_inner_stair_corner(f);
f->setInventoryTextureNodeBox(i,"cobble.png",
"cobble.png",
"cobble.png");
f->setInventoryTextureNodeBox(i,"cobble.png","cobble.png","cobble.png");
f->type = CMT_STONE;
f->hardness = 0.9;
f->onpunch_replace_node = CONTENT_COBBLE_STAIR;
@ -725,12 +667,9 @@ void content_mapnode_stair(bool repeat)
f->setAllTextures("mossycobble.png");
f->draw_type = CDT_NODEBOX;
f->is_ground_content = true;
f->dug_item = std::string("MaterialItem2 ")+
itos(CONTENT_MOSSYCOBBLE_STAIR)+ " 1";
f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_MOSSYCOBBLE_STAIR)+" 1";
content_nodebox_inner_stair_corner(f);
f->setInventoryTextureNodeBox(i,"mossycobble.png",
"mossycobble.png",
"mossycobble.png");
f->setInventoryTextureNodeBox(i,"mossycobble.png","mossycobble.png","mossycobble.png");
f->type = CMT_STONE;
f->hardness = 0.8;
f->onpunch_replace_node = CONTENT_MOSSYCOBBLE_STAIR;
@ -742,12 +681,9 @@ void content_mapnode_stair(bool repeat)
f->setAllTextures("stone.png");
f->draw_type = CDT_NODEBOX;
f->is_ground_content = true;
f->dug_item = std::string("MaterialItem2 ")+
itos(CONTENT_STONE_STAIR)+ " 1";
f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_STONE_STAIR)+" 1";
content_nodebox_inner_stair_corner(f);
f->setInventoryTextureNodeBox(i,"stone.png",
"stone.png",
"stone.png");
f->setInventoryTextureNodeBox(i,"stone.png","stone.png","stone.png");
f->type = CMT_STONE;
f->hardness = 1.0;
f->onpunch_replace_node = CONTENT_STONE_STAIR;
@ -759,12 +695,9 @@ void content_mapnode_stair(bool repeat)
f->draw_type = CDT_NODEBOX;
f->setAllTextures("wood.png");
f->is_ground_content = true;
f->dug_item = std::string("MaterialItem2 ")+
itos(CONTENT_WOOD_STAIR)+ " 1";
f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_WOOD_STAIR)+" 1";
content_nodebox_inner_stair_corner(f);
f->setInventoryTextureNodeBox(i,"wood.png",
"wood.png",
"wood.png");
f->setInventoryTextureNodeBox(i,"wood.png","wood.png","wood.png");
f->flammable = 1; // can be replaced by fire if the node under
// it is set on fire
f->fuel_time = 30;
@ -779,12 +712,9 @@ void content_mapnode_stair(bool repeat)
f->setAllTextures("junglewood.png");
f->draw_type = CDT_NODEBOX;
// f->is_ground_content = true;
f->dug_item = std::string("MaterialItem2 ")+
itos(CONTENT_JUNGLE_STAIR)+ " 1";
f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_JUNGLE_STAIR)+" 1";
content_nodebox_inner_stair_corner(f);
f->setInventoryTextureNodeBox(i,"junglewood.png",
"junglewood.png",
"junglewood.png");
f->setInventoryTextureNodeBox(i,"junglewood.png","junglewood.png","junglewood.png");
f->flammable = 1; // can be replaced by fire if the node under
// it is set on fire
f->fuel_time = 30;
@ -803,11 +733,9 @@ void content_mapnode_stair(bool repeat)
f->setTexture(1,"brick_bottom.png");
f->draw_type = CDT_NODEBOX;
f->is_ground_content = true;
f->dug_item = std::string("CraftItem clay_brick 24");
f->dug_item = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_CLAY_BRICK)+" 4";
content_nodebox_inner_stair_corner(f);
f->setInventoryTextureNodeBox(i,"brick.png",
"brick.png",
"brick.png");
f->setInventoryTextureNodeBox(i,"brick.png","brick.png","brick.png");
f->type = CMT_STONE;
f->hardness = 1.0;
f->onpunch_replace_node = CONTENT_BRICK_STAIR;
@ -820,12 +748,9 @@ void content_mapnode_stair(bool repeat)
f->setAllTextures("sandstone.png");
f->draw_type = CDT_NODEBOX;
f->is_ground_content = true;
f->dug_item = std::string("MaterialItem2 ")+
itos(CONTENT_SAND)+ " 24";
f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_SAND)+" 4";
content_nodebox_inner_stair_corner(f);
f->setInventoryTextureNodeBox(i,"sandstone.png",
"sandstone.png",
"sandstone.png");
f->setInventoryTextureNodeBox(i,"sandstone.png","sandstone.png","sandstone.png");
f->type = CMT_DIRT;
f->hardness = 1.0;
f->onpunch_replace_node = CONTENT_SANDSTONE_STAIR;
@ -837,12 +762,9 @@ void content_mapnode_stair(bool repeat)
f->setAllTextures("limestone.png");
f->draw_type = CDT_NODEBOX;
f->is_ground_content = true;
f->dug_item = std::string("MaterialItem2 ")+
itos(CONTENT_LIMESTONE_STAIR)+ " 1";
f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_LIMESTONE_STAIR)+" 1";
content_nodebox_inner_stair_corner(f);
f->setInventoryTextureNodeBox(i,"limestone.png",
"limestone.png",
"limestone.png");
f->setInventoryTextureNodeBox(i,"limestone.png","limestone.png","limestone.png");
f->type = CMT_STONE;
f->hardness = 0.9;
f->onpunch_replace_node = CONTENT_LIMESTONE_STAIR;
@ -856,12 +778,9 @@ void content_mapnode_stair(bool repeat)
f->setAllTextures("roughstone.png");
f->draw_type = CDT_NODEBOX;
f->is_ground_content = true;
f->dug_item = std::string("MaterialItem2 ")+
itos(CONTENT_ROUGHSTONE_STAIR)+ " 1";
f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_ROUGHSTONE_STAIR)+" 1";
content_nodebox_inner_stair_cornerud(f);
f->setInventoryTextureNodeBox(i,"roughstone.png",
"roughstone.png",
"roughstone.png");
f->setInventoryTextureNodeBox(i,"roughstone.png","roughstone.png","roughstone.png");
f->type = CMT_STONE;
f->hardness = 0.9;
f->onpunch_replace_node = CONTENT_ROUGHSTONE_STAIR_UD;
@ -874,12 +793,9 @@ void content_mapnode_stair(bool repeat)
f->setAllTextures("cobble.png");
f->draw_type = CDT_NODEBOX;
f->is_ground_content = true;
f->dug_item = std::string("MaterialItem2 ")+
itos(CONTENT_COBBLE_STAIR)+ " 1";
f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_COBBLE_STAIR)+" 1";
content_nodebox_inner_stair_cornerud(f);
f->setInventoryTextureNodeBox(i,"cobble.png",
"cobble.png",
"cobble.png");
f->setInventoryTextureNodeBox(i,"cobble.png","cobble.png","cobble.png");
f->type = CMT_STONE;
f->hardness = 0.9;
f->onpunch_replace_node = CONTENT_COBBLE_STAIR_UD;
@ -892,12 +808,9 @@ void content_mapnode_stair(bool repeat)
f->setAllTextures("mossycobble.png");
f->draw_type = CDT_NODEBOX;
f->is_ground_content = true;
f->dug_item = std::string("MaterialItem2 ")+
itos(CONTENT_MOSSYCOBBLE_STAIR)+ " 1";
f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_MOSSYCOBBLE_STAIR)+" 1";
content_nodebox_inner_stair_cornerud(f);
f->setInventoryTextureNodeBox(i,"mossycobble.png",
"mossycobble.png",
"mossycobble.png");
f->setInventoryTextureNodeBox(i,"mossycobble.png","mossycobble.png","mossycobble.png");
f->type = CMT_STONE;
f->hardness = 0.8;
f->onpunch_replace_node = CONTENT_MOSSYCOBBLE_STAIR_UD;
@ -910,12 +823,9 @@ void content_mapnode_stair(bool repeat)
f->setAllTextures("stone.png");
f->draw_type = CDT_NODEBOX;
f->is_ground_content = true;
f->dug_item = std::string("MaterialItem2 ")+
itos(CONTENT_STONE_STAIR)+ " 1";
f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_STONE_STAIR)+" 1";
content_nodebox_inner_stair_cornerud(f);
f->setInventoryTextureNodeBox(i,"stone.png",
"stone.png",
"stone.png");
f->setInventoryTextureNodeBox(i,"stone.png","stone.png","stone.png");
f->type = CMT_STONE;
f->hardness = 1.0;
f->onpunch_replace_node = CONTENT_STONE_STAIR_UD;
@ -927,12 +837,9 @@ void content_mapnode_stair(bool repeat)
f->draw_type = CDT_NODEBOX;
f->setAllTextures("wood.png");
f->is_ground_content = true;
f->dug_item = std::string("MaterialItem2 ")+
itos(CONTENT_WOOD_STAIR)+ " 1";
f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_WOOD_STAIR)+" 1";
content_nodebox_inner_stair_cornerud(f);
f->setInventoryTextureNodeBox(i,"wood.png",
"wood.png",
"wood.png");
f->setInventoryTextureNodeBox(i,"wood.png","wood.png","wood.png");
f->flammable = 1; // can be replaced by fire if the node under
// it is set on fire
f->fuel_time = 30;
@ -948,12 +855,9 @@ void content_mapnode_stair(bool repeat)
f->setAllTextures("junglewood.png");
f->draw_type = CDT_NODEBOX;
// f->is_ground_content = true;
f->dug_item = std::string("MaterialItem2 ")+
itos(CONTENT_JUNGLE_STAIR)+ " 1";
f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_JUNGLE_STAIR)+" 1";
content_nodebox_inner_stair_cornerud(f);
f->setInventoryTextureNodeBox(i,"junglewood.png",
"junglewood.png",
"junglewood.png");
f->setInventoryTextureNodeBox(i,"junglewood.png","junglewood.png","junglewood.png");
f->flammable = 1; // can be replaced by fire if the node under
// it is set on fire
f->fuel_time = 30;
@ -970,11 +874,9 @@ void content_mapnode_stair(bool repeat)
f->setTexture(1,"brick_stair_ud_inner_corner_top.png");
f->draw_type = CDT_NODEBOX;
f->is_ground_content = true;
f->dug_item = std::string("CraftItem clay_brick 24");
f->dug_item = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_CLAY_BRICK)+" 4";
content_nodebox_inner_stair_cornerud(f);
f->setInventoryTextureNodeBox(i,"brick.png",
"brick.png",
"brick.png");
f->setInventoryTextureNodeBox(i,"brick.png","brick.png","brick.png");
f->type = CMT_STONE;
f->hardness = 1.0;
f->onpunch_replace_node = CONTENT_BRICK_STAIR_UD;
@ -987,12 +889,9 @@ void content_mapnode_stair(bool repeat)
f->setAllTextures("sandstone.png");
f->draw_type = CDT_NODEBOX;
f->is_ground_content = true;
f->dug_item = std::string("MaterialItem2 ")+
itos(CONTENT_SAND)+ " 24";
f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_SAND)+ " 4";
content_nodebox_inner_stair_cornerud(f);
f->setInventoryTextureNodeBox(i,"sandstone.png",
"sandstone.png",
"sandstone.png");
f->setInventoryTextureNodeBox(i,"sandstone.png","sandstone.png","sandstone.png");
f->type = CMT_DIRT;
f->hardness = 1.0;
f->onpunch_replace_node = CONTENT_SANDSTONE_STAIR_UD;
@ -1005,12 +904,9 @@ void content_mapnode_stair(bool repeat)
f->setAllTextures("limestone.png");
f->draw_type = CDT_NODEBOX;
f->is_ground_content = true;
f->dug_item = std::string("MaterialItem2 ")+
itos(CONTENT_LIMESTONE_STAIR)+ " 1";
f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_LIMESTONE_STAIR)+" 1";
content_nodebox_inner_stair_cornerud(f);
f->setInventoryTextureNodeBox(i,"limestone.png",
"limestone.png",
"limestone.png");
f->setInventoryTextureNodeBox(i,"limestone.png","limestone.png","limestone.png");
f->type = CMT_STONE;
f->hardness = 0.9;
f->onpunch_replace_node = CONTENT_LIMESTONE_STAIR_UD;