Changes

no edit summary
Line 1: Line 1: −
local U = require("Module:Utils")
+
local U = require("Module:Core")
local format = require("Module:Utils").format
   
local Formatting = require("Module:Formatting")
 
local Formatting = require("Module:Formatting")
 
local Equipment = require("Module:Equipment")
 
local Equipment = require("Module:Equipment")
local ShipIterator = require("Module:ShipIterator")
+
local Iterator = require("Module:Iterator")
 
local ShipCapabilities = require("Module:ShipCapabilities")
 
local ShipCapabilities = require("Module:ShipCapabilities")
 +
local ShipCardKai = require("Module:ShipCardKai")
 
local ShipBattleCardKai = require("Module:ShipBattleCardKai")
 
local ShipBattleCardKai = require("Module:ShipBattleCardKai")
local Combat2 = require("Module:Combat2")
+
local Combat = require("Module:CalcCombat")
 
local EquipmentCardKai = require("Module:EquipmentCardKai")
 
local EquipmentCardKai = require("Module:EquipmentCardKai")
 
local EquipmentGraphicKai = require("Module:EquipmentGraphicKai")
 
local EquipmentGraphicKai = require("Module:EquipmentGraphicKai")
local EquipmentCollection = require("Module:Collection/Equipment")
+
local EquipmentCollection = require("Module:Data/Equipment")
 +
-- local AllEquipmentCollection = require("Module:Collection/EquipmentByApiId")
 
local Development = require("Module:Development")
 
local Development = require("Module:Development")
 
local ShipsByApiId = require("Module:Collection/ShipsByApiId")
 
local ShipsByApiId = require("Module:Collection/ShipsByApiId")
 +
local Ship = require("Module:Ship")
   −
local Ship = nil
  −
  −
local frame = nil
   
local args = nil
 
local args = nil
 +
-- local Ship = nil
 
local ship = nil
 
local ship = nil
 +
local shipCapabilities = {}
 
local target = nil
 
local target = nil
local shipCapabilities = {}
   
local equipment = nil
 
local equipment = nil
 
+
local sequence = nil
-- $('.calc-debug').show().appendTo('#mw-content-text')
+
local sequence_length = nil
local debug = {}
+
local sequence_position = nil
 
+
-- local sorted = false
function debugLog(k, v)
+
-- local env = {}
    if args.debug then
  −
        k = U.trim(tostring(k))
  −
        v = U.trim(tostring(v))
  −
        table.insert(debug, k .. " = " .. v)
  −
    end
  −
end
  −
 
  −
function debugString()
  −
    return #debug > 0 and args.debug and ([[<pre class="calc-debug" style="text-align:left;background:transparent;display:none"><code>]] .. table.concat(debug, "\n") .. [[</code></pre>]]) or ""
  −
end
  −
 
  −
function format_lua(lua)
  −
    if type(lua) == "table" then
  −
        return tostring(table.concat(lua, args.concat_value or ", "))
  −
    else
  −
        return tostring(lua)
  −
    end
  −
end
      
