Added support for text justification and vertical line shifts to EquipDoll.lua.

Adjusted default equipdoll layout to avoid collisions between tinkers and equipment labels.

Updated Charactersheet equipdoll to correctly show correct tinkers when switching equipment views.
Offhand multiple for ranged shooters is 1 by default.

game/engines/default/engine/ui/EquipDoll.lua

@@ -37,7 +37,7 @@ function _M:init(t)
 	doll.doll_h = doll.doll_h or math.ceil(doll.h * 2.6) -- for older actors
 
 	self.base_doll_y = t.base_doll_y or 0
-	self.scale = t.scale or 1
+	self.scale = t.scale or 1 -- resize frame, uis and fonts by this factor
 	self.drag_enable = t.drag_enable
 	self.on_select = t.on_select
 	self.fct = t.fct
@@ -173,7 +173,7 @@ function _M:generateEquipDollFrames()
 		if inven then
 			for item, def in ipairs(v) do
 				if item > inven.max then break end
-				local frame = EquipDollFrame.new{actor=self.actor, inven=inven, name_pos=def.text, item=item, w=doll.w, h=doll.h, iw=doll.iw, ih=doll.ih, ix=doll.ix, iy=doll.iy, bg=doll.itemframe, bg_sel=doll.itemframe_sel, bg_empty=self.actor.inven_def[inven.name].infos and self.actor.inven_def[inven.name].infos.equipdoll_back, drag_enable=self.drag_enable, font=self.font}
+				local frame = EquipDollFrame.new{actor=self.actor, inven=inven, name_pos=def.text, name_justify=def.text_justify, name_y_shift_max=def.name_y_line_shift_max, item=item, w=doll.w, h=doll.h, iw=doll.iw, ih=doll.ih, ix=doll.ix, iy=doll.iy, bg=doll.itemframe, bg_sel=doll.itemframe_sel, bg_empty=self.actor.inven_def[inven.name].infos and self.actor.inven_def[inven.name].infos.equipdoll_back, drag_enable=self.drag_enable, font=self.font}
 				frame.doll_select = true
 				frame.actorWear = function(_, ...) if self.actorWear then self.actorWear(frame, ...) end end
 				frame.fct=function(button, event) if frame:getItem() and self.fct then self.fct({inven=inven, item=item, object=frame:getItem()}, button, event) end end
