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

proper upgrade items

master
darkrose 2017-07-29 21:59:55 +10:00
parent f95db8f184
commit 22e0d8595d
7 changed files with 75 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

64
src/content_craftitem.cpp
View File

@ -1654,4 +1654,68 @@ void content_craftitem_init()
f->hunger_effect = 10;
f->health_effect = 10;
content_list_add("creative",i,1,0);
i = CONTENT_CRAFTITEM_UPGRADE_STORAGE;
f = &g_content_craftitem_features[(i&~CONTENT_CRAFTITEM_MASK)];
f->content = CONTENT_CRAFTITEM_UPGRADE_STORAGE;
f->texture = "upgrade_storage.png";
f->name = "upgrade_storage";
f->description = gettext("Storage Upgrade");
crafting::set1To1Recipe(CONTENT_CHEST,CONTENT_CRAFTITEM_UPGRADE_STORAGE);
crafting::set1To1Recipe(CONTENT_CHEST_APPLE,CONTENT_CRAFTITEM_UPGRADE_STORAGE);
crafting::set1To1Recipe(CONTENT_CHEST_JUNGLE,CONTENT_CRAFTITEM_UPGRADE_STORAGE);
crafting::set1To1Recipe(CONTENT_CHEST_PINE,CONTENT_CRAFTITEM_UPGRADE_STORAGE);
{
u16 r[9] = {
CONTENT_IGNORE, CONTENT_CRAFTITEM_PAPER, CONTENT_IGNORE,
CONTENT_CRAFTITEM_PAPER, CONTENT_CHEST, CONTENT_CRAFTITEM_PAPER,
CONTENT_IGNORE, CONTENT_CRAFTITEM_PAPER, CONTENT_IGNORE
};
/* why 3? because I couldn't decide between 2 and 4 */
crafting::setRecipe(r,CONTENT_CRAFTITEM_UPGRADE_STORAGE,3);
}
{
u16 r[9] = {
CONTENT_IGNORE, CONTENT_CRAFTITEM_PAPER, CONTENT_IGNORE,
CONTENT_CRAFTITEM_PAPER, CONTENT_CHEST_APPLE, CONTENT_CRAFTITEM_PAPER,
CONTENT_IGNORE, CONTENT_CRAFTITEM_PAPER, CONTENT_IGNORE
};
crafting::setRecipe(r,CONTENT_CRAFTITEM_UPGRADE_STORAGE,3);
}
{
u16 r[9] = {
CONTENT_IGNORE, CONTENT_CRAFTITEM_PAPER, CONTENT_IGNORE,
CONTENT_CRAFTITEM_PAPER, CONTENT_CHEST_JUNGLE, CONTENT_CRAFTITEM_PAPER,
CONTENT_IGNORE, CONTENT_CRAFTITEM_PAPER, CONTENT_IGNORE
};
crafting::setRecipe(r,CONTENT_CRAFTITEM_UPGRADE_STORAGE,3);
}
{
u16 r[9] = {
CONTENT_IGNORE, CONTENT_CRAFTITEM_PAPER, CONTENT_IGNORE,
CONTENT_CRAFTITEM_PAPER, CONTENT_CHEST_PINE, CONTENT_CRAFTITEM_PAPER,
CONTENT_IGNORE, CONTENT_CRAFTITEM_PAPER, CONTENT_IGNORE
};
crafting::setRecipe(r,CONTENT_CRAFTITEM_UPGRADE_STORAGE,3);
}
content_list_add("craftguide",i,1,0);
content_list_add("creative",i,1,0);
i = CONTENT_CRAFTITEM_UPGRADE_EXO;
f = &g_content_craftitem_features[(i&~CONTENT_CRAFTITEM_MASK)];
f->content = CONTENT_CRAFTITEM_UPGRADE_EXO;
f->texture = "upgrade_exo.png";
f->name = "upgrade_exo";
f->description = gettext("Exo Upgrade");
crafting::set1To1Recipe(CONTENT_CRAFTITEM_OERKKI_DUST,CONTENT_CRAFTITEM_UPGRADE_EXO);
{
u16 r[9] = {
CONTENT_IGNORE, CONTENT_CRAFTITEM_PAPER, CONTENT_IGNORE,
CONTENT_CRAFTITEM_PAPER, CONTENT_CRAFTITEM_OERKKI_DUST, CONTENT_CRAFTITEM_PAPER,
CONTENT_IGNORE, CONTENT_CRAFTITEM_PAPER, CONTENT_IGNORE
};
crafting::setRecipe(r,CONTENT_CRAFTITEM_UPGRADE_EXO,3);
}
content_list_add("craftguide",i,1,0);
content_list_add("creative",i,1,0);
}

