Line 36: |
Line 36: |
| !Ship | | !Ship |
| !Lv. | | !Lv. |
− | !colspan="4"|Equipment | + | !style="text-align:left;white-space:nowrap"|Equipment |
| ![[File:Icon HP.png]] | | ![[File:Icon HP.png]] |
| ![[File:Icon Gun.png]] | | ![[File:Icon Gun.png]] |
Line 138: |
Line 138: |
| for j, ship in ipairs(fleet.fleet) do | | for j, ship in ipairs(fleet.fleet) do |
| table.insert(result, string.format( | | table.insert(result, string.format( |
− | '|-\n|%s||%s||%s||%s||%s||%s||%s||%s||%s||%s||%s', | + | '|-\n|%s||%s||%s%s%s%s%s||%s||%s||%s||%s||%s', |
| getShipCard(ship.ship), | | getShipCard(ship.ship), |
| ship.level, | | ship.level, |
− | ship.equipment[1] and getEquipmentCard(ship.equipment[1]) or 'style="background:grey;width:100px"| ', | + | ship.equipment[1] and getEquipmentCard(ship.equipment[1]) or '', |
− | ship.equipment[2] and getEquipmentCard(ship.equipment[2]) or 'style="background:grey;width:100px"| ', | + | ship.equipment[2] and getEquipmentCard(ship.equipment[2]) or '', |
− | ship.equipment[3] and getEquipmentCard(ship.equipment[3]) or 'style="background:grey;width:100px"| ', | + | ship.equipment[3] and getEquipmentCard(ship.equipment[3]) or '', |
− | ship.equipment[4] and getEquipmentCard(ship.equipment[4]) or 'style="background:grey;width:100px"| ', | + | ship.equipment[4] and getEquipmentCard(ship.equipment[4]) or '', |
| + | ship.equipment[5] and getEquipmentCard(ship.equipment[5]) or '', |
| type(ship.hp) == 'table' and formatHp(ship.hp, ship.maxHp) or ship.hp ~= ship.maxHp and string.format('%s/%s', ship.hp, ship.maxHp) or ship.maxHp, | | type(ship.hp) == 'table' and formatHp(ship.hp, ship.maxHp) or ship.hp ~= ship.maxHp and string.format('%s/%s', ship.hp, ship.maxHp) or ship.maxHp, |
| ship.firepower, | | ship.firepower, |