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

apple wood stairs and columns

This commit is contained in:
Capricornus 2017-06-25 20:33:11 +02:00 committed by darkrose
parent 794f157d7d
commit eb6d734ce4
3 changed files with 235 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

114
src/content_mapnode.cpp
View File

@ -2793,6 +2793,67 @@ void content_mapnode_init(bool repeat)
f->onpunch_replace_node = CONTENT_BRICK_COLUMN_CROSS;
f->onpunch_replace_respects_borderstone = true;
i = CONTENT_APPLEWOOD_COLUMN_SQUARE;
f = &content_features(i);
f->description = gettext("Apple wood Column");
f->setAllTextures("applewood.png");
f->param_type = CPT_LIGHT;
f->draw_type = CDT_NODEBOX;
f->is_ground_content = true;
f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
f->air_equivalent = true; // grass grows underneath
f->light_propagates = true;
f->sunlight_propagates = true;
content_nodebox_column_square(f);
f->setInventoryTextureNodeBox(i,"applewood.png","applewood.png","applewood.png");
f->type = CMT_WOOD;
f->dig_time = 0.75;
f->onpunch_replace_node = CONTENT_APPLEWOOD_COLUMN_SQUARE_BASE;
f->onpunch_replace_respects_borderstone = true;
f->flammable = 1; // can be replaced by fire if the node under
// it is set on fire
f->fuel_time = 30/4;
f->cook_result = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_ASH)+" 1";
crafting::setCol3Recipe(CONTENT_APPLEWOOD,CONTENT_APPLEWOOD_COLUMN_SQUARE);
content_list_add("cooking",i,1,0);
content_list_add("craftguide",i,1,0);
content_list_add("creative",i,1,0);
i = CONTENT_APPLEWOOD_COLUMN_SQUARE_BASE;
f = &content_features(i);
f->setAllTextures("applewood.png");
f->param_type = CPT_LIGHT;
f->draw_type = CDT_NODEBOX;
f->is_ground_content = true;
f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_APPLEWOOD_COLUMN_SQUARE)+" 1";
f->light_propagates = true;
f->sunlight_propagates = true;
content_nodebox_column_square_base(f);
f->type = CMT_WOOD;
f->dig_time = 0.75;
f->flammable = 1; // can be replaced by fire if the node under
// it is set on fire
f->onpunch_replace_node = CONTENT_APPLEWOOD_COLUMN_SQUARE_TOP;
f->onpunch_replace_respects_borderstone = true;
i = CONTENT_APPLEWOOD_COLUMN_SQUARE_TOP;
f = &content_features(i);
f->setAllTextures("applewood.png");
f->param_type = CPT_LIGHT;
f->draw_type = CDT_NODEBOX;
f->is_ground_content = true;
f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_APPLEWOOD_COLUMN_SQUARE)+" 1";
f->air_equivalent = true; // grass grows underneath
f->light_propagates = true;
f->sunlight_propagates = true;
content_nodebox_column_square_top(f);
f->type = CMT_WOOD;
f->dig_time = 0.75;
f->flammable = 1; // can be replaced by fire if the node under
// it is set on fire
f->onpunch_replace_node = CONTENT_APPLEWOOD_COLUMN_CROSS;
f->onpunch_replace_respects_borderstone = true;
i = CONTENT_WOOD_COLUMN_SQUARE;
f = &content_features(i);
f->description = gettext("Wood Column");
@ -3263,6 +3324,59 @@ void content_mapnode_init(bool repeat)
f->onpunch_replace_node = CONTENT_BRICK_COLUMN_SQUARE;
f->onpunch_replace_respects_borderstone = true;
i = CONTENT_APPLEWOOD_COLUMN_CROSS;
f = &content_features(i);
f->setAllTextures("applewood.png");
f->param_type = CPT_LIGHT;
f->draw_type = CDT_NODEBOX;
f->is_ground_content = true;
f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_APPLEWOOD_COLUMN_SQUARE)+" 1";
f->air_equivalent = true; // grass grows underneath
f->light_propagates = true;
f->sunlight_propagates = true;
content_nodebox_column_cross(f);
f->type = CMT_WOOD;
f->dig_time = 0.75;
f->flammable = 1; // can be replaced by fire if the node under
// it is set on fire
f->onpunch_replace_node = CONTENT_APPLEWOOD_COLUMN_CROSS_BASE;
f->onpunch_replace_respects_borderstone = true;
i = CONTENT_APPLEWOOD_COLUMN_CROSS_BASE;
f = &content_features(i);
f->setAllTextures("applewood.png");
f->param_type = CPT_LIGHT;
f->draw_type = CDT_NODEBOX;
f->is_ground_content = true;
f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_APPLEWOOD_COLUMN_SQUARE)+" 1";
f->light_propagates = true;
f->sunlight_propagates = true;
content_nodebox_column_cross_base(f);
f->type = CMT_WOOD;
f->dig_time = 0.75;
f->flammable = 1; // can be replaced by fire if the node under
// it is set on fire
f->onpunch_replace_node = CONTENT_APPLEWOOD_COLUMN_CROSS_TOP;
f->onpunch_replace_respects_borderstone = true;
i = CONTENT_APPLEWOOD_COLUMN_CROSS_TOP;
f = &content_features(i);
f->setAllTextures("applewood.png");
f->param_type = CPT_LIGHT;
f->draw_type = CDT_NODEBOX;
f->is_ground_content = true;
f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_APPLEWOOD_COLUMN_SQUARE)+" 1";
f->air_equivalent = true; // grass grows underneath
f->light_propagates = true;
f->sunlight_propagates = true;
content_nodebox_column_cross_top(f);
f->type = CMT_WOOD;
f->dig_time = 0.75;
f->flammable = 1; // can be replaced by fire if the node under
// it is set on fire
f->onpunch_replace_node = CONTENT_APPLEWOOD_COLUMN_SQUARE;
f->onpunch_replace_respects_borderstone = true;
i = CONTENT_WOOD_COLUMN_CROSS;
f = &content_features(i);
f->setAllTextures("wood.png");