2
src/content_craftitem.h
View File

@ -220,5 +220,7 @@ CraftItemFeatures *content_craftitem_features(content_t i);
#define CONTENT_CRAFTITEM_OERKKI_DUST_SPACE (CONTENT_CRAFTITEM_MASK | 0x88)
#define CONTENT_CRAFTITEM_BLUEBERRY (CONTENT_CRAFTITEM_MASK | 0x89)
#define CONTENT_CRAFTITEM_RASPBERRY (CONTENT_CRAFTITEM_MASK | 0x8A)
#define CONTENT_CRAFTITEM_UPGRADE_STORAGE (CONTENT_CRAFTITEM_MASK | 0x8B)
#define CONTENT_CRAFTITEM_UPGRADE_EXO (CONTENT_CRAFTITEM_MASK | 0x8C)
#endif

1
src/environment.cpp
View File

@ -1380,6 +1380,7 @@ void ServerEnvironment::step(float dtime)
* 1 - spring grass
* 2 - autumn grass
* 4 - snow
* 6 - polluted
* 8 - jungle grass
*
* param2:

8
src/nodemeta/content_nodemeta_cooking.cpp
View File

@ -1001,7 +1001,7 @@ void CrusherNodeMetadata::inventoryModified()
itm = l->getItem(i);
if (!itm)
continue;
if (itm->getContent() == CONTENT_CHEST) {
if (itm->getContent() == CONTENT_CRAFTITEM_UPGRADE_STORAGE) {
if (m_is_expanded) {
b[0] = 1;
continue;
@ -1042,7 +1042,7 @@ void CrusherNodeMetadata::inventoryModified()
a[2] = 0;
b[1] = 1;
m_is_locked = true;
}else if (itm->getContent() == CONTENT_CRAFTITEM_OERKKI_DUST) {
}else if (itm->getContent() == CONTENT_CRAFTITEM_UPGRADE_EXO) {
if (m_is_exo) {
b[2] = 1;
continue;
@ -1105,11 +1105,11 @@ void CrusherNodeMetadata::inventoryModified()
l->clearAllowed();
if (a[0])
l->addAllowed(CONTENT_CHEST);
l->addAllowed(CONTENT_CRAFTITEM_UPGRADE_STORAGE);
if (a[1])
l->addAllowed(CONTENT_CRAFTITEM_PADLOCK);
if (a[2])
l->addAllowed(CONTENT_CRAFTITEM_OERKKI_DUST);
l->addAllowed(CONTENT_CRAFTITEM_UPGRADE_EXO);
}
bool CrusherNodeMetadata::step(float dtime, v3s16 pos, ServerEnvironment *env)
{

8
src/nodemeta/content_nodemeta_storage.cpp
View File

@ -145,7 +145,7 @@ void ChestNodeMetadata::inventoryModified()
itm = l->getItem(i);
if (!itm)
continue;
if (itm->getContent() == CONTENT_CHEST) {
if (itm->getContent() == CONTENT_CRAFTITEM_UPGRADE_STORAGE) {
if (m_is_expanded) {
b[0] = 1;
continue;
@ -185,7 +185,7 @@ void ChestNodeMetadata::inventoryModified()
a[2] = 0;
b[1] = 1;
m_is_locked = true;
}else if (itm->getContent() == CONTENT_CRAFTITEM_OERKKI_DUST) {
}else if (itm->getContent() == CONTENT_CRAFTITEM_UPGRADE_EXO) {
if (m_is_exo) {
b[2] = 1;
continue;
@ -248,11 +248,11 @@ void ChestNodeMetadata::inventoryModified()
l->clearAllowed();
if (a[0])
l->addAllowed(CONTENT_CHEST);
l->addAllowed(CONTENT_CRAFTITEM_UPGRADE_STORAGE);
if (a[1])
l->addAllowed(CONTENT_CRAFTITEM_PADLOCK);
if (a[2])
l->addAllowed(CONTENT_CRAFTITEM_OERKKI_DUST);
l->addAllowed(CONTENT_CRAFTITEM_UPGRADE_EXO);
}
bool ChestNodeMetadata::nodeRemovalDisabled()
{