Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

i18n: raidboss cn5x output overhaul #490

Merged
merged 13 commits into from
Nov 10, 2024
Merged

i18n: raidboss cn5x output overhaul #490

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
9654f2a
update alliance
Echoring Oct 31, 2024
bf55c6e
update dungeon p1
Echoring Oct 31, 2024
7682623
update dungeon p2
Echoring Oct 31, 2024
6564107
Merge remote-tracking branch 'upstream/main' into raidboss-cn5xoverhaul
Echoring Nov 1, 2024
b503acf
update bozjan
Echoring Nov 4, 2024
c62bc27
update hunt
Echoring Nov 4, 2024
5888c24
raid p1
Echoring Nov 5, 2024
d2ed227
raid p2
Echoring Nov 6, 2024
6d0f7bc
raid p3
Echoring Nov 7, 2024
5b52536
trial
Echoring Nov 9, 2024
db9c2d1
fix unnecessary regex capture
Echoring Nov 9, 2024
f79ddd4
Merge branch 'main' into raidboss-cn5xoverhaul
Echoring Nov 9, 2024
cf5d4ae
Apply suggestions from code review
Echoring Nov 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions resources/outputs.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -553,7 +553,7 @@ export default {
de: 'Seiten',
fr: 'Côtés',
ja: '横へ',
cn: '去侧面',
cn: '去两侧',
ko: '양옆으로',
},
middle: {
Expand Down Expand Up @@ -692,7 +692,7 @@ export default {
de: 'Bewegen!',
fr: 'Bougez !',
ja: '避けて！',
cn: '快躲开！',
cn: '离开原地！',
ko: '이동하기!',
},
moveAround: {
Expand Down
30 changes: 15 additions & 15 deletions ui/raidboss/data/05-shb/alliance/the_copied_factory.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ const triggerSet: TriggerSet<Data> = {
de: 'Bewegenden Kreisen ausweichen',
fr: 'Esquivez les cercles mouvants',
ja: '動いてるサークルを避ける',
cn: '躲避移动圆圈',
cn: '躲避旋转扇形和月环',
ko: '시계방향 회전하면서 나오는 장판 피하기',
},
},
Expand All @@ -153,7 +153,7 @@ const triggerSet: TriggerSet<Data> = {
de: 'Flammenwerfer hinter dir',
fr: 'Repérez les lance-flammes derrière',
ja: '後ろに火炎放射器',
cn: '观察后方放火',
cn: '观察后方喷火',
ko: '뒤에서 불 나오는 곳 확인',
},
},
Expand All @@ -180,7 +180,7 @@ const triggerSet: TriggerSet<Data> = {
de: 'Den fallenden Wände asuweichen',
fr: 'Esquivez les murs tombants',
ja: '倒れてくる壁を避ける',
cn: '躲避倒塌墙壁',
cn: '躲避倒塌箱壁',
ko: '넘어지는 벽 피하기',
},
},
Expand All @@ -192,12 +192,12 @@ const triggerSet: TriggerSet<Data> = {
delaySeconds: 10,
alertText: (_data, _matches, output) => output.text!(),
outputStrings: {
text: {
text: { // In fact mostly Tank takes all tethers.
en: 'Spread Tethers',
de: 'Verbindungen Verteilen',
fr: 'Dispersez les liens',
ja: '散開、線を断つ',
cn: '散开扯断连线',
ja: '散開、線を断つ', // FIXME
Echoring marked this conversation as resolved.
Show resolved Hide resolved
cn: '散开放置连线',
ko: '산개 선 (탱 혼자도 가능)',
},
},
Expand Down Expand Up @@ -248,7 +248,7 @@ const triggerSet: TriggerSet<Data> = {
de: 'Förderbänder',
fr: 'Tapis roulant',
ja: 'ローラーコンベア',
cn: '输送带',
cn: '传送带',
ko: '컨베이어 벨트',
},
},
Expand All @@ -268,7 +268,7 @@ const triggerSet: TriggerSet<Data> = {
de: 'Ölbehälter',
fr: 'Cuves à huile',
ja: 'オイルが沸く',
cn: '油桶',
cn: '躲避热油地板',
ko: '뚫린 바닥 피하기',
},
},
Expand All @@ -287,7 +287,7 @@ const triggerSet: TriggerSet<Data> = {
de: 'Ölbehälter',
fr: 'Cuves à huile',
ja: 'オイルが沸く',
cn: '油桶',
cn: '躲避热油地板',
ko: '뚫린 바닥 피하기',
},
},
Expand Down Expand Up @@ -377,7 +377,7 @@ const triggerSet: TriggerSet<Data> = {
de: 'Klauen töten',
fr: 'Tuez les pinces',
ja: 'マルクスを倒す',
cn: '杀掉爪子',
cn: '击杀电锯',
ko: '양옆 톱 처리',
},
},
Expand Down Expand Up @@ -443,7 +443,7 @@ const triggerSet: TriggerSet<Data> = {
de: 'Fläche auf dir',
fr: 'Zone au sol sur VOUS',
ja: '自分に水溜り',
cn: '水圈点名',
cn: '火圈点名',
ko: '징 대상자',
},
},
Expand All @@ -460,7 +460,7 @@ const triggerSet: TriggerSet<Data> = {
de: 'Geh Raus + Zielsuch-AoE ausweichen',
fr: 'À l\'extérieur + Esquivez l\'AoE',
ja: '外 + AoE',
cn: '远离 + 躲避弹幕',
cn: '远离人群 + 躲避追踪AOE',
ko: '바깥으로 빠지고 따라오는 장판 피하기',
},
},
Expand Down Expand Up @@ -510,7 +510,7 @@ const triggerSet: TriggerSet<Data> = {
de: 'Halt nach den kleinen Sägen ausschau',
fr: 'Repérez les scies murales',
ja: 'マルクス突撃',
cn: '观察墙壁',
cn: '观察两侧电锯',
ko: '양옆 톱 확인',
},
},
Expand Down Expand Up @@ -611,7 +611,7 @@ const triggerSet: TriggerSet<Data> = {
de: 'Hinter den nicht verbundenen Panzer gehen',
fr: 'Allez derrière le tank non-lié',
ja: '線のない戦車の後ろへ',
cn: '没连线的坦克后躲避',
cn: '躲到没连线的坦克后',
ko: '연결되지 않은 탱크 뒤로 숨기',
},
},
Expand Down Expand Up @@ -995,7 +995,7 @@ const triggerSet: TriggerSet<Data> = {
'Shockwave': '冲击波',
'Short-Range Missile': '短途导弹',
'Shrapnel Impact': '残骸坠落',
'Spin': '回转',
'Spin': '中央/侧方旋转攻击',
'Surface Missile': '对地导弹',
'Systematic Airstrike': '空袭阵型',
'Systematic Siege': '包围阵型',
Expand Down
4 changes: 2 additions & 2 deletions ui/raidboss/data/05-shb/alliance/the_puppets_bunker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -426,7 +426,7 @@ const triggerSet: TriggerSet<Data> = {
de: 'Raus aus dem oberen Laser',
fr: 'À l\'extérieur des lasers supérieurs',
ja: '高いレーザー放射装置の外へ',
cn: '躲避远程激光',
cn: '去上层激光塔的外圈',
ko: '높은 레이저 쪽 밖으로 이동',
},
},
Expand Down Expand Up @@ -524,7 +524,7 @@ const triggerSet: TriggerSet<Data> = {
de: 'Zwischen Laser gehen (auf die Verbindungen achten)',
fr: 'Allez entre les lasers (regardez les liens)',
ja: 'レーザーの真ん中に (線を気にして)',
cn: '去激光之间（观察直线）',
cn: '去激光辅助机之间（注意连线）',
ko: '레이저 사이로 이동 (연결된 모니터 확인)',
},
},
Expand Down
6 changes: 3 additions & 3 deletions ui/raidboss/data/05-shb/alliance/the_tower_at_paradigms_breach.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ const triggerSet: TriggerSet<Data> = {
de: 'Rückstoß -> Raus aus der Mitte',
fr: 'Poussée -> Sortez du milieu',
ja: 'ノックバック -> 外へ',
Echoring marked this conversation as resolved.
Show resolved Hide resolved
cn: '击退 -> 去外面',
cn: '击退 -> 去两侧',
ko: '넉백 -> 가운데 피하기',
},
},
Expand Down Expand Up @@ -374,14 +374,14 @@ const triggerSet: TriggerSet<Data> = {
en: 'Move between',
de: 'Laufe zwischen beide Bosse',
fr: 'Allez entre les boss',
cn: '移动到BOSS之间',
cn: '去BOSS之间',
ko: '보스 사이로',
},
opposite: {
en: 'Move opposite',
de: 'Laufe entgegengesetzt beider Bosse',
fr: 'Allez à l\'opposé des boss',
cn: '移动到BOSS对面',
cn: '去BOSS对面',
ko: '보스 반대쪽으로',
},
},
Expand Down
2 changes: 1 addition & 1 deletion ui/raidboss/data/05-shb/dungeon/akadaemia_anyder.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ const triggerSet: TriggerSet<Data> = {
de: 'Fläche auf DIR',
fr: 'Zone au sol sur VOUS',
ja: '自分に水溜り',
cn: '水球点名',
cn: '放水圈点名',
ko: '징 대상자',
},
},
Expand Down
2 changes: 1 addition & 1 deletion ui/raidboss/data/05-shb/dungeon/amaurot.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ const triggerSet: TriggerSet<Data> = {
de: 'Meteor im Osten ablegen',
fr: 'Déposez le météore à l\'est',
ja: 'メテオを東に',
cn: '陨石放右边',
cn: '右边放陨石',
ko: '메테오 동쪽으로 빼기',
},
meteor: {
Expand Down
2 changes: 1 addition & 1 deletion ui/raidboss/data/05-shb/dungeon/heroes_gauntlet.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ const triggerSet: TriggerSet<Data> = {
de: 'Auf deinem Stein sammeln',
fr: 'Packez-vous avec votre rocher',
ja: '自分の岩に貼りつく',
cn: '与自己的石堆重合',
cn: '与自己的石堆分摊',
ko: '돌과 같이 맞기',
},
stackOnYou: Outputs.stackOnYou,
Expand Down
4 changes: 2 additions & 2 deletions ui/raidboss/data/05-shb/dungeon/holminster_switch.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@ const triggerSet: TriggerSet<Data> = {
en: 'Break chain on ${player}',
de: 'Kette von ${player} brechen',
fr: 'Cassez les chaînes de ${player}',
ja: '${player}の線を取る',
cn: '截断${player}的线',
ja: '${player}の線を取る', // FIXME
Echoring marked this conversation as resolved.
Show resolved Hide resolved
cn: '击破 ${player} 的锁链',
ko: '${player}의 사슬 부수기',
},
},
Expand Down
2 changes: 1 addition & 1 deletion ui/raidboss/data/05-shb/dungeon/malikahs_well.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ const triggerSet: TriggerSet<Data> = {
de: 'Nahkämpfer Rückstoß',
fr: 'Poussée au CaC',
ja: '近接最大距離ノックバック',
cn: '近战击退',
cn: '小范围击退',
ko: '근거리 넉백',
},
},
Expand Down
12 changes: 6 additions & 6 deletions ui/raidboss/data/05-shb/dungeon/matoyas_relict.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ const triggerSet: TriggerSet<Data> = {
de: 'Orb in ein Loch lenken',
fr: 'Tirez l\'orbe vers un trou vide',
ja: '泥団子を四隅の穴に誘導',
cn: '诱导泥球到无敌人的风圈',
cn: '诱导泥球进洞',
ko: '빈 구멍으로 구슬 보내기',
},
},
Expand Down Expand Up @@ -85,7 +85,7 @@ const triggerSet: TriggerSet<Data> = {
de: 'Weiche den Wand-Stömmungen aus',
fr: 'Évitez le jet d\'eau',
ja: '光ってない横列に移動',
cn: '站在墙壁未发光的一列',
cn: '去墙壁未发光的一列',
ko: '벽 물줄기 피하기',
},
},
Expand All @@ -103,7 +103,7 @@ const triggerSet: TriggerSet<Data> = {
de: 'In einer Fläche nahe der Wolke stehen',
fr: 'Marchez dans la zone au sol près du nuage',
ja: '雲に近い水を踏む',
cn: '站在靠近云朵的水流里等待浮空',
cn: '站在靠近云朵的水流里等待击飞',
ko: '구름 근처 물줄기 위에 서기',
},
},
Expand All @@ -125,7 +125,7 @@ const triggerSet: TriggerSet<Data> = {
de: 'Lass dich in den Safespot zurückstoßen (kein Rückstoßschutz)',
fr: 'Faites-vous pousser en zone safe (pas d\'anti-poussée)',
ja: 'ボスの正面に (堅実魔効かない)',
cn: '站在Boss正面 (防击退无效)',
cn: '去Boss脚下击退 (防击退无效)',
ko: '안전한 구역으로 넉백당하기',
},
},
Expand All @@ -141,7 +141,7 @@ const triggerSet: TriggerSet<Data> = {
de: 'Geh auf die andere Seite',
fr: 'Allez du côté opposé',
ja: '反対側へ',
cn: '对面躲避坠落',
cn: '去对侧边缘',
ko: '반대편으로 이동',
},
},
Expand Down Expand Up @@ -181,7 +181,7 @@ const triggerSet: TriggerSet<Data> = {
de: 'Gehe zum Boss',
fr: 'Allez vers le boss',
ja: 'ボスの場所に移動',
cn: '站在Boss正下方',
cn: '去Boss正下方',
ko: '보스쪽으로',
},
},
Expand Down
4 changes: 2 additions & 2 deletions ui/raidboss/data/05-shb/dungeon/mt_gulg.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ const triggerSet: TriggerSet<Data> = {
de: 'Frontaler Laser',
fr: 'Laser frontal',
ja: 'ボス前方レーザー',
cn: '面前激光',
cn: '正面激光',
ko: '정면 레이저 공격',
},
},
Expand All @@ -73,7 +73,7 @@ const triggerSet: TriggerSet<Data> = {
de: 'Wind-Fächerflächen ausweichen',
fr: 'Esquivez les cônes de vent',
ja: '風の楔から離れる',
cn: '躲风锥',
cn: '躲避风球扇形AOE',
ko: '부채꼴 공격 피하기',
},
},
Expand Down
6 changes: 3 additions & 3 deletions ui/raidboss/data/05-shb/dungeon/paglthan.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ const triggerSet: TriggerSet<Data> = {
de: 'Geh zu einem Blitzableiter',
fr: 'Allez sur un paratonnerre',
ja: '避雷針に円範囲を転嫁',
cn: '蹭一下无AoE的塔',
cn: '把雷传给避雷针',
ko: '장판 기둥에 넘기기',
},
},
Expand Down Expand Up @@ -120,7 +120,7 @@ const triggerSet: TriggerSet<Data> = {
de: 'Kan Rhai auf DIR',
fr: 'Kan Rhai sur VOUS',
ja: '自分にカン・ラーイ',
cn: '十字AoE点名',
cn: '十字多段AoE点名',
ko: '십자 장판 대상자',
},
},
Expand Down Expand Up @@ -307,7 +307,7 @@ const triggerSet: TriggerSet<Data> = {
'The Gathering Ring': '佐尔玛刻祭场',
},
'replaceText': {
'\\(circles\\)': '圈',
'\\(circles\\)': '(预兆)',
'\\(explosions\\)': '(爆炸)',
'--Levin orbs--': '--电球--',
'Akh Morn': '死亡轮回',
Expand Down
8 changes: 4 additions & 4 deletions ui/raidboss/data/05-shb/dungeon/the_grand_cosmos.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ const triggerSet: TriggerSet<Data> = {
de: 'Samen auf den nicht bewachsenen Boden legen',
fr: 'Mettez les graines sur la terre',
ja: '種を土に置かないように',
cn: '种子搬离AOE',
cn: '将种子搬离草地',
ko: '씨앗 자라지 못하게 하기',
},
},
Expand Down Expand Up @@ -131,7 +131,7 @@ const triggerSet: TriggerSet<Data> = {
de: 'Den Kreuzen ausweichen',
fr: 'Esquivez les croix',
ja: '十字を避ける',
cn: '躲避交叉',
cn: '躲避十字AOE',
ko: '십자 장판 피하기',
},
},
Expand All @@ -156,7 +156,7 @@ const triggerSet: TriggerSet<Data> = {
de: 'Einrichtung berühren',
fr: 'Touchez un meuble',
ja: '調度品に寄る',
cn: '传火家具',
cn: '传火给家具',
ko: '가구에 불 옮기기',
},
},
Expand Down Expand Up @@ -346,7 +346,7 @@ const triggerSet: TriggerSet<Data> = {
'Dark Shock': '黑暗冲击',
'Dark Well': '黑暗爆碎',
'Direct Seeding': '直接播种',
'(?<! )Far Wind': '(?<! )远风',
'(?<! )Far Wind': '(?<! )晴岚',
'Fire\'s Domain': '炎狱杀',
'Fire\'s Ire': '炎狱闪',
'Gardener\'s Hymn': '育芽之谣',
Expand Down
4 changes: 2 additions & 2 deletions ui/raidboss/data/05-shb/dungeon/twinning.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ const triggerSet: TriggerSet<Data> = {
de: 'Verteilen (Vermeide "Käfige")',
fr: 'Dispersez-vous (évitez les cages)',
ja: '散開 (檻に近づかない)',
cn: '分散（躲避笼子）',
cn: '分散（避开笼子）',
ko: '산개 (몬스터 우리 피하기)',
},
},
Expand Down Expand Up @@ -94,7 +94,7 @@ const triggerSet: TriggerSet<Data> = {
de: 'Himmelrichtungs-Lasers',
fr: 'Lasers cardinaux',
ja: '十字レーザー',
cn: '正点激光',
cn: '十字激光',
ko: '십자 레이저',
},
},
Expand Down
Loading
Loading