Merge branch 'quisquous:main' into main

SiliconExarch · Oct 15, 2023 · 0af01c1 · 0af01c1
2 parents 9757f4a + aa76084
commit 0af01c1
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/resources/outputs.ts b/resources/outputs.ts
@@ -41,7 +41,7 @@ export default {
     en: 'AoE + Bleed',
     de: 'AoE + Blutung',
     fr: 'AoE + Saignement',
-    ja: '全体攻撃 + 出血',
+    ja: '全体攻撃 + DoT',
     cn: 'AOE + 流血',
     ko: '전체 공격 + 도트',
   },
@@ -106,6 +106,7 @@ export default {
     en: 'Tank Cleaves on YOU',
     de: 'Tank Cleaves auf DIR',
     fr: 'Tank cleaves sur VOUS',
+    ja: 'MT・ST同時範囲攻撃(自分対象)',
     cn: '坦克顺劈点名',
     ko: '광역 탱버 대상자',
   },
@@ -367,7 +368,7 @@ export default {
     en: 'Out of melee',
     de: 'Raus aus Nahkampf',
     fr: 'Sortez de la mêlée',
-    ja: '近接レンジ離れ',
+    ja: '近接の範囲から離れる',
     cn: '离开近战距离',
     ko: '근접범위 밖으로',
   },
@@ -511,7 +512,7 @@ export default {
     en: 'Counter-clock',
     de: 'Gegen den Uhrzeigersinn',
     fr: 'Anti-horaire',
-    ja: '逆時針回り',
+    ja: '反時針回り',
     cn: '逆时针',
     ko: '반시계방향',
   },
@@ -675,7 +676,7 @@ export default {
     en: 'Close Tethers (${player})',
     de: 'Nahe Verbindungen (${player})',
     fr: 'Liens proches avec (${player})',
-    ja: '(${player})に近づく',
+    ja: '${player}に近づく',
     cn: '靠近连线 (${player})',
     ko: '상대와 가까이 붙기 (${player})',
   },
@@ -907,7 +908,7 @@ export default {
     en: 'Healer',
     de: 'Heiler',
     fr: 'Healer',
-    ja: 'ヒーラ',
+    ja: 'ヒーラー',
     cn: '治疗',
     ko: '힐',
   },

diff --git a/ui/raidboss/data/06-ew/trial/zeromus.ts b/ui/raidboss/data/06-ew/trial/zeromus.ts
@@ -30,6 +30,7 @@ const triggerSet: TriggerSet<Data> = {
         text: {
           en: 'Heal to full',
           de: 'Voll heilen',
+          ja: 'HPを全回復する',
           cn: '奶满全队',
         },
       },
@@ -44,6 +45,7 @@ const triggerSet: TriggerSet<Data> = {
         text: {
           en: 'Away from glowing circles',
           de: 'Weg von den leuchtenden Kreisen',
+          ja: '光っている円から離れる',
           cn: '远离黑洞',
         },
       },
@@ -59,6 +61,7 @@ const triggerSet: TriggerSet<Data> = {
         lineStackOn: {
           en: '5x line stack on ${player}',
           de: '5x in einer Linie Sammeln auf ${player}',
+          ja: '${player}に5回の直線頭割り',
           cn: '${player} 直线分摊 (5次)',
         },
       },
@@ -74,6 +77,7 @@ const triggerSet: TriggerSet<Data> = {
         text: {
           en: '${dir1} / ${dir2}',
           de: '${dir1} / ${dir2}',
+          ja: '${dir1} / ${dir2}',
           cn: '${dir1} / ${dir2}',
         },
         ne: Outputs.northeast,
@@ -91,6 +95,7 @@ const triggerSet: TriggerSet<Data> = {
         text: {
           en: '${dir1} / ${dir2}',
           de: '${dir1} / ${dir2}',
+          ja: '${dir1} / ${dir2}',
           cn: '${dir1} / ${dir2}',
         },
         nw: Outputs.northwest,
@@ -137,6 +142,7 @@ const triggerSet: TriggerSet<Data> = {
         tower: {
           en: 'Stand in Tower',
           de: 'Steh im Turm',
+          ja: '塔を踏む',
           cn: '踩塔',
         },
       },
@@ -197,6 +203,7 @@ const triggerSet: TriggerSet<Data> = {
         text: {
           en: 'Spread + Stay Out',
           de: 'Verteilen + Draußen stehen',
+          ja: '散開 + 範囲から離れる',
           cn: '分散 + 远离',
         },
       },