Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into cenote-ja-ja-gural
Browse files Browse the repository at this point in the history
  • Loading branch information
@xiashtra
xiashtra committed Nov 2, 2024
2 parents 581820e + 7f9a51d commit fdbd9e8
Show file tree
Hide file tree
Showing 102 changed files with 688 additions and 688 deletions.
72 changes: 36 additions & 36 deletions resources/outputs.ts
View file
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 @@ -513,15 +513,15 @@ export default {
de: '<= Nach Links/Westen',
fr: '<= Allez à Gauche/Ouest',
ja: '<= 左/西へ',
cn: '<= 去左/西边',
cn: '<= 去左半场',
ko: '<= 왼쪽/서쪽',
},
getRightAndEast: {
en: 'Get Right/East =>',
de: 'Nach Rechts/Osten =>',
fr: 'Allez à Droite/Est =>',
ja: '右/東へ =>',
cn: '去右/东边 =>',
cn: '去右半场 =>',
ko: '오른쪽/동쪽 =>',
},
leftThenRight: {
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: '自分にマーキング',
cn: '猎物点名',
ko: '홍옥징 대상자',
},
preyOnPlayer: {
en: 'Prey on ${player}',
de: 'Marker auf ${player}',
fr: 'Marquage sur ${player}',
ja: '${player}に捕食',
cn: '掠食点名${player}',
ja: '${player}にマーキング',
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 Expand Up @@ -789,191 +789,191 @@ export default {
de: 'Norden',
fr: 'Nord',
ja: '北',
cn: '上(北)',
cn: '上',
ko: '북쪽',
},
south: {
en: 'South',
de: 'Süden',
fr: 'Sud',
ja: '南',
cn: '下(南)',
cn: '下',
ko: '남쪽',
},
east: {
en: 'East',
de: 'Osten',
fr: 'Est',
ja: '東',
cn: '右(东)',
cn: '右',
ko: '동쪽',
},
west: {
en: 'West',
de: 'Westen',
fr: 'Ouest',
ja: '西',
cn: '左(西)',
cn: '左',
ko: '서쪽',
},
northwest: {
en: 'Northwest',
de: 'Nordwesten',
fr: 'Nord-Ouest',
ja: '北西',
cn: '左上(西北)',
cn: '左上',
ko: '북서쪽',
},
northeast: {
en: 'Northeast',
de: 'Nordosten',
fr: 'Nord-Est',
ja: '北東',
cn: '右上(东北)',
cn: '右上',
ko: '북동쪽',
},
southwest: {
en: 'Southwest',
de: 'Südwesten',
fr: 'Sud-Ouest',
ja: '南西',
cn: '左下(西南)',
cn: '左下',
ko: '남서쪽',
},
southeast: {
en: 'Southeast',
de: 'Südosten',
fr: 'Sud-Est',
ja: '南東',
cn: '右下(东南)',
cn: '右下',
ko: '남동쪽',
},
dirN: {
en: 'N',
de: 'N',
fr: 'N',
ja: '北',
cn: '上(北)',
cn: '上',
ko: '북',
},
dirS: {
en: 'S',
de: 'S',
fr: 'S',
ja: '南',
cn: '下(南)',
cn: '下',
ko: '남',
},
dirE: {
en: 'E',
de: 'O',
fr: 'E',
ja: '東',
cn: '右(东)',
cn: '右',
ko: '동',
},
dirW: {
en: 'W',
de: 'W',
fr: 'O',
ja: '西',
cn: '左(西)',
cn: '左',
ko: '서',
},
dirNW: {
en: 'NW',
de: 'NW',
fr: 'NO',
ja: '北西',
cn: '左上(西北)',
cn: '左上',
ko: '북서',
},
dirNE: {
en: 'NE',
de: 'NO',
fr: 'NE',
ja: '北東',
cn: '右上(东北)',
cn: '右上',
ko: '북동',
},
dirSW: {
en: 'SW',
de: 'SW',
fr: 'SO',
ja: '南西',
cn: '左下(西南)',
cn: '左下',
ko: '남서',
},
dirSE: {
en: 'SE',
de: 'SO',
fr: 'SE',
ja: '南東',
cn: '右下(东南)',
cn: '右下',
ko: '남동',
},
dirNNE: {
en: 'NNE',
de: 'NNO',
fr: 'NNE',
ja: '北北東(1時)',
cn: '上偏右(北偏东)',
cn: '上偏右',
ko: '1시',
},
dirENE: {
en: 'ENE',
de: 'ONO',
fr: 'ENE',
ja: '東北東(2時)',
cn: '右偏上(东偏北)',
cn: '右偏上',
ko: '2시',
},
dirESE: {
en: 'ESE',
de: 'OSO',
fr: 'ESE',
ja: '東南東(4時)',
cn: '右偏下(东偏南)',
cn: '右偏下',
ko: '4시',
},
dirSSE: {
en: 'SSE',
de: 'SSO',
fr: 'SSE',
ja: '南南東(5時)',
cn: '下偏右(南偏东)',
cn: '下偏右',
ko: '5시',
},
dirSSW: {
en: 'SSW',
de: 'SSW',
fr: 'SSO',
ja: '南南西(7時)',
cn: '下偏左(南偏西)',
cn: '下偏左',
ko: '7시',
},
dirWSW: {
en: 'WSW',
de: 'WSW',
fr: 'OSO',
ja: '西南西(8時)',
cn: '左偏下(西偏南)',
cn: '左偏下',
ko: '8시',
},
dirWNW: {
en: 'WNW',
de: 'WNW',
fr: 'ONO',
ja: '西北西(10時)',
cn: '左偏上(西偏北)',
cn: '左偏上',
ko: '10시',
},
dirNNW: {
en: 'NNW',
de: 'NNW',
fr: 'NNO',
ja: '北北西(11時)',
cn: '上偏左(北偏西)',
cn: '上偏左',
ko: '11시',
},
tank: {
Expand Down
2 changes: 1 addition & 1 deletion ui/raidboss/data/02-arr/trial/ultima-ex.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ const triggerSet: TriggerSet<Data> = {
en: 'Orbs: Cardinals (N/S first)',
de: 'Orbs: Kardinal (N/S zuerst)',
fr: 'Orbes : Cardinaux (N/S en premier)',
cn: '球: 十字（先南/北）',
cn: '球: 十字（先上/下）',
ko: '구슬: 십자(남/북 먼저)',
},
boom3: {
Expand Down
6 changes: 3 additions & 3 deletions ui/raidboss/data/03-hw/pvp/shatter.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,23 +45,23 @@ const triggerSet: TriggerSet<Data> = {
de: 'Grosses Eis: Norden',
fr: 'Grosse Glace : Nord',
ja: '氷: 北',
cn: '大冰: 北方',
cn: '大冰: 上方',
ko: '큰 얼음: 북쪽',
},
southeast: {
en: 'Big Ice: Southeast',
de: 'Grosses Eis: Süden',
fr: 'Grosse Glace : Sud-Est',
ja: '氷: 南東',
cn: '大冰: 东南',
cn: '大冰: 右下',
ko: '큰 얼음: 남동쪽',
},
southwest: {
en: 'Big Ice: Southwest',
de: 'Grosses Eis: Südwesten',
fr: 'Grosse Glace : Sud-Ouest',
ja: '氷: 西南',
cn: '大冰: 西南',
cn: '大冰: 左下',
ko: '큰 얼음: 남서쪽',
},
},
Expand Down
Loading

0 comments on commit fdbd9e8

Please sign in to comment.