Changes

Better distinguish final and postclear enemy patterns
Line 22: Line 22:  
     _column_cell_templates = {
 
     _column_cell_templates = {
 
         node = [[| colspan="${colspan}" rowspan="${rowspan}" style="text-align: center; color: ${color}; background-color: ${bg_color};" |${values.node}]],
 
         node = [[| colspan="${colspan}" rowspan="${rowspan}" style="text-align: center; color: ${color}; background-color: ${bg_color};" |${values.node}]],
         formation = [[| style="text-align: center; background-color: ${bg_color}; color: ${color};" |${values.formation}]],
+
         formation = [[| style="text-align: center; background-color: ${bg_color}; color: ${color}; font-weight: ${font_weight};" |${values.formation}]],
 
         fleet = [[| style="width: 490px; background-color: ${bg_color};" |${values.fleet}]],
 
         fleet = [[| style="width: 490px; background-color: ${bg_color};" |${values.fleet}]],
         as = [[| style="text-align: center; background-color: ${bg_color}; color: ${color};" |${values.as}]],
+
         as = [[| style="text-align: center; background-color: ${bg_color}; color: ${color}; font-weight: ${font_weight};" |${values.as}]],
 
     },
 
     },
 
     _column_cell_templates_basexp = {
 
     _column_cell_templates_basexp = {
 
         node = [[| colspan="${colspan}" rowspan="${rowspan}" style="text-align: center; color: ${color}; background-color: ${bg_color};" |${values.node}]],
 
         node = [[| colspan="${colspan}" rowspan="${rowspan}" style="text-align: center; color: ${color}; background-color: ${bg_color};" |${values.node}]],
         formation = [[| style="text-align: center; background-color: ${bg_color}; color: ${color};" |${values.formation}]],
+
         formation = [[| style="text-align: center; background-color: ${bg_color}; color: ${color}; font-weight: ${font_weight};" |${values.formation}]],
         basexp = [[| style="text-align: center; background-color: ${bg_color}; color: ${color};" |${values.basexp}]],  
+
         basexp = [[| style="text-align: center; background-color: ${bg_color}; color: ${color}; font-weight: ${font_weight};" |${values.basexp}]],  
 
         fleet = [[| style="width: 490px; background-color: ${bg_color};" |${values.fleet}]],
 
         fleet = [[| style="width: 490px; background-color: ${bg_color};" |${values.fleet}]],
         as = [[| style="text-align: center; background-color: ${bg_color}; color: ${color};" |${values.as}]],
+
         as = [[| style="text-align: center; background-color: ${bg_color}; color: ${color}; font-weight: ${font_weight};" |${values.as}]],
 
     },
 
     },
 
     _empty_node_template = [[| style="text-align: center;" |${values.node}
 
     _empty_node_template = [[| style="text-align: center;" |${values.node}
Line 62: Line 62:  
     _raid_battle_bg_color = "#81C784",
 
     _raid_battle_bg_color = "#81C784",
 
     _boss_battle_color = "red",
 
     _boss_battle_color = "red",
 +
    _cleared_battle_color = "blue",
 
     --_resource_node_bg_color = "lightgreen",
 
     --_resource_node_bg_color = "lightgreen",
 
     _resource_node_bg_color = "initial",
 
     _resource_node_bg_color = "initial",
Line 98: Line 99:  
         row.formation = row.formation .. "<br />(Final)"
 
         row.formation = row.formation .. "<br />(Final)"
 
     end
 
     end
     local color = "initial"
+
    if row.tags.cleared then
     if row.tags.boss then
+
        row.formation = row.formation .. "<br />(Cleared)"
 +
    end
 +
     local color, font_weight = "initial", "initial"
 +
     if row.tags.boss or row.tags.final then
 
         color = self._boss_battle_color
 
         color = self._boss_battle_color
 
     end
 
     end
     return { values = { formation = row.formation }, color = color }
+
    if row.tags.final or row.tags.cleared then
 +
        font_weight = "bold"
 +
    end
 +
    if row.tags.cleared then
 +
        color = self._cleared_battle_color
 +
    end
 +
     return { values = { formation = row.formation }, color = color, font_weight = font_weight }
 
end
 
end
 
   
 
   
 
function NodeInfo:basexp(row)
 
function NodeInfo:basexp(row)
     color = "initial"
+
     color, font_weight = "initial", "initial"
     if row.tags.boss then
+
     if row.tags.boss or row.tags.final then
 
         color = self._boss_battle_color
 
         color = self._boss_battle_color
 
     end
 
     end
     return { values = { basexp = row.basexp }, color = color }
+
    if row.tags.final or row.tags.cleared then
 +
        font_weight = "bold"
 +
    end
 +
    -- if a composition is at a boss node but is tagged as a cleared comp, override the boss node color
 +
    if row.tags.cleared then
 +
        color = self._cleared_battle_color
 +
    end
 +
     return { values = { basexp = row.basexp }, color = color, font_weight = font_weight }
 
end
 
end
 
   
 
   
Line 118: Line 135:  
   
 
   
 
function NodeInfo:as(row)
 
function NodeInfo:as(row)
     color = "initial"
+
     color, font_weight = "initial", "initial"
     if row.tags.boss then
+
     if row.tags.boss or row.tags.final then
 
         color = self._boss_battle_color
 
         color = self._boss_battle_color
 
     end
 
     end
     return { values = { as = row.as }, color = color }
+
    if row.tags.final or row.tags.cleared then
 +
        font_weight = "bold"
 +
    end
 +
    if row.tags.cleared then
 +
        color = self._cleared_battle_color
 +
    end
 +
     return { values = { as = row.as }, color = color, font_weight = font_weight }
 
end
 
end