Make dungeon masters though and make oerkkis disappear when they get to you (because...

[dragonfireclient.git] / src / content_nodemeta.cpp

diff --git a/src/content_nodemeta.cpp b/src/content_nodemeta.cpp
index 6b8bf05ef549cc230bfd094fd4934c831786c5b2..e79ff6d54c14762772542612f403f8588cdea34b 100644 (file)
--- a/src/content_nodemeta.cpp
+++ b/src/content_nodemeta.cpp
@@ -117,6 +117,70 @@ std::string ChestNodeMetadata::getInventoryDrawSpecString()
                "list[current_player;main;0,5;8,4;]";
 }
 
+/*
+       LockingChestNodeMetadata
+*/
+
+// Prototype
+LockingChestNodeMetadata proto_LockingChestNodeMetadata;
+
+LockingChestNodeMetadata::LockingChestNodeMetadata()
+{
+       NodeMetadata::registerType(typeId(), create);
+
+       m_inventory = new Inventory();
+       m_inventory->addList("0", 8*4);
+}
+LockingChestNodeMetadata::~LockingChestNodeMetadata()
+{
+       delete m_inventory;
+}
+u16 LockingChestNodeMetadata::typeId() const
+{
+       return CONTENT_LOCKABLE_CHEST;
+}
+NodeMetadata* LockingChestNodeMetadata::create(std::istream &is)
+{
+       LockingChestNodeMetadata *d = new LockingChestNodeMetadata();
+       d->setOwner(deSerializeString(is));
+       d->m_inventory->deSerialize(is);
+       return d;
+}
+NodeMetadata* LockingChestNodeMetadata::clone()
+{
+       LockingChestNodeMetadata *d = new LockingChestNodeMetadata();
+       *d->m_inventory = *m_inventory;
+       return d;
+}
+void LockingChestNodeMetadata::serializeBody(std::ostream &os)
+{
+       os<<serializeString(m_text);
+       m_inventory->serialize(os);
+}
+std::string LockingChestNodeMetadata::infoText()
+{
+       return "Locking Chest";
+}
+bool LockingChestNodeMetadata::nodeRemovalDisabled()
+{
+       /*
+               Disable removal if chest contains something
+       */
+       InventoryList *list = m_inventory->getList("0");
+       if(list == NULL)
+               return false;
+       if(list->getUsedSlots() == 0)
+               return false;
+       return true;
+}
+std::string LockingChestNodeMetadata::getInventoryDrawSpecString()
+{
+       return
+               "invsize[8,9;]"
+               "list[current_name;0;0,0;8,4;]"
+               "list[current_player;main;0,5;8,4;]";
+}
+
 /*
        FurnaceNodeMetadata
 */
@@ -178,23 +242,49 @@ std::string FurnaceNodeMetadata::infoText()
        //return "Furnace";
        if(m_fuel_time >= m_fuel_totaltime)
        {
-               InventoryList *src_list = m_inventory->getList("src");
+               const InventoryList *src_list = m_inventory->getList("src");
                assert(src_list);
-               InventoryItem *src_item = src_list->getItem(0);
+               const InventoryItem *src_item = src_list->getItem(0);
 
-               if(src_item)
+               if(src_item && src_item->isCookable()) {
+                       InventoryList *dst_list = m_inventory->getList("dst");
+                       if(!dst_list->roomForCookedItem(src_item))
+                               return "Furnace is overloaded";
                        return "Furnace is out of fuel";
+               }
                else
                        return "Furnace is inactive";
        }
        else
        {
-               std::string s = "Furnace is active (";
-               s += itos(m_fuel_time/m_fuel_totaltime*100);
-               s += "%)";
+               std::string s = "Furnace is active";
+               // Do this so it doesn't always show (0%) for weak fuel
+               if(m_fuel_totaltime > 3) {
+                       s += " (";
+                       s += itos(m_fuel_time/m_fuel_totaltime*100);
+                       s += "%)";
+               }
                return s;
        }
 }
+bool FurnaceNodeMetadata::nodeRemovalDisabled()
+{
+       /*
+               Disable removal if furnace is not empty
+       */
+       InventoryList *list[3] = {m_inventory->getList("src"),
+       m_inventory->getList("dst"), m_inventory->getList("fuel")};
+       
+       for(int i = 0; i < 3; i++) {
+               if(list[i] == NULL)
+                       continue;
+               if(list[i]->getUsedSlots() == 0)
+                       continue;
+               return true;
+       }
+       return false;
+       
+}
 void FurnaceNodeMetadata::inventoryModified()
 {
        dstream<<"Furnace inventory modification callback"<<std::endl;
@@ -221,9 +311,14 @@ bool FurnaceNodeMetadata::step(float dtime)
                assert(src_list);
                InventoryItem *src_item = src_list->getItem(0);
                
+               bool room_available = false;
+               
+               if(src_item && src_item->isCookable())
+                       room_available = dst_list->roomForCookedItem(src_item);
+               
                // Start only if there are free slots in dst, so that it can
                // accomodate any result item
-               if(dst_list->getFreeSlots() > 0 && src_item && src_item->isCookable())
+               if(room_available)
                {
                        m_src_totaltime = 3;
                }
@@ -252,13 +347,23 @@ bool FurnaceNodeMetadata::step(float dtime)
                                m_src_totaltime = 0;
                        }
                        changed = true;
-                       continue;
+                       
+                       // If the fuel was not used up this step, just keep burning it
+                       if(m_fuel_time < m_fuel_totaltime)
+                               continue;
                }
                
                /*
-                       If there is no source item or source item is not cookable, stop loop.
+                       Get the source again in case it has all burned
+               */
+               src_item = src_list->getItem(0);
+               
+               /*
+                       If there is no source item, or the source item is not cookable,
+                       or the furnace is still cooking, or the furnace became overloaded, stop loop.
                */
-               if(src_item == NULL || m_src_totaltime < 0.001)
+               if(src_item == NULL || !room_available || m_fuel_time < m_fuel_totaltime ||
+                       dst_list->roomForCookedItem(src_item) == false)
                {
                        m_step_accumulator = 0;
                        break;
@@ -268,7 +373,7 @@ bool FurnaceNodeMetadata::step(float dtime)
 
                InventoryList *fuel_list = m_inventory->getList("fuel");
                assert(fuel_list);
-               InventoryItem *fuel_item = fuel_list->getItem(0);
+               const InventoryItem *fuel_item = fuel_list->getItem(0);
 
                if(ItemSpec(ITEM_MATERIAL, CONTENT_TREE).checkItem(fuel_item))
                {