voxelands
/
voxelands
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

reordering - wood blocks' recipes

master
Capricornus 2017-07-21 21:28:04 +02:00 committed by darkrose
parent 501c631395
commit df8b6463b0
3 changed files with 17 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/content_craft.cpp
View File

@ -712,6 +712,17 @@ void setShortsRecipe(u16 input, u16 result)
};
setRecipe(r,result,1);
}
// 4 spaced input yelds 1 result
void set4SpacedTo1Recipe(u16 input, u16 result)
{
u16 r[9] = {
input, CONTENT_IGNORE, input,
CONTENT_IGNORE, CONTENT_IGNORE, CONTENT_IGNORE,
input, CONTENT_IGNORE, input
};
setRecipe(r,result,1);
}
InventoryItem *getResult(InventoryItem **items, Player *player, Server *server)
{

2
src/content_craft.h
View File

@ -279,6 +279,8 @@ namespace crafting {
void setShoesRecipe(u16 input, u16 result);
// pants recipe 5 input in an upside-down V yields one result
void setShortsRecipe(u16 input, u16 result);
// 4 spaced input yelds 1 result
void set4SpacedTo1Recipe(u16 input, u16 result);
InventoryItem *getResult(InventoryItem **items, Player *player, Server *server);
content_t *getRecipe(InventoryItem *item);

40
src/content_mapnode.cpp
View File

@ -1276,15 +1276,7 @@ void content_mapnode_init(bool repeat)
f->type = CMT_WOOD;
f->dig_time = 0.75;
crafting::set1To4Recipe(CONTENT_TREE,CONTENT_WOOD);
//crafting::setSoftBlockRecipe(CONTENT_CRAFTITEM_WOOD_PLANK,CONTENT_WOOD);
{
u16 r[9] = {
CONTENT_CRAFTITEM_WOOD_PLANK, CONTENT_IGNORE, CONTENT_CRAFTITEM_WOOD_PLANK,
CONTENT_IGNORE, CONTENT_IGNORE, CONTENT_IGNORE,
CONTENT_CRAFTITEM_WOOD_PLANK, CONTENT_IGNORE, CONTENT_CRAFTITEM_WOOD_PLANK
};
crafting::setRecipe(r,CONTENT_WOOD,1);
}
crafting::set4SpacedTo1Recipe(CONTENT_CRAFTITEM_WOOD_PLANK,CONTENT_WOOD);
content_list_add("craftguide",i,1,0);
content_list_add("creative",i,1,0);
@ -1301,15 +1293,7 @@ void content_mapnode_init(bool repeat)
f->type = CMT_WOOD;
f->dig_time = 0.75;
crafting::set1To4Recipe(CONTENT_APPLE_TREE,CONTENT_APPLEWOOD);
//crafting::setSoftBlockRecipe(CONTENT_CRAFTITEM_APPLE_PLANK,CONTENT_APPLEWOOD);
{
u16 r[9] = {
CONTENT_CRAFTITEM_APPLE_PLANK, CONTENT_IGNORE, CONTENT_CRAFTITEM_APPLE_PLANK,
CONTENT_IGNORE, CONTENT_IGNORE, CONTENT_IGNORE,
CONTENT_CRAFTITEM_APPLE_PLANK, CONTENT_IGNORE, CONTENT_CRAFTITEM_APPLE_PLANK
};
crafting::setRecipe(r,CONTENT_APPLEWOOD,1);
}
crafting::set4SpacedTo1Recipe(CONTENT_CRAFTITEM_APPLE_PLANK,CONTENT_APPLEWOOD);
content_list_add("craftguide",i,1,0);
content_list_add("creative",i,1,0);
@ -1326,15 +1310,7 @@ void content_mapnode_init(bool repeat)
f->type = CMT_WOOD;
f->dig_time = 0.75;
crafting::set1To4Recipe(CONTENT_JUNGLETREE,CONTENT_JUNGLEWOOD);
//crafting::setSoftBlockRecipe(CONTENT_CRAFTITEM_JUNGLE_PLANK,CONTENT_JUNGLEWOOD);
{
u16 r[9] = {
CONTENT_CRAFTITEM_JUNGLE_PLANK, CONTENT_IGNORE, CONTENT_CRAFTITEM_JUNGLE_PLANK,
CONTENT_IGNORE, CONTENT_IGNORE, CONTENT_IGNORE,
CONTENT_CRAFTITEM_JUNGLE_PLANK, CONTENT_IGNORE, CONTENT_CRAFTITEM_JUNGLE_PLANK
};
crafting::setRecipe(r,CONTENT_JUNGLEWOOD,1);
}
crafting::set4SpacedTo1Recipe(CONTENT_CRAFTITEM_JUNGLE_PLANK,CONTENT_JUNGLEWOOD);
content_list_add("craftguide",i,1,0);
content_list_add("creative",i,1,0);
@ -1351,15 +1327,7 @@ void content_mapnode_init(bool repeat)
f->type = CMT_WOOD;
f->dig_time = 0.5;
crafting::set1To4Recipe(CONTENT_CONIFER_TREE,CONTENT_WOOD_PINE);
//crafting::setSoftBlockRecipe(CONTENT_CRAFTITEM_PINE_PLANK,CONTENT_WOOD_PINE);
{
u16 r[9] = {
CONTENT_CRAFTITEM_PINE_PLANK, CONTENT_IGNORE, CONTENT_CRAFTITEM_PINE_PLANK,
CONTENT_IGNORE, CONTENT_IGNORE, CONTENT_IGNORE,
CONTENT_CRAFTITEM_PINE_PLANK, CONTENT_IGNORE, CONTENT_CRAFTITEM_PINE_PLANK
};
crafting::setRecipe(r,CONTENT_WOOD_PINE,1);
}
crafting::set4SpacedTo1Recipe(CONTENT_CRAFTITEM_PINE_PLANK,CONTENT_WOOD_PINE);
content_list_add("craftguide",i,1,0);
content_list_add("creative",i,1,0);