Line 111: |
Line 111: |
| ship.type | | ship.type |
| local row2 = '<tr><th colspan="2">' .. JaName .. '</th><th colspan="2">' .. ship.name[3] .. "</th></tr>" | | local row2 = '<tr><th colspan="2">' .. JaName .. '</th><th colspan="2">' .. ship.name[3] .. "</th></tr>" |
− | local class_string = ship.class == ship.class_override and ship.class or formatTooltip(ship.class, "Game library: " .. ship.class_override) | + | local class_string = ship.display_class and formatTooltip(ship.class, "Game library: " .. ship.display_class) or ship.class |
| local row3 = '<tr><td colspan="4" style="text-align: center;">' .. class_string .. " " .. shipType .. "</td></tr>" | | local row3 = '<tr><td colspan="4" style="text-align: center;">' .. class_string .. " " .. shipType .. "</td></tr>" |
| local row4 = | | local row4 = |
Line 306: |
Line 306: |
| string.format("[[File:Item Icon Action Report.png|25px|Action Report|link=Action Report]] %d", ship.remodelar) | | string.format("[[File:Item Icon Action Report.png|25px|Action Report|link=Action Report]] %d", ship.remodelar) |
| end | | end |
− | if ship.remodeldevmat or ship.remodelconmat or ship.remodelgunmat or ship.remodelairmat or ship.remodelarmmat or ship.remodelboiler then | + | if ship.remodeldevmat or ship.remodelconmat or ship.remodelgunmat or ship.remodelairmat or ship.remodelarmmat or ship.remodelboiler or ship.remodelscrew then |
| remodelinfo = remodelinfo .. "<br>" | | remodelinfo = remodelinfo .. "<br>" |
| end | | end |
Line 352: |
Line 352: |
| ship.remodelboiler | | ship.remodelboiler |
| ) | | ) |
| + | end |
| + | if ship.remodelscrew then |
| + | remodelinfo = |
| + | remodelinfo .. " " .. string.format("[[File:Item Icon Improvement Material.png|18px|Improvement Material|link=Improvement]] %d", ship.remodelscrew) |
| end | | end |
| end | | end |
Line 473: |
Line 477: |
| string.format("[[File:Item Icon Action Report.png|25px|Action Report|link=Action Report]] %d", ship.reversionar) | | string.format("[[File:Item Icon Action Report.png|25px|Action Report|link=Action Report]] %d", ship.reversionar) |
| end | | end |
− | if ship.reversiondevmat or ship.reversionconmat or ship.reversiongunmat or ship.reversionairmat or ship.reversionarmmat or ship.reversionboiler then | + | if ship.reversiondevmat or ship.reversionconmat or ship.reversiongunmat or ship.reversionairmat or ship.reversionarmmat or ship.reversionboiler or ship.reversionscrew then |
| reversioninfo = reversioninfo .. "<br>" | | reversioninfo = reversioninfo .. "<br>" |
| end | | end |
Line 519: |
Line 523: |
| ship.reversionboiler | | ship.reversionboiler |
| ) | | ) |
| + | end |
| + | if ship.reversionscrew then |
| + | reversioninfo = reversioninfo .. " " .. string.format( |
| + | "[[File:Item Icon Improvement Material.png|18px|Improvement Material|link=Improvement]] %d", |
| + | ship.reversionscrew |
| + | ) |
| end | | end |
| end | | end |
Line 561: |
Line 571: |
| local class = ship:class() | | local class = ship:class() |
| data.class = class and class:name() or "???" | | data.class = class and class:name() or "???" |
− | data.class_override = class and class:name_override() or "???" | + | data.display_class = ship._display_class |
| data.type = ship:formatted_type() or "" | | data.type = ship:formatted_type() or "" |
| data.spd = ship:formatted_speed() or "" | | data.spd = ship:formatted_speed() or "" |
Line 616: |
Line 626: |
| data.remodeldevmat = trueIsOne(ship._remodel_development_material) | | data.remodeldevmat = trueIsOne(ship._remodel_development_material) |
| data.remodelconmat = trueIsOne(ship._remodel_construction_material) | | data.remodelconmat = trueIsOne(ship._remodel_construction_material) |
| + | data.remodelscrew = trueIsOne(ship._remodel_screw) |
| | | |
| data.reversible = trueIsOne(ship._reversible) | | data.reversible = trueIsOne(ship._reversible) |
Line 632: |
Line 643: |
| data.reversiondevmat = trueIsOne(ship._remodel_to_development_material) | | data.reversiondevmat = trueIsOne(ship._remodel_to_development_material) |
| data.reversionconmat = trueIsOne(ship._remodel_to_construction_material) | | data.reversionconmat = trueIsOne(ship._remodel_to_construction_material) |
| + | data.reversionscrew = trueIsOne(ship._remodel_to_screw) |
| return data | | return data |
| end | | end |