Line 145: |
Line 145: |
| end | | end |
| if table.getn(fleet.voices or {}) > 0 then | | if table.getn(fleet.voices or {}) > 0 then |
− | fleetNote = fleetNote .. ' ' .. U.ijoin(U.imap(fleet.voices[1], formatVoice), ' ') | + | fleetNote = fleetNote .. ' ' .. U.ijoin(U.imap(fleet.voices, formatVoice), ' ') |
| end | | end |
| table.insert(result, string.format('|-\n!colspan="11"|%s', fleetNote)) | | table.insert(result, string.format('|-\n!colspan="11"|%s', fleetNote)) |
Line 153: |
Line 153: |
| result, | | result, |
| string.format( | | 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||%s||%s||%s||%s||%s', |
| getShipCard(ship.ship), | | getShipCard(ship.ship), |
| ship.level, | | ship.level, |
Line 161: |
Line 161: |
| ship.equipment[4] and getEquipmentCard(ship.equipment[4]) or '', | | ship.equipment[4] and getEquipmentCard(ship.equipment[4]) or '', |
| ship.equipment[5] and getEquipmentCard(ship.equipment[5]) or '', | | ship.equipment[5] and getEquipmentCard(ship.equipment[5]) or '', |
| + | ship.extraSlot and string.format('<span style="display:inline-block;border-radius:10px;border:5px solid steelblue">%s</span>', getEquipmentCard(ship.extraSlot)) 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 | | 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.maxHp, |