Merge remote-tracking branch 'upstream/main'

Author: xiashtra

ui/raidboss/emulator/data/network_log_converter/LineEvent0x108.ts

@@ -20,7 +20,7 @@ export class LineEvent0x108 extends LineEvent {
 
     this.abilityIdHex = parts[fields.id]?.toUpperCase() ?? '';
     this.abilityId = parseInt(this.abilityIdHex, 16);
-    this.id = parts[fields.id]?.toUpperCase() ?? '';
+    this.id = parts[fields.sourceId]?.toUpperCase() ?? '';
 
     this.x = parseFloat(parts[fields.x] ?? '');
     this.y = parseFloat(parts[fields.y] ?? '');

util/logtools/generate_triggers.ts

@@ -1400,8 +1400,8 @@ CastInfo Hints: ${[...castTypeFullSuggestions].join(', ')}
           fr: 'Intercardinal',
           ja: '斜めへ',
           cn: '四角',
-          tc: '分攤',
           ko: '대각선 쪽으로',
+          tc: '四角',
         },
       },
     },`;
@@ -1465,8 +1465,8 @@ CastInfo Hints: ${[...castTypeFullSuggestions].join(', ')}
           de: 'Sammeln',
           fr: 'Package',
           cn: '分摊',
-          tc: '分攤',
           ko: '쉐어',
+          tc: '分攤',
         },
       },
     },`;
@@ -1575,8 +1575,8 @@ const generateFileFromTriggerInfo = async (triggerInfo: TriggerInfo[], args: Ext
 
   return `// Auto-generated with:
 // ${processArgs}
+import Outputs from '../../../../../resources/outputs';
 import { Responses } from '../../../../../resources/responses';
-import { Outputs } from '../../../../../resources/outputs';
 import ZoneId from '../../../../../resources/zone_id';
 import { RaidbossData } from '../../../../../types/data';
 import { TriggerSet } from '../../../../../types/trigger';