Changes

no edit summary
Line 1: Line 1:  
local BaseData = require('Module:BaseData')
 
local BaseData = require('Module:BaseData')
 
local Iterator = require('Module:Iterator')
 
local Iterator = require('Module:Iterator')
local format = require('Module:Utils').format
+
local format = require('Module:Core').format
    
local BaseTable = BaseData{
 
local BaseTable = BaseData{
_table_start = [[{| class="wikitable typography-xl-optout" style="width: -moz-fit-content; width: -webkit-fit-content; width: fit-content;"]],
+
_table_start = [[{| class="wikitable"]],
 
_row_starter = "|-",
 
_row_starter = "|-",
 
_row_starter_with_attributes = [[|- class="${classes}"]],
 
_row_starter_with_attributes = [[|- class="${classes}"]],
Line 11: Line 11:  
_cell_color = {
 
_cell_color = {
 
},
 
},
_cell = [[| class="${classes}" colspan="${colspan}" rowspan="${rowspan}" style="text-align: ${text_align}; background-color: ${bg_color}; padding:3px;" |${values.value}]],
+
_cell = [[| class="${classes}" colspan="${colspan}" rowspan="${rowspan}" style="text-align:${text_align};background-color:${bg_color}" |${values.value}]],
 +
_cell_simple = [[|${values.value}]],
 
_empty_cell = [[|]],
 
_empty_cell = [[|]],
 
_column_cell_templates = {
 
_column_cell_templates = {
Line 106: Line 107:  
table.insert(self._items, mw.ustring.sub(item_key, 2))
 
table.insert(self._items, mw.ustring.sub(item_key, 2))
 
else
 
else
local item = self._item_class(self:process_item_key(item_key))
+
local item = self._item_class(self:process_item_key(item_key), self._enemy)
 
table.insert(self._items, item)
 
table.insert(self._items, item)
 
local note = self._args[item_key .. self._notes_suffix]
 
local note = self._args[item_key .. self._notes_suffix]
Line 240: Line 241:  
for _, column in ipairs(self._columns) do
 
for _, column in ipairs(self._columns) do
 
if row_values[column] then
 
if row_values[column] then
table.insert(self._rows, format(self._column_cell_templates[column] or self._cell, row_values[column]))
+
if row_values[column].bg_color and row_values[column].bg_color ~= self._transparent then
 +
row_values[column].classes = "highlighted " .. (row_values[column].classes or "")
 +
end
 +
if row_values[column].simple then
 +
table.insert(self._rows, format(self._cell_simple, row_values[column]))
 +
else
 +
table.insert(self._rows, format(self._column_cell_templates[column] or self._cell, row_values[column]))
 +
end
 
end
 
end
 
end
 
end
Line 265: Line 273:  
for _, column in ipairs(self._columns) do
 
for _, column in ipairs(self._columns) do
 
if row_values[column] then
 
if row_values[column] then
table.insert(self._rows, format(self._column_cell_templates[column] or self._cell, row_values[column]))
+
if row_values[column].simple then
 +
table.insert(self._rows, format(self._cell_simple, row_values[column]))
 +
else
 +
table.insert(self._rows, format(self._column_cell_templates[column] or self._cell, row_values[column]))
 +
end
 
end
 
end
 
end
 
end
Line 277: Line 289:  
     if mw.ustring.sub(custom_row_key, 1, 1) == "#" then
 
     if mw.ustring.sub(custom_row_key, 1, 1) == "#" then
 
         local value = mw.ustring.sub(custom_row_key, 2)
 
         local value = mw.ustring.sub(custom_row_key, 2)
         if self._row_starter then
+
         if not self._disable_row_starter and self._row_starter then
 
    table.insert(self._rows, self._row_starter)
 
    table.insert(self._rows, self._row_starter)
 
end
 
end
Line 293: Line 305:  
},
 
},
 
})
 
})
if self._row_starter then
+
if not self._disable_row_starter and self._row_starter then
 
        table.insert(self._rows, self._row_starter)
 
        table.insert(self._rows, self._row_starter)
 
    end
 
    end
    if self._header then
+
    if not self._disable_row_starter and self._header then
 
             table.insert(self._rows, self._header)
 
             table.insert(self._rows, self._header)
 
         end
 
         end
7,212

edits