Line 66: |
Line 66: |
| | | |
| _row = [=[|- | | _row = [=[|- |
− | | style="text-align:left;" rowspan="4" id="${name}" | ${link} | + | | style="text-align:left;" rowspan="${rowspan}" id="${name}" | ${link} |
| | 0 | | | 0 |
| | nowrap | ${devmats0}/${devmats0_x} | | | nowrap | ${devmats0}/${devmats0_x} |
Line 228: |
Line 228: |
| local products = equipment:improvement_products() | | local products = equipment:improvement_products() |
| local resources = equipment:improvement_resources() | | local resources = equipment:improvement_resources() |
− | local resources0, resources0_x, resources6, resources6_x, resources10, resources10_x
| |
− | local ships, days
| |
− | local product_names = {}
| |
− | local i = 0
| |
| for _, product in ipairs(products) do | | for _, product in ipairs(products) do |
− | if i == 0 then | + | local resources0 = equipment:improvement_resources(false, product, 0) |
− | resources0 = equipment:improvement_resources(false, product, 0)
| + | local resources0_x = equipment:improvement_resources(true, product, 0) |
− | resources0_x = equipment:improvement_resources(true, product, 0)
| + | local resources6 = equipment:improvement_resources(false, product, 6) |
− | resources6 = equipment:improvement_resources(false, product, 6)
| + | local resources6_x = equipment:improvement_resources(true, product, 6) |
− | resources6_x = equipment:improvement_resources(true, product, 6)
| + | local resources10 = equipment:improvement_resources(false, product, 10) |
− | resources10 = equipment:improvement_resources(false, product, 10)
| + | local resources10_x = equipment:improvement_resources(true, product, 10) |
− | resources10_x = equipment:improvement_resources(true, product, 10)
| + | local ships, days = format_ships_and_days(equipment:improvement_ships(product), equipment, product) |
− | ships, days = format_ships_and_days(equipment:improvement_ships(product), equipment, product)
| + | table.insert(self.rows, format{ |
− | end | + | self._row, |
− | if product then
| + | rowspan = math.max(4, 4 * #products), |
− | table.insert(product_names, product) | + | id = equipment:link(), |
− | end
| + | link = format_equipment_link(equipment), |
− | i = i + 1 | + | fuel = resources.fuel or 0, |
| + | ammo = resources.ammo or 0, |
| + | steel = resources.steel or 0, |
| + | bauxite = resources.bauxite or 0, |
| + | devmats0 = format_devmat(resources0), |
| + | devmats0_x = format_devmat(resources0_x), |
| + | devmats6 = format_devmat(resources6_x), |
| + | devmats6_x = format_devmat(resources6_x), |
| + | devmats10 = format_devmat(resources10), |
| + | devmats10_x = format_devmat(resources10_x), |
| + | impmats0 = format_screw(resources0), |
| + | impmats0_x = format_screw(resources0_x), |
| + | impmats6 = format_screw(resources6), |
| + | impmats6_x = format_screw(resources6_x), |
| + | impmats10 = format_screw(resources10), |
| + | impmats10_x = format_screw(resources10_x), |
| + | equips0 = format_equipment(resources0), |
| + | equips6 = format_equipment(resources6), |
| + | equips10 = format_equipment(resources10), |
| + | equips0_bg = format_equipment_bg(equipment, resources0), |
| + | equips6_bg = format_equipment_bg(equipment, resources6), |
| + | equips10_bg = format_equipment_bg(equipment, resources10), |
| + | upgrades = format_products(product_names), |
| + | ships = ships, |
| + | days = days, |
| + | }) |
| end | | end |
− | table.insert(self.rows, format{
| |
− | self._row,
| |
− | id = equipment:link(),
| |
− | link = format_equipment_link(equipment),
| |
− | fuel = resources.fuel or 0,
| |
− | ammo = resources.ammo or 0,
| |
− | steel = resources.steel or 0,
| |
− | bauxite = resources.bauxite or 0,
| |
− | devmats0 = format_devmat(resources0),
| |
− | devmats0_x = format_devmat(resources0_x),
| |
− | devmats6 = format_devmat(resources6_x),
| |
− | devmats6_x = format_devmat(resources6_x),
| |
− | devmats10 = format_devmat(resources10),
| |
− | devmats10_x = format_devmat(resources10_x),
| |
− | impmats0 = format_screw(resources0),
| |
− | impmats0_x = format_screw(resources0_x),
| |
− | impmats6 = format_screw(resources6),
| |
− | impmats6_x = format_screw(resources6_x),
| |
− | impmats10 = format_screw(resources10),
| |
− | impmats10_x = format_screw(resources10_x),
| |
− | equips0 = format_equipment(resources0),
| |
− | equips6 = format_equipment(resources6),
| |
− | equips10 = format_equipment(resources10),
| |
− | equips0_bg = format_equipment_bg(equipment, resources0),
| |
− | equips6_bg = format_equipment_bg(equipment, resources6),
| |
− | equips10_bg = format_equipment_bg(equipment, resources10),
| |
− | upgrades = format_products(product_names),
| |
− | ships = ships,
| |
− | days = days,
| |
− | })
| |
| end | | end |
| end | | end |