Line 1: |
Line 1: |
− | local U = require("Module:Utils") | + | local U = require("Module:Core") |
− | local format = require("Module:Utils").format | + | local format = require("Module:Core").format |
| local Formatting = require("Module:Formatting") | | local Formatting = require("Module:Formatting") |
| local BaseData = require("Module:BaseData") | | local BaseData = require("Module:BaseData") |
Line 39: |
Line 39: |
| form_data = ship_data[ship_suffix_next] | | form_data = ship_data[ship_suffix_next] |
| if form_data._remodel_to_level then | | if form_data._remodel_to_level then |
− | reversible_forms[form_data._name .. "/" .. (form_data._suffix or "")] = true | + | reversible_forms[form_data._name .. "/" .. (form_data._suffix or "")] = form_data._remodel_to |
| end | | end |
| end | | end |
Line 114: |
Line 114: |
| if basepagename == "Sandbox" then | | if basepagename == "Sandbox" then |
| override = { _page = "Sandbox/" .. self._vars.ship_name } | | override = { _page = "Sandbox/" .. self._vars.ship_name } |
| + | end |
| + | local reverse_form_suffix |
| + | if reversible_forms[form] then |
| + | local lua_huh, reverse_form_suffix_ = Ship:process_ship_key(reversible_forms[form]) |
| + | reverse_form_suffix = reverse_form_suffix_ |
| end | | end |
| table.insert(infoboxes, format{ | | table.insert(infoboxes, format{ |
| self._ship_infobox, | | self._ship_infobox, |
− | title = (self._ship_infobox_titles[i] or "?") .. (reversible_forms[form] and " (Reversible)" or ""), | + | title = (self._ship_infobox_titles[i] or "?") .. |
| + | (reverse_form_suffix and string.format(" (Reversible to %s)", reverse_form_suffix) or ""), |
| infobox = ShipInfoKai:Infobox({ form, override = override }) | | infobox = ShipInfoKai:Infobox({ form, override = override }) |
| }) | | }) |
Line 129: |
Line 135: |
| | | |
| function ShipPage:format_notice(basepagename) | | function ShipPage:format_notice(basepagename) |
− | self._vars.notice = basepagename == "Sandbox" and self._sandbox_notice or Ship(basepagename):type() == 2 and self._dd_notice or "" | + | self._vars.notice = basepagename == "Sandbox" and self._sandbox_notice or "" -- Ship(basepagename):type() == 2 and self._dd_notice or "" |
| end | | end |
| | | |
Line 212: |
Line 218: |
| end | | end |
| | | |
− | function ship_cgs(ship_name, ship_suffix, j, seasonal_forms) | + | function ship_cgs(ship_name, ship_suffix, j, seasonal_forms, visited_modules) |
| + | ship_suffix = ship_suffix or "" |
| j = j or 1 | | j = j or 1 |
− | ship_suffix = ship_suffix or "" | + | seasonal_forms = seasonal_forms or {} |
| + | visited_modules = visited_modules or {} |
| local forms = { { name = ship_name .. '/' .. ship_suffix, normal = true, damaged = true } } | | local forms = { { name = ship_name .. '/' .. ship_suffix, normal = true, damaged = true } } |
| local success, ship_data = Ship.requireModule(ship_name) | | local success, ship_data = Ship.requireModule(ship_name) |
Line 220: |
Line 228: |
| return forms | | return forms |
| end | | end |
− | local form_data = ship_data[ship_suffix] | + | if not U.ifind(visited_modules, ship_name) then |
− | seasonal_forms = seasonal_forms or {}
| + | table.insert(visited_modules, ship_name) |
− | for suffix, data in pairs(ship_data) do
| + | -- TODO: legacy seasonals, check if it is ok to delete |
− | if data._seasonal or data._season then
| + | for suffix, data in pairs(ship_data) do |
− | local normal = data._cg ~= false
| + | if data._seasonal or data._season then |
− | local damaged = data._cg_damaged ~= false
| + | local normal = data._cg ~= false |
− | table.insert(seasonal_forms, {
| + | local damaged = data._cg_damaged ~= false |
− | suffux = data._suffix or suffix,
| + | table.insert(seasonal_forms, { |
− | name = (data._name or ship_name) .. "/" .. (data._suffix or suffix),
| + | suffux = data._suffix or suffix, |
− | seasonal = true,
| + | name = (data._name or ship_name) .. "/" .. (data._suffix or suffix), |
− | normal = normal,
| + | seasonal = true, |
− | damaged = damaged,
| + | normal = normal, |
− | season = data._season,
| + | damaged = damaged, |
− | season_suffix = data._season_suffix,
| + | season = data._season, |
− | battle_card = data._show_battle_card,
| + | season_suffix = data._season_suffix, |
− | })
| + | battle_card = data._show_battle_card, |
− | end
| + | }) |
− | end
| + | end |
− | for _, data in ipairs(ship_data.seasonals or {}) do
| + | end |
− | local normal = data._cg ~= false
| + | for _, data in ipairs(ship_data.seasonals or {}) do |
− | local damaged = data._cg_damaged ~= false
| + | local normal = data._cg ~= false |
− | table.insert(seasonal_forms, {
| + | local damaged = data._cg_damaged ~= false |
− | suffux = data._suffix,
| + | table.insert(seasonal_forms, { |
− | name = (data._name or ship_name) .. "/" .. data._suffix,
| + | suffux = data._suffix, |
− | seasonal = true,
| + | name = (data._name or ship_name) .. "/" .. data._suffix, |
− | normal = normal,
| + | seasonal = true, |
− | damaged = damaged,
| + | normal = normal, |
− | season = data._season,
| + | damaged = damaged, |
− | season_suffix = data._season_suffix,
| + | season = data._season, |
− | battle_card = data._show_battle_card,
| + | season_suffix = data._season_suffix, |
− | })
| + | battle_card = data._show_battle_card, |
| + | }) |
| + | end |
| end | | end |
| local i = 1 | | local i = 1 |
| + | local form_data = ship_data[ship_suffix] |
| while form_data and form_data._remodel_to and not U.find(forms, form_data._remodel_to, 'name') and i <= 15 and j <= 3 do | | while form_data and form_data._remodel_to and not U.find(forms, form_data._remodel_to, 'name') and i <= 15 and j <= 3 do |
| local ship_name_next, ship_suffix_next = Ship:process_ship_key(form_data._remodel_to) | | local ship_name_next, ship_suffix_next = Ship:process_ship_key(form_data._remodel_to) |
| if ship_name_next ~= ship_name then | | if ship_name_next ~= ship_name then |
− | return U.concat(forms, ship_cgs(ship_name_next, ship_suffix_next, j + 1, seasonal_forms)) | + | return U.concat(forms, ship_cgs(ship_name_next, ship_suffix_next, j + 1, seasonal_forms, visited_modules)) |
| else | | else |
| local name = form_data._remodel_to | | local name = form_data._remodel_to |
Line 274: |
Line 285: |
| cg = ShipGraphicKai:Asset({ name, link = "nil", damaged = damaged, size = size, hd = true }), | | cg = ShipGraphicKai:Asset({ name, link = "nil", damaged = damaged, size = size, hd = true }), |
| card = ShipCardKai:Asset({ name, link = "nil", damaged = damaged, hd = true }), | | card = ShipCardKai:Asset({ name, link = "nil", damaged = damaged, hd = true }), |
− | battle_card = battle_card and ("<br>" .. ShipBattleCardKai:Asset({ name, link = "nil", damaged = damaged, hd = true })) or "" | + | battle_card = battle_card and ("<br>" .. ShipBattleCardKai:Asset({ name, link = "nil", damaged = damaged, hd = true })) or "", |
| } | | } |
| end | | end |
Line 329: |
Line 340: |
| end | | end |
| | | |
− | local function addBlurOptions(parts) | + | local blur_options = [=[<div style="margin-top:5px;text-align:right"> |
− | table.insert(parts, [=[<div class="toggle" data-target="nsfw" data-default="hide" data-classes="blur">
| + | <div class="toggle" data-target="nsfw" data-default="hide" data-classes="blur"> |
| <span class="toggle-show" style="cursor:pointer;color:#006cb0;">☑ Blur NSFW CG</span> | | <span class="toggle-show" style="cursor:pointer;color:#006cb0;">☑ Blur NSFW CG</span> |
| <span class="toggle-hide" style="cursor:pointer;color:#006cb0;">☒ Blur NSFW CG</span> | | <span class="toggle-hide" style="cursor:pointer;color:#006cb0;">☒ Blur NSFW CG</span> |
− | </div>]=]) | + | </div> |
− | table.insert(parts, [=[<div class="toggle" data-target="nsfw-damaged" data-default="hide" data-classes="blur">
| + | <div class="toggle" data-target="nsfw-damaged" data-default="hide" data-classes="blur"> |
| <span class="toggle-show" style="cursor:pointer;color:#006cb0;">☑ Blur other damaged CG</span> | | <span class="toggle-show" style="cursor:pointer;color:#006cb0;">☑ Blur other damaged CG</span> |
| <span class="toggle-hide" style="cursor:pointer;color:#006cb0;">☒ Blur other damaged CG</span> | | <span class="toggle-hide" style="cursor:pointer;color:#006cb0;">☒ Blur other damaged CG</span> |
− | </div>]=]) | + | </div> |
− | end
| + | </div>]=] |
| | | |
| function ShipPage.Gallery(frame, args) | | function ShipPage.Gallery(frame, args) |
Line 386: |
Line 397: |
| end | | end |
| table.insert(result, "</div>") | | table.insert(result, "</div>") |
− | addBlurOptions(result) | + | table.insert(result, blur_options) |
| return table.concat(result, "\n") | | return table.concat(result, "\n") |
| end | | end |
Line 424: |
Line 435: |
| end | | end |
| table.insert(result, "}}") | | table.insert(result, "}}") |
− | addBlurOptions(result) | + | table.insert(result, blur_options) |
| return table.concat(result, "\n") | | return table.concat(result, "\n") |
| end | | end |