added pick and drop

Author: jardimdanificado

data/config.lua

@@ -1,7 +1,7 @@
 local config = {};
 
 config.title = "brutopolis";
-config.version = "0.0.4";
+config.version = "0.0.5";
 
 config.mapSize = {x = 32, y = 32};
 config.minRoomSize = {x = 5, y = 5};

data/items.lua

@@ -53,6 +53,14 @@ items.bottle = function(position,content)-- 2.5 liters
     return self;
 end
 
+items.smallbox = function(position, content)
+    local self = Item("smallbox", "container", position);
+    self.creator = "unknown";
+    self.maxStorage = 12;
+    self.items = content or {};
+    return self;
+end
+
 items.corn = function(position)
     local self = Item("corn", "food", position);
     self.creator = "god";

main.lua

@@ -180,9 +180,7 @@ end
 
 br.player = player;
 br.getitem(player, "bottle", "water");
-for x = 1, 10 do
-    br.getitem(player, "bread");
-end
+br.getitem(player, "smallbox", "bread")
 
 br.inventory = br.player.items;
 
@@ -194,6 +192,20 @@ br.skills = function()
     br.help(br.player.skills);
 end
 
+br.drop = function(itemid)
+    if itemid == nil then
+        print("drop <itemid>");
+        return;
+    end
+    player.plan("drop", {itemid});
+    world.passTurn();
+end
+
+br.pick = function(direction)
+    player.plan("pick", {direction});
+    world.passTurn();
+end
+
 br.items = function()
     for x = 1, #br.player.items do
         local text = x .. ". ";
@@ -213,7 +225,7 @@ br.items = function()
                     txt = txt .. v*100 .. "ml of " .. k .. ", ";
                 end
                 --remove the last , and space
-                text = text .. txt:sub(1, -3) .. "\n";
+                text = text .. txt:sub(1, -3);
             else
                 for k,v in pairs(content) do
                     text = text .. v .. " " .. k .. "s";

types/Creature.lua

@@ -365,7 +365,43 @@ local creatureSleep = function(creature, world)
         end
     end
     creature.needs.current.sleep = creature.needs.current.sleep + 10;
+end
+
+local creatureDrop = function(creature, world, itemid)
+    local item;
+    if creature.items[itemid] then
+        item = table.remove(creature.items, itemid);
+        item.position["global"] = br.utils.table.clone(creature.position["global"]);
+        item.position["local"] = br.utils.table.clone(creature.position["local"]);
+        table.insert(world.map[creature.position["global"].x][creature.position["global"].y].items, item);
+        print(creature.name .. " dropped " .. item.name);
+    end
+end
+
+local creaturePick = function(creature, world, direction)
+    local room = world.map[creature.position["global"].x][creature.position["global"].y];
 
+    if direction == "up" then
+        direction = {x = 0, y = -1};
+    elseif direction == "down" then
+        direction = {x = 0, y = 1};
+    elseif direction == "left" then
+        direction = {x = -1, y = 0};
+    elseif direction == "right" then
+        direction = {x = 1, y = 0};
+    else
+        direction = {x = 0, y = 0};
+    end
+
+    for k,v in pairs(room.items) do
+        if v.position["local"].x == creature.position["local"].x + direction.x and v.position["local"].y == creature.position["local"].y + direction.y then
+            local item = table.remove(room.items, k);
+            item.position = creature.position;
+            table.insert(creature.items, v);
+            print(creature.name .. " picked " .. item.name);
+            break;
+        end
+    end
 end
 
 local function Creature(name)
@@ -388,7 +424,9 @@ local function Creature(name)
         consume = creatureConsume,
         pee = creaturePee,
         poo = creaturePoo,
-        sleep = creatureSleep
+        sleep = creatureSleep,
+        drop = creatureDrop,
+        pick = creaturePick
     };
 
     self.plan = function(action, args, index)