Changes

no edit summary
Line 2: Line 2:  
local Equipment = require('Module:Equipment')
 
local Equipment = require('Module:Equipment')
 
local Formatting = require('Module:Formatting')
 
local Formatting = require('Module:Formatting')
local StatIcons = require('Module:StatIcons')
+
local StatIcons = require('Module:Data/Asset')
 +
local EquipmentLink = require('Module:EquipmentLink')
   −
local format = require('Module:StringInterpolation').format
+
local format = require('Module:Core').format
    +
-- [[Category:Todo]]: hardcoded iconsClasses
 
local EquipmentListKai = BaseTable{
 
local EquipmentListKai = BaseTable{
 
_item_class = Equipment,
 
_item_class = Equipment,
_header_template = [[! No.
+
_table_start = [[{| class="wikitable"]],
 +
_header_template = [=[! No.
 
! Rarity
 
! Rarity
! Name
+
! style="width:240px" | Name
! style="width: 120px" | Type
+
! style="width:120px" | Equipment Type
 
${stat_columns}
 
${stat_columns}
! style="width: 120px" | Classes
+
! style="width:120px" | Refittable Types
! Craftable
+
! [[File:Icon_Dev.png|20px|Craftable|link=Development]]
! style="white-space:nowrap;width:130px;" | Notes]],
+
! [[File:Icon_Imp.png|20px|Improvable|link=Improvement]]
 +
! style="white-space:nowrap" | Notes]=],
 
_column_cell_templates = {
 
_column_cell_templates = {
name = [[| colspan="${colspan}" rowspan="${rowspan}" style="text-align: ${text_align}; background-color: ${bg_color}; padding:5px 5px 5px 5px;" |${values.name}<br />${values.icon} ${values.japanese_name}]]
+
id = [[| style="${text_align};background-color:${bg_color}" |${values.value}]],
 +
rarity = [[| rowspan="${rowspan}"style="${text_align};background-color:${bg_color}" |${values.value}]],
 +
name = [[| style="${text_align};background-color:${bg_color}" |${values.name}<br />${values.icon} ${values.japanese_name}]],
 +
equipment_type = [[| rowspan="${rowspan}" style="${text_align};background-color:${bg_color}" |${values.value}]],
 +
stats = [[| style="${text_align};background-color:${bg_color}" |${values.value}]],
 +
compatibility = [[| rowspan="${rowspan}"style="${text_align};background-color:${bg_color}" |${values.value}]],
 +
buildable = [[| rowspan="${rowspan}"style="${text_align};background-color:${bg_color}" |${values.value}]],
 +
improvable = [[| rowspan="${rowspan}" style="${text_align};background-color:${bg_color}" |${values.value}]],
 +
notes = [[| class="${classes}" rowspan="${rowspan}" style="${text_align};background-color:${bg_color}" |${values.value}]]
 
},
 
},
 
_columns = {
 
_columns = {
Line 27: Line 39:  
"compatibility",
 
"compatibility",
 
"buildable",
 
"buildable",
 +
"improvable",
 
"notes",
 
"notes",
 
},
 
},
Line 33: Line 46:     
function EquipmentListKai:id(equipment)
 
function EquipmentListKai:id(equipment)
return {values = {value = Formatting:format_stat(equipment:id())}, bg_color = self._transparent, text_align = self._center_align}
+
return {values = {value = Formatting:format_stat(equipment:id())}, bg_color = self._transparent, text_align = ""}
 
end
 
end
    
function EquipmentListKai:rarity(equipment)
 
function EquipmentListKai:rarity(equipment)
return {values = {value = Formatting:tooltip(Formatting:format_stars(equipment:stars()), Formatting:format_equipment_rarity(equipment:rarity()))}, bg_color = self._transparent, text_align = self._center_align}
+
return {values = {value = Formatting:tooltip(Formatting:format_stars(equipment:stars()), Formatting:format_equipment_rarity(equipment:rarity()), nil, Formatting._display_inline_block_css)}, bg_color = self._transparent, text_align = ""}
 
end
 
end
    
function EquipmentListKai:name(equipment)
 
function EquipmentListKai:name(equipment)
return {values = {name = Formatting:format_link(equipment:link()),  
+
return {values = {
 +
name = EquipmentLink.format(nil, { equipment:name() }),  
 
icon = Formatting:format_image{Formatting:format_equipment_icon(equipment:icon())},  
 
icon = Formatting:format_image{Formatting:format_equipment_icon(equipment:icon())},  
 
japanese_name = Formatting:format_stat(equipment:japanese_name())
 
japanese_name = Formatting:format_stat(equipment:japanese_name())
 
},  
 
},  
 
bg_color = self._transparent,
 
bg_color = self._transparent,
text_align = self._start_align,
+
text_align = "text-align: " .. self._start_align,
 
}
 
}
 
end
 
end
    
function EquipmentListKai:equipment_type(equipment)
 
function EquipmentListKai:equipment_type(equipment)
return {values = {value = Formatting:format_equipment_type(equipment:type())}, bg_color = self._transparent, text_align = self._center_align}
+
    return {values = {value = Formatting:format_equipment_type(equipment:type())}, bg_color = self._transparent, text_align = ""}
 
end
 
end
    
function EquipmentListKai:stats(equipment)
 
function EquipmentListKai:stats(equipment)
return {values = {value = Formatting:format_stat_bonuses({
+
    local stats = {
firepower = equipment:firepower(),  
+
firepower = equipment:firepower(),  
bombing = equipment:bombing(),  
+
bombing = equipment:bombing(),  
torpedo = equipment:torpedo(),  
+
torpedo = equipment:torpedo(),  
aa = equipment:aa(),  
+
aa = equipment:aa(),  
armor = equipment:armor(),  
+
armor = equipment:armor(),  
asw = equipment:asw(),  
+
asw = equipment:asw(),  
shelling_accuracy = equipment:shelling_accuracy(),
+
shelling_accuracy = equipment:shelling_accuracy(),
torpedo_accuracy = equipment:torpedo_accuracy(),
+
torpedo_accuracy = equipment:torpedo_accuracy(),
evasion = equipment:evasion(),
+
evasion = equipment:evasion(),
los = equipment:los(),
+
los = equipment:los(),
speed = Formatting:format_speed(equipment:speed()),
+
speed = Formatting:format_speed(equipment:speed()),
luck = equipment:luck(),
+
luck = equipment:luck(),
range = Formatting:format_range(equipment:range()),
+
range = Formatting:format_range(equipment:range()),
special = false,
+
special = false,
}, "<br />"),
+
}
 +
return {values = {value = equipment:type() == 48 and Formatting:format_stat_bonuses_interceptor(stats, "<br />") or Formatting:format_stat_bonuses(stats, "<br />"),
 
},  
 
},  
 
bg_color = self._transparent,  
 
bg_color = self._transparent,  
text_align = self._start_align,
+
text_align = "text-align: " .. self._start_align,
 
}
 
}
 
end
 
end
    
function EquipmentListKai:compatibility(equipment)
 
function EquipmentListKai:compatibility(equipment)
return {values = {value = Formatting:format_ship_compatibility(equipment:equippable())}, bg_color = self._transparent, text_align = self._start_align}
+
local value = Formatting:format_ship_compatibility(equipment:equippable())
 +
if equipment:is_lbas_plane() then
 +
value = value == "" and "LBAS" or value .. "; LBAS"
 +
end
 +
return {values = {value = value}, bg_color = self._transparent, text_align = "text-align: " .. self._start_align}
 
end
 
end
    
function EquipmentListKai:buildable(equipment)
 
function EquipmentListKai:buildable(equipment)
return {values = {value = Formatting:format_boolean(equipment:buildable())}, bg_color = self._transparent, text_align = self._center_align}
+
return {values = {value = Formatting:format_boolean_short(equipment:buildable())}, bg_color = self._transparent, text_align = ""}
 +
end
 +
 
 +
function EquipmentListKai:improvable(equipment)
 +
return {values = {value = Formatting:format_boolean_short(equipment:improvable())}, bg_color = self._transparent, text_align = ""}
 
end
 
end
   Line 88: Line 111:  
local note = self._notes[equipment]
 
local note = self._notes[equipment]
 
if note then
 
if note then
return {values = {value = note.note or ""}, bg_color = self._transparent}
+
return {values = {value = note.note or ""}, bg_color = self._transparent, text_align = "text-align: " .. self._start_align}
 
end
 
end
return {values = {value = ""}, bg_color = self._transparent}
+
return {values = {value = ""}, bg_color = self._transparent, text_align = "text-align: " .. self._start_align}
 
end
 
end
  
cssedit, gkautomate
6,926

edits