Line 15: |
Line 15: |
| | | |
| local template = [=[|- | | local template = [=[|- |
− | |style="${style}" nowrap|${id} | + | |style="${style}"|${id} |
| + | |style="${style}"|${diff} |
| |style="${style}"|${name} | | |style="${style}"|${name} |
| |style="${style}"|${time} | | |style="${style}"|${time} |
Line 28: |
Line 29: |
| | | |
| local template2 = [=[|- | | local template2 = [=[|- |
− | |style="${style}" nowrap|${id} | + | |style="${style}"|${id} |
| + | |style="${style}"|${diff} |
| |style="${style}"|${name} | | |style="${style}"|${name} |
| |style="${style}"|${time} | | |style="${style}"|${time} |
Line 77: |
Line 79: |
| <div style="position:relative;border:solid 1px lightgray;width:95%;border-radius:10px;padding:10px;margin:10px;margin-top:0px"> | | <div style="position:relative;border:solid 1px lightgray;width:95%;border-radius:10px;padding:10px;margin:10px;margin-top:0px"> |
| {|style="margin:0 auto;radius:10px;cellpadding:10px;width:100%" cellspacing="0" | | {|style="margin:0 auto;radius:10px;cellpadding:10px;width:100%" cellspacing="0" |
− | !style="cellpadding:10px;width:4%;" |# | + | !style="cellpadding:10px;width:2%;" |# |
| + | !style="cellpadding:10px;width:2%;" |Diff. |
| !style="cellpadding:10px;width:24%;" |Name | | !style="cellpadding:10px;width:24%;" |Name |
| !style="cellpadding:10px;" |Time | | !style="cellpadding:10px;" |Time |
Line 194: |
Line 197: |
| i % 2 == 0 and '' or backgrounds[e.maparea_id] or backgrounds[0] | | i % 2 == 0 and '' or backgrounds[e.maparea_id] or backgrounds[0] |
| ), | | ), |
− | id = tooltip(id, 'ID number as displayed in game') .. string.format(' (%s)', diffs[e.difficulty]), | + | id = tooltip(id, 'ID number as displayed in game'), |
| 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), | | 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), |
| + | diff = diffs[e.difficulty] or '??', |
| time = tooltip(formatTime(e.time), 'Time required for expedition'), | | time = tooltip(formatTime(e.time), 'Time required for expedition'), |
| hq = tooltip(formatAmount(args.explicit[id .. ' hq'], hourly and e.time), 'Admiral experience gained upon completion from this expedition'), | | hq = tooltip(formatAmount(args.explicit[id .. ' hq'], hourly and e.time), 'Admiral experience gained upon completion from this expedition'), |