Commit b86d16c42856b36fcd88424ad4f6daa7dda56f5c
1 parent
5227f9f7
Egos are again displayed in the NPC's tooltips
Showing
1 changed file
with
4 additions
and
4 deletions
@@ -1841,7 +1841,7 @@ function _M:tooltip(x, y, seen_by) | @@ -1841,7 +1841,7 @@ function _M:tooltip(x, y, seen_by) | ||
1841 | -- Short names of wielded weapons/ammo | 1841 | -- Short names of wielded weapons/ammo |
1842 | if self:getInven("MAINHAND") then | 1842 | if self:getInven("MAINHAND") then |
1843 | for i, o in ipairs(self:getInven("MAINHAND")) do | 1843 | for i, o in ipairs(self:getInven("MAINHAND")) do |
1844 | - local tst = ("#LIGHT_BLUE#Main:#LAST#"..o:getShortName({do_color=true, no_add_name=true})):toTString() | 1844 | + local tst = ("#LIGHT_BLUE#Main:#LAST#"..o:getShortName({force_id=true, do_color=true, no_add_name=true})):toTString() |
1845 | tst = tst:splitLines(game.tooltip.max-1, game.tooltip.font, 2) | 1845 | tst = tst:splitLines(game.tooltip.max-1, game.tooltip.font, 2) |
1846 | tst = tst:extractLines(true)[1] | 1846 | tst = tst:extractLines(true)[1] |
1847 | table.append(ts, tst) | 1847 | table.append(ts, tst) |
@@ -1850,7 +1850,7 @@ function _M:tooltip(x, y, seen_by) | @@ -1850,7 +1850,7 @@ function _M:tooltip(x, y, seen_by) | ||
1850 | end | 1850 | end |
1851 | if self:getInven("OFFHAND") then | 1851 | if self:getInven("OFFHAND") then |
1852 | for i, o in ipairs(self:getInven("OFFHAND")) do | 1852 | for i, o in ipairs(self:getInven("OFFHAND")) do |
1853 | - local tst = ("#LIGHT_BLUE#Off :#LAST#"..o:getShortName({do_color=true, no_add_name=true})):toTString() | 1853 | + local tst = ("#LIGHT_BLUE#Off :#LAST#"..o:getShortName({force_id=true, do_color=true, no_add_name=true})):toTString() |
1854 | tst = tst:splitLines(game.tooltip.max-1, game.tooltip.font, 2) | 1854 | tst = tst:splitLines(game.tooltip.max-1, game.tooltip.font, 2) |
1855 | tst = tst:extractLines(true)[1] | 1855 | tst = tst:extractLines(true)[1] |
1856 | table.append(ts, tst) | 1856 | table.append(ts, tst) |
@@ -1859,7 +1859,7 @@ function _M:tooltip(x, y, seen_by) | @@ -1859,7 +1859,7 @@ function _M:tooltip(x, y, seen_by) | ||
1859 | end | 1859 | end |
1860 | if self:getInven("PSIONIC_FOCUS") and self:attr("psi_focus_combat") then | 1860 | if self:getInven("PSIONIC_FOCUS") and self:attr("psi_focus_combat") then |
1861 | for i, o in ipairs(self:getInven("PSIONIC_FOCUS")) do | 1861 | for i, o in ipairs(self:getInven("PSIONIC_FOCUS")) do |
1862 | - local tst = ("#LIGHT_BLUE#Psi :#LAST#"..o:getShortName({do_color=true, no_add_name=true})):toTString() | 1862 | + local tst = ("#LIGHT_BLUE#Psi :#LAST#"..o:getShortName({force_id=true, do_color=true, no_add_name=true})):toTString() |
1863 | tst = tst:splitLines(game.tooltip.max-1, game.tooltip.font, 2) | 1863 | tst = tst:splitLines(game.tooltip.max-1, game.tooltip.font, 2) |
1864 | tst = tst:extractLines(true)[1] | 1864 | tst = tst:extractLines(true)[1] |
1865 | table.append(ts, tst) | 1865 | table.append(ts, tst) |
@@ -1868,7 +1868,7 @@ function _M:tooltip(x, y, seen_by) | @@ -1868,7 +1868,7 @@ function _M:tooltip(x, y, seen_by) | ||
1868 | end | 1868 | end |
1869 | if self:getInven("QUIVER") then | 1869 | if self:getInven("QUIVER") then |
1870 | for i, o in ipairs(self:getInven("QUIVER")) do | 1870 | for i, o in ipairs(self:getInven("QUIVER")) do |
1871 | - local tst = ("#LIGHT_BLUE#Ammo:#LAST#"..o:getShortName({do_color=true, no_add_name=true})):toTString() | 1871 | + local tst = ("#LIGHT_BLUE#Ammo:#LAST#"..o:getShortName({force_id=true, do_color=true, no_add_name=true})):toTString() |
1872 | tst = tst:splitLines(game.tooltip.max-1, game.tooltip.font, 2) | 1872 | tst = tst:splitLines(game.tooltip.max-1, game.tooltip.font, 2) |
1873 | tst = tst:extractLines(true)[1] | 1873 | tst = tst:extractLines(true)[1] |
1874 | table.append(ts, tst) | 1874 | table.append(ts, tst) |
-
Please register or login to post a comment