Merge branch 'main' into loaderparamsiguess

quisquous · Dec 7, 2023 · cfe8b77 · cfe8b77
2 parents 3f72a95 + 4e5661a
commit cfe8b77
Show file tree

Hide file tree

Showing 14 changed files with 92 additions and 47 deletions.
diff --git a/.github/actions/setup-js-env/action.yml b/.github/actions/setup-js-env/action.yml
@@ -7,6 +7,7 @@ runs:
       with:
         node-version: '20'
         cache: 'npm'
+        cache-dependency-path: 'package-lock.json'
 
     - name: Install Dependencies
       shell: bash

diff --git a/dprint.json b/dprint.json
@@ -9,8 +9,7 @@
     "./dist/",
     "./npm-package/",
     "./plugin/ThirdParty/",
-    "./publish/",
-    "**/*-lock.json"
+    "./publish/"
   ],
   "lineWidth": 100,
   "useTabs": false,

diff --git a/package-lock.json b/package-lock.json
diff --git a/ui/raidboss/data/05-shb/raid/e12s.ts b/ui/raidboss/data/05-shb/raid/e12s.ts
@@ -319,6 +319,7 @@ const triggerSet: TriggerSet<Data> = {
           },
           formlessBusterBLU: {
             en: 'Buster on YOU (w/${player})',
+            cn: '死刑点名 (与${player})',
           },
           formlessBusterOnYOU: Outputs.tankBusterOnYou,
         };
@@ -450,9 +451,11 @@ const triggerSet: TriggerSet<Data> = {
         output.responseOutputStrings = {
           stackOnYou: {
             en: 'Stack on YOU (w/${player})',
+            cn: '分摊点名 (与${player})',
           },
           stacks: {
             en: 'Stacks: ${players}',
+            cn: '分摊: ${players}',
           },
         };
 
@@ -1298,42 +1301,43 @@ const triggerSet: TriggerSet<Data> = {
             de: 'Auge auf DIR (w/${player})', // FIXME
             fr: 'Œil sur VOUS (w/${player})', // FIXME
             ja: '自分に目 (w/${player})', // FIXME
-            cn: '石化眼点名 (w/${player})', // FIXME
+            cn: '石化眼点名 (与${player})',
             ko: '시선징 대상자 (w/${player})', // FIXME
           },
           water: {
             en: 'Stack (w/${player})',
+            cn: '分摊 (与${player})',
           },
           longFire: {
             en: 'Long Fire (w/${player})',
             de: 'langes Feuer (w/${player})', // FIXME
             fr: 'Feu long (w/${player})', // FIXME
             ja: 'ファイガ(遅い) (w/${player})', // FIXME
-            cn: '长火 (w/${player})', // FIXME
+            cn: '长火 (与${player})',
             ko: '느린 파이가 (w/${player})', // FIXME
           },
           shortFire: {
             en: 'Short Fire (w/${player})',
             de: 'kurzes Feuer (w/${player})', // FIXME
             fr: 'Feu court (w/${player})', // FIXME
             ja: 'ファイガ(早い) (w/${player})', // FIXME
-            cn: '短火 (w/${player})', // FIXME
+            cn: '短火 (与${player})',
             ko: '빠른 파이가 (w/${player})', // FIXME
           },
           longIce: {
             en: 'Long Ice (w/${player})',
             de: 'langes Eis (w/${player})', // FIXME
             fr: 'Glace longue (w/${player})', // FIXME
             ja: 'ブリザガ(遅い) (w/${player})', // FIXME
-            cn: '长冰 (w/${player})', // FIXME
+            cn: '长冰 (与${player})',
             ko: '느린 블리자가 (w/${player})', // FIXME
           },
           shortIce: {
             en: 'Short Ice (w/${player})',
             de: 'kurzes Eis (w/${player})', // FIXME
             fr: 'Glace courte (w/${player})', // FIXME
             ja: 'ブリザガ(早い) (w/${player})', // FIXME
-            cn: '短冰 (w/${player})', // FIXME
+            cn: '短冰 (与${player})',
             ko: '빠른 블리자가 (w/${player})', // FIXME
           },
           unknown: Outputs.unknown,
@@ -1653,6 +1657,7 @@ const triggerSet: TriggerSet<Data> = {
         },
         stacksOn: {
           en: 'Stacks (${player1}, ${player2})',
+          cn: '分摊 (${player1}, ${player2})',
         },
         knockbackIntoStackGroups: {
           en: 'Knockback Into Stack Groups',
@@ -1664,6 +1669,7 @@ const triggerSet: TriggerSet<Data> = {
         },
         knockbackIntoStacksOn: {
           en: 'Knockback => Stacks (${player1}, ${player2})',
+          cn: '击退 => 分摊 (${player1}, ${player2})',
         },
       },
     },
