Merge remote-tracking branch 'upstream/main'

NewMoe-Technology · Dec 29, 2024 · 22f3b50 · 22f3b50
2 parents 7128eed + d782888
commit 22f3b50
Show file tree

Hide file tree

Showing 8 changed files with 126 additions and 3 deletions.
diff --git a/resources/zone_info.ts b/resources/zone_info.ts
@@ -10091,6 +10091,7 @@ const data: ZoneInfoType = {
       'en': 'AAC Light-heavyweight M1',
       'fr': 'Poids mi-lourds CCA - match 1',
       'ja': '至天の座アルカディア：ライトヘビー級1',
+      'ko': '아르카디아 선수권: 라이트헤비급 1',
     },
     'offsetX': -100,
     'offsetY': -100,
@@ -10121,6 +10122,7 @@ const data: ZoneInfoType = {
       'en': 'AAC Light-heavyweight M2',
       'fr': 'Poids mi-lourds CCA - match 2',
       'ja': '至天の座アルカディア：ライトヘビー級2',
+      'ko': '아르카디아 선수권: 라이트헤비급 2',
     },
     'offsetX': -100,
     'offsetY': -100,
@@ -10151,6 +10153,7 @@ const data: ZoneInfoType = {
       'en': 'AAC Light-heavyweight M3',
       'fr': 'Poids mi-lourds CCA - match 3',
       'ja': '至天の座アルカディア：ライトヘビー級3',
+      'ko': '아르카디아 선수권: 라이트헤비급 3',
     },
     'offsetX': -100,
     'offsetY': -100,
@@ -10181,6 +10184,7 @@ const data: ZoneInfoType = {
       'en': 'AAC Light-heavyweight M4',
       'fr': 'Poids mi-lourds CCA - match 4',
       'ja': '至天の座アルカディア：ライトヘビー級4',
+      'ko': '아르카디아 선수권: 라이트헤비급 4',
     },
     'offsetX': -100,
     'offsetY': -100,

diff --git a/ui/oopsyraidsy/oopsy_summary_list.ts b/ui/oopsyraidsy/oopsy_summary_list.ts
@@ -1,5 +1,5 @@
 import PartyTracker from '../../resources/party';
-import { OopsyMistake } from '../../types/oopsy';
+import { OopsyMistake, OopsyMistakeType } from '../../types/oopsy';
 
 import { DeathReport } from './death_report';
 import { MistakeObserver, ViewEvent } from './mistake_observer';
@@ -23,7 +23,7 @@ export class OopsySummaryTable implements MistakeObserver {
     [name: string]: TableRow;
   };
   // TODO: should this come from options?
-  private types: readonly string[] = ['death', 'fail', 'warn', 'pull'];
+  private types: readonly OopsyMistakeType[] = ['death', 'fail', 'warn', 'pull', 'damage'];
   private sortCol = 'death';
   private sortAsc = false;
 

diff --git a/ui/raidboss/data/07-dt/raid/r1n.ts b/ui/raidboss/data/07-dt/raid/r1n.ts
@@ -437,6 +437,35 @@ const triggerSet: TriggerSet<Data> = {
         '\\(telegraphs\\)': '(预兆)',
       },
     },
+    {
+      'locale': 'ko',
+      'replaceSync': {
+        'Black Cat': '블랙 캣',
+        'Copy Cat': '카피 캣',
+      },
+      'replaceText': {
+        '(?<! )Black Cat Crossing': '교차 손톱',
+        '(?<! )One-two Paw': '2연속 손톱',
+        'Biscuit Maker': '꾹꾹이',
+        'Bloody Scratch': '피묻은 손톱자국',
+        'Clawful': '묵직한 할퀴기',
+        'Copycat': '카피 캣',
+        'Elevate and Eviscerate': '고양이 올려치기',
+        'Grimalkin Gale': '고양이 돌풍',
+        'Impact': '충격',
+        'Leaping Black Cat Crossing': '도약 교차 손톱',
+        'Leaping One-two Paw': '도약 2연속 손톱',
+        'Mouser': '생쥐 몰이',
+        'Overshadow': '그림자 드리우기',
+        'Predaceous Pounce': '고양이 우다다',
+        'Shockwave': '충격파',
+        '\\(cast\\)': '(시전)',
+        '\\(damage\\)': '(피해)',
+        '\\(hits\\)': '(명중)',
+        '\\(jump\\)': '(점프)',
+        '\\(telegraphs\\)': '(전조)',
+      },
+    },
   ],
 };
 

diff --git a/ui/raidboss/data/07-dt/raid/r2n.ts b/ui/raidboss/data/07-dt/raid/r2n.ts
@@ -202,6 +202,31 @@ const triggerSet: TriggerSet<Data> = {
         'Tempting Twist': '甜心旋风',
       },
     },