local enumerating_functions = {
 
local enumerating_functions = {
 
+
     args = function() return mw.text.split(args.args, "%s*,%s*") end,
     args = function()
+
    base_names = function() return require('Module:Collection/ShipsBase') end,
        return mw.text.split(args.args, "%s*,%s*")
+
    all_names = function() return require('Module:Collection/Ships') end,
 +
    remodel_names = function()
 +
    local all_names = require('Module:Collection/Ships')
 +
    local base_names = require('Module:Collection/ShipsBase')
 +
    local result = {}
 +
    for _, name in ipairs(all_names) do
 +
    if not U.includes(base_names, name) then
 +
    local ship = Ship(name)
 +
    if ship._implementation_date then
 +
    table.insert(result, name)
 +
    end
 +
    end
 +
    end
 +
    return result
 
     end,
 
     end,
 
+
    enemy = function() return require('Module:Collection/EnemyShips') end,
     base_names = function()
+
     equipment = function()
        return ShipIterator.baseForms
+
    equipment = true
 +
    return U.imap(EquipmentCollection, function(e) return e._name end)
 
     end,
 
     end,
 
+
    --[[
     all_names = function()
+
     allEquipment = function()
         return ShipIterator.allForms
+
    equipment = true
 +
        local result = {}
 +
        for i = 1, 700 do
 +
            if AllEquipmentCollection[i] then
 +
                table.insert(result, AllEquipmentCollection[i])
 +
            end
 +
        end
 +
         return result
 
     end,
 
     end,
      
+
     enemyEquipment = function()
    enemy = function()
+
    equipment = true
         return ShipIterator.enemyForms
+
        local result = {}
 +
        for i = 501, 700 do
 +
            if AllEquipmentCollection[i] then
 +
                table.insert(result, AllEquipmentCollection[i])
 +
            end
 +
        end
 +
         return result
 
     end,
 
     end,
 +
    ]]--
 +
}
   −
    equipment = function()
+
local function format_lua(lua)
        return U.imap(EquipmentCollection, function(e) return e._name end)
+
return tostring(type(lua) == "table" and table.concat(lua, args.concat_value or ", ") or lua)
    end,
+
end
   −
}
  −
  −
-- TODO: have a syntax for calling Module:Formatting functions?
   
