#include <sstream>
#include "main.h"
#include "serverobject.h"
+#include "content_mapnode.h"
+#include "content_inventory.h"
+#include "content_sao.h"
+#include "player.h"
+#include "log.h"
+#include "mapnode_contentfeatures.h"
/*
InventoryItem
{
}
+content_t content_translate_from_19_to_internal(content_t c_from)
+{
+ for(u32 i=0; i<sizeof(trans_table_19)/sizeof(trans_table_19[0]); i++)
+ {
+ if(trans_table_19[i][1] == c_from)
+ {
+ return trans_table_19[i][0];
+ }
+ }
+ return c_from;
+}
+
InventoryItem* InventoryItem::deSerialize(std::istream &is)
{
DSTACK(__FUNCTION_NAME);
is>>material;
u16 count;
is>>count;
- if(material > 255)
+ // Convert old materials
+ if(material <= 0xff)
+ {
+ material = content_translate_from_19_to_internal(material);
+ }
+ if(material > MAX_CONTENT)
+ throw SerializationError("Too large material number");
+ return new MaterialItem(material, count);
+ }
+ else if(name == "MaterialItem2")
+ {
+ u16 material;
+ is>>material;
+ u16 count;
+ is>>count;
+ if(material > MAX_CONTENT)
throw SerializationError("Too large material number");
return new MaterialItem(material, count);
}
{
std::string inventorystring;
std::getline(is, inventorystring, '|');
- return new MapBlockObjectItem(inventorystring);
+ throw SerializationError("MBOItem not supported anymore");
}
else if(name == "CraftItem")
{
}
else
{
- dstream<<"Unknown InventoryItem name=\""<<name<<"\""<<std::endl;
+ infostream<<"Unknown InventoryItem name=\""<<name<<"\""<<std::endl;
throw SerializationError("Unknown InventoryItem name");
}
}
+std::string InventoryItem::getItemString() {
+ // Get item string
+ std::ostringstream os(std::ios_base::binary);
+ serialize(os);
+ return os.str();
+}
+
ServerActiveObject* InventoryItem::createSAO(ServerEnvironment *env, u16 id, v3f pos)
{
/*
Create an ItemSAO
*/
- // Get item string
- std::ostringstream os(std::ios_base::binary);
- serialize(os);
+ pos.Y -= BS*0.25; // let it drop a bit
+ // Randomize a bit
+ pos.X += BS*0.2*(float)myrand_range(-1000,1000)/1000.0;
+ pos.Z += BS*0.2*(float)myrand_range(-1000,1000)/1000.0;
// Create object
- ServerActiveObject *obj = new ItemSAO(env, 0, pos, os.str());
+ ServerActiveObject *obj = new ItemSAO(env, pos, getItemString());
return obj;
}
MaterialItem
*/
-bool MaterialItem::isCookable()
+#ifndef SERVER
+video::ITexture * MaterialItem::getImage() const
{
- if(m_content == CONTENT_TREE)
- {
- return true;
- }
- else if(m_content == CONTENT_COBBLE)
- {
- return true;
- }
- return false;
+ return content_features(m_content).inventory_texture;
}
+#endif
-InventoryItem *MaterialItem::createCookResult()
+bool MaterialItem::isCookable() const
{
- if(m_content == CONTENT_TREE)
- {
- return new CraftItem("lump_of_coal", 1);
- }
- else if(m_content == CONTENT_COBBLE)
- {
- return new MaterialItem(CONTENT_STONE, 1);
- }
- return NULL;
+ return item_material_is_cookable(m_content);
+}
+
+InventoryItem *MaterialItem::createCookResult() const
+{
+ return item_material_create_cook_result(m_content);
}
/*
*/
#ifndef SERVER
-video::ITexture * CraftItem::getImage()
+video::ITexture * CraftItem::getImage() const
{
if(g_texturesource == NULL)
return NULL;
- std::string name;
+ std::string name = item_craft_get_image_name(m_subname);
- if(m_subname == "Stick")
- name = "stick.png";
- else if(m_subname == "lump_of_coal")
- name = "lump_of_coal.png";
- else if(m_subname == "lump_of_iron")
- name = "lump_of_iron.png";
- else if(m_subname == "steel_ingot")
- name = "steel_ingot.png";
- else if(m_subname == "rat")
- name = "rat.png";
- else
- name = "cloud.png";
-
// Get such a texture
- //return g_irrlicht->getTexture(name);
return g_texturesource->getTextureRaw(name);
}
#endif
ServerActiveObject* CraftItem::createSAO(ServerEnvironment *env, u16 id, v3f pos)
{
// Special cases
- if(m_subname == "rat")
- {
- ServerActiveObject *obj = new RatSAO(env, id, pos);
+ ServerActiveObject *obj = item_craft_create_object(m_subname, env, pos);
+ if(obj)
return obj;
- }
// Default
- else
- {
- return InventoryItem::createSAO(env, id, pos);
- }
+ return InventoryItem::createSAO(env, id, pos);
}
-bool CraftItem::isCookable()
+u16 CraftItem::getDropCount() const
{
- if(m_subname == "lump_of_iron")
- {
- return true;
- }
- return false;
+ // Special cases
+ s16 dc = item_craft_get_drop_count(m_subname);
+ if(dc != -1)
+ return dc;
+ // Default
+ return InventoryItem::getDropCount();
}
-InventoryItem *CraftItem::createCookResult()
+bool CraftItem::isCookable() const
{
- if(m_subname == "lump_of_iron")
- {
- return new CraftItem("steel_ingot", 1);
- }
- return NULL;
+ return item_craft_is_cookable(m_subname);
}
-/*
- MapBlockObjectItem
- TODO: Remove
-*/
-#ifndef SERVER
-video::ITexture * MapBlockObjectItem::getImage()
-{
- if(m_inventorystring.substr(0,3) == "Rat")
- return g_texturesource->getTextureRaw("rat.png");
-
- if(m_inventorystring.substr(0,4) == "Sign")
- return g_texturesource->getTextureRaw("sign.png");
-
- return NULL;
-}
-#endif
-std::string MapBlockObjectItem::getText()
+InventoryItem *CraftItem::createCookResult() const
{
- if(m_inventorystring.substr(0,3) == "Rat")
- return "";
-
- if(m_inventorystring.substr(0,4) == "Sign")
- return "";
-
- return "obj";
+ return item_craft_create_cook_result(m_subname);
}
-MapBlockObject * MapBlockObjectItem::createObject
- (v3f pos, f32 player_yaw, f32 player_pitch)
+bool CraftItem::use(ServerEnvironment *env, ServerActiveObject *user)
{
- std::istringstream is(m_inventorystring);
- std::string name;
- std::getline(is, name, ' ');
+ if(!item_craft_is_eatable(m_subname))
+ return false;
- if(name == "None")
- {
- return NULL;
- }
- else if(name == "Sign")
- {
- std::string text;
- std::getline(is, text, '|');
- SignObject *obj = new SignObject(NULL, -1, pos);
- obj->setText(text);
- obj->setYaw(-player_yaw);
- return obj;
- }
- else if(name == "Rat")
- {
- RatObject *obj = new RatObject(NULL, -1, pos);
- return obj;
- }
- else if(name == "ItemObj")
- {
- /*
- Now we are an inventory item containing the serialization
- string of an object that contains the serialization
- string of an inventory item. Fuck this.
- */
- //assert(0);
- dstream<<__FUNCTION_NAME<<": WARNING: Ignoring ItemObj "
- <<"because an item-object should never be inside "
- <<"an object-item."<<std::endl;
- return NULL;
- }
- else
- {
- return NULL;
- }
+ u16 result_count = getCount() - 1; // Eat one at a time
+ s16 hp_change = item_craft_eat_hp_change(m_subname);
+ s16 hp = user->getHP();
+ hp += hp_change;
+ if(hp < 0)
+ hp = 0;
+ user->setHP(hp);
+
+ if(result_count < 1)
+ return true;
+
+ setCount(result_count);
+ return false;
}
/*
m_name = name;
m_size = size;
clearItems();
+ //m_dirty = false;
}
InventoryList::~InventoryList()
{
m_items.push_back(NULL);
}
+
+ //setDirty(true);
}
-void InventoryList::serialize(std::ostream &os)
+void InventoryList::serialize(std::ostream &os) const
{
//os.imbue(std::locale("C"));
m_items[i] = item->clone();
}
}
+ //setDirty(true);
return *this;
}
-std::string InventoryList::getName()
+const std::string &InventoryList::getName() const
{
return m_name;
}
return getSize() - getUsedSlots();
}
+const InventoryItem * InventoryList::getItem(u32 i) const
+{
+ if(i > m_items.size() - 1)
+ return NULL;
+ return m_items[i];
+}
+
InventoryItem * InventoryList::getItem(u32 i)
{
if(i > m_items.size() - 1)
InventoryItem *olditem = m_items[i];
m_items[i] = newitem;
+ //setDirty(true);
return olditem;
}
if(newitem == NULL)
return NULL;
+ //setDirty(true);
+
// If it is an empty position, it's an easy job.
- InventoryItem *to_item = m_items[i];
+ InventoryItem *to_item = getItem(i);
if(to_item == NULL)
{
m_items[i] = newitem;
}
}
-bool InventoryList::itemFits(u32 i, InventoryItem *newitem)
+bool InventoryList::itemFits(const u32 i, const InventoryItem *newitem)
{
// If it is an empty position, it's an easy job.
- InventoryItem *to_item = m_items[i];
+ const InventoryItem *to_item = getItem(i);
if(to_item == NULL)
{
return true;
}
- // If not addable, return the item
+ // If not addable, fail
if(newitem->addableTo(to_item) == false)
return false;
- // If the item fits fully in the slot, add counter and delete it
+ // If the item fits fully in the slot, pass
if(newitem->getCount() <= to_item->freeSpace())
{
return true;
return false;
}
+bool InventoryList::roomForItem(const InventoryItem *item)
+{
+ for(u32 i=0; i<m_items.size(); i++)
+ if(itemFits(i, item))
+ return true;
+ return false;
+}
+
+bool InventoryList::roomForCookedItem(const InventoryItem *item)
+{
+ if(!item)
+ return false;
+ const InventoryItem *cook = item->createCookResult();
+ if(!cook)
+ return false;
+ bool room = roomForItem(cook);
+ delete cook;
+ return room;
+}
+
InventoryItem * InventoryList::takeItem(u32 i, u32 count)
{
if(count == 0)
return NULL;
+
+ //setDirty(true);
- InventoryItem *item = m_items[i];
+ InventoryItem *item = getItem(i);
// If it is an empty position, return NULL
if(item == NULL)
return NULL;
return *this;
}
-void Inventory::serialize(std::ostream &os)
+void Inventory::serialize(std::ostream &os) const
{
for(u32 i=0; i<m_lists.size(); i++)
{
return m_lists[i];
}
-s32 Inventory::getListIndex(const std::string &name)
+const InventoryList * Inventory::getList(const std::string &name) const
+{
+ s32 i = getListIndex(name);
+ if(i == -1)
+ return NULL;
+ return m_lists[i];
+}
+
+const s32 Inventory::getListIndex(const std::string &name) const
{
for(u32 i=0; i<m_lists.size(); i++)
{
return a;
}
-void IMoveAction::apply(InventoryContext *c, InventoryManager *mgr)
+static std::string describeC(const struct InventoryContext *c)
{
-#if 1
-
- /*dstream<<"from_inv="<<from_inv<<" to_inv="<<to_inv<<std::endl;
- dstream<<"from_list="<<from_list<<" to_list="<<to_list<<std::endl;
- dstream<<"from_i="<<from_i<<" to_i="<<to_i<<std::endl;*/
+ if(c->current_player == NULL)
+ return "current_player=NULL";
+ else
+ return std::string("current_player=") + c->current_player->getName();
+}
+void IMoveAction::apply(InventoryContext *c, InventoryManager *mgr)
+{
Inventory *inv_from = mgr->getInventory(c, from_inv);
Inventory *inv_to = mgr->getInventory(c, to_inv);
-
- if(!inv_from || !inv_to)
- {
- dstream<<__FUNCTION_NAME<<": Operation not allowed "
- <<"(inventories not found)"<<std::endl;
+
+ if(!inv_from){
+ infostream<<"IMoveAction::apply(): FAIL: source inventory not found: "
+ <<"context=["<<describeC(c)<<"], from_inv=\""<<from_inv<<"\""
+ <<", to_inv=\""<<to_inv<<"\""<<std::endl;
+ return;
+ }
+ if(!inv_to){
+ infostream<<"IMoveAction::apply(): FAIL: destination inventory not found: "
+ "context=["<<describeC(c)<<"], from_inv=\""<<from_inv<<"\""
+ <<", to_inv=\""<<to_inv<<"\""<<std::endl;
return;
}
InventoryList *list_from = inv_from->getList(from_list);
InventoryList *list_to = inv_to->getList(to_list);
- /*dstream<<"list_from="<<list_from<<" list_to="<<list_to
- <<std::endl;*/
- /*if(list_from)
- dstream<<" list_from->getItem(from_i)="<<list_from->getItem(from_i)
- <<std::endl;
- if(list_to)
- dstream<<" list_to->getItem(to_i)="<<list_to->getItem(to_i)
- <<std::endl;*/
-
/*
If a list doesn't exist or the source item doesn't exist
*/
- if(!list_from || !list_to)
- {
- dstream<<__FUNCTION_NAME<<": Operation not allowed "
- <<"(a list doesn't exist)"
- <<std::endl;
+ if(!list_from){
+ infostream<<"IMoveAction::apply(): FAIL: source list not found: "
+ <<"context=["<<describeC(c)<<"], from_inv=\""<<from_inv<<"\""
+ <<", from_list=\""<<from_list<<"\""<<std::endl;
+ return;
+ }
+ if(!list_to){
+ infostream<<"IMoveAction::apply(): FAIL: destination list not found: "
+ <<"context=["<<describeC(c)<<"], to_inv=\""<<to_inv<<"\""
+ <<", to_list=\""<<to_list<<"\""<<std::endl;
return;
}
if(list_from->getItem(from_i) == NULL)
{
- dstream<<__FUNCTION_NAME<<": Operation not allowed "
- <<"(the source item doesn't exist)"
- <<std::endl;
+ infostream<<"IMoveAction::apply(): FAIL: source item not found: "
+ <<"context=["<<describeC(c)<<"], from_inv=\""<<from_inv<<"\""
+ <<", from_list=\""<<from_list<<"\""
+ <<" from_i="<<from_i<<std::endl;
return;
}
/*
*/
if(inv_from == inv_to && list_from == list_to && from_i == to_i)
{
- dstream<<__FUNCTION_NAME<<": Operation not allowed "
- <<"(source and the destination slots are the same)"<<std::endl;
+ infostream<<"IMoveAction::apply(): FAIL: source and destination slots "
+ <<"are the same: inv=\""<<from_inv<<"\" list=\""<<from_list
+ <<"\" i="<<from_i<<std::endl;
return;
}
mgr->inventoryModified(c, from_inv);
if(from_inv != to_inv)
mgr->inventoryModified(c, to_inv);
-#endif
+
+ infostream<<"IMoveAction::apply(): moved at "
+ <<"["<<describeC(c)<<"]"
+ <<" from inv=\""<<from_inv<<"\""
+ <<" list=\""<<from_list<<"\""
+ <<" i="<<from_i
+ <<" to inv=\""<<to_inv<<"\""
+ <<" list=\""<<to_list<<"\""
+ <<" i="<<to_i
+ <<std::endl;
}
/*
Craft checking system
*/
-bool ItemSpec::checkItem(InventoryItem *item)
+bool ItemSpec::checkItem(const InventoryItem *item) const
{
if(type == ITEM_NONE)
{
return true;
}
-bool checkItemCombination(InventoryItem **items, ItemSpec *specs)
+bool checkItemCombination(InventoryItem const * const *items, const ItemSpec *specs)
{
u16 items_min_x = 100;
u16 items_max_x = 100;
u16 items_y = items_min_y + y;
u16 specs_x = specs_min_x + x;
u16 specs_y = specs_min_y + y;
- InventoryItem *item = items[items_y * 3 + items_x];
- ItemSpec &spec = specs[specs_y * 3 + specs_x];
+ const InventoryItem *item = items[items_y * 3 + items_x];
+ const ItemSpec &spec = specs[specs_y * 3 + specs_x];
if(spec.checkItem(item) == false)
return false;
projects / dragonfireclient.git / blobdiff