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

Added paintings...

This commit is contained in:
Pentium44 2014-03-10 20:47:13 +08:00 committed by darkrose
parent 3be300a5ad
commit f1bc0ea318
4 changed files with 56 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
data/textures/painting.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 429 B

BIN
data/textures/painting_white.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 482 B

47
src/content_mapnode.cpp
View File

@ -772,6 +772,19 @@ static void content_mapnode_nodebox_guide(ContentFeatures *f)
));
}
// Painting nodebox - easy access!
static void content_mapnode_nodebox_painting(ContentFeatures *f)
{
f->setNodeBox(core::aabbox3d<f32>(
-0.437500*BS,
-0.375000*BS,
0.437500*BS,
0.437500*BS,
0.375000*BS,
0.500000*BS
));
}
static void content_mapnode_nodebox_book(ContentFeatures *f)
{
// lower cover
@ -8180,4 +8193,38 @@ void content_mapnode_init()
content_mapnode_nodebox_bed_foot(f);
f->type = CMT_WOOD;
f->hardness = 0.25;
// Paintings
i = CONTENT_PAINTING_WHITE;
f = &content_features(i);
f->description = std::string("White Painting");
f->setAllTextures("painting.png");
f->setTexture(4, "painting.png");
f->setTexture(5, "painting_white.png");
f->setInventoryTexture("painting_white.png");
f->param_type = CPT_LIGHT;
f->param2_type = CPT_FACEDIR_SIMPLE;
f->draw_type = CDT_NODEBOX;
f->light_propagates = true;
f->sunlight_propagates = true;
f->solidness = 0; // drawn separately, makes no faces
f->walkable = false;
//f->wall_mounted = true;
f->air_equivalent = true;
f->flammable = 1; // can be replaced by fire if the node under it is set on fire
f->fuel_time = 1;
f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_PAINTING_WHITE)+" 1";
f->type = CMT_WOOD;
content_mapnode_nodebox_painting(f);
f->hardness = 0.1;
{
u16 r[9] = {
CONTENT_CRAFTITEM_STICK, CONTENT_CRAFTITEM_STICK, CONTENT_CRAFTITEM_STICK,
CONTENT_CRAFTITEM_STICK, CONTENT_CRAFTITEM_DYE_WHITE, CONTENT_CRAFTITEM_STICK,
CONTENT_CRAFTITEM_STICK, CONTENT_CRAFTITEM_STICK, CONTENT_CRAFTITEM_STICK
};
crafting::setRecipe(r,CONTENT_PAINTING_WHITE,1);
}
lists::add("craftguide",i);
lists::add("creative",i);
}

10
src/content_mapnode.h
View File

@ -439,10 +439,18 @@ MapNode mapnode_translate_to_internal(MapNode n_from, u8 version);
#define CONTENT_BED_MIN 0xC10
#define CONTENT_BED_MAX 0xC1F
#define CONTENT_BED_FOOT_MASK 0x001
// FREE C20-CFF
// FREE C25-CFF
// D00-DFF - play space for other devs and experiments
// paintings D00 - D04
//#define CONTENT_PAINTING_RED 0xD00
//#define CONTENT_PAINTING_BLUE 0xD01
//#define CONTENT_PAINTING_GREEN 0xD02
//#define CONTENT_PAINTING_YELLOW 0xD03
#define CONTENT_PAINTING_WHITE 0xD04
// FREE E00-FFF
#endif