local formatting_functions = {
 
local formatting_functions = {
 
+
    air_power = function(ship) return ship.air_power and ship:air_power() or -1 end,
     air_power = function(ship)
+
    equipment_range = function(ship) return U.imax(U.imap(ship._equipment or {}, function (e) return Equipment(e.equipment):range() or 0 end), 0) end,
         return ship:air_power() or -1
+
     equipment_range_diff = function(ship)
 +
        local equipment_range = U.imax(U.imap(ship._equipment or {}, function (e) return Equipment(e.equipment):range() or 0 end), 0)
 +
         return (ship:range() or 0) - equipment_range
 
     end,
 
     end,
 
+
     night_battle_power = function(ship) return (ship:firepower_max() or 0) + (ship:torpedo_max() or 0) end,
     night_battle_power = function(ship)
  −
        return (ship:firepower_max() or 0) + (ship:torpedo_max() or 0)
  −
    end,
  −
   
   
     format_day_battle = function(ship)
 
     format_day_battle = function(ship)
 
         local mode, attack_power = shipCapabilities:day_battle()
 
         local mode, attack_power = shipCapabilities:day_battle()
 
         return shipCapabilities:format_day_battle(mode, attack_power)
 
         return shipCapabilities:format_day_battle(mode, attack_power)
 
     end,
 
     end,
   
     format_night_battle = function(ship)
 
     format_night_battle = function(ship)
 
         local mode, attack_power = shipCapabilities:night_battle()
 
         local mode, attack_power = shipCapabilities:night_battle()
 
         return shipCapabilities:format_night_battle(mode, attack_power)
 
         return shipCapabilities:format_night_battle(mode, attack_power)
 
     end,
 
     end,
   
     format_opening_torpedo = function(ship)
 
     format_opening_torpedo = function(ship)
 
         return shipCapabilities:format_torpedo(shipCapabilities:opening_torpedo())
 
         return shipCapabilities:format_torpedo(shipCapabilities:opening_torpedo())
 
     end,
 
     end,
   
     format_closing_torpedo = function(ship)
 
     format_closing_torpedo = function(ship)
 
         return shipCapabilities:format_torpedo(shipCapabilities:closing_torpedo())
 
         return shipCapabilities:format_torpedo(shipCapabilities:closing_torpedo())
 
     end,
 
     end,
   
     format_asw_attack = function(ship)
 
     format_asw_attack = function(ship)
 
         local attack_power, opening, day, night, uncertain = shipCapabilities:asw_attack()
 
         local attack_power, opening, day, night, uncertain = shipCapabilities:asw_attack()
 
         return shipCapabilities:format_asw_attack(attack_power, opening, day, night, uncertain)
 
         return shipCapabilities:format_asw_attack(attack_power, opening, day, night, uncertain)
 
     end,
 
     end,
   
     format_opening_airstrike = function(ship)
 
     format_opening_airstrike = function(ship)
 
         return shipCapabilities:format_opening_airstrike(shipCapabilities:opening_airstrike())
 
         return shipCapabilities:format_opening_airstrike(shipCapabilities:opening_airstrike())
 
     end,
 
     end,
 
+
     slots = function(ship) return format_lua(U.imap(ship._equipment or {}, function (e) return e and e.size or '?' end)) end,
     slots = function(ship)
  −
        return format_lua(U.imap(ship._equipment or {}, function (e) return e and e.size or '?' end))
  −
    end,
  −
 
   
     equips = function(ship)
 
     equips = function(ship)
         return U.ijoin(U.imap(ship._equipment or {}, function (e)
+
         return 'style="text-align:left"|' .. U.ijoin(U.imap(ship._equipment or {}, function (e)
 
             if not e or e.equipment == nil then
 
             if not e or e.equipment == nil then
 
                 return '(?)'
 
                 return '(?)'
Line 121: Line 118:  
             local icon = type(e.equipment) == 'string' and Equipment(e.equipment):icon() or e.equipment:icon()
 
             local icon = type(e.equipment) == 'string' and Equipment(e.equipment):icon() or e.equipment:icon()
 
             local link = type(e.equipment) == 'string' and e.equipment or e.equipment:name()
 
             local link = type(e.equipment) == 'string' and e.equipment or e.equipment:name()
             return Formatting:format_image{Formatting:format_equipment_icon(icon), link = link }
+
             return string.format('%s [[%s]]', Formatting:format_image{Formatting:format_equipment_icon(icon), link = link}, link)
        end))
+
         end), "<br>")
    end,
  −
 
  −
    code = function(obj)
  −
         return equipment and
  −
            Formatting:format_equipment_type(obj:type()) or
  −
            Formatting:format_ship_code(obj:type())
  −
    end,
  −
 
  −
    -- overrides ShipData:type
  −
    type = function(obj)
  −
        return equipment and
  −
            Formatting:format_equipment_type(obj:type()) or
  −
            Formatting:format_ship_type(obj:type())
   
     end,
 
     end,
 
+
    code = function(obj) return equipment and Formatting:format_equipment_type(obj:type()) or Formatting:format_ship_code(obj:type()) end,
 +
    code_link = function(obj) return string.format("[[%s]]", Formatting:format_ship_code(obj:type())) end,
 +
    type = function(obj) return equipment and Formatting:format_equipment_type(obj:type()) or Formatting:format_ship_type(obj:type()) end,
 
     icon = function(obj)
 
     icon = function(obj)
         return [[<span data-sort-value="]] .. obj._type .. [=[">[[File:]=] .. Formatting:format_equipment_icon(obj:icon()) .. "]]</span>"
+
         if obj.hp then
    end,
+
            if obj:id() >= 1501 then
 
+
                return string.format("[[File:Enemy Icon %s.png|100px]]", obj:unique_name():gsub('- Damaged', 'Damaged'))
    -- overrides ShipData:link
+
            else
    link = function(obj)
+
                return string.format("[[File:Ship Icon %s.png|100px]]", obj:name())
        local link = obj._dummy and ShipsByApiId[obj._name] or obj.link and obj:link()
+
            end
        return link and Formatting:format_link(link) or ''
+
        else
 +
        return obj.icon and ([=[[[File:]=] .. Formatting:format_equipment_icon(obj:icon()) .. "]]") or ''
 +
            -- return obj.icon and ([[<span data-sort-value="]] .. (obj._type or '0') .. [=[">[[File:]=] .. Formatting:format_equipment_icon(obj:icon()) .. "]]</span>") or ''
 +
        end
 
     end,
 
     end,
 
+
    icon_damaged = function(obj) return string.format("[[File:Ship Icon %s Damaged.png|100px]]", obj:name()) end,
     -- overrides ShipData:class
+
     link = function(obj) return string.format("[[%s]]", equipment and obj:name() or obj:unique_name()) end,
     class = function(ship)
+
     class = function(ship) return ship:class() and ship:class():name() or "?" end,
        return ship:class() and ship:class():name() or "?"
  −
    end,
  −
 
  −
    -- overrides ShipData:implementation_date
   
     implementation_date = function(ship)
 
     implementation_date = function(ship)
 
         local date = ship:implementation_date()
 
         local date = ship:implementation_date()
         return not date and "??" or format{
+
         return not date and "??" or string.format("%s/%s/%s", date[1], date[2] < 10 and "0" .. date[2] or date[2], date[3] < 10 and "0" .. date[3] or date[3])
            "${year}/${month}/${day}",
+
    end,
            year = date[1],
+
    banner = function(obj)
            month = date[2] < 10 and "0" .. date[2] or date[2],
+
    if not obj or not obj.lua_name then
            day = date[3] < 10 and "0" .. date[3] or date[3],
+
    return ' '
         }
+
    end
 +
         return ShipBattleCardKai:Asset({ obj:lua_name(), hd = true, size = "160px" })
 
     end,
 
     end,
  −
    -- overrides ShipData:card
   
     card = function(obj)
 
     card = function(obj)
 +
    if not obj or not obj.lua_name then
 +
    return ' '
 +
    end
 
         if obj.hp then
 
         if obj.hp then
             return ShipBattleCardKai:Asset({ obj:lua_name(), hd = true, size = "160px" })
+
             return ShipCardKai:Asset({ obj:lua_name(), hd = true, size = "160px" })
 
         else
 
         else
 
             return EquipmentCardKai:Asset({ obj:name(), size = "75px", link = "nil" })
 
             return EquipmentCardKai:Asset({ obj:name(), size = "75px", link = "nil" })
 
         end
 
         end
 
     end,
 
     end,
 
+
     item = function(obj) return EquipmentGraphicKai:Asset({ obj:name(), size = "75px", link = "nil" }) end,
     item = function(obj)
+
     fairy = function(obj) return EquipmentGraphicKai:Asset({ obj:name(), size = "75px", fairy = "only", link = "nil" }) end,
        return EquipmentGraphicKai:Asset({ obj:name(), size = "75px", link = "nil" })
+
     full = function(obj) return EquipmentGraphicKai:Asset({ obj:name(), size = "75px", fairy = "true", link = "nil" }) end,
    end,
+
     card_ = function(o) return string.format("[[File:%s Card.png|75px]]", o:name()) end,
 
+
    equipment_ = function(o) return string.format("[[File:%s Equipment.png|75px]]", o:name()) end,
     fairy = function(obj)
+
    character_ = function(o) return string.format("[[File:%s Character.png|75px]]", o:name()) end,
        return EquipmentGraphicKai:Asset({ obj:name(), size = "75px", fairy = "only", link = "nil" })
+
    full_ = function(o) return string.format("[[File:%s Full.png|75px]]", o:name()) end,
    end,
  −
 
  −
     full = function(obj)
  −
        return EquipmentGraphicKai:Asset({ obj:name(), size = "75px", fairy = "true", link = "nil" })
  −
     end,
  −
 
   
     format_morale = function(ship)
 
     format_morale = function(ship)
 
         local morale = ship:morale() or 49
 
         local morale = ship:morale() or 49
 
         return morale <= 19 and "Red" or morale <= 29 and "Orange" or morale <= 49 and "Normal" or "Sparkle"
 
         return morale <= 19 and "Red" or morale <= 29 and "Orange" or morale <= 49 and "Normal" or "Sparkle"
 
     end,
 
     end,
   
     hit_rate = function(ship, target)
 
     hit_rate = function(ship, target)
         local r = Combat2.hit_rate(ship, target)
+
         local r = Combat.hit_rate(ship, target)
 
         if r then
 
         if r then
 
             ship.hit_rate = r
 
             ship.hit_rate = r
Line 199: Line 179:  
         end
 
         end
 
     end,
 
     end,
   
     critical_hit_rate = function(ship, target)
 
     critical_hit_rate = function(ship, target)
         local r = Combat2.critical_hit_rate(ship, target)
+
         local r = Combat.critical_hit_rate(ship, target)
 
         if r then
 
         if r then
 
             ship.critical_hit_rate = r
 
             ship.critical_hit_rate = r
Line 209: Line 188:  
         end
 
         end
 
     end,
 
     end,
   
     scrap = function(eq)
 
     scrap = function(eq)
 
         local scrap = eq:scrap()
 
         local scrap = eq:scrap()
         return format{
+
         return string.format("%s/%s/%s/%s", scrap.fuel or 0, scrap.ammo or 0, scrap.steel or 0, scrap.bauxite or 0)
            "${fuel}/${ammo}/${steel}/${bauxite}",
  −
            fuel = scrap.fuel or 0,
  −
            ammo = scrap.ammo or 0,
  −
            steel = scrap.steel or 0,
  −
            bauxite = scrap.bauxite or 0,
  −
        }
   
     end,
 
     end,
 
+
    development = function(eq) return Development.formatResources(eq) end,
     development = function(eq)
+
     development_rate = function(eq) return Development.formatRates(eq) end,
        return Development.formatResources(eq)
+
    development_hq = function(eq) return Development.formatHQ(eq) end,
 +
    backMinusRarity = function(ship) return (ship:back() or 0) - (ship:rarity() or 0) end,
 +
    rarity_bg = function(ship)
 +
        return string.format('style="background:%s"|%s<br>%s', Formatting:format_ship_back(ship:rarity()), ship:rarity() or '??', Formatting:format_ship_rarity(ship:rarity()))
 
     end,
 
     end,
 
+
     back_bg = function(ship)
     development_rate = function(eq)
+
         return string.format('style="background:%s"|%s<br>%s', Formatting:format_ship_back(ship:back()), ship:back() or '??', Formatting:format_ship_rarity(ship:back()))
         return Development.formatRates(eq)
   
     end,
 
     end,
      
+
     same_day_remodel_links = function(ship)
    development_hq = function(eq)
+
    local result = { string.format("[[%s]]", ship:name()) }
        return Development.formatHQ(eq)
+
    local visited = {}
 +
visited[ship:name()] = true
 +
    while true do
 +
    local next = ship:remodel_to()
 +
    if not next then break end
 +
    ship = Ship(next)
 +
    if ship._implementation_date then break end
 +
    if visited[ship:name()] then break end
 +
    visited[ship:name()] = true
 +
    table.insert(result, string.format("[[%s]]", ship:name()))
 +
    end
 +
    return table.concat(result, ", ")
 
     end,
 
     end,
   
}
 
}
   −
function addFormattingFunctions(name, table)
+
--[[
 +
local function addFormattingFunctions(name, table)
 
     for k, v in pairs(table) do
 
     for k, v in pairs(table) do
 
         formatting_functions[name .. "." .. k] = v
 
         formatting_functions[name .. "." .. k] = v
Line 241: Line 226:  
end
 
end
   −
local Plugins = require("Module:Calc/Plugins")
+
addFormattingFunctions("FitData", require("Module:CalcFit"))
 +
addFormattingFunctions("Assets", require("Module:CalcAsset"))
 +
]]--
   −
for _, name in ipairs(Plugins) do
+
local function format_value(key, ship, target)
    local data = require("Module:Calc/Plugins/" .. name)
  −
    addFormattingFunctions(name, data)
  −
end
  −
 
  −
function format_value(key, ship, target)
   
     local formatting_function = formatting_functions[key]
 
     local formatting_function = formatting_functions[key]
 
     if formatting_function then
 
     if formatting_function then
 
         return formatting_function(ship, target)
 
         return formatting_function(ship, target)
 
     end
 
     end
 +
    --[[
 
     if shipCapabilities[key] then
 
     if shipCapabilities[key] then
 
         local a, b = shipCapabilities[key](shipCapabilities)
 
         local a, b = shipCapabilities[key](shipCapabilities)
 
         return format_lua(b or a)
 
         return format_lua(b or a)
 
     end
 
     end
     if ship then
+
     ]]--
        local lua = ship[key]
+
    local lua = ship[key]
        if type(lua) == "function" then
+
    if type(lua) == "function" then
            return format_lua(lua(ship))
+
        return format_lua(lua(ship))
        else
+
    else
            return format_lua(lua)
+
        return format_lua(lua)
        end
   
     end
 
     end
 
end
 
end
   −
local sequence = nil
+
local function format_arg(arg)
local sequence_position = nil
  −
 
  −
function format_arg(arg)
   
     return args.format == "table" and ("| " .. arg .. "\n") or arg
 
     return args.format == "table" and ("| " .. arg .. "\n") or arg
 
end
 
end
   −
local env = {}
+
--[[
 
+
local function interpret_setter(s)
function interpret_setter(s)
   
     local kv = mw.text.split(s, "%s*~%s*")
 
     local kv = mw.text.split(s, "%s*~%s*")
 
     local k = kv[1]
 
     local k = kv[1]
Line 319: Line 297:  
end
 
end
   −
function interpret_arg(arg, args)
+
local function trigger()
 +
    local ship_key = sequence[sequence_position]
 +
    sequence_position = sequence_position + 1
 +
    ship = Ship(ship_key)
 +
    if ship:id() then
 +
        shipCapabilities = ShipCapabilities{ ship = ship }
 +
        equipment = false
 +
    else
 +
        ship = Equipment(ship_key)
 +
        equipment = true
 +
    end
 +
end
 +
 
 +
local function interpret_arg(arg)
 
     local prefix = string.sub(arg, 1, 1)
 
     local prefix = string.sub(arg, 1, 1)
 
     local prefix2 = string.sub(arg, 1, 2)
 
     local prefix2 = string.sub(arg, 1, 2)
     if arg == "_" then
+
     if arg == "-" then return format_arg("")
        return false
+
elseif arg == "!@" then trigger(false)
    elseif arg == "-" then
  −
        return format_arg("")
  −
    elseif prefix == "@" then
  −
        local enumerator = string.sub(arg, 2)
  −
        local enumerating_function = enumerating_functions[enumerator]
  −
        if enumerating_function and not sequence then
  −
            sequence = enumerating_function()
  −
            sequence_position = 1
  −
        end
  −
    elseif arg == "!@" then
  −
        local ship_key = sequence[sequence_position]
  −
        sequence_position = sequence_position + 1
  −
        ship = Ship(ship_key)
  −
        if ship._dummy then
  −
           
  −
        elseif ship:id() then
  −
            shipCapabilities = ShipCapabilities{ ship = ship }
  −
        else
  −
            ship = Equipment(ship_key)
  −
            equipment = true
  −
        end
   
     elseif prefix2 == "!!" then
 
     elseif prefix2 == "!!" then
 
         local key = string.sub(arg, 3)
 
         local key = string.sub(arg, 3)
Line 357: Line 327:  
                     key = part
 
                     key = part
 
                     ship = Ship(key)
 
                     ship = Ship(key)
                     if ship:id() then
+
                     if ship:hp() then
 
                         shipCapabilities = ShipCapabilities{ ship = ship }
 
                         shipCapabilities = ShipCapabilities{ ship = ship }
 +
                        equipment = false
 
                     else
 
                     else
 
                         ship = Equipment(key)
 
                         ship = Equipment(key)
Line 371: Line 342:  
     elseif prefix == "#" and args.format == "table" then
 
     elseif prefix == "#" and args.format == "table" then
 
         return "|-\n"
 
         return "|-\n"
     elseif prefix == "?" then
+
     if prefix == "?" then
 
         local prefix2 = string.sub(arg, 1, 2)
 
         local prefix2 = string.sub(arg, 1, 2)
         if prefix2 == "??" then
+
         if prefix2 == "??" then return format_arg(format_value(string.sub(arg, 3), target, ship))
            return format_arg(format_value(string.sub(arg, 3), target, ship))
+
         elseif prefix2 == "?#" then return "?# is unimplemented" -- frame:preprocess(format{string.sub(arg, 3), this = env[this] or ""})
         elseif prefix2 == "?#" then
  −
            return frame:preprocess(format{string.sub(arg, 3), this = env[this] or ""})
   
         else
 
         else
            return format_arg(format_value(string.sub(arg, 2), ship, target))
+
if test then
        end
+
return format_arg(format_value(string.sub(arg, 2), ship, target))
 +
else
 +
return nil
 +
end
 
     else
 
     else
 
         return format_arg(arg)
 
         return format_arg(arg)
Line 385: Line 357:  
end
 
end
   −
function interpret_args()
   
     Ship = args.enemy and require("Module:EnemyShip") or require("Module:Ship")
 
     Ship = args.enemy and require("Module:EnemyShip") or require("Module:Ship")
    debugLog("#args", #args)
  −
    debugLog("type(args)", type(args))
   
     if args.from and args.to then
 
     if args.from and args.to then
 
         sequence = {}
 
         sequence = {}
Line 396: Line 365:  
         sequence_position = 1
 
         sequence_position = 1
 
     end
 
     end
     local i = 1
+
 
 +
        else
 +
            local buildIterator = Iterator[enumerator]
 +
            if buildIterator then
 +
                sequence = {}
 +
                sequence_position = 1
 +
                local iterator = buildIterator(args)
 +
                while iterator.next() do
 +
                    table.insert(sequence, iterator.current())
 +
                end
 +
                sequence_length = #sequence
 +
            end
 +
 
 +
]]--
 +
 
 +
local function interpret(args_)
 +
args = args_
 +
local filterArgs = {}
 +
     for _, arg in ipairs(args) do
 +
    local prefix = string.sub(arg, 1, 1)
 +
    if prefix == "~" then
 +
    -- ~x.y.z~a.b.c means obj.x.y.z == a or obj.x.y.z == b or obj.x.y.z == c
 +
    -- obj.x.y.z can be obj:x():y():z(), etc.
 +
    local ksvs = mw.text.split(string.sub(arg, 2), "%s*~%s*")
 +
    local ks = mw.text.split(ksvs[1], "%s*%.%s*")
 +
    local vs = mw.text.split(ksvs[2], "%s*,%s*")
 +
    table.insert(filterArgs, {ks, vs})
 +
    end
 +
    end
 +
    local actions = {}
 +
    for _, arg in ipairs(args) do
 +
    local prefix = string.sub(arg, 1, 1)
 +
    if prefix == "@" then
 +
    local enumerator = string.sub(arg, 2)
 +
        local enumerating_function = enumerating_functions[enumerator]
 +
        if enumerating_function then
 +
        sequence = {}
 +
        for _, e in ipairs(enumerating_function()) do
 +
        local ship
 +
        if equipment then
 +
        ship = Equipment(e)
 +
        else
 +
        ship = Ship(e)
 +
        end
 +
        if #filterArgs > 0 then
 +
    local test = true
 +
for _, ksvs in ipairs(filterArgs) do
 +
local test2 = false
 +
 
 +
local obj = ship
 +
for _, k in ipairs(ksvs[1]) do
 +
local g = obj[k]
 +
if type(g) == 'function' then
 +
obj = g(obj)
 +
elseif type(g) == 'table' then
 +
obj = g
 +
else
 +
obj = g
 +
break
 +
end
 +
end
 +
local v1 = tostring(obj)
 +
 
 +
for _, v2 in ipairs(ksvs[2]) do
 +
if v1 == v2 then
 +
test2 = true
 +
break
 +
end
 +
end
 +
 
 +
if not test2 then
 +
test = false
 +
break
 +
end
 +
end
 +
if test then
 +
table.insert(sequence, ship)
 +
end
 +
        else
 +
        table.insert(sequence, ship)
 +
        end
 +
        end
 +
        sequence_position = 1
 +
sequence_length = #sequence
 +
        end
 +
    elseif prefix == '!' then
 +
    local name = string.sub(arg, 2)
 +
    local obj = Ship(name)
 +
    if not obj:hp() then
 +
    equipment = true
 +
    obj = Equipment(name)
 +
    end
 +
    sequence = {}
 +
    table.insert(sequence, obj)
 +
        sequence_position = 1
 +
sequence_length = 1
 +
    elseif arg == "#" or prefix == "?" then
 +
    table.insert(actions, string.sub(arg, 2))
 +
    end
 +
    end
 +
    if args.sort and sequence then
 +
    local sorts = mw.text.split(args.sort, "%s*,%s*")
 +
    table.sort(sequence, function(a, b)
 +
    for _, sort in ipairs(sorts) do
 +
  local x = a[sort](a)
 +
  local y = b[sort](b)
 +
  if x < y then return true end
 +
  if x > y then return false end
 +
    end
 +
return false
 +
end)
 +
    end
 
     local values = {}
 
     local values = {}
 
     repeat
 
     repeat
         for _, arg in ipairs(args) do
+
    if sequence then
            debugLog("i", i)
+
    ship = sequence[sequence_position]
            debugLog("arg", arg)
+
    sequence_position = sequence_position + 1
            local value = interpret_arg(arg, args)
+
    end
            debugLog("value", value)
+
         for _, arg in ipairs(actions) do
            if value then
+
        if arg == '' then
                table.insert(values, value)
+
        if args.format == "table" then
 +
        table.insert(values, "|-\n")
 +
        end
 +
        else
 +
            local value = ship and format_arg(format_value(arg, ship)) -- interpret_arg(arg)
 +
            if value then
 +
                table.insert(values, value)
 +
            end
 
             end
 
             end
            i = i + 1
   
         end
 
         end
     until not sequence or sequence_position > #sequence
+
     until not sequence_length or sequence_position > sequence_length
    debugLog("#values", #values)
+
     return table.concat(values, args.concat or (args.format == "table" and "" or ", "))
     return table.concat(values, args.concat or "") .. debugString()
   
end
 
end
   −
local Calc = {}
+
local function test()
 
+
mw.log(interpret({"@base_names", "~is_battleship~true", "?link", sort = "type,id"}))
function Calc.format(frame_, args_)
+
mw.log(interpret({"@base_names", "~class.name~Kagerou Class", "?link", sort = "type,id"}))
    frame = frame_
+
mw.log(interpret({"!Saiun", "?icon"}))
    args = args_ or U.getTemplateArgs(frame).explicit
  −
    for _, arg in ipairs(args) do
  −
        debugLog("arg", arg)
  −
    end
  −
    return interpret_args()
   
end
 
end
   −
function Calc.test()
+
return {
    mw.log(
+
format = function(frame) return interpret(U.getTemplateArgs(frame).explicit) end,
        Calc.format(nil, {
+
test = test,
            format = "table",
+
}
            debug = "true",
  −
            "!Nagato/Kai Ni",
  −
            "!_equipment ~ 41cm Triple Gun Mount Kai, 41cm Triple Gun Mount Kai, Type 13 Air Radar Kai",
  −
            "!_level ~ 99",
  −
            "!_luck ~ nil",
  −
            "!_morale ~ 25",
  −
            "!!Destroyer Ro-Class",
  −
            "!cl0 ~ 56",
  −
            "!cl1 ~ 807",
  −
            "!cl2 ~ 137",
  −
            "?card",
  −
            "?level",
  −
            "?format_morale",
  −
            "?accuracy",
  −
            "?luck",
  −
            "??card",
  −
            "?cl0",
  −
            "?cl1",
  −
            "?cl2",
  −
            "",
  −
            "",
  −
            "",
  −
            "",
  −
            "-",
  −
            "?FitData.hit",
  −
            "?FitData.error",
  −
            "?FitData.crit",
  −
            "?hit_rate",
  −
            "?critical_hit_rate",
  −
            "?FitData.difference",
  −
            "?FitData.critical_difference",
  −
            "?FitData.accuracy_value",
  −
            "?FitData.fit",
  −
        })
  −
    )
  −
end
  −
-- print(p.test())
  −
 
  −
return Calc
 
cssedit, gkautomate
6,926

edits