@@ -182,7 +182,7 @@ function _M:generateEquipDollFrames()
 				uis[#uis+1] = {x=def.x, y=def.y, ui=frame, _weight=def.weight}
 
 				if self.subobject and (not self.subobject_restrict_slots or (self.subobject_restrict_slots[inven.name] and self.subobject_restrict_slots[inven.name] >= item)) then
-					local frame = EquipDollFrame.new{actor=self.actor, inven=inven, name_pos=def.text, item=item, w=math.ceil(doll.w/2), h=math.ceil(doll.h/2), iw=math.ceil(doll.iw/2), ih=math.ceil(doll.ih/2), ix=math.floor(doll.ix/2), iy=math.floor(doll.iy/2), bg=doll.itemframe, bg_sel=doll.itemframe_sel, bg_empty=self.actor.inven_def[inven.name].infos and self.actor.inven_def[inven.name].infos.equipdoll_back, drag_enable=self.drag_enable, subobject=self.subobject, font=self.font}
+					local frame = EquipDollFrame.new{actor=self.actor, inven=inven, name_pos=def.text, name_justify=def.text_justify, name_y_shift_max=def.name_y_line_shift_max, item=item, w=math.ceil(doll.w/2), h=math.ceil(doll.h/2), iw=math.ceil(doll.iw/2), ih=math.ceil(doll.ih/2), ix=math.floor(doll.ix/2), iy=math.floor(doll.iy/2), bg=doll.itemframe, bg_sel=doll.itemframe_sel, bg_empty=self.actor.inven_def[inven.name].infos and self.actor.inven_def[inven.name].infos.equipdoll_back, drag_enable=self.drag_enable, subobject=self.subobject, font=self.font}
 					frame.doll_select = true
 					frame.secondary = true
 					frame.no_name = true
@@ -191,10 +191,10 @@ function _M:generateEquipDollFrames()
 					frame.filter = self.filter
 					frame.on_focus_change=function(status) local ui = self.focus_ui if self.on_select and ui then self.on_select(ui, ui.ui.inven, ui.ui.item, ui.ui:getItem()) end end
 
-					local dsx, dsy = doll.w + 3, 0
+					local dsx, dsy = doll.w + 3, 3
 					if def.subshift == "up" then dsx, dsy = 0, -math.ceil(doll.h/2) - 3
 					elseif def.subshift == "bottom" then dsx, dsy = 0, doll.h + 3
-					elseif def.subshift == "left" then dsx, dsy = -math.ceil(doll.w/2) - 3, 0
+					elseif def.subshift == "left" then dsx, dsy = -math.ceil(doll.w/2) - 3, 3
 					end
 
 					uis[#uis+1] = {x=def.x + dsx, y=def.y + dsy, ui=frame, _weight=def.weight}

game/engines/default/engine/ui/EquipDollFrame.lua

@@ -44,7 +44,9 @@ function _M:init(t)
 	self.drag_enable = t.drag_enable
 	self.fct = t.fct
 	self.filter = t.filter
-	self.name_pos = t.name_pos
+	self.name_pos = t.name_pos --"bottom", "abovetop", "topleft","topright", centered above by default
+	self.name_justify = t.name_justify --Justification, left, right, center by default
+	self.name_y_line_shift_max = t.name_y_line_shift_max or 0.85 -- allow the text to me moved up this many lines for multi-line names that may overlap the frame
 	self.subobject = t.subobject
 	if t.font then
 		self.font = t.font
@@ -120,8 +122,9 @@ function _M:drawItemShortName(o, x, y)
 		t, nlines, width = self.font:draw(name, self.w*3, 255, 255, 255, false, true)
 		t.nlines, t.width = nlines, width
 	end
-	-- center justify text from the requested position, with extra lines below (possibly overlapping the frame)
-	local y_shift = util.bound(t.nlines-1, 0, 0.85)*self.font_h --shift the position of multi-line text up slightly
+	-- text is center justified by default with extra lines word-wrapped below (possibly overlapping the frame)
+	--multi-line text will be shifted up slightly to keep it centered at the specified y-position up to self.name_y_line_shift_max lines
+	local y_shift = util.bound(t.nlines-1, 0, self.name_y_line_shift_max)*self.font_h
 	if self.name_pos == "bottom" then
 		x = x + self.w/2
 		y = y + self.h
@@ -134,13 +137,20 @@ function _M:drawItemShortName(o, x, y)
 	elseif self.name_pos == "topright" then
 		x = x + self.w
 		y = y - self.font_h - y_shift
-	else -- top center
+	else -- top center by default
 		x = x + self.w/2
 		y = y - self.font_h - y_shift
 	end
+	local xpos, ypos
 	for i, tex in ipairs(t) do
-		local xpos = x - tex.realw/2
-		local ypos = y + (i-1)*self.font_h
+		if self.name_justify == "left" then
+			xpos = x - t.width/2
+		elseif self.name_justify == "right" then
+			xpos = x + t.width/2 - tex.realw
+		else -- default center justification
+			xpos = x - tex.realw/2
+		end
+		ypos = y + (i-1)*self.font_h
 		tex._tex:toScreenFull(xpos, ypos, tex.realw+1, tex.h, tex._tex_w, tex._tex_h)
 	end
 	self.last_t = t

game/modules/tome/class/interface/Combat.lua

@@ -1661,6 +1661,7 @@ end
 
 --- Gets the off hand multiplier
 function _M:getOffHandMult(combat, mult)
+	if combat and combat.range and not combat.dam then return mult or 1 end --no penalty for ranged shooters
 	local offmult = 1/2
 	-- Take the bigger multiplier from Dual weapon training and Corrupted Strength
 	if self:knowTalent(Talents.T_DUAL_WEAPON_TRAINING) then

game/modules/tome/dialogs/CharacterSheet.lua

@@ -67,10 +67,10 @@ function _M:init(actor, start_tab)
 				if self.last_tab == "equipment" then
 					local last_set = self.equip_set
 					self.equip_set = last_set == "off" and "main" or "off"
-					if not self:switchEquipRefs(self.equip_set) then
+					if not self:updateEquipDollRefs() then
 						self.equip_set = last_set
 					else
-						game.log("#RED#Displaying %s set for %s (equipment NOT switched)", self.equip_set, self.actor.name:capitalize())
+						game.logPlayer(self.actor, "#RED#Displaying %s set for %s (equipment NOT switched)", self.equip_set, self.actor.name:capitalize())
 					end
 				end
 				self.c_equipment.title = "[E]quipment: "..self.equip_set.." set"
@@ -145,7 +145,9 @@ Mouse: Hover over stat for info
 
 	self.equip_frame = { -- display equipment
 		dialog = self,
-		c_doll = EquipDoll.new{equipdoll = "default", actor=self.actor, title=false,
+		c_doll = EquipDoll.new{equipdoll = self.actor.equipdoll or "default", actor=self.actor, title=false,
+			subobject=self.actor:attr("can_tinker") and "getTinker" or nil,
+			subobject_restrict_slots=self.actor.tinker_restrict_slots,
 			drag_enable=false, filter=nil,
 			scale = math.min(self.ih/630, self.iw/1700), --scale doll to fit dialog
 			fct=function(item) end,
@@ -159,7 +161,6 @@ Mouse: Hover over stat for info
 		},
 		vsep = Separator.new{dir="horizontal", size=self.ih - self.c_tut.h - self.c_general.h - 20}
 	}
-
 	self.equip_frame.c_doll.dialog = self
 	self.equip_frame.c_obj_desc = TextzoneList.new{focus_check=true, scrollbar=true, pingpong = 20, width=self.iw - self.equip_frame.c_doll.w - self.equip_frame.vsep.w - 50, height = self.ih - self.c_tut.h, no_color_bleed=true,
 		dest_area = { h = self.ih - self.c_tut.h - self.vs.h},
@@ -304,44 +305,41 @@ end
 -- Switch between equipment sets (by reference only) for the equip doll
 -- This makes sure the equipment shown in the equipdoll matches the tab setting
 -- Done this way to make sure the actor's equipment is never actually touched
-function _M:switchEquipRefs(set)
+function _M:updateEquipDollRefs()
 	local actor, c_doll = self.actor, self.equip_frame.c_doll
+	local showset = "main"
 	
+	if (actor.off_weapon_slots and self.equip_set ~= "off") or (actor.off_weapon_slots == false and self.equip_set ~= "main") then
+		showset = "off"
+	else showset = "main"
+	end
+--game.log("Showing actual %s set", showset)
 	local mh1, mh2 = actor.inven[actor.INVEN_MAINHAND], actor.inven[actor.INVEN_QS_MAINHAND]
 	local oh1, oh2 = actor.inven[actor.INVEN_OFFHAND], actor.inven[actor.INVEN_QS_OFFHAND]
 	local pf1, pf2 = actor.inven[actor.INVEN_PSIONIC_FOCUS], actor.inven[actor.INVEN_QS_PSIONIC_FOCUS]
 	local qv1, qv2 = actor.inven[actor.INVEN_QUIVER], actor.inven[actor.INVEN_QS_QUIVER]
 	if not mh1 or not mh2 or not oh1 or not oh2 then return end
 	
-	--find ui's corresponding to displayed inventory slots
+	--find ui's corresponding to displayed inventory slots and update refs to the displayed slots
 	local mhui, ohui, qvui, pfui
 	for i, ui in ipairs(c_doll.uis) do
 		if ui.ui and ui.ui.inven then
 			if not ui.ui.inven_name then -- assign inventory names the first time
 				ui.ui.inven_name = ui.ui.inven.name
 			end
-			if ui.ui.inven_name == "MAINHAND" then mhui = i
-			elseif ui.ui.inven_name == "OFFHAND" then ohui = i
-			elseif ui.ui.inven_name == "PSIONIC_FOCUS" then pfui = i
-			elseif ui.ui.inven_name == "QUIVER" then qvui = i
+			if ui.ui.inven_name == "MAINHAND" then
+				ui.ui.inven = showset == "main" and mh1 or mh2
+			elseif ui.ui.inven_name == "OFFHAND" then
+				ui.ui.inven = showset == "main" and oh1 or oh2
+			elseif ui.ui.inven_name == "PSIONIC_FOCUS" then
+				ui.ui.inven = showset == "main" and pf1 or pf2
+			elseif ui.ui.inven_name == "QUIVER" then
+				ui.ui.inven = showset == "main" and qv1 or qv2
 			end
+--game.log("#GREY#--UI %d: %s (showing: %s)", i, ui.ui.inven_name, ui.ui.inven.id)
 		end
 	end
-	if not mhui and ohui then return end
---game.log("Found UI's: %s[%s], %s[%s], %s[%s], %s[%s],", mhui, actor.INVEN_MAINHAND, ohui, actor.INVEN_OFFHAND, pfui, actor.INVEN_PSIONIC_FOCUS, qvui, actor.INVEN_QUIVER)
-
-	--reassign equip doll inventory references to match the set selected
-	if (actor.off_weapon_slots and self.equip_set ~= "off") or (not actor.off_weapon_slots and self.equip_set ~= "main") then --requested set DOES NOT MATCH the used set, assign inventories to use the off set
-		self.equip_frame.c_doll.uis[mhui].ui.inven = mh2
-		self.equip_frame.c_doll.uis[ohui].ui.inven = oh2
-		if pfui and pf1 and pf2 then self.equip_frame.c_doll.uis[pfui].ui.inven = pf2 end
-		if qvui and qv1 and qv2 then self.equip_frame.c_doll.uis[qvui].ui.inven = qv2 end
-	else --requested set MATCHES the used set, assign inventories to use the main set
-		self.equip_frame.c_doll.uis[mhui].ui.inven = mh1
-		self.equip_frame.c_doll.uis[ohui].ui.inven = oh1
-		if pfui and pf1 and pf2 then self.equip_frame.c_doll.uis[pfui].ui.inven = pf1 end
-		if qvui and qv1 and qv2 then self.equip_frame.c_doll.uis[qvui].ui.inven = qv1 end
-	end
+--	return showset == self.equip_set
 	return true
 end
 
@@ -390,6 +388,7 @@ function _M:hideEquipmentFrame()
 	self:toggleDisplay(EF.vsep, false)
 end
 
+--Failing to update Csheet on equipment drag?
 -- show the inventory screen
 function _M:showInventory()
 	if self.actor.no_inventory_access or not self.actor.player then return end
@@ -845,6 +844,8 @@ function _M:drawDialog(kind, actor_to_compare)
 					text = compare_fields(player, actor_to_compare, function(actor, ...) return 1/actor:combatSpeed(...) end, color.."%.1f%%", "%+.1f%%", 100, true, false, mean)
 					self:mouseTooltip(self.TOOLTIP_COMBAT_SPEED,  s:drawColorStringBlended(self.font, ("Speed       : #00ff00#%s"):format(text), w, h, 255, 255, 255, true)) h = h + self.font_h
 				end
+				
+ -- compare fields
 				if range then
 					self:mouseTooltip(self.TOOLTIP_COMBAT_RANGE, s:drawColorStringBlended(self.font, ("Range (Main Hand): #00ff00#%3d"):format(range), w, h, 255, 255, 255, true)) h = h + self.font_h
 				end
@@ -875,6 +876,7 @@ function _M:drawDialog(kind, actor_to_compare)
 		h = h + self.font_h
 		-- All weapons in off hands
 		-- Offhand attacks are with a damage penalty, that can be reduced by talents
+		
 		if player:getInven(player.INVEN_OFFHAND) then
 			for i, o in ipairs(player:getInven(player.INVEN_OFFHAND)) do
 				local offmult = player:getOffHandMult(o.combat)
@@ -897,6 +899,7 @@ function _M:drawDialog(kind, actor_to_compare)
 					text = compare_fields(player, actor_to_compare, function(actor, ...) return 1/actor:combatSpeed(...) end, color.."%.1f%%", "%+.1f%%", 100, false, false, mean)
 					self:mouseTooltip(self.TOOLTIP_COMBAT_SPEED,  s:drawColorStringBlended(self.font, ("Speed       : #00ff00#%s"):format(text), w, h, 255, 255, 255, true)) h = h + self.font_h
 				end
+ -- compare fields
 				if mean and mean.range then self:mouseTooltip(self.TOOLTIP_COMBAT_RANGE, s:drawColorStringBlended(self.font, ("Range (Off Hand): #00ff00#%3d"):format(mean.range), w, h, 255, 255, 255, true)) h = h + self.font_h end
 			end
 		end
@@ -1350,6 +1353,8 @@ function _M:drawDialog(kind, actor_to_compare)
 		end
 	end
 
+	--put a hook here to allow adding more info to the display?  (Steampower, etc.)
+	
 	self.c_desc:update()
 	self.changed = false
 end

game/modules/tome/load.lua

@@ -144,15 +144,15 @@ ActorInventory.equipdolls = {
 		OFFHAND = {{weight=3, x=48, y=192, subshift="left"}},
 		BODY = {{weight=4, x=48, y=264, subshift="left"}},
 		QUIVER = {{weight=5, x=48, y=336, subshift="left"}},
-		FINGER = {{weight=6, x=48, y=408, subshift="bottom"}, {weight=7, x=120, y=408, text="bottom", subshift="bottom"}},
-		LITE = {{weight=8, x=192, y=408, subshift="bottom"}},
-		TOOL = {{weight=9, x=264, y=408, subshift="bottom", text="bottom"}},
+		FINGER = {{weight=6, x=48, y=408, subshift="left"}, {weight=7, x=124, y=408, text="bottom", subshift="left"}},
+		LITE = {{weight=8, x=188, y=408, subshift="right"}},
+		TOOL = {{weight=9, x=264, y=408, subshift="right", text="bottom"}},
 		FEET = {{weight=10, x=264, y=336}},
 		BELT = {{weight=11, x=264, y=264}},
 		HANDS = {{weight=12, x=264, y=192}},
 		CLOAK = {{weight=13, x=264, y=120}},
-		NECK = {{weight=14, x=235, y=48, subshift="bottom", text="topright"}},
-		HEAD = {{weight=15, x=150, y=35, subshift="bottom", text="bottom"}},
+		NECK = {{weight=14, x=235, y=48, subshift="right", text="topright"}},
+		HEAD = {{weight=15, x=150, y=35, subshift="left", text="bottom"}},
 	}},
 	alchemist_golem = { w=48, h=48, itemframe="ui/equipdoll/itemframe48.png", itemframe_sel="ui/equipdoll/itemframe-sel48.png", ix=3, iy=3, iw=42, ih=42, doll_x=116, doll_y=168+64, doll_w=128, doll_h=128,
 	list={