18
src/content_mapnode.h
View File

@ -180,7 +180,13 @@ MapNode mapnode_translate_to_internal(MapNode n_from, u8 version);
#define CONTENT_ROUGHSTONE_COLUMN_CROSS 0x0BC
#define CONTENT_ROUGHSTONE_COLUMN_CROSS_BASE 0x0BD
#define CONTENT_ROUGHSTONE_COLUMN_CROSS_TOP 0x0BE
// FREE 0x0BF-0x7F5
#define CONTENT_APPLEWOOD_COLUMN_SQUARE 0X0BF
#define CONTENT_APPLEWOOD_COLUMN_SQUARE_BASE 0X0C0
#define CONTENT_APPLEWOOD_COLUMN_SQUARE_TOP 0X0C1
#define CONTENT_APPLEWOOD_COLUMN_CROSS 0x0C2
#define CONTENT_APPLEWOOD_COLUMN_CROSS_BASE 0x0C3
#define CONTENT_APPLEWOOD_COLUMN_CROSS_TOP 0x0C4
// FREE 0x0C5-0x7F5
#define CONTENT_APPLEWOOD 0x7F6
#define CONTENT_LEAVES_SNOWY 0x7F7
#define CONTENT_TRIMMED_LEAVES_AUTUMN 0x7F8
@ -509,6 +515,7 @@ MapNode mapnode_translate_to_internal(MapNode n_from, u8 version);
#define CONTENT_SANDSTONE_STAIR 0xA26
#define CONTENT_COBBLE_STAIR 0xA27
#define CONTENT_LIMESTONE_STAIR 0xA28
#define CONTENT_APPLEWOOD_STAIR 0xA29
// upside down slabs
#define CONTENT_ROUGHSTONE_SLAB_UD 0xA40
#define CONTENT_MOSSYCOBBLE_SLAB_UD 0xA41
@ -537,6 +544,7 @@ MapNode mapnode_translate_to_internal(MapNode n_from, u8 version);
#define CONTENT_SANDSTONE_STAIR_UD 0xA66
#define CONTENT_COBBLE_STAIR_UD 0xA67
#define CONTENT_LIMESTONE_STAIR_UD 0xA68
#define CONTENT_APPLEWOOD_STAIR_UD 0xA69
// slab/stair masks
#define CONTENT_SLAB_STAIR_MIN 0xA00
#define CONTENT_SLAB_STAIR_MAX 0xA6F
@ -723,7 +731,13 @@ MapNode mapnode_translate_to_internal(MapNode n_from, u8 version);
#define CONTENT_SANDSTONE_INNER_STAIR_CORNER_UD 0xE21
#define CONTENT_COBBLE_INNER_STAIR_CORNER_UD 0xE22
#define CONTENT_LIMESTONE_INNER_STAIR_CORNER_UD 0xE23
// FREE E24-EFF
// applewood stairs' corners, inner and upside down
#define CONTENT_APPLEWOOD_STAIR_CORNER 0xE24
#define CONTENT_APPLEWOOD_INNER_STAIR_CORNER 0xE25
#define CONTENT_APPLEWOOD_STAIR_CORNER_UD 0xE26
#define CONTENT_APPLEWOOD_INNER_STAIR_CORNER_UD 0xE27
// FREE E28-EFF
// circuits
// circuits - wire

