Changes

no edit summary
Line 17: Line 17:  
!style="background-color:#eef2f7;color:red"|OR
 
!style="background-color:#eef2f7;color:red"|OR
 
|colspan="4" style="background-color:#eef2f7"|]=],
 
|colspan="4" style="background-color:#eef2f7"|]=],
 +
choice_separator = [=[|-
 +
!style="background-color:#eee;color:blue"|THEN
 +
|colspan="4" style="background-color:#eee"|]=],
 
item_header = [[{|style="text-align:center;width:100%" class="sortable"
 
item_header = [[{|style="text-align:center;width:100%" class="sortable"
 
!style="background-color:#3baef5;color:white;width:40%"|Reward
 
!style="background-color:#3baef5;color:white;width:40%"|Reward
Line 31: Line 34:  
}
 
}
   −
local assetTypes = { item = 'Item Icon', equipment = 'Equipment Card', ship = 'Ship Banner' }
+
local assetType = { item = 'Item Icon', equipment = 'Equipment Card', ship = 'Ship Banner' }
   −
local assetSizes = { item = '75px', equipment = '75px', ship = '240px' }
+
local assetSize = { item = '75px', equipment = '75px', ship = '160px', large_ship = '240px' }
    
local function render(frame, event, map)
 
local function render(frame, event, map)
Line 39: Line 42:  
local map = map or frame.args[2] or "??"
 
local map = map or frame.args[2] or "??"
 
local success, data = U.loadData("Data/Map/" .. event)
 
local success, data = U.loadData("Data/Map/" .. event)
if not success then return "Unknown event: " .. event end
+
if not success then return "No data for event: " .. event end
 
data = data[map]
 
data = data[map]
if not data then return "Unknown map: " .. map end
+
if not data then return "No data for map: " .. map end
 +
local version = data.version or 1
 
local index = {}
 
local index = {}
 
local tbl = {}
 
local tbl = {}
 
local types = {}
 
local types = {}
-- TODO: assuming 0-1 ship
  −
-- TODO: assuming 0-1 choice
   
local ship = false
 
local ship = false
local choice = false
+
local choiceIndex = {}
local choiceFirstIndex = {}
+
local choice1Index = {}
local choiceSecondIndex = {}
+
local choice2Index = {}
 
local function setData(diff)
 
local function setData(diff)
 
for _, v in ipairs(data[diff] or {}) do
 
for _, v in ipairs(data[diff] or {}) do
Line 60: Line 62:  
types[name1] = v1.item and 'item' or v1.equipment and 'equipment' or v1.ship and 'ship' or '??'
 
types[name1] = v1.item and 'item' or v1.equipment and 'equipment' or v1.ship and 'ship' or '??'
 
types[name2] = v2.item and 'item' or v2.equipment and 'equipment' or v2.ship and 'ship' or '??'
 
types[name2] = v2.item and 'item' or v2.equipment and 'equipment' or v2.ship and 'ship' or '??'
choice = true
+
if not U.ifind(choice1Index, name1) then table.insert(choice1Index, name1) end
tbl['choice1' .. name1] = tbl['choice1' .. name1] or {}
+
if not U.ifind(choice2Index, name2) then table.insert(choice2Index, name2) end
tbl['choice1' .. name1][diff] = { count = v1.count or 1, level = v1.level }
+
        if version == 0 then
tbl['choice2' .. name2] = tbl['choice2' .. name2] or {}
+
        local names = table.concat({name1, name2}, '|')
tbl['choice2' .. name2][diff] = { count = v2.count or 1, level = v2.level }
+
        tbl[names] = tbl[names] or {}
if not U.ifind(choiceFirstIndex, name1) then table.insert(choiceFirstIndex, name1) end
+
        tbl[names][diff] = {{ count = v1.count or 1, level = v1.level }, { count = v2.count or 1, level = v2.level }}
if not U.ifind(choiceSecondIndex, name2) then table.insert(choiceSecondIndex, name2) end
+
        if not U.ifind(choiceIndex, names) then table.insert(choiceIndex, names) end
 +
        else
 +
        tbl['choice1' .. name1] = tbl['choice1' .. name1] or {}
 +
        tbl['choice1' .. name1][diff] = { count = v1.count or 1, level = v1.level }
 +
        tbl['choice2' .. name2] = tbl['choice2' .. name2] or {}
 +
        tbl['choice2' .. name2][diff] = { count = v2.count or 1, level = v2.level }
 +
        if not U.ifindBy(choiceIndex, function(e) return e[1] == name1 and e[2] == name2 end) then table.insert(choiceIndex, {name1, name2}) end
 +
        end
 
else
 
else
 
local name = v.item or v.equipment or v.ship or '??'
 
local name = v.item or v.equipment or v.ship or '??'
Line 80: Line 89:  
end
 
end
 
end
 
end
local function getCount(name, diff)
+
local function getCount(name, diff, i)
return ((tbl[name] or {})[diff] or {}).count or 0
+
    local data = (tbl[name] or {})[diff] or {}
 +
    return data[i] and (data[i].count or 0) or data.count or 0
 
end
 
end
local function getLevel(name, diff)
+
local function getLevel(name, diff, i)
local level = ((tbl[name] or {})[diff] or {}).level
+
    local data = (tbl[name] or {})[diff] or {}
 +
    local level = data[i] and data[i].level or data.level
 
return level and string.format(" (★%d)", level) or ''
 
return level and string.format(" (★%d)", level) or ''
 
end
 
end
local function getCell(name, diff)
+
local function getCell(name, diff, i)
local count = getCount(name, diff)
+
local count = getCount(name, diff, i)
return (count == 0 and '' or count) .. getLevel(name, diff)
+
return (count == 0 and '' or count) .. getLevel(name, diff, i)
 
end
 
end
local function getAsset(name)
+
local function getAsset(name, size)
return string.format("[[File:%s %s.png|%s|link=%s]]", assetTypes[types[name]] or '??', name, assetSizes[types[name]] or '??', name)
+
local fname = name:gsub('/', ' ')
 +
return string.format("[[File:%s %s.png|%s|link=%s]]", assetType[types[name]] or '??', fname, assetSize[size or types[name]] or '??', name)
 
end
 
end
 
setData('Hard')
 
setData('Hard')
Line 98: Line 110:  
setData('Easy')
 
setData('Easy')
 
setData('Casual')
 
setData('Casual')
 +
local deep_plot1 = {}
 +
local deep_plot2 = {}
 +
if version >= 2 then
 +
for _, choice in ipairs(choiceIndex) do
 +
deep_plot1[choice[1]] = deep_plot1[choice[1]] or {}
 +
table.insert(deep_plot1[choice[1]], 1, choice[2])
 +
deep_plot2[choice[2]] = deep_plot2[choice[2]] or {}
 +
table.insert(deep_plot2[choice[2]], 1, choice[1])
 +
end
 +
end
 +
if version >= 3 then
 +
    for _, name in ipairs(index) do
 +
    for diff in pairs(tbl[name] or {}) do
 +
        if tbl['choice1' .. name] and not tbl['choice1' .. name][diff] and not tbl['choice2' .. name] or
 +
        tbl['choice2' .. name] and not tbl['choice2' .. name][diff] and not tbl['choice1' .. name] then
 +
        local spot = tbl['choice1' .. name] or tbl['choice2' .. name]
 +
        spot[diff] = tbl[name][diff]
 +
        U.removekey(tbl[name], diff)
 +
        end
 +
    end
 +
    end
 +
    local newIndex = {}
 +
    for _, name in ipairs(index) do
 +
    if U.size(tbl[name]) == 0 then
 +
        U.removekey(tbl, name)
 +
    else
 +
        table.insert(newIndex, name)
 +
    end
 +
    end
 +
    index = newIndex
 +
end
 
local result = { string.format(template.header, mw.uri.encode(event, 'WIKI')) }
 
local result = { string.format(template.header, mw.uri.encode(event, 'WIKI')) }
 
if ship then
 
if ship then
table.insert(result, string.format(template.ship_row, getAsset(ship), ship))
+
table.insert(result, string.format(template.ship_row, getAsset(ship, 'large_ship'), ship))
 
end
 
end
if choice then
+
if #choiceIndex > 0 then
 
table.insert(result, template.choice_header)
 
table.insert(result, template.choice_header)
for i, name in ipairs(choiceFirstIndex) do
+
if version >= 2 then
table.insert(result, string.format(template.item_row, 0, getAsset(name), name,
+
local done = {}
getCell('choice1' .. name, 'Casual'), getCell('choice1' .. name, 'Easy'), getCell('choice1' .. name, 'Medium'), getCell('choice1' .. name, 'Hard')))
+
local first = true
end
+
for i, names in ipairs(choiceIndex) do
table.insert(result, template.choice)
+
if not done[names[1] .. '|' .. names[2]] then
for i, name in ipairs(choiceSecondIndex) do
+
if first then
table.insert(result, string.format(template.item_row, 0, getAsset(name), name,
+
first = false
getCell('choice2' .. name, 'Casual'), getCell('choice2' .. name, 'Easy'), getCell('choice2' .. name, 'Medium'), getCell('choice2' .. name, 'Hard')))
+
else
 +
table.insert(result, template.choice_separator)
 +
end
 +
local size1 = #deep_plot1[names[1]]
 +
local size2 = #deep_plot2[names[2]]
 +
if size1 > size2 then
 +
table.insert(result, string.format(template.item_row, 0, getAsset(names[1]), names[1],
 +
getCell('choice1' .. names[1], 'Casual'), getCell('choice1' .. names[1], 'Easy'), getCell('choice1' .. names[1], 'Medium'), getCell('choice1' .. names[1], 'Hard')))
 +
table.insert(result, template.choice)
 +
for _, name in ipairs(deep_plot1[names[1]]) do
 +
table.insert(result, string.format(template.item_row, 0, getAsset(name), name,
 +
getCell('choice2' .. name, 'Casual'), getCell('choice2' .. name, 'Easy'), getCell('choice2' .. name, 'Medium'), getCell('choice2' .. name, 'Hard')))
 +
done[names[1] .. '|' .. name] = true
 +
end
 +
elseif size2 > size1 then
 +
for _, name in ipairs(deep_plot2[names[2]]) do
 +
table.insert(result, string.format(template.item_row, 0, getAsset(name), name,
 +
getCell('choice1' .. name, 'Casual'), getCell('choice1' .. name, 'Easy'), getCell('choice1' .. name, 'Medium'), getCell('choice1' .. name, 'Hard')))
 +
done[name .. '|' .. names[2]] = true
 +
end
 +
table.insert(result, template.choice)
 +
table.insert(result, string.format(template.item_row, 0, getAsset(names[2]), names[2],
 +
getCell('choice2' .. names[2], 'Casual'), getCell('choice2' .. names[2], 'Easy'), getCell('choice2' .. names[2], 'Medium'), getCell('choice2' .. names[2], 'Hard')))
 +
else
 +
table.insert(result, string.format(template.item_row, 0, getAsset(names[1]), names[1],
 +
getCell('choice1' .. names[1], 'Casual'), getCell('choice1' .. names[1], 'Easy'), getCell('choice1' .. names[1], 'Medium'), getCell('choice1' .. names[1], 'Hard')))
 +
table.insert(result, template.choice)
 +
table.insert(result, string.format(template.item_row, 0, getAsset(names[2]), names[2],
 +
getCell('choice2' .. names[2], 'Casual'), getCell('choice2' .. names[2], 'Easy'), getCell('choice2' .. names[2], 'Medium'), getCell('choice2' .. names[2], 'Hard')))
 +
done[names[1] .. '|' .. names[2]] = true
 +
end
 +
end
 +
end
 +
elseif version == 0 then
 +
for i, names in ipairs(choiceIndex) do
 +
local names_ = U.split(names, '|')
 +
for j, name in ipairs(names_) do
 +
table.insert(result, string.format(template.item_row, 0, getAsset(name), name,
 +
getCell(names, 'Casual', j), getCell(names, 'Easy', j), getCell(names, 'Medium', j), getCell(names, 'Hard', j)))
 +
if j < #names_ then
 +
table.insert(result, template.choice)
 +
end
 +
end
 +
if i < #choiceIndex then
 +
table.insert(result, template.choice_separator)
 +
end
 +
end
 +
elseif #choice1Index == #choice2Index then
 +
for i, e in ipairs(choiceIndex) do
 +
local name = e[1]
 +
        table.insert(result, string.format(template.item_row, 0, getAsset(name), name,
 +
        getCell('choice1' .. name, 'Casual'), getCell('choice1' .. name, 'Easy'), getCell('choice1' .. name, 'Medium'), getCell('choice1' .. name, 'Hard')))
 +
table.insert(result, template.choice)
 +
name = e[2]
 +
  table.insert(result, string.format(template.item_row, 0, getAsset(name), name,
 +
getCell('choice2' .. name, 'Casual'), getCell('choice2' .. name, 'Easy'), getCell('choice2' .. name, 'Medium'), getCell('choice2' .. name, 'Hard')))
 +
if i < #choiceIndex then
 +
table.insert(result, template.choice_separator)
 +
end
 +
end
 +
else
 +
for i, name in ipairs(choice1Index) do
 +
table.insert(result, string.format(template.item_row, 0, getAsset(name), name,
 +
getCell('choice1' .. name, 'Casual'), getCell('choice1' .. name, 'Easy'), getCell('choice1' .. name, 'Medium'), getCell('choice1' .. name, 'Hard')))
 +
end
 +
table.insert(result, template.choice)
 +
for i, name in ipairs(choice2Index) do
 +
table.insert(result, string.format(template.item_row, 0, getAsset(name), name,
 +
getCell('choice2' .. name, 'Casual'), getCell('choice2' .. name, 'Easy'), getCell('choice2' .. name, 'Medium'), getCell('choice2' .. name, 'Hard')))
 +
end
 
end
 
end
 
end
 
end
Line 125: Line 237:  
return x.i < y.i
 
return x.i < y.i
 
end)
 
end)
local sortValues = {}
+
-- local sortValues = {}
for i, e in ipairs(sortedIndex) do sortValues[e.name] = i end
+
-- for i, e in ipairs(sortedIndex) do sortValues[e.name] = i end
for i, name in ipairs(index) do
+
for i, e in ipairs(sortedIndex) do
table.insert(result, string.format(template.item_row, sortValues[name], getAsset(name), name,
+
table.insert(result, string.format(template.item_row, e.i, getAsset(e.name), e.name,
getCell(name, 'Casual'), getCell(name, 'Easy'), getCell(name, 'Medium'), getCell(name, 'Hard')))
+
getCell(e.name, 'Casual'), getCell(e.name, 'Easy'), getCell(e.name, 'Medium'), getCell(e.name, 'Hard')))
 
end
 
end
 
table.insert(result, template.footer)
 
table.insert(result, template.footer)
Line 136: Line 248:     
local function test()
 
local function test()
mw.log(render(nil, 'Summer 2022 Event', 'E-1'))
+
mw.log(render(nil, 'Summer 2023 Event', 'E-7'))
 
end
 
end
  
cssedit, gkautomate
6,926

edits