+ sandstone

This commit is contained in:
Nils Dagsson Moskopp 2011-05-28 02:17:19 +02:00
parent acd7ce897d
commit e76f4155d5
7 changed files with 27 additions and 5 deletions

View File

@ -1,6 +1 @@
c37bcfd89dd627fdb131ae3f77fcaab02721bf76 working
69547bd6be420eb40f55524fd2131cbbaa2e0e29 110107195706-exp
e3c3c8e27bbc8c9b61710517a78944deb1c61696 110211211322
23880c78e40c50ad54fcd8844510f7a423b37f2a 110212200513
20c49c98c92a62df457b773c562df41d4167492b 110214175330
10be2b71f965585af90af96903e83b4ddff52bf9 20110424_0

BIN
data/sandstone.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 772 B

View File

@ -181,6 +181,14 @@ void init_mapnode()
f->is_ground_content = true;
f->dug_item = std::string("MaterialItem ")+itos(i)+" 1";
i = CONTENT_SANDSTONE;
f = &g_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("MaterialItem ")+itos(CONTENT_SAND)+" 1";
i = CONTENT_TREE;
f = &g_content_features[i];
f->setAllTextures("tree.png");

View File

@ -101,6 +101,7 @@ void init_content_inventory_texture_paths();
#define CONTENT_STEEL 19
#define CONTENT_GLASS 20
#define CONTENT_FENCE 21
#define CONTENT_SANDSTONE 22
/*
Content feature list

View File

@ -59,6 +59,7 @@ void initializeMaterialProperties()
*/
setStoneLikeDiggingProperties(CONTENT_STONE, 1.0);
setStoneLikeDiggingProperties(CONTENT_SANDSTONE, 1.0);
setStoneLikeDiggingProperties(CONTENT_MESE, 0.5);
setStoneLikeDiggingProperties(CONTENT_COALSTONE, 1.5);
setStoneLikeDiggingProperties(CONTENT_FURNACE, 3.0);

View File

@ -3972,6 +3972,21 @@ void Server::UpdateCrafting(u16 peer_id)
found = true;
}
}
// Sandstone
if(!found)
{
ItemSpec specs[9];
specs[3] = ItemSpec(ITEM_MATERIAL, CONTENT_SAND);
specs[4] = ItemSpec(ITEM_MATERIAL, CONTENT_SAND);
specs[6] = ItemSpec(ITEM_MATERIAL, CONTENT_SAND);
specs[7] = ItemSpec(ITEM_MATERIAL, CONTENT_SAND);
if(checkItemCombination(items, specs))
{
rlist->addItem(new MaterialItem(CONTENT_SANDSTONE, 1));
found = true;
}
}
}
} // if creative_mode == false
@ -4060,6 +4075,7 @@ void setCreativeInventory(Player *player)
CONTENT_MUD,
CONTENT_STONE,
CONTENT_SAND,
CONTENT_SANDSTONE,
CONTENT_TREE,
CONTENT_LEAVES,
CONTENT_GLASS,

View File

@ -506,6 +506,7 @@ void TextureSource::buildMainAtlas()
sourcelist.push_back("stone.png");
sourcelist.push_back("mud.png");
sourcelist.push_back("sand.png");
sourcelist.push_back("sandstone.png");
sourcelist.push_back("grass.png");
sourcelist.push_back("grass_footsteps.png");
sourcelist.push_back("tree.png");