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 row3 = '<tr><td colspan="4" style="text-align: center;">' .. ship.class .. " " .. shipType .. "</td></tr>" | + | 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 row4 = | | local row4 = |
| '<tr><td colspan="4"><hr style="border: 0; height: 1px; background-image: linear-gradient(to right, rgba(0,0,0,0), rgba(0,0,0,0.75), rgba(0,0,0,0));" /></td></tr>' | | '<tr><td colspan="4"><hr style="border: 0; height: 1px; background-image: linear-gradient(to right, rgba(0,0,0,0), rgba(0,0,0,0.75), rgba(0,0,0,0));" /></td></tr>' |
Line 280: |
Line 281: |
| remodelinfo = | | remodelinfo = |
| string.format( | | string.format( |
− | "[[File:IcoSteel.png|18px|Steel]] %d [[File:IcoAmmo.png|18px|Ammo]] %d", | + | "[[File:IcoAmmo.png|18px|Ammo]] %d [[File:IcoSteel.png|18px|Steel]] %d", |
− | ship.remodelreq[1], | + | ship.remodelreq[2], |
− | ship.remodelreq[2] | + | ship.remodelreq[1] |
| ) | | ) |
| if ship.remodelbp then | | if ship.remodelbp then |
Line 305: |
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 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 351: |
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 423: |
Line 428: |
| | | |
| local function renderReversion(ship) --Copy paste mess by Chocolatecravinghobo. Shows information/cost for models that remodel/revert to a previous remodel | | local function renderReversion(ship) --Copy paste mess by Chocolatecravinghobo. Shows information/cost for models that remodel/revert to a previous remodel |
| + | --- Souya hardcode fix |
| + | if ship["reversionto"] == "Souya " then |
| + | ship.reversionto = ship.reversionto .. "(AGS)" |
| + | end |
| + | |
| local reversionHeader = "" | | local reversionHeader = "" |
| local reversionStyle = "" | | local reversionStyle = "" |
| local reversionHeader = | | local reversionHeader = |
− | '<th style="width: 75%; white-space: nowrap; {{border-radius|12px 12px 12px 12px}} background-color: #3baef5; color: #ffffff; vertical-align: baseline;"> Reversible to ' .. ship.reversionto .. "</th>" | + | '<th colspan="4" style="width: 75%; white-space: nowrap; {{border-radius|12px 12px 12px 12px}} background-color: #3baef5; color: #ffffff; vertical-align: baseline;"> Reversible to ' .. ship.reversionto .. "</th>" |
| local reversionStyle = '<td style="white-space: nowrap; text-align: center; vertical-align: baseline;">' | | local reversionStyle = '<td style="white-space: nowrap; text-align: center; vertical-align: baseline;">' |
| local RscHeader = | | local RscHeader = |
Line 442: |
Line 452: |
| reversioninfo = | | reversioninfo = |
| string.format( | | string.format( |
− | "[[File:IcoSteel.png|18px|Steel]] %d [[File:IcoAmmo.png|18px|Ammo]] %d", | + | "[[File:IcoAmmo.png|18px|Ammo]] %d [[File:IcoSteel.png|18px|Steel]] %d", |
− | ship.reversionreq[1], | + | ship.reversionreq[2], |
− | ship.reversionreq[2] | + | ship.reversionreq[1] |
| ) | | ) |
| if ship.reversionbp then | | if ship.reversionbp then |
Line 467: |
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 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 513: |
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 548: |
Line 564: |
| | | |
| local function loadShipData(key) | | local function loadShipData(key) |
− | local ship = Ship(shipsById[(U.find(shipsByNo, ShipData[key] or key, "name") or {}).id]) | + | local ship = Ship(shipsById[(U.find(shipsByNo, ShipData[key] or key, "name") or {}).id] or key) |
| local data = {} | | local data = {} |
| data.id = ship:id() or '???' | | data.id = ship:id() or '???' |
Line 554: |
Line 570: |
| data.name = {ship:japanese_name() or "", ship:reading() or "", ship:name() or ""} | | data.name = {ship:japanese_name() or "", ship:reading() or "", ship:name() or ""} |
| local class = ship:class() | | local class = ship:class() |
− | data.class = class and ship:class():name() or "???" | + | data.class = class and class:name() 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 606: |
Line 623: |
| data.remodelairmat = trueIsOne(ship._remodel_airmat) | | data.remodelairmat = trueIsOne(ship._remodel_airmat) |
| data.remodelarmmat = trueIsOne(ship._remodel_armament) | | data.remodelarmmat = trueIsOne(ship._remodel_armament) |
| + | data.remodelboiler = trueIsOne(ship._remodel_boiler) |
| 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.remodelboiler = trueIsOne(ship._remodel_boiler) | + | data.remodelscrew = trueIsOne(ship._remodel_screw) |
| | | |
| data.reversible = trueIsOne(ship._reversible) | | data.reversible = trueIsOne(ship._reversible) |
| data.reversionto = ship:remodel_to() or "" | | data.reversionto = ship:remodel_to() or "" |
| data.reversionto = data.reversionto:gsub("/", " ") | | data.reversionto = data.reversionto:gsub("/", " ") |
| + | data.reversionbp = trueIsOne(ship._remodel_to_blueprint) |
| data.reversionlv = ship:remodel_to_level() or "" | | data.reversionlv = ship:remodel_to_level() or "" |
| data.reversionreq = not ship._remodel_to_steel and not ship._remodel_to_ammo and '' or {ship._remodel_to_steel or 0, ship._remodel_to_ammo or 0} | | data.reversionreq = not ship._remodel_to_steel and not ship._remodel_to_ammo and '' or {ship._remodel_to_steel or 0, ship._remodel_to_ammo or 0} |
| data.reversionbp = trueIsOne(ship._remodel_to_blueprint) | | data.reversionbp = trueIsOne(ship._remodel_to_blueprint) |
| data.reversioncatapult = trueIsOne(ship._remodel_to_catapult) | | data.reversioncatapult = trueIsOne(ship._remodel_to_catapult) |
| + | data.reversionar = trueIsOne(ship._remodel_to_report) |
| + | data.reversiongunmat = trueIsOne(ship._remodel_to_gunmat) |
| + | data.reversionairmat = trueIsOne(ship._remodel_to_airmat) |
| + | data.reversionarmmat = trueIsOne(ship._remodel_to_armament) |
| + | data.reversionboiler = trueIsOne(ship._remodel_to_boiler) |
| 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 |