fix(lagre): 'rækker til' regnes på nettoforbrug (+ 'stiger'), bredere beholdningskolonne, kort tooltip (v1.16.1.0)
This commit is contained in:
@@ -74,13 +74,13 @@
|
||||
</Bitmap>
|
||||
<!-- Lagre: statistik-tabel (vare · i bygningen · værdi nu · ved toppris · gården · rækker til · forbrug/prod.) -->
|
||||
<Bitmap profile="fs25_multiTextOptionContainer" id="statPrefab">
|
||||
<Text profile="spuCellBold" name="c1" position="20px 0px" size="145px 40px"/>
|
||||
<Text profile="spuCell" name="c2" position="165px 0px" size="135px 40px"/>
|
||||
<Text profile="spuCell" name="c3" position="300px 0px" size="200px 40px"/>
|
||||
<Text profile="spuCell" name="c4" position="400px 0px" size="100px 40px"/>
|
||||
<Text profile="spuCell" name="c5" position="500px 0px" size="70px 40px"/>
|
||||
<Text profile="spuCell" name="c6" position="570px 0px" size="85px 40px"/>
|
||||
<Text profile="spuCell" name="c7" position="655px 0px" size="155px 40px"/>
|
||||
<Text profile="spuCellBold" name="c1" position="20px 0px" size="140px 40px"/>
|
||||
<Text profile="spuCell" name="c2" position="160px 0px" size="145px 40px"/>
|
||||
<Text profile="spuCell" name="c3" position="305px 0px" size="200px 40px"/>
|
||||
<Text profile="spuCell" name="c4" position="405px 0px" size="100px 40px"/>
|
||||
<Text profile="spuCell" name="c5" position="505px 0px" size="65px 40px"/>
|
||||
<Text profile="spuCell" name="c6" position="570px 0px" size="80px 40px"/>
|
||||
<Text profile="spuCell" name="c7" position="650px 0px" size="160px 40px"/>
|
||||
</Bitmap>
|
||||
<!-- Lagre: gårdens beholdning som gitter (bygning · 2 varer pr. række). Rækken er ~815 px bred. -->
|
||||
<Bitmap profile="fs25_multiTextOptionContainer" id="gridPrefab">
|
||||
|
||||
@@ -98,7 +98,12 @@ function SmartPickupFrame:statCells(stat)
|
||||
if stat.valueNow ~= nil then
|
||||
now, top = SmartPickupFrame.formatMoney(stat.valueNow), SmartPickupFrame.formatMoney(stat.valueTop)
|
||||
end
|
||||
local days = stat.days ~= nil and string.format(i18n:getText("spu_stat_days"), stat.days) or "-"
|
||||
local days = "-"
|
||||
if stat.days ~= nil then
|
||||
days = string.format(i18n:getText("spu_stat_days"), stat.days)
|
||||
elseif stat.rising then
|
||||
days = i18n:getText("spu_stat_rising")
|
||||
end
|
||||
return {self:fillTypeTitle(stat.fillType), here, now, top, fc(stat.farmTotal), days, ADStorageStats.rateText(stat.consumption, stat.production, fc)}
|
||||
end
|
||||
|
||||
|
||||
Reference in New Issue
Block a user