+    {
+      'locale': 'ko',
+      'replaceSync': {
+        'Honey B. Lovely': '허니 B. 러블리',
+      },
+      'replaceText': {
+        'Alarm Pheromones': '페로몬 경보',
+        'Blinding Love': '맹목적인 사랑',
+        'Blow Kiss': '손키스',
+        'Call Me Honey': '러블리한 인사',
+        'Drop of Venom': '독성 빗방울',
+        'Fracture': '작렬',
+        'Heart-struck': '애통',
+        'Heartsick': '가슴앓이',
+        'Heartsore': '상심',
+        'Honey B. Finale': '허니 B. 피날레',
+        'Honey B. Live': '허니 B. 라이브',
+        'Honey Beeline': '허니 폭발',
+        'Honeyed Breeze': '허니 돌풍',
+        'Love Me Tender': '러브 미 텐더',
+        'Loveseeker': '구애',
+        'Splash of Venom': '독성 비',
+        'Tempting Twist': '허니 회오리',
+      },
+    },
   ],
 };
 

diff --git a/ui/raidboss/data/07-dt/raid/r3n.ts b/ui/raidboss/data/07-dt/raid/r3n.ts
@@ -308,6 +308,34 @@ const triggerSet: TriggerSet<Data> = {
         'Self-destruct': '自爆',
       },
     },
+    {
+      'locale': 'ko',
+      'replaceSync': {
+        'Brute Bomber': '브루트 봄버',
+        'Lit Fuse': '불붙은 봄',
+      },
+      'replaceText': {
+        '\\(cast\\)': '(시전)',
+        '\\(cones\\)': '(장판)',
+        '\\(damage\\)': '(피해)',
+        '\\(long\\)': '(긴)',
+        '\\(short\\)': '(짧은)',
+        'Barbarous Barrage': '봄버리안 봄',
+        'Brutal Burn': '비열한 화염',
+        'Brutal Impact': '비열한 내리치기',
+        'Brutal Lariat': '비열한 후려갈기기',
+        'Doping Draught': '도핑',
+        'Explosion': '폭발',
+        'Explosive Rain': '봄 세례',
+        'Fire Spin': '회전 불 뿜기',
+        'Fuses of Fury': '불붙은 봄',
+        'Infernal Spin': '회전 지옥불 뿜기',
+        'Knuckle Sandwich': '비열한 주먹질',
+        'Lariat Combo': '연속 후려갈기기',
+        'Murderous Mist': '녹색 안개',
+        'Self-destruct': '자폭',
+      },
+    },
   ],
 };
 

diff --git a/ui/raidboss/data/07-dt/raid/r4n.ts b/ui/raidboss/data/07-dt/raid/r4n.ts
@@ -739,6 +739,37 @@ const triggerSet: TriggerSet<Data> = {
         'Wrath of Zeus': '宙斯之怒',
       },
     },
+    {
+      'locale': 'ko',
+      'replaceSync': {
+        'Wicked Replica': '위키드 선더의 환영',
+        'Wicked Thunder': '위키드 선더',
+      },
+      'replaceText': {
+        'Right Roll/Left Roll': '좌/우회전',
+        '--east/west--': '--동/서쪽--',
+        '\\(cast\\)': '(시전)',
+        '\\(clone\\)': '(분신)',
+        '\\(damage\\)': '(피해)',
+        'Bewitching Flight': '마녀의 비행',
+        'Burst': '대폭발',
+        'Fivefold Blast': '5연속 대포',
+        'Fourfold Blast': '4연속 대포',
+        'Shadows\' Sabbath': '검은 안식일',
+        'Sidewise Spark': '측면 번갯불',
+        'Soaring Soulpress': '도약 영혼 내리찍기',
+        'Stampeding Thunder': '대포 집중 연사',
+        'Threefold Blast': '3연속 대포',
+        'Thunderslam': '번개 공격',
+        'Thunderstorm': '번개 폭풍',
+        'Wicked Bolt': '위키드 볼트',
+        'Wicked Cannon': '위키드 대포',
+        'Wicked Hypercannon': '위키드 거포',
+        'Wicked Jolt': '위키드 졸트',
+        'Witch Hunt': '마녀사냥',
+        'Wrath of Zeus': '제우스의 분노',
+      },
+    },
   ],
 };
 

diff --git a/util/coverage/coverage.ts b/util/coverage/coverage.ts
@@ -170,6 +170,9 @@ const contentTypeToLabel: { [contentType: number]: LocaleText } = {
     cn: '多变&异闻迷宫',
     ko: '변형&파생던전',
   },
+  [ContentType.ChaoticAllianceRaid]: {
+    en: 'Chaotic',
+  },
 } as const;
 
 const contentTypeLabelOrder = [

diff --git a/util/gen_coverage_report.ts b/util/gen_coverage_report.ts
@@ -297,9 +297,12 @@ const buildTotals = (coverage: Coverage, missingTranslations: MissingTranslation
     const origContentType = zoneInfo.contentType;
     if (origContentType === undefined)
       continue;
-    // Until we get more V&C dungeons (if ever), lump them in with "dungeons".
+
     const contentTypeRemap: { [type: number]: number } = {
+      // Until we get more V&C dungeons (if ever), lump them in with "dungeons".
       [ContentType.VCDungeonFinder]: ContentType.Dungeons,
+      // lump chaotic alliance raids with raids for now.
+      [ContentType.ChaoticAllianceRaid]: ContentType.Raids,
     };
     const contentType = contentTypeRemap[origContentType] ?? origContentType;