Skip to content
Snippets Groups Projects
Commit f87aac2b authored by dg's avatar dg
Browse files

Character sheet now displays archery damage correctly 

git-svn-id: http://svn.net-core.org/repos/t-engine4@2112 51575b47-30f0-44d4-a5cc-537603b46e54
parent 2aaf2936
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
game/modules/tome/class/interface/PlayerDumpJSON.lua
+ 22
− 12
View file @ f87aac2b
......@@ -100,25 +100,35 @@ function _M:dumpToJSON(js)
local c = js:newSection("offense", "offense", "pairs", "add")
if self:getInven(self.INVEN_MAINHAND) then
for i, o in ipairs(self:getInven(self.INVEN_MAINHAND)) do
if o.combat then
c[#c+1] = { ["attack (main hand)"] = string.format("%d", self:combatAttack(o.combat)) }
c[#c+1] = { ["damage (main hand)"] = string.format("%d", self:combatDamage(o.combat)) }
c[#c+1] = { ["APR (main hand)"] = string.format("%d", self:combatAPR(o.combat)) }
c[#c+1] = { ["crit(main hand)"] = string.format("%d%%", self:combatCrit(o.combat)) }
c[#c+1] = { ["speed(main hand)"] = string.format("%0.2f", self:combatSpeed(o.combat)) }
local mean, dam = o.combat, o.combat
if o.archery and mean then
dam = (self:getInven("QUIVER")[1] and self:getInven("QUIVER")[1].combat) or o.basic_ammo
end
if mean and dam then
c[#c+1] = { ["attack (main hand)"] = string.format("%d", self:combatAttack(mean)) }
c[#c+1] = { ["damage (main hand)"] = string.format("%d", self:combatDamage(dam)) }
c[#c+1] = { ["APR (main hand)"] = string.format("%d", self:combatAPR(dam)) }
c[#c+1] = { ["crit (main hand)"] = string.format("%d%%", self:combatCrit(dam)) }
c[#c+1] = { ["speed (main hand)"] = string.format("%0.2f", self:combatSpeed(mean)) }
end
if mean.range then c[#c+1] = { ["range (main hand)"] = mean.range } end
end
end
if self:getInven(self.INVEN_OFFHAND) then
local offmult = self:getOffHandMult()
for i, o in ipairs(self:getInven(self.INVEN_OFFHAND)) do
if o.combat then
c[#c+1] = { ["attack (off hand)"] = string.format("%d", self:combatAttack(o.combat)) }
c[#c+1] = { ["damage (off hand)"] = string.format("%d", self:combatDamage(o.combat) * offmult) }
c[#c+1] = { ["APR (off hand)"] = string.format("%d", self:combatAPR(o.combat)) }
c[#c+1] = { ["crit(off hand)"] = string.format("%d%%", self:combatCrit(o.combat)) }
c[#c+1] = { ["speed(off hand)"] = string.format("%0.2f", self:combatSpeed(o.combat)) }
local mean, dam = o.combat, o.combat
if o.archery and mean then
dam = (self:getInven("QUIVER")[1] and self:getInven("QUIVER")[1].combat) or o.basic_ammo
end
if mean and dam then
c[#c+1] = { ["attack (off hand)"] = string.format("%d", self:combatAttack(mean)) }
c[#c+1] = { ["damage (off hand)"] = string.format("%d", self:combatDamage(dam) * offmult) }
c[#c+1] = { ["APR (off hand)"] = string.format("%d", self:combatAPR(dam)) }
c[#c+1] = { ["crit(off hand)"] = string.format("%d%%", self:combatCrit(dam)) }
c[#c+1] = { ["speed(off hand)"] = string.format("%0.2f", self:combatSpeed(mean)) }
end
if mean.range then c[#c+1] = { ["range (main hand)"] = mean.range } end
end
end
c[#c+1] = { spellpower = self:combatSpellpower() }
......
game/modules/tome/class/interface/TooltipsData.lua
+ 3
− 0
View file @ f87aac2b
......@@ -148,6 +148,9 @@ TOOLTIP_COMBAT_SPEED = [[#GOLD#Attack speed#LAST#
Attack speed represents how fast your attacks are compared to a normal turn.
The lower it is the faster your attacks are.
]]
TOOLTIP_COMBAT_RANGE = [[#GOLD#Firing range#LAST#
The maximun distance your weapon can reach.
]]
-------------------------------------------------------------
-- Defense
......
game/modules/tome/dialogs/CharacterSheet.lua
+ 46
− 26
View file @ f87aac2b
......@@ -138,13 +138,18 @@ function _M:drawDialog(s)
-- All weapons in main hands
if player:getInven(player.INVEN_MAINHAND) then
for i, o in ipairs(player:getInven(player.INVEN_MAINHAND)) do
if o.combat then
self:mouseTooltip(self.TOOLTIP_COMBAT_ATTACK, s:drawColorStringBlended(self.font, ("Attack(Main Hand): #00ff00#%3d"):format(player:combatAttack(o.combat)), w, h, 255, 255, 255)) h = h + self.font_h
self:mouseTooltip(self.TOOLTIP_COMBAT_DAMAGE, s:drawColorStringBlended(self.font, ("Damage(Main Hand): #00ff00#%3d"):format(player:combatDamage(o.combat)), w, h, 255, 255, 255)) h = h + self.font_h
self:mouseTooltip(self.TOOLTIP_COMBAT_APR, s:drawColorStringBlended(self.font, ("APR (Main Hand): #00ff00#%3d"):format(player:combatAPR(o.combat)), w, h, 255, 255, 255)) h = h + self.font_h
self:mouseTooltip(self.TOOLTIP_COMBAT_CRIT, s:drawColorStringBlended(self.font, ("Crit (Main Hand): #00ff00#%3d%%"):format(player:combatCrit(o.combat)), w, h, 255, 255, 255)) h = h + self.font_h
self:mouseTooltip(self.TOOLTIP_COMBAT_SPEED, s:drawColorStringBlended(self.font, ("Speed (Main Hand): #00ff00#%0.2f"):format(player:combatSpeed(o.combat)), w, h, 255, 255, 255)) h = h + self.font_h
local mean, dam = o.combat, o.combat
if o.archery and mean then
dam = (player:getInven("QUIVER")[1] and player:getInven("QUIVER")[1].combat) or o.basic_ammo
end
if mean and dam then
self:mouseTooltip(self.TOOLTIP_COMBAT_ATTACK, s:drawColorStringBlended(self.font, ("Attack(Main Hand): #00ff00#%3d"):format(player:combatAttack(mean)), w, h, 255, 255, 255)) h = h + self.font_h
self:mouseTooltip(self.TOOLTIP_COMBAT_DAMAGE, s:drawColorStringBlended(self.font, ("Damage(Main Hand): #00ff00#%3d"):format(player:combatDamage(dam)), w, h, 255, 255, 255)) h = h + self.font_h
self:mouseTooltip(self.TOOLTIP_COMBAT_APR, s:drawColorStringBlended(self.font, ("APR (Main Hand): #00ff00#%3d"):format(player:combatAPR(dam)), w, h, 255, 255, 255)) h = h + self.font_h
self:mouseTooltip(self.TOOLTIP_COMBAT_CRIT, s:drawColorStringBlended(self.font, ("Crit (Main Hand): #00ff00#%3d%%"):format(player:combatCrit(dam)), w, h, 255, 255, 255)) h = h + self.font_h
self:mouseTooltip(self.TOOLTIP_COMBAT_SPEED, s:drawColorStringBlended(self.font, ("Speed (Main Hand): #00ff00#%0.2f"):format(player:combatSpeed(mean)), w, h, 255, 255, 255)) h = h + self.font_h
end
if mean.range then self:mouseTooltip(self.TOOLTIP_COMBAT_RANGE, s:drawColorStringBlended(self.font, ("Range (Main Hand): #00ff00#%3d"):format(mean.range), w, h, 255, 255, 255)) h = h + self.font_h end
end
end
h = h + self.font_h
......@@ -153,13 +158,18 @@ function _M:drawDialog(s)
if player:getInven(player.INVEN_OFFHAND) then
local offmult = player:getOffHandMult()
for i, o in ipairs(player:getInven(player.INVEN_OFFHAND)) do
if o.combat then
self:mouseTooltip(self.TOOLTIP_COMBAT_ATTACK, s:drawColorStringBlended(self.font, ("Attack (Off Hand): #00ff00#%3d"):format(player:combatAttack(o.combat)), w, h, 255, 255, 255)) h = h + self.font_h
self:mouseTooltip(self.TOOLTIP_COMBAT_DAMAGE, s:drawColorStringBlended(self.font, ("Damage (Off Hand): #00ff00#%3d"):format(player:combatDamage(o.combat) * offmult), w, h, 255, 255, 255)) h = h + self.font_h
self:mouseTooltip(self.TOOLTIP_COMBAT_APR , s:drawColorStringBlended(self.font, ("APR (Off Hand): #00ff00#%3d"):format(player:combatAPR(o.combat)), w, h, 255, 255, 255)) h = h + self.font_h
self:mouseTooltip(self.TOOLTIP_COMBAT_CRIT , s:drawColorStringBlended(self.font, ("Crit (Off Hand): #00ff00#%3d%%"):format(player:combatCrit(o.combat)), w, h, 255, 255, 255)) h = h + self.font_h
self:mouseTooltip(self.TOOLTIP_COMBAT_SPEED , s:drawColorStringBlended(self.font, ("Speed (Off Hand): #00ff00#%0.2f"):format(player:combatSpeed(o.combat)), w, h, 255, 255, 255)) h = h + self.font_h
local mean, dam = o.combat, o.combat
if o.archery and mean then
dam = (player:getInven("QUIVER")[1] and player:getInven("QUIVER")[1].combat) or o.basic_ammo
end
if mean and dam then
self:mouseTooltip(self.TOOLTIP_COMBAT_ATTACK, s:drawColorStringBlended(self.font, ("Attack (Off Hand): #00ff00#%3d"):format(player:combatAttack(mean)), w, h, 255, 255, 255)) h = h + self.font_h
self:mouseTooltip(self.TOOLTIP_COMBAT_DAMAGE, s:drawColorStringBlended(self.font, ("Damage (Off Hand): #00ff00#%3d"):format(player:combatDamage(dam) * offmult), w, h, 255, 255, 255)) h = h + self.font_h
self:mouseTooltip(self.TOOLTIP_COMBAT_APR , s:drawColorStringBlended(self.font, ("APR (Off Hand): #00ff00#%3d"):format(player:combatAPR(dam)), w, h, 255, 255, 255)) h = h + self.font_h
self:mouseTooltip(self.TOOLTIP_COMBAT_CRIT , s:drawColorStringBlended(self.font, ("Crit (Off Hand): #00ff00#%3d%%"):format(player:combatCrit(dam)), w, h, 255, 255, 255)) h = h + self.font_h
self:mouseTooltip(self.TOOLTIP_COMBAT_SPEED , s:drawColorStringBlended(self.font, ("Speed (Off Hand): #00ff00#%0.2f"):format(player:combatSpeed(mean)), w, h, 255, 255, 255)) h = h + self.font_h
end
if 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)) h = h + self.font_h end
end
end
h = h + self.font_h
......@@ -269,16 +279,21 @@ function _M:dump()
-- All weapons in main hands
local strings = {}
for i = 1, 5 do strings[i]="" end
for i = 1, 6 do strings[i]="" end
if player:getInven(player.INVEN_MAINHAND) then
for i, o in ipairs(player:getInven(player.INVEN_MAINHAND)) do
if o.combat then
strings[1] = ("Attack(Main Hand): %3d"):format(player:combatAttack(o.combat))
strings[2] = ("Damage(Main Hand): %3d"):format(player:combatDamage(o.combat))
strings[3] = ("APR (Main Hand): %3d"):format(player:combatAPR(o.combat))
strings[4] = ("Crit (Main Hand): %3d%%"):format(player:combatCrit(o.combat))
strings[5] = ("Speed (Main Hand): %0.2f"):format(player:combatSpeed(o.combat))
local mean, dam = o.combat, o.combat
if o.archery and mean then
dam = (player:getInven("QUIVER")[1] and player:getInven("QUIVER")[1].combat) or o.basic_ammo
end
if mean and dam then
strings[1] = ("Attack(Main Hand): %3d"):format(player:combatAttack(mean))
strings[2] = ("Damage(Main Hand): %3d"):format(player:combatDamage(dam))
strings[3] = ("APR (Main Hand): %3d"):format(player:combatAPR(dam))
strings[4] = ("Crit (Main Hand): %3d%%"):format(player:combatCrit(dam))
strings[5] = ("Speed (Main Hand): %0.2f"):format(player:combatSpeed(mean))
end
if mean.range then strings[6] = ("Range (Main Hand): %3d"):format(mean.range) end
end
end
......@@ -315,7 +330,7 @@ function _M:dump()
else
nl()
end
nnl(("%-32s"):format(""))
nnl(("%-32s"):format(strings[6]))
if player:knowTalent(player.T_VIM_POOL) then
nl(makelabel("Vim", (" %d/%d"):format(player:getVim(), player.max_vim)))
else
......@@ -333,14 +348,19 @@ function _M:dump()
if player:getInven(player.INVEN_OFFHAND) then
local offmult = player:getOffHandMult()
for i, o in ipairs(player:getInven(player.INVEN_OFFHAND)) do
if o.combat then
local mean, dam = o.combat, o.combat
if o.archery and mean then
dam = (player:getInven("QUIVER")[1] and player:getInven("QUIVER")[1].combat) or o.basic_ammo
end
if mean and dam then
nl()
nl(("Attack (Off Hand): %3d"):format(player:combatAttack(o.combat)))
nl(("Damage (Off Hand): %3d"):format(player:combatDamage(o.combat) * offmult))
nl(("APR (Off Hand): %3d"):format(player:combatAPR(o.combat)))
nl(("Crit (Off Hand): %3d%%"):format(player:combatCrit(o.combat)))
nl(("Speed (Off Hand): %0.2f"):format(player:combatSpeed(o.combat)))
nl(("Attack (Off Hand): %3d"):format(player:combatAttack(mean)))
nl(("Damage (Off Hand): %3d"):format(player:combatDamage(dam) * offmult))
nl(("APR (Off Hand): %3d"):format(player:combatAPR(dam)))
nl(("Crit (Off Hand): %3d%%"):format(player:combatCrit(dam)))
nl(("Speed (Off Hand): %0.2f"):format(player:combatSpeed(mean)))
end
if mean.range then strings[6] = ("Range (Off Hand): %3d"):format(mean.range) end
end
end
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment