Changes

m
166 revisions imported
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 10: Line 10:  
local ShipInfoKai = require("Module:ShipInfoKai")
 
local ShipInfoKai = require("Module:ShipInfoKai")
 
local ShipCategoriesKai = require("Module:ShipCategoriesKai")
 
local ShipCategoriesKai = require("Module:ShipCategoriesKai")
local CalcAsset = require('Module:Calc/Plugins/Assets')
      
-- can't use Ship:remodel_to_level() normally for some reason
 
-- can't use Ship:remodel_to_level() normally for some reason
Line 116: Line 115:  
             override = { _page = "Sandbox/" .. self._vars.ship_name }
 
             override = { _page = "Sandbox/" .. self._vars.ship_name }
 
         end
 
         end
         local reversible_form = reversible_forms[form]
+
         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
 
         table.insert(infoboxes, format{
 
         table.insert(infoboxes, format{
 
             self._ship_infobox,
 
             self._ship_infobox,
             title = (self._ship_infobox_titles[i] or "?") .. (reversible_form and string.format(" (Reversible to %s)", reversible_form) 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 214: 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 222: 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 273: Line 282:  
function cg(seasonal, name, damaged, size, battle_card)
 
function cg(seasonal, name, damaged, size, battle_card)
 
     return format{
 
     return format{
         [[<span data-full-url="${full_url}" class="advanced-tooltip">${cg}<div class="tooltip-contents">${card}${battle_card}</div></span>]],
+
         [[<span class="advanced-tooltip">${cg}<div class="tooltip-contents">${card}${battle_card}</div></span>]],
 
         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 "",
        full_url = CalcAsset[damaged and "full_dmg" or "full"](Ship(name)),
   
     }
 
     }
 
end
 
end
Line 332: Line 340:  
end
 
end
   −
local blur_options = [=[<div style="float:right;text-align:right">
+
local blur_options = [=[<div style="margin-top:5px;text-align:right">
 
<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>
Bots, gkautomate
12,557

edits