Line 104: |
Line 104: |
| name = worldNames[world], | | name = worldNames[world], |
| } .. U.joinLines(U.imap(es, function(e, i) | | } .. U.joinLines(U.imap(es, function(e, i) |
| + | local id = e.disp_no |
| return U.format{ | | return U.format{ |
| template, | | template, |
Line 110: |
Line 111: |
| 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(e.disp_no, 'ID number as displayed in game'), | + | id = tooltip(id, 'ID number as displayed in game'), |
| name = tooltip(e.name, e.details), | | name = tooltip(e.name, e.details), |
| time = tooltip(formatTime(e.time), 'Time required for expedition'), | | time = tooltip(formatTime(e.time), 'Time required for expedition'), |
− | hq = tooltip(args.explicit.hq or '??', 'Admiral experience gained upon completion from this expedition'), | + | hq = tooltip(args.explicit[id .. ' hq'] or '??', 'Admiral experience gained upon completion from this expedition'), |
− | ship = tooltip(args.explicit.ship or '??', 'Ship experience gained upon completion from this expedition'), | + | ship = tooltip(args.explicit[id .. ' ship'] or '??', 'Ship experience gained upon completion from this expedition'), |
− | fuel = tooltip(args.explicit.fuel or '??', 'Base resources gain from expedition (at 100% ratio)'), | + | fuel = tooltip(args.explicit[id .. ' fuel'] or '??', 'Base resources gain from expedition (at 100% ratio)'), |
− | ammo = tooltip(args.explicit.ammo or '??', 'Base resources gain from expedition (at 100% ratio)'), | + | ammo = tooltip(args.explicit[id .. ' ammo'] or '??', 'Base resources gain from expedition (at 100% ratio)'), |
− | steel = tooltip(args.explicit.steel or '??', 'Base resources gain from expedition (at 100% ratio)'), | + | steel = tooltip(args.explicit[id .. ' steel'] or '??', 'Base resources gain from expedition (at 100% ratio)'), |
− | bauxite = tooltip(args.explicit.bauxite or '??', 'Base resources gain from expedition (at 100% ratio)'), | + | bauxite = tooltip(args.explicit[id .. ' bauxite'] or '??', 'Base resources gain from expedition (at 100% ratio)'), |
− | item1 = args.explicit.item1 or '??', | + | item1 = '??', |
− | item2 = args.explicit.item2 or '??', | + | item2 = '??', |
| } | | } |
| end)) .. '\n|}</div>' | | end)) .. '\n|}</div>' |