Second weapon set does not provide stats & prevent offhands to be used

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

game/engines/default/engine/dialogs/ShowEquipInven.lua

@@ -156,7 +156,7 @@ function _M:generateList()
 	local i = 1
 	self.max_h = 0
 	for inven_id =  1, #self.actor.inven_def do
-		if self.actor.inven[inven_id] and self.actor.inven_def[inven_id].is_worn then
+		if self.actor.inven[inven_id] and (self.actor.inven_def[inven_id].is_worn or self.actor.inven_def[inven_id].is_shown_equip) then
 			list[#list+1] = { id=#list+1, char="", name="#{bold}#"..self.actor.inven_def[inven_id].name.."#{normal}#", color={0x90, 0x90, 0x90}, inven=inven_id, cat="", encumberance="", desc=self.actor.inven_def[inven_id].description }
 			self.max_h = math.max(self.max_h, #self.actor.inven_def[inven_id].description:splitLines(self.iw - 10, self.font))
 

game/engines/default/engine/dialogs/ShowEquipment.lua

@@ -85,7 +85,7 @@ function _M:generateList()
 	list.chars = chars
 	local i = 1
 	for inven_id =  1, #self.actor.inven_def do
-		if self.actor.inven[inven_id] and self.actor.inven_def[inven_id].is_worn then
+		if self.actor.inven[inven_id] and (self.actor.inven_def[inven_id].is_worn or self.actor.inven_def[inven_id].is_shown_equip) then
 			list[#list+1] = { id=#list+1, char="", name="#{bold}#"..self.actor.inven_def[inven_id].name.."#{normal}#", color={0x90, 0x90, 0x90}, inven=inven_id, cat="", encumberance="", desc=self.actor.inven_def[inven_id].description }
 
 			for item, o in ipairs(self.actor.inven[inven_id]) do

game/engines/default/engine/interface/ActorInventory.lua

@@ -31,7 +31,7 @@ _M.inven_def = {}
 
 --- Defines stats
 -- Static!
-function _M:defineInventory(short_name, name, is_worn, desc)
+function _M:defineInventory(short_name, name, is_worn, desc, show_equip)
 	assert(name, "no inventory slot name")
 	assert(short_name, "no inventory slot short_name")
 	assert(desc, "no inventory slot desc")
@@ -40,6 +40,7 @@ function _M:defineInventory(short_name, name, is_worn, desc)
 		short_name = short_name,
 		description = desc,
 		is_worn = is_worn,
+		is_shown_equip = show_equip,
 	})
 	self.inven_def[#self.inven_def].id = #self.inven_def
 	self.inven_def[short_name] = self.inven_def[#self.inven_def]

game/modules/tome/load.lua

@@ -78,8 +78,8 @@ ActorInventory:defineInventory("FEET", "On feet", true, "Sandals or boots can be
 ActorInventory:defineInventory("TOOL", "Tool", true, "This is your readied tool, always available immediately.")
 ActorInventory:defineInventory("QUIVER", "Quiver", true, "Your readied ammo.")
 ActorInventory:defineInventory("MOUNT", "Mount", false, "Your mount.")
-ActorInventory:defineInventory("QS_MAINHAND", "Second weapon set: In main hand", true, "Weapon Set 2: Most weapons are wielded in the main hand. Press 'x' to switch weapon sets.")
-ActorInventory:defineInventory("QS_OFFHAND", "Second weapon set: In off hand", true, "Weapon Set 2: You can use shields or a second weapon in your off-hand, if you have the talents for it. Press 'x' to switch weapon sets.")
+ActorInventory:defineInventory("QS_MAINHAND", "Second weapon set: In main hand", false, "Weapon Set 2: Most weapons are wielded in the main hand. Press 'x' to switch weapon sets.", true)
+ActorInventory:defineInventory("QS_OFFHAND", "Second weapon set: In off hand", false, "Weapon Set 2: You can use shields or a second weapon in your off-hand, if you have the talents for it. Press 'x' to switch weapon sets.", true)
 
 -- Damage types
 DamageType:loadDefinition("/data/damage_types.lua")