Finish cooldowns

xpdota · Jul 14, 2024 · 22cce19 · 22cce19
1 parent 4b562f4
commit 22cce19
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 8 deletions.
diff --git a/xivdata/src/main/java/gg/xp/xivdata/data/CdBuilder.java b/xivdata/src/main/java/gg/xp/xivdata/data/CdBuilder.java
@@ -147,11 +147,11 @@ public JobType getJobType() {
 			return switch (Integer.parseInt(ai.categoryRaw())) {
 				case 66, 105, 123, 171 -> PRANGED;
 				case 67, 76, 84, 114, 148 -> MELEE_DPS;
-				case 89, 116, 175 -> CASTER;
+				case 89, 116, 175, 198 -> CASTER;
 				case 113, 121, 166 -> TANK;
 				case 117, 125, 128, 165 -> HEALER;
 				// It's actually not but I don't have a category for DoW/DoM yet
-				case 120 -> CASTER;
+				case 120, 199 -> CASTER;
 				// This is actually DoM, but no category for that yet
 				case 161 -> TANK;
 				default -> UNKNOWN;
@@ -172,7 +172,7 @@ public JobType getJobType() {
 			int rawJobCategory = Integer.parseInt(ai.categoryRaw());
 			return switch (rawJobCategory) {
 				case 2, 20, 38 -> PLD;
-				case 3, 21 -> MNK;
+				case 3, 21, 41 -> MNK;
 				case 4, 22, 44 -> WAR;
 				case 5, 23, 47 -> DRG;
 				case 6, 24, 50 -> BRD;

diff --git a/xivdata/src/main/java/gg/xp/xivdata/data/Cooldown.java b/xivdata/src/main/java/gg/xp/xivdata/data/Cooldown.java
@@ -116,8 +116,8 @@ personal CDs overlay by default, or not, and the ability ID(s). You only need to
 	AetherialShift(builder(CooldownType.PERSONAL_UTILITY, false, 0x9090)),
 	Plenary(builder(CooldownType.HEAL, false, 0x1D09)),
 	Tetra(builder(CooldownType.HEAL, false, 0xDF2).maxCharges(2)),
-	ThinAir(builder(CooldownType.PERSONAL_UTILITY, false, 0xDF2)),
-	DivineBenison(builder(CooldownType.HEAL, false, 0x1D08)),
+	ThinAir(builder(CooldownType.PERSONAL_UTILITY, false, 0x1D06)),
+	DivineBenison(builder(CooldownType.HEAL, false, 0x1D08).maxCharges(2)),
 
 	// SCH
 	SacredSoil(true, CooldownType.PARTY_MIT, 0xbc),
@@ -146,7 +146,7 @@ personal CDs overlay by default, or not, and the ability ID(s). You only need to
 	DeploymentTactics(builder(CooldownType.PARTY_MIT, false, 0xE01).cooldown(90)),
 	EmergencyTactics(false, CooldownType.PARTY_MIT, 0xE02),
 	Seraphism(builder(CooldownType.HEAL, false, 0x9096)),
-	Seraph(builder(CooldownType.HEAL, false, 0x40A1)),
+	Seraph(builder(CooldownType.HEAL, false, 0x40A1).duration(22)),
 	Excogitation(builder(CooldownType.HEAL, false, 0x1D0A)),
 	Indomitability(builder(CooldownType.HEAL, false, 0xDFF)),
 
@@ -202,7 +202,7 @@ personal CDs overlay by default, or not, and the ability ID(s). You only need to
 	Kassatsu(builder(CooldownType.PERSONAL_BURST, true, 0x8D8)),
 	Meisui(builder(CooldownType.PERSONAL_BURST, true, 0x4069)),
 	Shadeshift(builder(CooldownType.PERSONAL_BURST, true, 0x8C1)),
-	Shukuchi(builder(CooldownType.PERSONAL_BURST, true, 0x8D6)),
+	Shukuchi(builder(CooldownType.PERSONAL_BURST, true, 0x8D6).maxCharges(2)),
 	TCJ(builder(CooldownType.PERSONAL_BURST, true, 0x1CEB)),
 
 	// DRG
@@ -236,6 +236,12 @@ personal CDs overlay by default, or not, and the ability ID(s). You only need to
 	ThirdEye(builder(CooldownType.PERSONAL_MIT, false, 7498, 0x9062)),
 	HissatsuGurenSenei(builder(CooldownType.PERSONAL_BURST, false, 0x1D48, 0x4061).name("Hissatsu: Guren/Senei")),
 
+	// VPR
+	// Also pit of dread
+	Dreadwinder(builder(CooldownType.PERSONAL_BURST, true, 0x873C, 0x873F).maxCharges(3)),
+	SerpentsIre(builder(CooldownType.PERSONAL_BURST, true, 0x8757)),
+	Slither(builder(CooldownType.PERSONAL_UTILITY, false, 0x8756)),
+
 	// CASTER
 	Addle(true, CooldownType.PARTY_MIT, 0x1d88),
 	Swiftcast(builder(CooldownType.PERSONAL_UTILITY, true, 0x1d89).cooldown(40.0)),
@@ -255,7 +261,8 @@ personal CDs overlay by default, or not, and the ability ID(s). You only need to
 
 	// SMN
 	SearingLight(true, CooldownType.PARTY_BUFF, 25801),
-	EnergyDrainSiphon(builder(CooldownType.PERSONAL_BURST, true, 0x407C, 0x407D)),
+	EnergyDrainSiphon(builder(CooldownType.PERSONAL_BURST, true, 0x407C, 0x407E)),
+	RadiantAegis(builder(CooldownType.PERSONAL_MIT, true, 0x64C7).maxCharges(2)),
 
 	// BLM
 	Amplifier(builder(CooldownType.PERSONAL_BURST, true, 0x64C4)),