object stacking

git-svn-id: http://svn.net-core.org/repos/t-engine4@155 51575b47-30f0-44d4-a5cc-537603b46e54

game/engine/Object.lua

@@ -19,6 +19,11 @@ function _M:resolve(t)
 	engine.Entity.resolve(self, t)
 
 	if not t then
+		-- Stackable property is the name by default
+		if self.stacking and type(self.stacking) == "boolean" then
+			self.stacking = self.name
+		end
+
 		-- Auto add all objects to the game, if they can act
 		game:addEntity(self)
 	end
@@ -64,3 +69,48 @@ function _M:useEnergy(val)
 	val = val or game.energy_to_act
 	self.energy.value = self.energy.value - val
 end
+
+--- Stackable, can it stack at all ?
+function _M:stackable()
+	return self.stacking
+end
+
+--- Can it stacks with others of its kind ?
+function _M:canStack(o)
+	if not self.stacking or not o.stacking then return false end
+	if  self.stacking == o.stacking then return true end
+	return false
+end
+
+--- Adds object to the stack
+-- @return true if stacking worked, false if not
+function _M:stack(o)
+	if not self:canStack(o) then return false end
+	self.stacked = self.stacked or {}
+	self.stacked[#self.stacked+1] = o
+
+	-- Merge stacks
+	if o.stacked then
+		for i, so in ipairs(o.stacked) do
+			self.stacked[#self.stacked+1] = so
+		end
+		o.stacked = nil
+	end
+	return true
+end
+
+--- Removes an object of the stack
+-- @return object, true if the last, or object, false if more
+function _M:unstack()
+	if not self:stackable() or not self.stacked or #self.stacked == 0 then return self, true end
+	local o = table.remove(self.stacked)
+	if #self.stacked == 0 then self.stacked = nil end
+	return o, false
+end
+
+--- Returns the number of objects available
+-- Always one for non stacking objects
+function _M:getNumber()
+	if not self.stacked then return 1 end
+	return 1 + #self.stacked
+end

game/engine/dialogs/ShowEquipment.lua

@@ -53,7 +53,9 @@ function _M:generateList()
 			for item, o in ipairs(self.actor.inven[inven_id]) do
 				if not self.filter or self.filter(o) then
 					local char = string.char(string.byte('a') + i)
-					list[#list+1] = { name=char..")  "..o:getName(), object=o, inven=inven_id, item=item }
+					local nb = o:getNumber()
+					nb = (nb == 1) and "" or nb.." "
+					list[#list+1] = { name=char..")  "..nb..o:getName(), object=o, inven=inven_id, item=item }
 					chars[char] = #list
 					i = i + 1
 				end

game/engine/dialogs/ShowInventory.lua

@@ -47,7 +47,9 @@ function _M:generateList()
 	local i = 0
 	for item, o in ipairs(self.inven) do
 		if not self.filter or self.filter(o) then
-			list[#list+1] = { name=string.char(string.byte('a') + i)..")  "..o:getName(), object=o, item=item }
+			local nb = o:getNumber()
+			nb = (nb == 1) and "" or nb.." "
+			list[#list+1] = { name=string.char(string.byte('a') + i)..")  "..nb..o:getName(), object=o, item=item }
 			i = i + 1
 		end
 	end

game/engine/dialogs/ShowPickupFloor.lua

@@ -56,7 +56,9 @@ function _M:generateList()
 		local o = game.level.map:getObject(self.x, self.y, idx)
 		if not o then break end
 		if not self.filter or self.filter(o) then
-			list[#list+1] = { name=string.char(string.byte('a') + i)..")  "..o:getName(), object=o, item=idx }
+			local nb = o:getNumber()
+			nb = (nb == 1) and "" or nb.." "
+			list[#list+1] = { name=string.char(string.byte('a') + i)..")  "..nb..o:getName(), object=o, item=idx }
 			i = i + 1
 		end
 		idx = idx + 1

game/engine/interface/ActorInventory.lua

@@ -90,7 +90,11 @@ end
 -- @return the object removed or nil if no item existed
 function _M:removeObject(inven, item)
 	if type(inven) == "number" then inven = self.inven[inven] end
-	local o = table.remove(inven, item)
+	local o = inven[item]
+	local o, finish = o:unstack()
+	if finish then
+		table.remove(inven, item)
+	end
 
 	-- Do whatever is needed when takingoff this object
 	print("remove object", inven, inven.max, inven.worn, item, o)
@@ -104,7 +108,7 @@ end
 -- @param item the item id to drop
 -- @return the object removed or nil if no item existed
 function _M:dropFloor(inven, item, vocal)
-	local o = table.remove(inven, item)
+	local o = self:removeObject(inven, item)
 	if not o then
 		if vocal then game.logSeen(self, "There is nothing to drop.") end
 		return
@@ -185,3 +189,22 @@ function _M:onTakeoff(o)
 	end
 	o.wielded = nil
 end
+
+--- Re-order inventory, sorting and stacking it
+function _M:sortInven(inven)
+	if not inven then inven = self.inven[self.INVEN_INVEN] end
+
+	-- Stack objects first, from bottom
+	for i = #inven, 1, -1 do
+		-- If it is stackable, look for obejcts before it that it could stack into
+		if inven[i]:stackable() then
+			for j = i - 1, 1, -1 do
+				if inven[j]:stack(inven[i]) then
+					print("Stacked objects", i, inven[i].name, "into", j, inven[j].name)
+					table.remove(inven, i)
+					break
+				end
+			end
+		end
+	end
+end

game/engine/interface/ActorTemporaryEffects.lua

@@ -46,19 +46,7 @@ function _M:timedEffects()
 	for eff, p in pairs(self.tmp) do
 		p.dur = p.dur - 1
 		if p.dur <= 0 then
-			self.tmp[eff] = nil
-			self.changed = true
-			if _M.tempeffect_def[eff].on_lose then
-				local ret, fly = _M.tempeffect_def[eff].on_lose(self, p)
-				if ret then
-					game.logSeen(self, ret:gsub("#Target#", self.name:capitalize()):gsub("#target#", self.name))
-				end
-				if fly and game.flyers then
-					local sx, sy = game.level.map:getTileToScreen(self.x, self.y)
-					game.flyers:add(sx, sy, 20, (rng.range(0,2)-1) * 0.5, -3, fly, {255,100,80})
-				end
-			end
-			if _M.tempeffect_def[eff].deactivate then _M.tempeffect_def[eff].deactivate(self, p) end
+--			self:removeEffect(eff)
 		else
 			if _M.tempeffect_def[eff].on_timeout then
 				_M.tempeffect_def[eff].on_timeout(self, p)
@@ -72,6 +60,9 @@ end
 -- @param dur the number of turns to go on
 -- @param p a table containing the effects parameters
 function _M:setEffect(eff_id, dur, p)
+	-- Beware, setting to 0 means removing
+	if dur <= 0 then return self:removeEffect(eff_id) end
+
 	for k, e in pairs(_M.tempeffect_def[eff_id].parameters) do
 		if not p[k] then p[k] = e end
 	end
@@ -97,3 +88,21 @@ end
 function _M:hasEffect(eff_id)
 	return self.tmp[eff_id]
 end
+
+--- Removes the effect
+function _M:removeEffecf(eff)
+	local p = self.tmp[eff]
+	self.tmp[eff] = nil
+	self.changed = true
+	if _M.tempeffect_def[eff].on_lose then
+		local ret, fly = _M.tempeffect_def[eff].on_lose(self, p)
+		if ret then
+			game.logSeen(self, ret:gsub("#Target#", self.name:capitalize()):gsub("#target#", self.name))
+		end
+		if fly and game.flyers then
+			local sx, sy = game.level.map:getTileToScreen(self.x, self.y)
+			game.flyers:add(sx, sy, 20, (rng.range(0,2)-1) * 0.5, -3, fly, {255,100,80})
+		end
+	end
+	if _M.tempeffect_def[eff].deactivate then _M.tempeffect_def[eff].deactivate(self, p) end
+end

game/engine/interface/ObjectActivable.lua

@@ -16,7 +16,7 @@ function _M:regenPower()
 	self.power = util.bound(self.power + self.power_regen, 0, self.max_power)
 end
 
-function _M:canUse()
+function _M:canUseObject()
 	if self.use_simple or self.use_power then
 		return true
 	end

game/modules/tome/class/Game.lua

@@ -302,9 +302,11 @@ function _M:setupCommands()
 			if self.level.map:getObject(self.player.x, self.player.y, 2) then
 				self.player:showPickupFloor(nil, nil, function(o, item)
 					self.player:pickupFloor(item, true)
+					self.player:sortInven()
 				end)
 			else
 				self.player:pickupFloor(1, true)
+				self.player:sortInven()
 			end
 		end,
 
@@ -321,6 +323,7 @@ function _M:setupCommands()
 			local inven = self.player:getInven(self.player.INVEN_INVEN)
 			self.player:showInventory("Drop object", inven, nil, function(o, item)
 				self.player:dropFloor(inven, item)
+				self.player:sortInven()
 			end)
 		end,
 		-- Wear item
@@ -334,6 +337,7 @@ function _M:setupCommands()
 					if type(ro) == "table" then self.player:addObject(self.player.INVEN_INVEN, ro) end
 					self.player:removeObject(self.player.INVEN_INVEN, item)
 				end
+				self.player:sortInven()
 			end)
 		end,
 		-- Takeoff item
@@ -342,18 +346,25 @@ function _M:setupCommands()
 				if self.player:takeoffObject(inven, item) then
 					self.player:addObject(self.player.INVEN_INVEN, o)
 				end
+				self.player:sortInven()
 			end)
 		end,
 
 		-- Use item
 		_u = function()
-			self.player:showInventory(nil, self.player:getInven(self.player.INVEN_INVEN), nil, function(o, item)
-				local ret = o:use(self.player)
-				if ret and ret == "destroy" then
-					self.player:removeObject(self.player:getInven(self.player.INVEN_INVEN), item)
-					game.log("You have no more "..o:getName())
+			self.player:showInventory(nil, self.player:getInven(self.player.INVEN_INVEN),
+				function(o)
+					return o:canUseObject()
+				end,
+				function(o, item)
+					local ret = o:use(self.player)
+					if ret and ret == "destroy" then
+						self.player:removeObject(self.player:getInven(self.player.INVEN_INVEN), item)
+						game.log("You have no more "..o:getName())
+						self.player:sortInven()
+					end
 				end
-			end)
+			)
 		end,
 
 

game/modules/tome/class/Object.lua

@@ -29,7 +29,7 @@ end
 --- Use the object (quaff, read, ...)
 function _M:use(who, typ)
 	local types = {}
-	if self:canUse() then types[#types+1] = "use" end
+	if self:canUseObject() then types[#types+1] = "use" end
 
 	if not typ and #types == 1 then typ = types[1] end
 

game/modules/tome/data/general/objects/egos.lua

@@ -12,6 +12,7 @@ newEntity{
 	name = " of accuracy",
 	level_range = {1, 50},
 	rarity = 3,
+	cost = 10,
 	wielder = {
 		combat_atk = resolvers.mbonus(20),
 	},
@@ -21,6 +22,7 @@ newEntity{
 	name = "kinetic ", prefix=true,
 	level_range = {1, 50},
 	rarity = 3,
+	cost = 10,
 	wielder = {
 		combat_apr = resolvers.mbonus(15),
 	},

game/modules/tome/data/general/objects/massive-armors.lua

@@ -12,6 +12,7 @@ newEntity{ base = "BASE_MASSIVE_ARMOR",
 	name = "iron plate armour",
 	level_range = {1, 10},
 	require = { stat = { str=22 }, },
+	cost = 20,
 	wielder = {
 		combat_def = 3,
 		combat_armor = 7,
@@ -23,6 +24,7 @@ newEntity{ base = "BASE_MASSIVE_ARMOR",
 	name = "steel plate armour",
 	level_range = {10, 20},
 	require = { stat = { str=28 }, },
+	cost = 25,
 	wielder = {
 		combat_def = 4,
 		combat_armor = 9,
@@ -34,6 +36,7 @@ newEntity{ base = "BASE_MASSIVE_ARMOR",
 	name = "dwarven-steel plate armour",
 	level_range = {20, 30},
 	require = { stat = { str=35 }, },
+	cost = 30,
 	wielder = {
 		combat_def = 5,
 		combat_armor = 11,
@@ -44,6 +47,7 @@ newEntity{ base = "BASE_MASSIVE_ARMOR",
 newEntity{ base = "BASE_MASSIVE_ARMOR",
 	name = "galvorn plate armour",
 	level_range = {30, 40},
+	cost = 40,
 	require = { stat = { str=48 }, },
 	wielder = {
 		combat_def = 7,
@@ -56,6 +60,7 @@ newEntity{ base = "BASE_MASSIVE_ARMOR",
 	name = "mithril plate armour",
 	level_range = {40, 50},
 	require = { stat = { str=60 }, },
+	cost = 50,
 	wielder = {
 		combat_def = 9,
 		combat_armor = 16,

game/modules/tome/data/general/objects/potions.lua

@@ -3,22 +3,24 @@ newEntity{
 	type = "potion", subtype="potion",
 	display = "!", color=colors.WHITE,
 	encumber = 0.2,
+	stacking = true,
 	desc = [[Magical potions can have wildly different effects, from healing to killing you, beware! Most of them function better with a high Magic score]],
 }
 
 -------------------------------------------------------
--- Healing & Curing
+-- Healing
 -------------------------------------------------------
 newEntity{ base = "BASE_POTION",
 	name = "potion of lesser healing",
 	color = colors.LIGHT_RED,
 	level_range = {1, 20},
 	rarity = 3,
+	cost = 3,
 
 	use_simple = { name="heal some life", use = function(self, who)
 		who:heal(40 + who:getMag())
 		game.logSeen(who, "%s quaffs a %s!", who.name:capitalize(), self:getName())
-		return "destroy"
+		return "destroy", true
 	end}
 }
 
@@ -27,11 +29,12 @@ newEntity{ base = "BASE_POTION",
 	color = colors.LIGHT_RED,
 	level_range = {15, 35},
 	rarity = 4,
+	cost = 5,
 
 	use_simple = { name="heal a good part of your life", use = function(self, who)
 		who:heal(140 + who:getMag())
 		game.logSeen(who, "%s quaffs a %s!", who.name:capitalize(), self:getName())
-		return "destroy"
+		return "destroy", true
 	end}
 }
 
@@ -40,11 +43,12 @@ newEntity{ base = "BASE_POTION",
 	color = colors.LIGHT_RED,
 	level_range = {30, 50},
 	rarity = 5,
+	cost = 7,
 
 	use_simple = { name="heal a lot", use = function(self, who)
 		who:heal(240 + who:getMag())
 		game.logSeen(who, "%s quaffs a %s!", who.name:capitalize(), self:getName())
-		return "destroy"
+		return "destroy", true
 	end}
 }
 
@@ -53,11 +57,12 @@ newEntity{ base = "BASE_POTION",
 	color = colors.LIGHT_RED,
 	level_range = {45, 50},
 	rarity = 14,
+	cost = 50,
 
 	use_simple = { name="fully heal", use = function(self, who)
 		who:heal(1000000)
 		game.logSeen(who, "%s quaffs a %s!", who.name:capitalize(), self:getName())
-		return "destroy"
+		return "destroy", true
 	end}
 }
 
@@ -69,11 +74,12 @@ newEntity{ base = "BASE_POTION",
 	color = colors.LIGHT_BLUE,
 	level_range = {1, 20},
 	rarity = 3,
+	cost = 3,
 
 	use_simple = { name="restore some mana", use = function(self, who)
 		who:incMana(40 + who:getMag())
 		game.logSeen(who, "%s quaffs a %s!", who.name:capitalize(), self:getName())
-		return "destroy"
+		return "destroy", true
 	end}
 }
 
@@ -82,11 +88,12 @@ newEntity{ base = "BASE_POTION",
 	color = colors.LIGHT_BLUE,
 	level_range = {15, 35},
 	rarity = 4,
+	cost = 5,
 
 	use_simple = { name="restore a good part of your mana", use = function(self, who)
 		who:incMana(140 + who:getMag())
 		game.logSeen(who, "%s quaffs a %s!", who.name:capitalize(), self:getName())
-		return "destroy"
+		return "destroy", true
 	end}
 }
 
@@ -95,11 +102,12 @@ newEntity{ base = "BASE_POTION",
 	color = colors.LIGHT_BLUE,
 	level_range = {30, 50},
 	rarity = 5,
+	cost = 7,
 
 	use_simple = { name="restore a lot of mana", use = function(self, who)
 		who:incMana(240 + who:getMag())
 		game.logSeen(who, "%s quaffs a %s!", who.name:capitalize(), self:getName())
-		return "destroy"
+		return "destroy", true
 	end}
 }
 
@@ -108,10 +116,32 @@ newEntity{ base = "BASE_POTION",
 	color = colors.LIGHT_BLUE,
 	level_range = {45, 50},
 	rarity = 14,
+	cost = 50,
 
 	use_simple = { name="fully restore mana", use = function(self, who)
 		who:incMana(1000000)
 		game.logSeen(who, "%s quaffs a %s!", who.name:capitalize(), self:getName())
-		return "destroy"
+		return "destroy", true
 	end}
 }
+
+-------------------------------------------------------
+-- Curing
+-------------------------------------------------------
+newEntity{ base = "BASE_POTION",
+	name = "potion of cure poison",
+	color = colors.LIGHT_GREEN,
+	level_range = {1, 50},
+	rarity = 7,
+	cost = 3,
+
+	use_simple = { name="cures poison", use = function(self, who)
+		if who:hasEffect(who.EFF_POISONED) then
+			who:removeEffect(who.EFF_POISONED)
+			game.logSeen(who, "%s cures %s from poisoning!", self:getName(), who.name:capitalize())
+			return "destroy", true
+		end
+		return "destroy", false
+	end}
+}
+

game/modules/tome/data/general/objects/shields.lua

@@ -15,6 +15,7 @@ newEntity{ base = "BASE_SHIELD",
 	name = "iron shield",
 	level_range = {1, 10},
 	require = { stat = { str=11 }, },
+	cost = 5,
 	special_combat = {
 		dam = resolvers.rngavg(7,11),
 		physcrit = 2.5,
@@ -30,6 +31,7 @@ newEntity{ base = "BASE_SHIELD",
 	name = "steel shield",
 	level_range = {10, 20},
 	require = { stat = { str=16 }, },
+	cost = 10,
 	special_combat = {
 		dam = resolvers.rngavg(10,20),
 		physcrit = 3,
@@ -45,6 +47,7 @@ newEntity{ base = "BASE_SHIELD",
 	name = "dwarven-steel shield",
 	level_range = {20, 30},
 	require = { stat = { str=24 }, },
+	cost = 15,
 	special_combat = {
 		dam = resolvers.rngavg(25,35),
 		physcrit = 3.5,
@@ -60,6 +63,7 @@ newEntity{ base = "BASE_SHIELD",
 	name = "galvorn shield",
 	level_range = {30, 40},
 	require = { stat = { str=35 }, },
+	cost = 25,
 	special_combat = {
 		dam = resolvers.rngavg(40,55),
 		physcrit = 4.5,
@@ -75,6 +79,7 @@ newEntity{ base = "BASE_SHIELD",
 	name = "mithril shield",
 	level_range = {40, 50},
 	require = { stat = { str=48 }, },
+	cost = 35,
 	special_combat = {
 		dam = resolvers.rngavg(60,75),
 		physcrit = 5,

game/modules/tome/data/general/objects/staves.lua

@@ -13,6 +13,7 @@ newEntity{ base = "BASE_STAFF",
 	name = "elm staff",
 	level_range = {1, 10},
 	require = { stat = { mag=11 }, },
+	cost = 5,
 	combat = {
 		dam = resolvers.rngavg(3,5),
 		apr = 2,
@@ -29,6 +30,7 @@ newEntity{ base = "BASE_STAFF",
 	name = "ash staff",
 	level_range = {10, 20},
 	require = { stat = { mag=16 }, },
+	cost = 10,
 	combat = {
 		dam = resolvers.rngavg(7,11),
 		apr = 3,
@@ -45,6 +47,7 @@ newEntity{ base = "BASE_STAFF",
 	name = "yew staff",
 	level_range = {20, 30},
 	require = { stat = { mag=24 }, },
+	cost = 15,
 	combat = {
 		dam = resolvers.rngavg(14,22),
 		apr = 4,
@@ -61,6 +64,7 @@ newEntity{ base = "BASE_STAFF",
 	name = "elven-wood staff",
 	level_range = {30, 40},
 	require = { stat = { mag=35 }, },
+	cost = 25,
 	combat = {
 		dam = resolvers.rngavg(24,28),
 		apr = 5,
@@ -77,6 +81,7 @@ newEntity{ base = "BASE_STAFF",
 	name = "dragonbone staff",
 	level_range = {40, 50},
 	require = { stat = { mag=48 }, },
+	cost = 35,
 	combat = {
 		dam = resolvers.rngavg(32,38),
 		apr = 6,

game/modules/tome/data/general/objects/swords.lua

@@ -13,6 +13,7 @@ newEntity{ base = "BASE_LONGSWORD",
 	name = "iron longsword",
 	level_range = {1, 10},
 	require = { stat = { str=11 }, },
+	cost = 5,
 	combat = {
 		dam = resolvers.rngavg(7,11),
 		apr = 2,
@@ -25,6 +26,7 @@ newEntity{ base = "BASE_LONGSWORD",
 	name = "steel longsword",
 	level_range = {10, 20},
 	require = { stat = { str=16 }, },
+	cost = 10,
 	combat = {
 		dam = resolvers.rngavg(10,20),
 		apr = 3,
@@ -37,6 +39,7 @@ newEntity{ base = "BASE_LONGSWORD",
 	name = "dwarven-steel longsword",
 	level_range = {20, 30},
 	require = { stat = { str=24 }, },
+	cost = 15,
 	combat = {
 		dam = resolvers.rngavg(25,35),
 		apr = 4,
@@ -49,6 +52,7 @@ newEntity{ base = "BASE_LONGSWORD",
 	name = "galvorn longsword",
 	level_range = {30, 40},
 	require = { stat = { str=35 }, },
+	cost = 25,
 	combat = {
 		dam = resolvers.rngavg(40,55),
 		apr = 5,
@@ -61,6 +65,7 @@ newEntity{ base = "BASE_LONGSWORD",
 	name = "mithril longsword",
 	level_range = {40, 50},
 	require = { stat = { str=48 }, },
+	cost = 35,
 	combat = {
 		dam = resolvers.rngavg(60,75),
 		apr = 6,

game/modules/tome/data/general/objects/world-artifacts.lua

@@ -9,6 +9,7 @@ newEntity{
 	encumber = 6,
 	rarity = 100,
 	desc = [[This unique looking staff is carved with runes of destruction.]],
+	cost = 10000,
 
 	require = { stat = { mag=24 }, },
 	combat = {
@@ -32,6 +33,7 @@ newEntity{
 	encumber = 1,
 	rarity = 100,
 	desc = [[A small crystal phial, with the light of Earendil's Star contained inside. Its light is imperishable, and near it darkness cannot endure.]],
+	cost = 2000,
 
 	wielder = {
 		lite = 4,
@@ -47,34 +49,14 @@ newEntity{
 	display = "~", color=colors.YELLOW,
 	encumber = 1,
 	rarity = 250,
-
 	desc = [[A great globe seemingly filled with moonlight, the famed Heart of the Mountain, which splinters the light that falls upon it into a thousand glowing shards.]],
+	cost = 4000,
 
 	wielder = {
 		lite = 5,
 	},
 }
 
-newEntity{
-	unique = true,
-	slot = "AMULET",
-	type = "jewelery", subtype="amulet",
-	name = "Shifting Amulet",
-	level_range = {1, 10},
-	display = '"', color=colors.VIOLET,
-	encumber = 1,
-	rarity = 1,
-	desc = [[A crystal clear stone hangs on the chain. It displays images of your surroundings, but somehow they seem closer.]],
-
-	max_power = 15, power_regen = 1,
-	use_power = { name = "blink away", power = 5,
-		use = function(self, who)
-			game.logSeen(who, "%s uses the Shifting Amulet and blinks away!", who.name:capitalize())
-			who:teleportRandom(who.x, who.y, 10)
-		end
-	},
-}
-
 newEntity{
 	unique = true,
 	type = "potion", subtype="potion",
@@ -84,6 +66,7 @@ newEntity{
 	encumber = 0.4,
 	rarity = 80,
 	desc = [[Bottle containing healing magic. But the more you drink from it, the more it refills!]],
+	cost = 2000,
 
 	max_power = 40, power_regen = 1,
 	use_power = { name = "blink away", power = 30,