Line 87: |
Line 87: |
| | | |
| function insertRow(result, remodel, args, line, count) | | function insertRow(result, remodel, args, line, count) |
| + | |
| local remodel_string = remodel and "/" .. remodel or "" | | local remodel_string = remodel and "/" .. remodel or "" |
| + | |
| local ja, en, note = args[line.name .. remodel_string], args[line.name .. remodel_string .. "/En"], args[line.name .. remodel_string .. "/Note"] | | local ja, en, note = args[line.name .. remodel_string], args[line.name .. remodel_string .. "/En"], args[line.name .. remodel_string .. "/Note"] |
| local jaEn = args[line.name .. remodel_string .. "/Both"] | | local jaEn = args[line.name .. remodel_string .. "/Both"] |
| local link = args[line.name .. remodel_string .. "/Link"] | | local link = args[line.name .. remodel_string .. "/Link"] |
| + | |
| + | local same = args[line.name .. remodel_string .. "/Same"] |
| + | if same then |
| + | ja = ja or args[same .. remodel_string] |
| + | en = en or args[same .. remodel_string .. "/En"] |
| + | note = note or args[same .. remodel_string .. "/Note"] |
| + | jaEn = jaEn or args[same .. remodel_string .. "/Both"] |
| + | link = link or args[same .. remodel_string .. "/Link"] |
| + | end |
| + | |
| local is_empty_pre_kai_line = not remodel and not ja and not en and not jaEn and (args[line.name .. "/Kai"] or args[line.name .. "/Kai/En"] or args[line.name .. "/Kai/Both"]) | | local is_empty_pre_kai_line = not remodel and not ja and not en and not jaEn and (args[line.name .. "/Kai"] or args[line.name .. "/Kai/En"] or args[line.name .. "/Kai/Both"]) |
− | local same_line = args[line.name .. remodel_string .. "/Same"]
| |
| | | |
| if line.name == "Night Attack" then | | if line.name == "Night Attack" then |
Line 117: |
Line 128: |
| ship = args.ship, | | ship = args.ship, |
| suffix = audio_suffixes[remodel] or "", | | suffix = audio_suffixes[remodel] or "", |
− | line = same_line or line.name, | + | line = same or line.name, |
| }, | | }, |
| }, | | }, |
Line 131: |
Line 142: |
| return 1 | | return 1 |
| end | | end |
| + | |
| return 0 | | return 0 |
| + | |
| end | | end |
| | | |