Skip to content

Commit

Permalink
Merge branch 'main' into zeromus_miasmic_wording
Browse files Browse the repository at this point in the history
  • Loading branch information
quisquous committed Oct 9, 2023
2 parents 21e7f94 + b1b0949 commit 6fca50f
Show file tree
Hide file tree
Showing 18 changed files with 973 additions and 246 deletions.
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "cactbot",
"version": "0.30.1",
"version": "0.30.2",
"license": "Apache-2.0",
"type": "module",
"types": "./types",
Expand Down
4 changes: 2 additions & 2 deletions plugin/CactbotEventSource/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@
// - Revision
// GitHub has only 3 version components, so Revision should always be 0.
// CactbotOverlay and CactbotEventSource version should match.
[assembly: AssemblyVersion("0.30.1.0")]
[assembly: AssemblyFileVersion("0.30.1.0")]
[assembly: AssemblyVersion("0.30.2.0")]
[assembly: AssemblyFileVersion("0.30.2.0")]
4 changes: 2 additions & 2 deletions plugin/CactbotOverlay/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,5 @@
// - Build Number
// - Revision
// GitHub has only 3 version components, so Revision should always be 0.
[assembly: AssemblyVersion("0.30.1.0")]
[assembly: AssemblyFileVersion("0.30.1.0")]
[assembly: AssemblyVersion("0.30.2.0")]
[assembly: AssemblyFileVersion("0.30.2.0")]
2 changes: 2 additions & 0 deletions ui/jobs/jobs_config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,9 @@ UserConfig.registerOptions('jobs', {
id: 'CountdownSoundVolume',
name: {
en: 'Countdown sound volume',
de: 'Countdown Lautstärke',
cn: '倒计时提示音量',
ko: '초읽기 소리 크기',
},
type: 'float',
default: 0.3,
Expand Down
1 change: 1 addition & 0 deletions ui/oopsyraidsy/data/00-misc/general.ts
Original file line number Diff line number Diff line change
Expand Up @@ -266,6 +266,7 @@ const triggerSet: OopsyTriggerSet<Data> = {
en: `overwrote ${lastSource}'s ${matches.ability}`,
de: `überschrieb ${lastSource}'s ${matches.ability}`,
cn: `顶掉了${lastSource}${matches.ability}`,
ko: `${lastSource}${matches.ability} 덮어씀`,
},
};
}
Expand Down
79 changes: 79 additions & 0 deletions ui/oopsyraidsy/data/06-ew/trial/zeromus-ex.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
import NetRegexes from '../../../../../resources/netregexes';
import ZoneId from '../../../../../resources/zone_id';
import { OopsyData } from '../../../../../types/data';
import { OopsyTriggerSet } from '../../../../../types/oopsy';

// TODO: people not in 8B3B Sable Thread line stack
// TODO: people not in 8B60 Flare tower
// TODO: people not taking 8B58 and failing meteors(???)
// TODO: instant death on enumerations / meteor tethers not stretched
// TODO: try to assign blame for Forked Lightning
// TODO: having a Forked Lightning/tank debuff and being in The Dark Beckons stack
// TODO: not being in The Dark Beckons stack when you don't have a tank/lightning debuff
// TODO: black hole death
// TODO: people missing from Umbral Rays stack
// TODO: people missing / extra people in Umbral Prism enumerations

export type Data = OopsyData;