105
src/content_mapnode_stair.cpp
View File

@ -105,6 +105,26 @@ void content_mapnode_stair(bool repeat)
content_list_add("craftguide",i,1,0);
content_list_add("creative",i,1,0);
i = CONTENT_APPLEWOOD_STAIR;
f = &content_features(i);
f->description = gettext("Apple wood Stair");
f->param_type = CPT_FACEDIR_SIMPLE;
f->draw_type = CDT_STAIRLIKE;
f->setAllTextures("applewood.png");
f->is_ground_content = true;
f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
content_nodebox_stair(f);
f->setInventoryTextureNodeBox(i,"applewood.png", "applewood.png", "applewood.png");
f->flammable = 1; // can be replaced by fire if the node under it is set on fire
f->fuel_time = 30;
f->type = CMT_WOOD;
f->dig_time = 0.75;
f->onpunch_replace_node = CONTENT_APPLEWOOD_STAIR_CORNER;
f->onpunch_replace_respects_borderstone = true;
crafting::setStairRecipe(CONTENT_APPLEWOOD,CONTENT_APPLEWOOD_STAIR);
content_list_add("craftguide",i,1,0);
content_list_add("creative",i,1,0);
i = CONTENT_WOOD_STAIR;
f = &content_features(i);
f->description = gettext("Wood Stair");
@ -265,6 +285,23 @@ void content_mapnode_stair(bool repeat)
f->onpunch_replace_respects_borderstone = true;
f->suffocation_per_second = 0;
i = CONTENT_APPLEWOOD_STAIR_UD;
f = &content_features(i);
f->param_type = CPT_FACEDIR_SIMPLE;
f->setAllTextures("applewood.png");
f->draw_type = CDT_STAIRLIKE;
f->is_ground_content = true;
f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_APPLEWOOD_STAIR)+" 1";
content_nodebox_stairud(f);
f->setInventoryTextureNodeBox(i,"applewood.png", "applewood.png", "applewood.png");
f->flammable = 1; // can be replaced by fire if the node under it is set on fire
f->fuel_time = 30;
f->type = CMT_WOOD;
f->dig_time = 0.75;
f->onpunch_replace_node = CONTENT_APPLEWOOD_STAIR_CORNER_UD;
f->onpunch_replace_respects_borderstone = true;
f->suffocation_per_second = 0;
i = CONTENT_WOOD_STAIR_UD;
f = &content_features(i);
f->param_type = CPT_FACEDIR_SIMPLE;
@ -410,6 +447,23 @@ void content_mapnode_stair(bool repeat)
f->onpunch_replace_node = CONTENT_STONE_INNER_STAIR_CORNER;
f->onpunch_replace_respects_borderstone = true;
i = CONTENT_APPLEWOOD_STAIR_CORNER;
f = &content_features(i);
f->param_type = CPT_FACEDIR_SIMPLE;
f->draw_type = CDT_NODEBOX;
f->setAllTextures("applewood.png");
f->is_ground_content = true;
f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_APPLEWOOD_STAIR)+" 1";
content_nodebox_stair_corner(f);
f->setInventoryTextureNodeBox(i,"applewood.png","applewood.png","applewood.png");
f->flammable = 1; // can be replaced by fire if the node under
// it is set on fire
f->fuel_time = 30;
f->type = CMT_WOOD;
f->dig_time = 0.75;
f->onpunch_replace_node = CONTENT_APPLEWOOD_INNER_STAIR_CORNER;
f->onpunch_replace_respects_borderstone = true;
i = CONTENT_WOOD_STAIR_CORNER;
f = &content_features(i);
f->param_type = CPT_FACEDIR_SIMPLE;
@ -551,6 +605,23 @@ void content_mapnode_stair(bool repeat)
f->onpunch_replace_node = CONTENT_STONE_INNER_STAIR_CORNER_UD;
f->onpunch_replace_respects_borderstone = true;
i = CONTENT_APPLEWOOD_STAIR_CORNER_UD;
f = &content_features(i);
f->param_type = CPT_FACEDIR_SIMPLE;
f->draw_type = CDT_NODEBOX;
f->setAllTextures("applewood.png");
f->is_ground_content = true;
f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_APPLEWOOD_STAIR)+" 1";
content_nodebox_stair_cornerud(f);
f->setInventoryTextureNodeBox(i,"applewood.png","applewood.png","applewood.png");
f->flammable = 1; // can be replaced by fire if the node under
// it is set on fire
f->fuel_time = 30;
f->type = CMT_WOOD;
f->dig_time = 0.75;
f->onpunch_replace_node = CONTENT_APPLEWOOD_INNER_STAIR_CORNER_UD;
f->onpunch_replace_respects_borderstone = true;
i = CONTENT_WOOD_STAIR_CORNER_UD;
f = &content_features(i);
f->param_type = CPT_FACEDIR_SIMPLE;
@ -689,6 +760,23 @@ void content_mapnode_stair(bool repeat)
f->onpunch_replace_node = CONTENT_STONE_STAIR;
f->onpunch_replace_respects_borderstone = true;
i = CONTENT_APPLEWOOD_INNER_STAIR_CORNER;
f = &content_features(i);
f->param_type = CPT_FACEDIR_SIMPLE;
f->draw_type = CDT_NODEBOX;
f->setAllTextures("applewood.png");
f->is_ground_content = true;
f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_APPLEWOOD_STAIR)+" 1";
content_nodebox_inner_stair_corner(f);
f->setInventoryTextureNodeBox(i,"applewood.png","applewood.png","applewood.png");
f->flammable = 1; // can be replaced by fire if the node under
// it is set on fire
f->fuel_time = 30;
f->type = CMT_WOOD;
f->dig_time = 0.75;
f->onpunch_replace_node = CONTENT_APPLEWOOD_STAIR;
f->onpunch_replace_respects_borderstone = true;
i = CONTENT_WOOD_INNER_STAIR_CORNER;
f = &content_features(i);
f->param_type = CPT_FACEDIR_SIMPLE;
@ -831,6 +919,23 @@ void content_mapnode_stair(bool repeat)
f->onpunch_replace_node = CONTENT_STONE_STAIR_UD;
f->onpunch_replace_respects_borderstone = true;
i = CONTENT_APPLEWOOD_INNER_STAIR_CORNER_UD;
f = &content_features(i);
f->param_type = CPT_FACEDIR_SIMPLE;
f->draw_type = CDT_NODEBOX;
f->setAllTextures("applewood.png");
f->is_ground_content = true;
f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_APPLEWOOD_STAIR)+" 1";
content_nodebox_inner_stair_cornerud(f);
f->setInventoryTextureNodeBox(i,"applewood.png","applewood.png","applewood.png");
f->flammable = 1; // can be replaced by fire if the node under
// it is set on fire
f->fuel_time = 30;
f->type = CMT_WOOD;
f->dig_time = 0.75;
f->onpunch_replace_node = CONTENT_APPLEWOOD_STAIR_UD;
f->onpunch_replace_respects_borderstone = true;
i = CONTENT_WOOD_INNER_STAIR_CORNER_UD;
f = &content_features(i);
f->param_type = CPT_FACEDIR_SIMPLE;