Skip to content
This repository was archived by the owner on May 24, 2026. It is now read-only.
Merged

735 #218

Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 9 additions & 0 deletions build/@.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
🔙🔚🔛🔜🔝
⊕︎⊗︎⌾︎⏺︎▢︎◉︎◎︎●︎◯︎☀︎☯︎☹︎☺︎☻︎☼︎🞅🞆🞇🞈🞉
🔴🟠🟡🟢🔵🟣🟤⚪⚫
🟥🟧🟨🟩🟦🟪🟫◻️◼️▪️▫️⬛⬜
🠜🠝🠞🠟
🡄🡅🡆🡇
🡐🡑🡒🡓
🡸🡹🡺🡻🡼🡽🡾🡿
🢀🢁🢂🢃🢄🢅🢆🢇
Comment on lines +1 to +9

Copilot AI Oct 21, 2025

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[nitpick] This file contains only unicode symbols without context or explanation. If this is a reference file for available symbols to use in translations, consider adding a comment header explaining its purpose or moving it to a documentation folder rather than the build directory.

Copilot uses AI. Check for mistakes.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "cactbot-build",
"version": "99.166.0",
"version": "99.168.0",
"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("99.166.0.0")]
[assembly: AssemblyFileVersion("99.166.0.0")]
[assembly: AssemblyVersion("99.168.0.0")]
[assembly: AssemblyFileVersion("99.168.0.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("99.166.0.0")]
[assembly: AssemblyFileVersion("99.166.0.0")]
[assembly: AssemblyVersion("99.168.0.0")]
[assembly: AssemblyFileVersion("99.168.0.0")]
4 changes: 4 additions & 0 deletions resources/content_type.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ const data = {
'ChaoticAllianceRaid': 37,
'Companions': 12,
'CustomDeliveries': 25,
'DeepDungeonExtras': 39,
'DeepDungeons': 21,
'DisciplesOfTheHand': 17,
'DisciplesOfTheLand': 16,
Expand All @@ -17,6 +18,7 @@ const data = {
'GoldSaucer': 19,
'GrandCompany': 11,
'Guildhests': 3,
'HallOfTheNovice': 20,
'IslandSanctuary': 36,
'Levequests': 10,
'OccultCrescent': 38,
Expand All @@ -28,7 +30,9 @@ const data = {
'Raids': 5,
'RetainerVentures': 18,
'SaveTheQueen': 29,
'SeasonalEvents': 22,
'SocietyQuests': 13,
'TheDiadem': 23,
'TheHunt': 33,
'TheMaskedCarnivale': 27,
'TreasureHunt': 9,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import Outputs from '../../../../../resources/outputs';
import { Responses } from '../../../../../resources/responses';
import ZoneId from '../../../../../resources/zone_id';
import { RaidbossData } from '../../../../../types/data';
Expand Down Expand Up @@ -73,7 +74,7 @@ const triggerSet: TriggerSet<Data> = {
// ---------------- Pomanders ----------------
{
id: 'PotD General Pomander Duplicate',
// duplicate item message: https://xivapi.com/LogMessage/7222?pretty=true
// duplicate pomander message: https://v2.xivapi.com/api/sheet/LogMessage/7222
// en: You return the pomander of ${pomander} to the coffer. You cannot carry any more of that item.
type: 'SystemLogMessage',
netRegex: { id: '1C36' },
Expand Down Expand Up @@ -111,12 +112,8 @@ const triggerSet: TriggerSet<Data> = {
return output.duplicate!({ pomander: output.raising!() });
case 16:
return output.duplicate!({ pomander: output.resolution!() });
case 17:
return output.duplicate!({ pomander: output.frailty!() });
case 18:
return output.duplicate!({ pomander: output.concealment!() });
case 19:
return output.duplicate!({ pomander: output.petrification!() });
default:
return output.duplicate!({ pomander: output.unknown!() });
}
},
outputStrings: {
Expand All @@ -128,7 +125,7 @@ const triggerSet: TriggerSet<Data> = {
cn: '${pomander} 重复',
ko: '${pomander} 중복',
},
// pomanders: https://xivapi.com/deepdungeonItem?pretty=true
// pomanders: https://v2.xivapi.com/api/sheet/DeepDungeonItem
safety: {
en: 'Safety',
de: 'Siegelbruchs',
Expand Down Expand Up @@ -257,37 +254,14 @@ const triggerSet: TriggerSet<Data> = {
cn: '基路伯化',
ko: '쿠리부 변신',
},
frailty: {
en: 'Frailty',
de: 'Feindschwächung',
fr: 'Incapacité',
ja: '敵弱体',
cn: '弱化敌人',
ko: '적 약화',
},
concealment: {
en: 'Concealment',
de: 'Verschwindens',
fr: 'Invisibilité',
ja: 'バニシュ',
cn: '隐形',
ko: '배니시',
},
petrification: {
en: 'Petrification',
de: 'Feindversteinerung',
fr: 'Pétrification',
ja: '敵石化',
cn: '石化敌人',
ko: '적 석화',
},
unknown: Outputs.unknown,
},
},
// ---------------- Floor Notifications ----------------
{
id: 'PotD General Cairn of Passage',
// portal to transfer between floors
// Cairn of Passage activation message: https://xivapi.com/LogMessage/7245?pretty=true
// Cairn of Passage activation message: https://v2.xivapi.com/api/sheet/LogMessage/7245
// en: The Cairn of Passage is activated!
type: 'SystemLogMessage',
netRegex: { id: '1C4D', capture: false },
Expand Down
47 changes: 12 additions & 35 deletions ui/raidboss/data/04-sb/deepdungeon/heaven-on-high_general.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import Outputs from '../../../../../resources/outputs';
import { Responses } from '../../../../../resources/responses';
import ZoneId from '../../../../../resources/zone_id';
import { RaidbossData } from '../../../../../types/data';
Expand Down Expand Up @@ -63,7 +64,7 @@ const triggerSet: TriggerSet<Data> = {
// ---------------- Pomanders and Magicite ----------------
{
id: 'HoH General Pomander Duplicate',
// duplicate item message: https://xivapi.com/LogMessage/7222?pretty=true
// duplicate pomander message: https://v2.xivapi.com/api/sheet/LogMessage/7222
// en: You return the pomander of ${pomander} to the coffer. You cannot carry any more of that item.
type: 'SystemLogMessage',
netRegex: { id: '1C36' },
Expand Down Expand Up @@ -91,22 +92,18 @@ const triggerSet: TriggerSet<Data> = {
return output.duplicate!({ pomander: output.witching!() });
case 11:
return output.duplicate!({ pomander: output.serenity!() });
case 12:
return output.duplicate!({ pomander: output.rage!() });
case 13:
return output.duplicate!({ pomander: output.lust!() });
case 14:
return output.duplicate!({ pomander: output.intuition!() });
case 15:
return output.duplicate!({ pomander: output.raising!() });
case 16:
return output.duplicate!({ pomander: output.resolution!() });
case 17:
return output.duplicate!({ pomander: output.frailty!() });
case 18:
return output.duplicate!({ pomander: output.concealment!() });
case 19:
return output.duplicate!({ pomander: output.petrification!() });
default:
return output.duplicate!({ pomander: output.unknown!() });
}
},
outputStrings: {
Expand All @@ -118,7 +115,7 @@ const triggerSet: TriggerSet<Data> = {
cn: '${pomander} 重复',
ko: '${pomander} 중복',
},
// pomanders: https://xivapi.com/deepdungeonItem?pretty=true
// pomanders: https://v2.xivapi.com/api/sheet/DeepDungeonItem
safety: {
en: 'Safety',
de: 'Siegelbruchs',
Expand Down Expand Up @@ -207,22 +204,6 @@ const triggerSet: TriggerSet<Data> = {
cn: '魔法效果解除',
ko: '마법 효과 해제',
},
rage: {
en: 'Rage',
de: 'Manticoren',
fr: 'Manticore',
ja: 'マンティコア化',
cn: '曼提克化',
ko: '만티코어 변신',
},
lust: {
en: 'Lust',
de: 'Sukkuben',
fr: 'Succube',
ja: 'サキュバス化',
cn: '梦魔化',
ko: '서큐버스 변신',
},
intuition: {
en: 'Intuition',
de: 'Finders',
Expand All @@ -239,14 +220,6 @@ const triggerSet: TriggerSet<Data> = {
cn: '重生',
ko: '리레이즈',
},
resolution: {
en: 'Resolution',
de: 'Kuribu',
fr: 'Kuribu',
ja: 'クリブ化',
cn: '基路伯化',
ko: '쿠리부 변신',
},
frailty: {
en: 'Frailty',
de: 'Feindschwächung',
Expand All @@ -271,11 +244,12 @@ const triggerSet: TriggerSet<Data> = {
cn: '石化敌人',
ko: '적 석화',
},
unknown: Outputs.unknown,
},
},
{
id: 'HoH General Magicite Duplicate',
// duplicate item message: https://xivapi.com/LogMessage/9208?pretty=true
// duplicate magicite message: https://v2.xivapi.com/api/sheet/LogMessage/9208
// en: You return the splinter of ${magicite} magicite to the coffer. You cannot carry any more of that item.
type: 'SystemLogMessage',
netRegex: { id: '23F8' },
Expand All @@ -289,6 +263,8 @@ const triggerSet: TriggerSet<Data> = {
return output.duplicate!({ magicite: output.vortex!() });
case 4:
return output.duplicate!({ magicite: output.elder!() });
default:
return output.duplicate!({ magicite: output.unknown!() });
}
},
outputStrings: {
Expand All @@ -300,7 +276,7 @@ const triggerSet: TriggerSet<Data> = {
cn: '${magicite} 重复',
ko: '${magicite} 중복',
},
// magicite: https://xivapi.com/DeepDungeonMagicStone?pretty=true
// magicite: https://v2.xivapi.com/api/sheet/DeepDungeonMagicStone
inferno: {
en: 'Inferno',
de: 'Ifrit',
Expand Down Expand Up @@ -333,13 +309,14 @@ const triggerSet: TriggerSet<Data> = {
cn: '奥丁',
ko: '오딘',
},
unknown: Outputs.unknown,
},
},
// ---------------- Floor Notifications ----------------
{
id: 'HoH General Beacon of Passage',
// portal to transfer between floors
// Beacon of Passage activation message: https://xivapi.com/LogMessage/7245?pretty=true
// Beacon of Passage activation message: https://v2.xivapi.com/api/sheet/LogMessage/7245
// en: The Beacon of Passage is activated!
type: 'SystemLogMessage',
netRegex: { id: '1C4D', capture: false },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ const triggerSet: TriggerSet<Data> = {
type: 'HeadMarker',
netRegex: { id: '00C5' },
condition: Conditions.targetIsYou(),
alertText: (_data, _matches, outputs) => outputs.text!(),
alertText: (_data, _matches, output) => output.text!(),
outputStrings: {
text: {
en: '5x chasing puddles on you!',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,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
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ const triggerSet: TriggerSet<Data> = {
de: 'Geh in eine Intercardinale Himmelsrichtung vom Boss',
fr: 'Allez en intercardinal du boss',
ja: 'ボスの斜めへ',
cn: '去Boss的对角线方向',
cn: '去Boss的斜角方向',
ko: '보스 비스듬히 피해요',
},
},
Expand Down Expand Up @@ -348,6 +348,7 @@ const triggerSet: TriggerSet<Data> = {
between: {
en: '${safe}, between eggs',
de: '${safe}, zwichen den Eiern',
fr: '${safe}, entre les œufs',
ja: '${safe}, たまごの間',
cn: '${safe}, 蛋中间',
ko: '${safe}, 알 사이',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,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 Expand Up @@ -219,15 +219,15 @@ const triggerSet: TriggerSet<Data> = {
de: 'Lass dich von Eis treffen',
fr: 'Faites-vous toucher par la glace',
ja: '氷へ',
cn: '被冰打',
cn: '吃冰',
ko: '얼음에 부디쳐요',
},
fire: {
en: 'Get hit by Fire',
de: 'Lass dich von Feuer treffen',
fr: 'Faites-vous toucher par le feu',
ja: '炎へ',
cn: '被火打',
cn: '吃火',
ko: '불에 부디쳐요',
},
},
Expand All @@ -251,7 +251,7 @@ const triggerSet: TriggerSet<Data> = {
de: 'Lass dich von Eis treffen',
fr: 'Faites-vous toucher par la glace',
ja: '氷へ',
cn: '被冰打',
cn: '吃冰',
ko: '얼음에 부디쳐요',
},
avoid: {
Expand Down Expand Up @@ -283,7 +283,7 @@ const triggerSet: TriggerSet<Data> = {
de: 'Lass dich von Feuer treffen',
fr: 'Faites-vous toucher par le feu',
ja: '炎へ',
cn: '被火打',
cn: '吃火',
ko: '불에 부디쳐요',
},
avoid: {
Expand Down
Loading