const triggerSet: OopsyTriggerSet<Data> = {
zoneId: ZoneId.TheAbyssalFractureExtreme,
damageWarn: {
'ZeromusEx Abyssal Echoes': '8B42', // big lit up glowing circles from lines on floor
'ZeromusEx Nox 1': '8D2A', // initial orb circle damage
'ZeromusEx Nox 2': '8D24', // chasing orb damage
'ZeromusEx Scald': '8BB6', // standing too long in flare tower before Flare/Prominence Spine
'ZeromusEx Flare': '8B62', // standing in post-tower meteor circle
'ZeromusEx Prominence Spine': '8B63', // line aoes from post-tower meteor circle
'ZeromusEx Visceral Whirl 1': '8B44', // claw swipe damage from NE/SW safe
'ZeromusEx Visceral Whirl 2': '8B45', // claw swipe damage from NE/SW safe
'ZeromusEx Visceral Whirl 3': '8B47', // claw swipe damage from NW/SE safe
'ZeromusEx Visceral Whirl 4': '8B48', // claw swipe damage from NW/SE safe
'ZeromusEx Big Bang': '8B4E', // ground circles during Big Bang cast
'ZeromusEx Fractured Eventide 1': '8B3E', // initial damage from Eventide line
'ZeromusEx Fractured Eventide 2': '8BB2', // ongoing damage from Eventide line
'ZeromusEx Big Crunch': '8D31', // ground circles during Big Crunch cast
'ZeromusEx Dimension Surge': '8B7E', // ground circle damage after Rend the Rift
'ZeromusEx Dimension Surge Line': '8B82', // large white line cleave from wall
'ZeromusEx Akh Rhai': '8B75', // ongoing Akh Rhai damage
'ZeromusEx Chasmic Nails 1': '8B79', // first damage
'ZeromusEx Chasmic Nails 2': '8B7A', // second damage
'ZeromusEx Chasmic Nails 3': '8B7B', // third damage
'ZeromusEx Chasmic Nails 4': '8B7C', // fourth damage
'ZeromusEx Chasmic Nails 5': '8B7D', // fifth damage
},
damageFail: {
'ZeromusEx The Dark Binds': '8B55', // tether damage
'ZeromusEx Toxic Bubble Burst': '8B67', // hitting a Void Bio bubble
'ZeromusEx Forked Lightning': '8B54', // forked lightning debuff, TODO: try to determine source
},
shareWarn: {
'ZeromusEx Big Bang Spread': '8BDE', // spread during Big Bang
'ZeromusEx The Dark Divides': '8B52', // spread debuff after Big Bang
'ZeromusEx Big Crunch Spread': '8D32', // spread during Big Crunch
},
shareFail: {
'ZeromusEx Dark Matter': '8B84', // tankbuster
},
soloFail: {
'ZeromusEx The Dark Beckons': '8D3A', // stack debuff after Big Bang
'ZeromusEx Umbral Prism': '8B77', // enumerations
},
triggers: [
{
id: 'ZeromusEx Doom',
type: 'GainsEffect',
netRegex: NetRegexes.gainsEffect({ effectId: '6E9' }),
delaySeconds: (_data, matches) => parseFloat(matches.duration) - 0.5,
deathReason: (_data, matches) => {
return {
id: matches.targetId,
name: matches.target,
text: matches.effect,
};
},
},
],
};

