Line 43: |
Line 43: |
| local Banners = | | local Banners = |
| '<td colspan="3" class="double-image" style="width:240px;height:60px">' .. BannerImg .. BannerDmgImg .. "</td>" | | '<td colspan="3" class="double-image" style="width:240px;height:60px">' .. BannerImg .. BannerDmgImg .. "</td>" |
− | local dispNo = U.split(ship.no, "-")[1] or "?" | + | local dispNo = U.split(ship.no, "-")[1] or "???" |
| local sortNo = ship.sortno | | local sortNo = ship.sortno |
| local sortNoText = sortNo and (sortNo > 1000 and formatTooltip(dispNo, string.format("%d ", sortNo)) or sortNo) or dispNo | | local sortNoText = sortNo and (sortNo > 1000 and formatTooltip(dispNo, string.format("%d ", sortNo)) or sortNo) or dispNo |
Line 92: |
Line 92: |
| ship.no == "147" or ship.no == "311" or ship.no == "312" or ship.no == "313" or ship.no == "313a" or | | ship.no == "147" or ship.no == "311" or ship.no == "312" or ship.no == "313" or ship.no == "313a" or |
| ship.no == "316" | | ship.no == "316" |
− | then --Russian ship markup | + | then -- Russian ship markup |
| JaName = | | JaName = |
| '<ruby lang="ru"><rb>' .. | | '<ruby lang="ru"><rb>' .. |
Line 443: |
Line 443: |
| local ship = Ship(shipsById[(U.find(shipsByNo, ShipData[no] or no, "name") or {}).id]) | | local ship = Ship(shipsById[(U.find(shipsByNo, ShipData[no] or no, "name") or {}).id]) |
| local data = {} | | local data = {} |
| + | -- Two index formats from Module:Data/Ship: base_sortno..('a' if sortno>1000) OR sortno..'-'..mstid |
| + | -- here forced to former format instead of: data.no = no, |
| + | -- since `no` now might be {{pagename}}(ship name directly), without dependency on Module:Data/Ship. |
| data.no = (ship:true_id() or 0) > 1000 and ship:id()..'a' or ship:id() or no | | data.no = (ship:true_id() or 0) > 1000 and ship:id()..'a' or ship:id() or no |
| data.sortno = ship:true_id() | | data.sortno = ship:true_id() |