@@ -1728,6 +1734,7 @@ const triggerSet: TriggerSet<Data> = {
         },
         stacksOn: {
           en: 'Stacks (${player1}, ${player2})',
+          cn: '分摊 (${player1}, ${player2})',
         },
       },
     },
@@ -1754,23 +1761,23 @@ const triggerSet: TriggerSet<Data> = {
             de: 'Auge auf DIR (w/${player})', // FIXME
             fr: 'Œil sur VOUS (w/${player})', // FIXME
             ja: '自分に目 (w/${player})', // FIXME
-            cn: '石化眼点名 (w/${player})', // FIXME
+            cn: '石化眼点名 (与${player})',
             ko: '시선징 대상자 (w/${player})', // FIXME
           },
           doubleAero: {
             en: 'Double Aero (w/${player})',
             de: 'Doppel Windga auf DIR (w/${player})', // FIXME
             fr: 'Double Vent sur VOUS (w/${player})', // FIXME
             ja: '自分にエアロガ×2 (w/${player})', // FIXME
-            cn: '双风点名 (w/${player})', // FIXME
+            cn: '双风点名 (与${player})',
             ko: '더블 에어로가 대상자 (w/${player})', // FIXME
           },
           spread: {
             en: 'Spread (w/${player1}, ${player2}, ${player3})',
             de: 'Verteilen auf DIR (w/${player1}, ${player2}, ${player3})', // FIXME
             fr: 'Dispersion sur VOUS (w/${player1}, ${player2}, ${player3})', // FIXME
             ja: '自分に散開 (w/${player1}, ${player2}, ${player3})', // FIXME
-            cn: '分散点名 (w/${player1}, ${player2}, ${player3})', // FIXME
+            cn: '分散点名 (与${player1}, ${player2}, ${player3})',
             ko: '산개징 대상자 (w/${player1}, ${player2}, ${player3})', // FIXME
           },
           unknown: Outputs.unknown,

diff --git a/ui/raidboss/data/05-shb/raid/e4s.ts b/ui/raidboss/data/05-shb/raid/e4s.ts
@@ -72,6 +72,7 @@ const triggerSet: TriggerSet<Data> = {
       outputStrings: {
         text: {
           en: 'Yellow Spread',
+          cn: '黄标分散',
         },
       },
     },
@@ -101,6 +102,7 @@ const triggerSet: TriggerSet<Data> = {
       outputStrings: {
         text: {
           en: 'Orange Stack',
+          cn: '橙标分摊',
         },
       },
     },
@@ -361,6 +363,7 @@ const triggerSet: TriggerSet<Data> = {
       outputStrings: {
         text: {
           en: 'Blue Weight',
+          cn: '蓝标大陆之重',
         },
       },
     },
@@ -409,6 +412,7 @@ const triggerSet: TriggerSet<Data> = {
       outputStrings: {
         text: {
           en: 'Gaol on YOU (w/${player})',
+          cn: '石牢点名 (与${player})',
         },
       },
     },
@@ -432,7 +436,7 @@ const triggerSet: TriggerSet<Data> = {
           de: 'VON VORNE RECHTS RUNTER', // FIXME
           fr: 'PARTEZ DE L\'AVANT DROITE', // FIXME
           ja: '右前壊れるよ', // FIXME
-          cn: '破坏右前', // FIXME
+          cn: '左 (或 后)',
           ko: '앞 오른쪽 피하기', // FIXME
         },
         left: Outputs.left,
@@ -459,7 +463,7 @@ const triggerSet: TriggerSet<Data> = {
           de: 'VON HINTEN RECHTS RUNTER', // FIXME
           fr: 'PARTEZ DE L\'ARRIÈRE DROITE', // FIXME
           ja: '右後ろ壊れるよ', // FIXME
-          cn: '破坏右后', // FIXME
+          cn: '左 (或 前)',
           ko: '뒤 오른쪽 피하기', // FIXME
         },
         left: Outputs.left,
@@ -486,7 +490,7 @@ const triggerSet: TriggerSet<Data> = {
           de: 'VON HINTEN LINKS RUNTER', // FIXME
           fr: 'PARTEZ DE L\'ARRIÈRE GAUCHE', // FIXME
           ja: '左後ろ壊れるよ', // FIXME
-          cn: '破坏左后', // FIXME
+          cn: '右 (或 前)',
           ko: '뒤 왼쪽 피하기', // FIXME
         },
         right: Outputs.right,
@@ -513,7 +517,7 @@ const triggerSet: TriggerSet<Data> = {
           de: 'VON VORNE LINKS RUNTER', // FIXME
           fr: 'PARTEZ DE L\'AVANT GAUCHE', // FIXME
           ja: '左前壊れるよ', // FIXME
-          cn: '破坏左前', // FIXME
+          cn: '右 (或 后)',
           ko: '앞 왼쪽 피하기', // FIXME
         },
         right: Outputs.right,