export default triggerSet;
10 changes: 5 additions & 5 deletions ui/oopsyraidsy/data/06-ew/trial/zeromus.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@ const triggerSet: OopsyTriggerSet<Data> = {
'Zeromus Dimension Surge 3': '8B33', // ground line damage attached to 8B32 circles
'Zeromus Dimension Surge Line': '8B35', // large white line cleave from wall
'Zeromus Akh Rhai': '8B24', // ongoing Akh Rhai damage
'Zeromus Chasmic Nails 1': '82BC', // south damage
'Zeromus Chasmic Nails 2': '82BD', // weest damage
'Zeromus Chasmic Nails 3': '82BE', // southeast damage
'Zeromus Chasmic Nails 4': '82BF', // southwest damage
'Zeromus Chasmic Nails 5': '8230', // east damage
'Zeromus Chasmic Nails 1': '82BC', // first damage
'Zeromus Chasmic Nails 2': '82BD', // second damage
'Zeromus Chasmic Nails 3': '82BE', // third damage
'Zeromus Chasmic Nails 4': '82BF', // fourth damage
'Zeromus Chasmic Nails 5': '8230', // fifth damage
},
shareWarn: {
'Zeromus The Dark Divides': '8B09', // Big Bang spread
Expand Down
1 change: 1 addition & 0 deletions ui/oopsyraidsy/oopsyraidsy_config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -377,6 +377,7 @@ const templateOptions: OptionsTemplate = {
en: 'Minimum time to show overwritten mit (seconds)',
de: 'Minimum Zeit überschriebene Mitigation anzuzeigen (Sekunden)',
cn: '显示被顶减伤最小时间 (秒)',
ko: '파티 생존기 덮어씀 경고를 표시할 기준 시간 (초)',
},
type: 'float',
default: 2,
Expand Down
29 changes: 27 additions & 2 deletions ui/raidboss/data/03-hw/trial/thordan-ex.ts
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ const triggerSet: TriggerSet<Data> = {
de: 'Flächen Ködern',
fr: 'Attirez les flaques',
cn: '诱导圈圈',
ko: '장판 유도',
},
},
},
Expand Down Expand Up @@ -109,6 +110,7 @@ const triggerSet: TriggerSet<Data> = {
de: 'Köder Gravitationsflächen',
fr: 'Attirez les flaques de gravité',
cn: '诱导黑圈',
ko: '검은색 장판 유도',
},
},
},
Expand All @@ -124,6 +126,7 @@ const triggerSet: TriggerSet<Data> = {
de: 'AoE + Rückstoß x7',
fr: 'AoE + Poussée x7',
cn: 'AOE + 击退 x7',
ko: '전체공격 + 넉백x7',
},
},
},
Expand Down Expand Up @@ -198,6 +201,7 @@ const triggerSet: TriggerSet<Data> = {
de: 'Ketten mit ${partner} zerbrechen',
fr: 'Cassez les chaînes avec ${partner}',
cn: '与 ${partner} 拉断连锁',
ko: '${partner} 사슬 끊기',
},
},
},
Expand All @@ -223,12 +227,14 @@ const triggerSet: TriggerSet<Data> = {
de: 'Schau weg von Thordan',
fr: 'Ne regardez pas Thordan',
cn: '背对托尔丹',
ko: '토르당에게서 뒤돌기',
},
doubleGaze: {
en: 'Look away from Thordan and Eye',
de: 'Schau weg von Thordan und dem Auge',
fr: 'Ne regardez pas Thordan ni l\'œil',
cn: '背对托尔丹和眼睛',
ko: '토르당과 눈에 대해 뒤돌기',
},
},
},
Expand Down Expand Up @@ -293,6 +299,7 @@ const triggerSet: TriggerSet<Data> = {
de: 'Greife ${swordKnight} an',
fr: 'Attaquez ${swordKnight}',
cn: '攻击 ${swordKnight}',
ko: '${swordKnight} 공격',
},
},
},
Expand Down Expand Up @@ -347,18 +354,21 @@ const triggerSet: TriggerSet<Data> = {
de: 'Harter Tankbuster',
fr: 'Gros busters',
cn: '高伤死刑',
ko: '탱버',
},
singleDance: {
en: '2x buster on ${target}',
de: '2x Tankbuster auf ${target}',
fr: 'Buster x2 sur ${target}',
cn: '双死刑点 ${target}',
ko: '${target} 탱버 x2',
},
doubleDance: {
en: 'Sword buster on ${sword} (shield on ${shield})',
de: 'Schwert-Tankbuster auf ${sword} (Schild auf ${shield})',
fr: 'Buster épée sur ${sword} (bouclier sur ${shield})',
cn: '剑死刑点 ${sword} (盾死刑点 ${shield})',
ko: '칼 탱버 ${sword} (방패 ${shield})',
},
},
},
Expand All @@ -379,12 +389,14 @@ const triggerSet: TriggerSet<Data> = {
de: 'Große AoE auf YOU',
fr: 'Diffamation sur VOUS',
cn: '穿天点名',
ko: '광역 대상자',
},
defamationCounted: {
en: 'Defamation #${number} on YOU',
de: 'Große AoE #${number} auf DIR',
fr: 'Diffamation #${number} sur VOUS',
cn: '穿天 #${number} 点名',
ko: '광역 #${number} 대상자',
},
},
},
Expand All @@ -401,6 +413,7 @@ const triggerSet: TriggerSet<Data> = {
de: 'Linien-AoE auf DIR',
fr: 'AoE en ligne sur VOUS',
cn: '直线AOE点名',
ko: '직선 쉐어 대상자',
},
},
},
Expand All @@ -416,6 +429,7 @@ const triggerSet: TriggerSet<Data> = {
de: 'Eisfläche auf DIR',
fr: 'Flaque de glace sur VOUS',
cn: '冰圈点名',
ko: '얼음 장판 대상자',
},
},
},
Expand All @@ -431,6 +445,7 @@ const triggerSet: TriggerSet<Data> = {
de: '4x Meteorflächen auf DIR',
fr: '4x Météor sur VOUS',
cn: '4连陨石点名',
ko: '4연속 운석 장판 대상자',
},
},
},
Expand Down Expand Up @@ -461,18 +476,21 @@ const triggerSet: TriggerSet<Data> = {
de: 'Ansturm auf DIR',
fr: 'Charge sauvage sur VOUS',
cn: '奶枪点名',
ko: '돌진 대상자',
},
spearMainTank: {
en: 'Wild Charge: STAY OUT',
de: 'Ansturm: BLEIB DRAUSEN',
fr: 'Charge sauvage : RESTEZ À L\'EXTÉRIEUR',
cn: '奶枪: 保持远离',
ko: '돌진: 밖으로',
},
spearOther: {
en: 'Wild Charge: Intercept ${spearTarget}',
de: 'Ansturm: Zwichen ${spearTarget} stehen',
fr: 'Charge sauvage : Interceptez ${spearTarget}',
cn: '奶枪: 挡住 ${spearTarget}',
ko: '돌진: ${spearTarget} 앞으로',
},
},
},
Expand Down Expand Up @@ -501,6 +519,7 @@ const triggerSet: TriggerSet<Data> = {
de: '${dir1} / ${dir2} Nicht Sicher',
fr: '${dir1} / ${dir2} non-sûr',
cn: '${dir1} / ${dir2} 危险',
ko: '${dir1} / ${dir2} 위험',
},
...Directions.outputStrings8Dir,
},
Expand All @@ -523,6 +542,7 @@ const triggerSet: TriggerSet<Data> = {
de: 'Rückstoß von ${knightDir}',
fr: 'Poussée depuis ${knightDir}',
cn: '${knightDir} 击退',
ko: '${knightDir} 넉백',
},
...fullDirNameMap,
},
Expand All @@ -537,7 +557,6 @@ const triggerSet: TriggerSet<Data> = {
},
{
'locale': 'de',
'missingTranslations': true,
'replaceSync': {
'Comet Circle': 'Meteoritensiegel',
'King Thordan': 'Thordan',
Expand Down Expand Up @@ -580,6 +599,7 @@ const triggerSet: TriggerSet<Data> = {
'Holy Shield Bash': 'Heiliger Schildschlag',
'Knights Of the Round': 'Ritter der Runde',
'Lightning Storm': 'Blitzsturm',
'Meteor Impact': 'Meteoreinschlag',
'Meteorain': 'Meteorregen',
'Pure Of Soul': 'Reine Seele',
'Sacred Cross': 'Heiliges Kreuz',
Expand Down Expand Up @@ -639,6 +659,7 @@ const triggerSet: TriggerSet<Data> = {
'Holy Shield Bash': 'Coup de bouclier saint',
'Knights Of the Round': 'Chevaliers de la Table ronde',
'Lightning Storm': 'Pluie d\'éclairs',
'Meteor Impact': 'Impact de météore',
'Meteorain': 'Pluie de météorites',
'Pure Of Soul': 'Pureté d\'âme',
'Sacred Cross': 'Croix sacrée',
Expand Down Expand Up @@ -698,6 +719,7 @@ const triggerSet: TriggerSet<Data> = {
'Holy Shield Bash': 'ホーリーシールドバッシュ',
'Knights Of the Round': 'ナイツ・オブ・ラウンド',
'Lightning Storm': '百雷',
'Meteor Impact': 'メテオインパクト',
'Meteorain': 'メテオレイン',
'Pure Of Soul': 'ピュア・オブ・ソウル',
'Sacred Cross': 'セイクリッドクロス',
Expand Down Expand Up @@ -759,6 +781,7 @@ const triggerSet: TriggerSet<Data> = {
'Holy Shield Bash': '圣盾猛击',
'Knights Of the Round': '圆桌骑士',
'Lightning Storm': '百雷',
'Meteor Impact': '陨石冲击',
'Meteorain': '流星雨',
'Pure Of Soul': '纯粹灵魂',
'Sacred Cross': '神圣十字',
Expand All @@ -777,7 +800,6 @@ const triggerSet: TriggerSet<Data> = {
},
{
'locale': 'ko',
'missingTranslations': true,
'replaceSync': {
'Comet Circle': '성스러운 별조각 문양',
'King Thordan': '기사신 토르당',
Expand All @@ -796,6 +818,8 @@ const triggerSet: TriggerSet<Data> = {
'Ser Zephirin': '성기사 제피랭',
},
'replaceText': {
'--chains appear--': '--사슬 연결--',
'--towers spawn--': '--기둥 등장--',
'Absolute Conviction': '절대적 신념',
'Ancient Quaga': '에인션트 퀘이가',
'Ascalon\'s Mercy': '아스칼론의 자비',
Expand All @@ -818,6 +842,7 @@ const triggerSet: TriggerSet<Data> = {
'Holy Shield Bash': '성스러운 방패 강타',
'Knights Of the Round': '나이츠 오브 라운드',
'Lightning Storm': '백뢰',
'Meteor Impact': '운석 낙하',
'Meteorain': '메테오 레인',
'Pure Of Soul': '영혼의 순수',
'Sacred Cross': '거룩한 십자가',
Expand Down
Loading

0 comments on commit 6fca50f

Please sign in to comment.