Skip to content

Commit

Permalink
triggers build: i18n: update ko translations (quisquous#5765) a2f7d1b
Browse files Browse the repository at this point in the history
  • Loading branch information
github-actions committed Aug 15, 2023
1 parent 6eec63c commit 8036442
Show file tree
Hide file tree
Showing 2 changed files with 65 additions and 15 deletions.
14 changes: 14 additions & 0 deletions 06-ew/dungeon/mount_rokkon.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -179,11 +179,13 @@ Options.Triggers.push({
en: 'Look West',
de: 'Schau nach Westen',
cn: '看西侧',
ko: '서쪽 보기',
},
lookEast: {
en: 'Look East',
de: 'Schau nach Osten',
cn: '看东侧',
ko: '동쪽 보기',
},
},
},
Expand Down Expand Up @@ -223,21 +225,25 @@ Options.Triggers.push({
en: 'Outside North',
de: 'Nördlich außen',
cn: '外北',
ko: '북쪽 바깥',
},
insideNorth: {
en: 'Inside North',
de: 'Nördlich innen',
cn: '内北',
ko: '북쪽 안',
},
insideSouth: {
en: 'Inside South',
de: 'Südlich innen',
cn: '内南',
ko: '남쪽 안',
},
outsideSouth: {
en: 'Outside South',
de: 'Südlich außen',
cn: '外南',
ko: '남쪽 바깥',
},
},
},
Expand All @@ -252,6 +258,7 @@ Options.Triggers.push({
en: '4x Chasing AOE on YOU',
de: '4x verfolgende AoE auf DIR',
cn: '四连 AOE 点名',
ko: '따라오는 장판 4번',
},
},
},
Expand Down Expand Up @@ -450,16 +457,19 @@ Options.Triggers.push({
en: 'Avoid Expanding Lines',
de: 'Weiche den expandierenden Linien aus',
cn: '远离扩张的线',
ko: '커지는 직선 장판 피하기',
},
rocks: {
en: 'Avoid Expanding Rocks',
de: 'Weiche den expandierenden Steinen aus',
cn: '远离变大的石头',
ko: '커지는 바위 장판 피하기',
},
both: {
en: 'Avoid Expanding Rocks/Lines',
de: 'Weiche den expandierenden Steinen/Linien aus',
cn: '远离扩张的线 + 石头',
ko: '커지는 직선/바위 장판 피하기',
},
},
},
Expand All @@ -483,11 +493,13 @@ Options.Triggers.push({
en: 'Stand on Rock',
de: 'Steh auf einem Stein',
cn: '站在石头上',
ko: '바위 위에 있기',
},
both: {
en: 'Stand on Rock + Line',
de: 'Steh auf einem Stein + Linie',
cn: '站在石头+线上',
ko: '바위 + 직선장판 위에 있기',
},
},
},
Expand All @@ -501,6 +513,7 @@ Options.Triggers.push({
en: 'Stand in All Towers',
de: 'Steh in allen Türmen',
cn: '站在塔里',
ko: '모든 기둥 밟기',
},
},
},
Expand All @@ -527,6 +540,7 @@ Options.Triggers.push({
en: 'Between Rings + Outside Line',
de: 'Zwischen Ringen + äußere Linie',
cn: '内环 + 外线',
ko: '고리들 사이 + 바깥',
},
},
},
Expand Down
66 changes: 51 additions & 15 deletions 06-ew/raid/p12s.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,9 +126,11 @@ const superchainNpcBaseIds = Object.values(superchainNpcBaseIdMap);
const whiteFlameDelayOutputStrings = {
delay1: {
en: 'now',
ko: '바로',
},
delay2: {
en: 'soon',
ko: '곧',
},
delay3: {
en: 'delayed',
Expand Down Expand Up @@ -315,6 +317,21 @@ Options.Triggers.push({
},
default: 'shapeAndDebuff',
},
{
id: 'classicalConcepts2ActualNoFlip',
comment: {
en:
'Only calls final position immediately in chosen pair order with no flip. For example, for BPOG, the blue X (crosses) will be far west. <a href="https://quisquous.github.io/cactbot/resources/images/06ew_raid_p12s_classic2_noflip.gif" target="_blank">Visual</a>',
ko:
'선택한 도형 순서에 따른 최종 위치만 알립니다. 예시에서 파보빨초를 기준으로 파랑 X는 1열이 됩니다. <a href="https://quisquous.github.io/cactbot/resources/images/06ew_raid_p12s_classic2_noflip.gif" target="_blank">Visual</a>',
},
name: {
en: 'Classical Concepts 2: Actual only & no inversion',
ko: 'Classical Concepts 2: 반전 없이 실제 위치만 알림',
},
type: 'checkbox',
default: false,
},
{
id: 'pangenesisFirstTower',
name: {
Expand Down Expand Up @@ -1761,15 +1778,15 @@ Options.Triggers.push({
fr: 'Bait le laser (${delay})',
ja: 'レーザー誘導 (${delay})',
cn: '引导激光 (${delay})',
ko: '레이저 유도 (${delay})', // FIXME
ko: '레이저 유도 (${delay})',
},
firstWhiteFlame: {
en: '(5 and 7 ${delay})',
de: '(5 und 7 ködern ${delay})',
fr: '(5 et 7 bait ${delay})',
ja: '(5と7誘導 ${delay})',
cn: '(5 和 7 引导 ${delay})',
ko: '(5, 7 레이저 ${delay})', // FIXME
ko: '(5, 7 레이저 ${delay})',
},
...whiteFlameDelayOutputStrings,
};
Expand Down Expand Up @@ -1806,31 +1823,31 @@ Options.Triggers.push({
fr: 'Bait le laser (${delay})',
ja: 'レーザー誘導 (${delay})',
cn: '引导激光 (${delay})',
ko: '레이저 유도 (${delay})', // FIXME
ko: '레이저 유도 (${delay})',
},
secondWhiteFlame: {
en: '(6 and 8 ${delay})',
de: '(6 und 8 ködern ${delay})',
fr: '(6 et 8 bait ${delay})',
ja: '(6と8誘導 ${delay})',
cn: '(6 和 8 引导 ${delay})',
ko: '(6, 8 레이저 ${delay})', // FIXME
ko: '(6, 8 레이저 ${delay})',
},
thirdWhiteFlame: {
en: '(1 and 3 ${delay})',
de: '(1 und 3 ködern ${delay})',
fr: '(1 et 3 bait ${delay})',
ja: '(1と3誘導 ${delay})',
cn: '(1 和 3 引导 ${delay})',
ko: '(1, 3 레이저 ${delay})', // FIXME
ko: '(1, 3 레이저 ${delay})',
},
fourthWhiteFlame: {
en: '(2 and 4 ${delay})',
de: '(2 und 6 ködern ${delay})',
fr: '(2 et 4 bait ${delay})',
ja: '(2と4誘導 ${delay})',
cn: '(2 和 4 引导 ${delay})',
ko: '(2, 4 레이저 ${delay})', // FIXME
ko: '(2, 4 레이저 ${delay})',
},
...whiteFlameDelayOutputStrings,
};
Expand Down Expand Up @@ -2826,6 +2843,12 @@ Options.Triggers.push({
columnOrderFromConfig[data.triggerSetConfig.classicalConceptsPairOrder];
if (columnOrder?.length !== 4)
return;
// If classicalConcepts2ActualNoFlip is enabled the left/west assigned pair will handle
// the left/west column, as opposed to flipping to pre-position in the right/east column before Panta Rhei.
// To accommodate this, and because the shapes spawn in their flipped arrangement,
// we just reverse the columnOrder from the config settings when determining initial safe spots.
if (data.triggerSetConfig.classicalConcepts2ActualNoFlip)
columnOrder.reverse();
myColumn = columnOrder.indexOf(data.conceptPair);
const myColumnLocations = [
conceptLocationMap.north[myColumn],
Expand Down Expand Up @@ -2901,8 +2924,12 @@ Options.Triggers.push({
data.classical2InitialRow = myRow;
data.classical2Intercept = myInterceptOutput;
}
} else {
// for Panta Rhei, get myColumn, myRow, and myInterceptOutput from data{} and invert them
}
if (
(matches.id === '8336') ||
(matches.id === '8331' && data.triggerSetConfig.classicalConcepts2ActualNoFlip)
) {
// invert myColumn, myRow, and myInterceptOutput to correspond to final/actual positions
if (data.classical2InitialColumn !== undefined)
myColumn = 3 - data.classical2InitialColumn;
if (data.classical2InitialRow !== undefined)
Expand Down Expand Up @@ -2932,20 +2959,29 @@ Options.Triggers.push({
});
return { alertText: outputStr };
}
if (matches.id === '8331') { // classic2 initial
// call the actual position on Panta Rhei or on classical2 cast (depending on classicalConcepts2ActualNoFlip)
if (
(matches.id === '8336' && !data.triggerSetConfig.classicalConcepts2ActualNoFlip) ||
(matches.id === '8331' && data.triggerSetConfig.classicalConcepts2ActualNoFlip)
) {
outputStr = output.classic2actual({
column: output[columnOutput](),
row: output[rowOutput](),
intercept: output[myInterceptOutput](),
});
return { alertText: outputStr };
}
// the initial call is not suppressed by classicalConcepts2ActualNoFlip, so call it for classical2
if (matches.id === '8331') {
outputStr = output.classic2initial({
column: output[columnOutput](),
row: output[rowOutput](),
intercept: output[myInterceptOutput](),
});
return { infoText: outputStr };
}
outputStr = output.classic2actual({
column: output[columnOutput](),
row: output[rowOutput](),
intercept: output[myInterceptOutput](),
});
return { alertText: outputStr };
// only case left is Panta Rhei where initial call was suppressed by classicalConcepts2ActualNoFlip, so don't call anything
return;
},
run: (data) => {
if (data.phase === 'classical1') {
Expand Down

0 comments on commit 8036442

Please sign in to comment.