Line 140: |
Line 140: |
| 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||style="text-align:left;white-space:nowrap"|%s%s%s%s%s||%s||%s||%s||%s||%s', | + | '|-\n|%s||%s||style="text-align:left;white-space:nowrap"|%s||%s||%s||%s||%s||%s', |
| getShipCard(ship.ship), | | getShipCard(ship.ship), |
| ship.level, | | ship.level, |
− | ship.equipment[1] and getEquipmentCard(ship.equipment[1], cardSize) or '', | + | U.ijoin(U.imap(ship.equipment, function(eq) return getEquipmentCard(eq, cardSize) end)), |
− | ship.equipment[2] and getEquipmentCard(ship.equipment[2], cardSize) or '',
| |
− | ship.equipment[3] and getEquipmentCard(ship.equipment[3], cardSize) or '',
| |
− | ship.equipment[4] and getEquipmentCard(ship.equipment[4], cardSize) or '',
| |
− | ship.equipment[5] and getEquipmentCard(ship.equipment[5], cardSize) 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, |