• Welcome to the Kancolle Wiki!
  • If you have any questions regarding site content, account registration, etc., please visit the KanColle Wiki Discord

Changes

Jump to navigation Jump to search
no edit summary
Line 62: Line 62:  
|style="${style}"|${fuel_cost}
 
|style="${style}"|${fuel_cost}
 
|style="${style}"|${ammo_cost}]=]
 
|style="${style}"|${ammo_cost}]=]
 +
 +
local template3 = [=[|-
 +
|style="${style}" nowrap|${id}
 +
|style="${style}"|${name}
 +
|style="${style}"|${time}
 +
|style="${style}" colspan="10"|${desc}]=]
    
-- todo: use modules
 
-- todo: use modules
Line 222: Line 228:  
end
 
end
   −
local function formatRow(args, e, i, hourly, req)
+
local function formatRow(args, e, i, hourly, req, supp)
 
   local id = e.disp_no
 
   local id = e.disp_no
 
   return U.format{
 
   return U.format{
     (req and template2 or template),
+
     (supp and template3 or req and template2 or template),
 
     style = string.format(
 
     style = string.format(
 
     'text-align: center; height: 35px; background: #%s; color:#000',
 
     'text-align: center; height: 35px; background: #%s; color:#000',
Line 233: Line 239:  
     name = (e.damage_type == 1 and string.format('<span style="color:red">%s</span>', tooltip(e.name, e.details)) or tooltip(e.name, e.details)) .. (e.reset_type == 1 and string.format(' (%s)', tooltip('M', 'Monthly expedtion')) or ''),
 
     name = (e.damage_type == 1 and string.format('<span style="color:red">%s</span>', tooltip(e.name, e.details)) or tooltip(e.name, e.details)) .. (e.reset_type == 1 and string.format(' (%s)', tooltip('M', 'Monthly expedtion')) or ''),
 
     time = tooltip(formatTime(e.time), 'Time required for expedition'),
 
     time = tooltip(formatTime(e.time), 'Time required for expedition'),
 +
    desc = string.format('<style font-weight="bold">%s</style>', args.explicit[id .. ' desc']),
 
     hq = tooltip(formatAmount(args.explicit[id .. ' hq'], hourly and e.time, e.reset_type), 'Admiral experience gained upon completion from this expedition'),
 
     hq = tooltip(formatAmount(args.explicit[id .. ' hq'], hourly and e.time, e.reset_type), 'Admiral experience gained upon completion from this expedition'),
 
     ship = tooltip(formatAmount(args.explicit[id .. ' ship'], hourly and e.time, e.reset_type), 'Ship experience gained upon completion from this expedition'),
 
     ship = tooltip(formatAmount(args.explicit[id .. ' ship'], hourly and e.time, e.reset_type), 'Ship experience gained upon completion from this expedition'),
Line 266: Line 273:  
   if id then
 
   if id then
 
     local e = U.ifilter(data, function(e) return e.disp_no == id end)[1]
 
     local e = U.ifilter(data, function(e) return e.disp_no == id end)[1]
     return formatRow(args, e, args.explicit.odd and 1 or 0, args.explicit.hourly, args.explicit.requirements)
+
     return formatRow(args, e, args.explicit.odd and 1 or 0, args.explicit.hourly, args.explicit.requirements, args.explicit.support)
 
   end
 
   end
 
   local world = tonumber(args.explicit.world)
 
   local world = tonumber(args.explicit.world)

Navigation menu