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.

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 general output&4.x content CN output overhaul #487

Merged
merged 47 commits into from
Nov 1, 2024
Merged
Show file tree
Hide file tree
Changes from 42 commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
87756a8
Update orbonne_monastery.ts
Echoring Oct 29, 2024
934d5e0
Update ridorana_lighthouse.ts
Echoring Oct 29, 2024
6666f78
Update heaven-on-high_floors_51-60.ts
Echoring Oct 29, 2024
766aae6
Update heaven-on-high_floors_81-90.ts
Echoring Oct 29, 2024
fd7e83e
Update ala_mhigo.ts
Echoring Oct 29, 2024
40422ed
Update drowned_city_of_skalla.ts
Echoring Oct 29, 2024
b2d6e32
Update swallows_compass.ts
Echoring Oct 29, 2024
838e532
Update temple_of_the_fist.ts
Echoring Oct 29, 2024
48c30d0
Update eureka_hydatos.ts
Echoring Oct 29, 2024
61c3e94
Update o2n.ts
Echoring Oct 29, 2024
caf06ef
Update o2s.ts
Echoring Oct 29, 2024
6f8b846
Update o3s.ts
Echoring Oct 29, 2024
190029e
Update o4s.ts
Echoring Oct 30, 2024
22cf908
Update o5s.ts
Echoring Oct 30, 2024
8f7e74f
Update o6s.ts
Echoring Oct 30, 2024
cd36db3
Update o7n.ts
Echoring Oct 30, 2024
6a18fe4
update o7s and prey response
Echoring Oct 30, 2024
107468f
Update o8s.ts
Echoring Oct 30, 2024
fb2476c
Update o9n.ts
Echoring Oct 30, 2024
d137f56
update o9
Echoring Oct 30, 2024
bce175d
update o10
Echoring Oct 30, 2024
01be1a2
Update o11n.ts
Echoring Oct 30, 2024
0d4a1bf
Update o11s.ts
Echoring Oct 30, 2024
0ad99f9
Update o12n.ts
Echoring Oct 30, 2024
01a5482
Update o12s.ts
Echoring Oct 30, 2024
7ccb733
Update byakko-ex.ts
Echoring Oct 30, 2024
11f532c
update lakshmi-ex
Echoring Oct 30, 2024
749e240
Update outputs.ts
Echoring Oct 30, 2024
6bbef9f
Update lakshmi.ts
Echoring Oct 30, 2024
471ea16
Update seiryu-ex.ts
Echoring Oct 30, 2024
b1522bf
Update shinryu-ex.ts
Echoring Oct 30, 2024
d138f82
Update shinryu.ts
Echoring Oct 31, 2024
ddaee68
Update susano-ex.ts
Echoring Oct 31, 2024
64b9d1f
Update yojimbo.ts
Echoring Oct 31, 2024
fbbfd9b
Merge remote-tracking branch 'upstream/main' into raidboss-cn4xfixing
Echoring Oct 31, 2024
26653a8
Merge remote-tracking branch 'upstream/main' into raidboss-cn4xfixing
Echoring Oct 31, 2024
57e3f3a
Update o3s.ts
Echoring Oct 31, 2024
980b9ba
Update ultima_weapon_ultimate.ts
Echoring Oct 31, 2024
2ea4cc8
Update unending_coil_ultimate.ts
Echoring Oct 31, 2024
ebd87e5
Update unending_coil_ultimate.ts
Echoring Oct 31, 2024
4ab083d
Update o11s.ts
Echoring Oct 31, 2024
85fa95e
fix timeline replace cn (raid)
Echoring Oct 31, 2024
6fe7481
Update o7s.ts
Echoring Oct 31, 2024
7c42688
Update outputs.ts
Echoring Oct 31, 2024
c98f9d0
Apply suggestions from code review
Echoring Oct 31, 2024
40b9539
Apply suggestions from code review
Echoring Oct 31, 2024
f41f19c
Apply suggestions from code review
Echoring Nov 1, 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
20 changes: 10 additions & 10 deletions resources/outputs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -229,15 +229,15 @@ export default {
de: 'Heiler-Gruppen',
fr: 'Groupes sur les heals',
ja: 'ヒラに頭割り',
cn: '治疗分摊组',
cn: '双奶分组分摊',
ko: '힐러 그룹 쉐어',
},
stackOnYou: {
en: 'Stack on YOU',
de: 'Auf DIR sammeln',
fr: 'Package sur VOUS',
ja: '自分に頭割り',
cn: '集合点名',
cn: '分摊点名',
ko: '쉐어징 대상자',
},
stackOnPlayer: {
Expand Down Expand Up @@ -269,7 +269,7 @@ export default {
de: 'Flächen Ködern',
fr: 'Attirez les flaques',
ja: 'AOE誘導',
cn: '诱导圈圈',
cn: '诱导放圈',
ko: '장판 유도',
},
// For general more-than-one-stack-at-a-time situations
Expand Down Expand Up @@ -634,16 +634,16 @@ export default {
en: 'Prey on YOU',
de: 'Marker auf DIR',
fr: 'Marquage sur VOUS',
ja: '自分に捕食',
cn: '掠食点名',
ja: '自分に捕食', // FIXME
Echoring marked this conversation as resolved.
Show resolved Hide resolved
cn: '点名',
ko: '홍옥징 대상자',
},
preyOnPlayer: {
en: 'Prey on ${player}',
de: 'Marker auf ${player}',
fr: 'Marquage sur ${player}',
ja: '${player}に捕食',
cn: '掠食点名${player}',
ja: '${player}に捕食', // FIXME
Echoring marked this conversation as resolved.
Show resolved Hide resolved
cn: '${player} 的点名',
ko: '"${player}" 홍옥징',
},
awayFromGroup: {
Expand Down Expand Up @@ -701,7 +701,7 @@ export default {
de: 'Bewegen!',
fr: 'Bougez !',
ja: '動く!',
cn: '快动!',
cn: '保持运动!',
ko: '움직이기!',
},
breakChains: {
Expand Down Expand Up @@ -741,15 +741,15 @@ export default {
de: 'Nahe Verbindungen (${player})',
fr: 'Liens proches avec (${player})',
ja: '${player}に近づく',
cn: '靠近连线 (${player})',
cn: '近线 (${player})',
ko: '상대와 가까이 붙기 (${player})',
},
farTethersWithPlayer: {
en: 'Far Tethers (${player})',
de: 'Entfernte Verbindungen (${player})',
fr: 'Liens éloignés avec (${player})',
ja: ' (${player})から離れる',
cn: '远离连线 (${player})',
cn: '远线 (${player})',
ko: '상대와 떨어지기 (${player})',
},
getTowers: {
Expand Down
32 changes: 16 additions & 16 deletions ui/raidboss/data/04-sb/alliance/orbonne_monastery.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ const triggerSet: TriggerSet<Data> = {
// I know, I know, there's two warnings for this.
// But like seriously you've got like at least thirty years,
// and if you do it wrong it wipes the raid. So... /shrug??
id: 'Orbonne Agrias Duskblade',
id: 'Orbonne Cid Duskblade',
regex: /Duskblade/,
beforeSeconds: 15,
infoText: (_data, _matches, output) => output.text!(),
Expand Down Expand Up @@ -107,8 +107,8 @@ const triggerSet: TriggerSet<Data> = {
en: 'Searchlight on YOU',
de: 'Suchscheinwerfer auf DIR',
fr: 'Repérage sur VOUS',
ja: '地雷を外に放置(踏まない)',
cn: '远离人群放地雷后离开',
ja: '地雷を外に放置(踏まない)', // FIXME
Echoring marked this conversation as resolved.
Show resolved Hide resolved
cn: '远离人群放圈',
ko: '탐조등 대상자',
},
},
Expand Down Expand Up @@ -183,8 +183,8 @@ const triggerSet: TriggerSet<Data> = {
en: 'Use Swords On Jails',
de: 'Kristalle mit Schwert zerschlagen',
fr: 'Utilisez les épées sur les prisons',
ja: '(コンテンツアクション)剣で魂を討つ',
cn: '使用额外技能攻击',
ja: '(コンテンツアクション)剣で魂を討つ', // FIXME
Echoring marked this conversation as resolved.
Show resolved Hide resolved
cn: '用剑击破囚牢',
ko: '감옥에 검 사용하기',
},
},
Expand Down Expand Up @@ -283,7 +283,7 @@ const triggerSet: TriggerSet<Data> = {
de: 'Schild benutzen, wenn verbunden',
fr: 'Utilisez un bouclier si lié',
ja: '線と繋ったらシールドを使う',
cn: '被连线使用盾牌',
cn: '用盾牌抵挡连线',
ko: '선 연결되면 방패 사용하기',
},
},
Expand All @@ -307,7 +307,7 @@ const triggerSet: TriggerSet<Data> = {
de: 'Tankbuster Zermürben',
fr: 'Évitez le Tank buster',
ja: 'タンクバスター(牽制使って)',
cn: '坦克死刑',
cn: '给牵制,坦克死刑',
ko: '성천폭격타 탱버',
},
},
Expand All @@ -331,7 +331,7 @@ const triggerSet: TriggerSet<Data> = {
de: 'Verbindung abgeben',
fr: 'Éloignez-vous et donnez le lien',
ja: '線を取らない!',
cn: '获取连线受到一次伤害后转给下一个',
cn: '不要接线',
ko: '선 건네주기',
},
},
Expand Down Expand Up @@ -431,8 +431,8 @@ const triggerSet: TriggerSet<Data> = {
en: 'Bolt on YOU',
de: 'Blitz auf DIR',
fr: 'Éclair sur VOUS',
ja: '剣から離れる',
cn: '离开剑所指的区域',
ja: '剣から離れる', // FIXME
Echoring marked this conversation as resolved.
Show resolved Hide resolved
cn: '无双惊电突点名',
ko: '번개찌르기 대상자',
},
},
Expand Down Expand Up @@ -463,7 +463,7 @@ const triggerSet: TriggerSet<Data> = {
de: 'Linie nach Außen',
fr: 'Pointez la ligne vers l\'extérieur',
ja: '(線形AoE)外周に向かって捨てる',
cn: '向外远离',
cn: '向场外引导连线',
ko: '성광폭렬파 바깥으로 빼기',
},
},
Expand Down Expand Up @@ -551,7 +551,7 @@ const triggerSet: TriggerSet<Data> = {
de: 'Eruption auf DIR',
fr: 'Éruption sur vous',
ja: '自分にエラプション',
cn: '地火喷发',
cn: '地火喷发点名',
ko: '불기둥 대상자',
},
},
Expand All @@ -574,7 +574,7 @@ const triggerSet: TriggerSet<Data> = {
de: 'In der langsamen Uhr stehen',
fr: 'Placez-vous sur une horloge lente',
ja: '遅い時計で待機(早い方が爆発したらすぐ安置へ)',
cn: '站慢速时钟等待快速爆炸后立即离开',
cn: '站慢速时钟,快速炸后穿',
ko: '느린 시계 위로',
},
},
Expand All @@ -589,8 +589,8 @@ const triggerSet: TriggerSet<Data> = {
en: 'Look for Hashmal dash',
de: 'Nach Hashmal-Dash ausschau halten',
fr: 'Repérez Hashmal pour la ruée',
ja: '十字レーザーを避ける',
cn: '观察场地三个大十字路径并远离',
ja: '十字レーザーを避ける', // FIXME
Echoring marked this conversation as resolved.
Show resolved Hide resolved
cn: '观察左右躲避半场刀',
ko: '하쉬말 돌진 확인',
},
},
Expand All @@ -607,7 +607,7 @@ const triggerSet: TriggerSet<Data> = {
de: 'Heilen was das Zeug hält',
fr: 'Soignez à mort',
ja: 'ヒーラー頑張って!',
cn: '加大治疗',
cn: '用力奶!',
ko: '계속 힐 돌리기',
},
},
Expand Down
6 changes: 3 additions & 3 deletions ui/raidboss/data/04-sb/alliance/ridorana_lighthouse.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ const mathOutputStrings = {
de: 'Draußen stehen',
fr: 'Restez à l\'extérieur',
ja: '入らない',
cn: '远离',
cn: '不踩圈',
ko: '바깥에 있기',
},
standIn1: {
Expand Down Expand Up @@ -187,7 +187,7 @@ const triggerSet: TriggerSet<Data> = {
de: 'In der langsamen Uhr stehen',
fr: 'Placez-vous sur une horloge lente',
ja: '遅い時計で待機(早い方が爆発したらすぐ安置へ)',
cn: '站慢速时钟等待',
cn: '站慢速时钟,快速炸后穿',
ko: '느린 시계 위로',
},
},
Expand Down Expand Up @@ -221,7 +221,7 @@ const triggerSet: TriggerSet<Data> = {
de: 'Uhrzeiger nach außen',
fr: 'Arrêtez les horloges',
ja: '針を外に向ける',
cn: '定时炸弹',
cn: '将指针踩到朝外',
ko: '시간 폭탄',
},
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ const triggerSet: TriggerSet<Data> = {
de: 'Geh hinter oder schau weg',
fr: 'Allez derrière ou Regardez ailleurs',
ja: '背面へ、または視線をそらす',
cn: '去背后或看向其他方向',
cn: '去背后或背对',
ko: '보스 뒤로 또는 뒤돌기',
},
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ const triggerSet: TriggerSet<Data> = {
de: 'Raus oder unterbreche ${name}',
fr: 'Extérieur ou interrompez ${name}',
ja: '外へ、または${name}に詠唱中断',
cn: '出去或打断 ${name}',
cn: '远离或打断 ${name}',
ko: '밖으로 또는 ${name} 시전 끊기',
},
},
Expand Down
4 changes: 2 additions & 2 deletions ui/raidboss/data/04-sb/dungeon/ala_mhigo.ts
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ const triggerSet: TriggerSet<Data> = {
de: 'Um den Boss verteilen',
fr: 'Changement',
ja: 'ボスを基準として散開',
cn: '和队友分散路径',
cn: '绕boss散开',
ko: '산개',
},
},
Expand All @@ -87,7 +87,7 @@ const triggerSet: TriggerSet<Data> = {
de: 'Verbindung nach draußen richten',
fr: 'Lien vers l\'extérieur',
ja: '線を外へ向ける',
cn: '离开人群背对连线',
cn: '向场外引导连线',
ko: '본진 바깥으로 선 유도하기',
},
},
Expand Down
2 changes: 1 addition & 1 deletion ui/raidboss/data/04-sb/dungeon/drowned_city_of_skalla.ts
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ const triggerSet: TriggerSet<Data> = {
de: 'Schweif-Flächenangriff',
fr: 'Évitez la queue',
ja: 'しっぽ!',
cn: '尾巴攻击',
cn: '躲开背后',
ko: '꼬리쓸기',
},
},
Expand Down
2 changes: 1 addition & 1 deletion ui/raidboss/data/04-sb/dungeon/swallows_compass.ts
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@ const triggerSet: TriggerSet<Data> = {
'Flames Of Hate': '怨念之火',
'Greater Palm': '掌击',
'Might Of The Tengu': '天狗碾',
'Mirage': 'Mirage',
'Mirage': '海市蜃楼',
'Mount Huaguo': '花果山',
'Mountain Falls': '泥石流',
'Mythmaker': '惊天动地',
Expand Down
4 changes: 2 additions & 2 deletions ui/raidboss/data/04-sb/dungeon/temple_of_the_fist.ts
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,8 @@ const triggerSet: TriggerSet<Data> = {
en: 'watch for safe',
de: 'nach sicherer Position schauen',
fr: 'Trouvez une zone safe',
ja: '安置へ',
cn: '前往安全区',
ja: '安置へ', // FIXME
Echoring marked this conversation as resolved.
Show resolved Hide resolved
cn: '攻击未格挡的方向',
ko: '안전지대 찾기',
},
},
Expand Down
2 changes: 1 addition & 1 deletion ui/raidboss/data/04-sb/eureka/eureka_hydatos.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ const triggerSet: TriggerSet<Data> = {
de: 'Schilde und Abschwächungen',
fr: 'Boucliers et mitigation',
ja: 'ダメージ軽減とバリアを',
cn: '切盾减伤',
cn: '大AOE,刷盾减伤',
ko: '뎀감, 보호막',
},
},
Expand Down
4 changes: 2 additions & 2 deletions ui/raidboss/data/04-sb/raid/o10n.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ const triggerSet: TriggerSet<Data> = {
de: 'Nächste Drehung: Rein oder raus',
fr: 'Tour suivant : Intérieur ou Extérieur',
ja: '次: 中/外',
cn: '下一转:内圈/外圈',
cn: '下一转:靠近或远离',
ko: '다음: 안으로 혹은 밖으로',
},
},
Expand Down Expand Up @@ -286,7 +286,7 @@ const triggerSet: TriggerSet<Data> = {
'(?<!/)Out': '远离',
'Northern Cross': '北十字星',
'Protostar': '原恒星',
'Spin': '回转',
'Spin': '横转',
'Tail End': '煞尾',
'Thunderstorm': '雷暴',
},
Expand Down
4 changes: 2 additions & 2 deletions ui/raidboss/data/04-sb/raid/o10s.ts
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ const triggerSet: TriggerSet<Data> = {
de: 'Nächste Drehung: Kanten oder Ecken',
fr: 'Tour suivant : Cardinal ou Coins',
ja: '次: コーナー',
cn: '下一转:靠边火角落',
cn: '下一转:靠边或角落',
ko: '십자 / 대각선',
},
},
Expand Down Expand Up @@ -339,7 +339,7 @@ const triggerSet: TriggerSet<Data> = {
'Protostar': '原恒星',
'Shaker/Thunder': '大地摇动/闪雷风暴',
'Signal': '信号',
'Spin': '回转',
'Spin': '横转',
'Tail End': '煞尾',
'Thunderstorm': '雷暴',
'Time Immemorial': '开天辟地',
Expand Down
12 changes: 6 additions & 6 deletions ui/raidboss/data/04-sb/raid/o11n.ts
Original file line number Diff line number Diff line change
Expand Up @@ -93,15 +93,15 @@ const triggerSet: TriggerSet<Data> = {
de: 'Bewegen (Links)',
fr: 'Bougez (À gauche)',
ja: '動け (左へ)',
cn: '去左边',
cn: '穿(左边)',
ko: '이동 (왼쪽)',
},
stayLeft: {
en: 'Stay (Left)',
de: 'Stehenbleiben (Links)',
fr: 'Restez (À gauche)',
ja: 'そのまま (左に)',
cn: '待在左边',
cn: '停(左边)',
ko: '멈추기 (왼쪽)',
},
},
Expand All @@ -123,15 +123,15 @@ const triggerSet: TriggerSet<Data> = {
de: 'Stehenbleiben (Rechts)',
fr: 'Restez (À droite)',
ja: 'そのまま (右に)',
cn: '待在右边',
cn: '停(右边)',
ko: '멈추기 (오른쪽)',
},
moveRight: {
en: 'Move (Right)',
de: 'Bewegen (Rechts)',
fr: 'Bougez (À droite)',
ja: '動け (右へ)',
cn: '去右边',
cn: '穿(右边)',
ko: '이동 (오른쪽)',
},
},
Expand All @@ -147,7 +147,7 @@ const triggerSet: TriggerSet<Data> = {
en: 'Drop Fire Outside',
de: 'Feuer draußen ablegen',
fr: 'Déposez le feu à l\'extérieur',
cn: '把火放在外面',
cn: '远离放火圈',
ko: '불 장판 바깥으로 유도',
},
},
Expand All @@ -169,7 +169,7 @@ const triggerSet: TriggerSet<Data> = {
en: 'Use duty action on Conductive Focus',
de: 'Benutze Spezialkommando auf "Ziel des Blitzstrahls"',
fr: 'Utilisez l\'action spéciale sur le Point de convergence électrique',
cn: '在雷力投射点上使用任务指令',
cn: '对雷力投射点使用任务指令',
ko: '뇌력 투사 지점에 교란기 사용',
},
},
Expand Down
Loading
Loading