Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

jobs: add pct job details struct #194

Merged
merged 5 commits into from
Jul 5, 2024
Merged
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
2 changes: 2 additions & 0 deletions plugin/CactbotEventSource/FFXIVProcess.cs
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,8 @@ public enum EntityJob : byte {
DNC = 38,
RPR = 39,
SGE = 40,
VPR = 41,
PCT = 42,
};

static internal bool IsGatherer(EntityJob job) {
Expand Down
70 changes: 70 additions & 0 deletions plugin/CactbotEventSource/FFXIVProcessIntl.cs
Original file line number Diff line number Diff line change
Expand Up @@ -277,6 +277,8 @@ public struct CharacterDetails {
return JObject.FromObject(*(SageJobMemory*)&p[0]);
case EntityJob.RPR:
return JObject.FromObject(*(ReaperJobMemory*)&p[0]);
case EntityJob.PCT:
return JObject.FromObject(*(PictomancerJobMemory*)&p[0]);
}
return null;
}
Expand Down Expand Up @@ -840,5 +842,73 @@ public struct ReaperJobMemory {
[FieldOffset(0x05)]
public byte voidShroud;
}

[StructLayout(LayoutKind.Explicit)]
public struct PictomancerJobMemory {
[Flags]
private enum CanvasFlags : byte {
Pom = 1,
Wing = 1 << 1,
Claw = 1 << 2,
Maw = 1 << 3,
Weapon = 1 << 4,
Landscape = 1 << 5,
}

[Flags]
private enum CreatureFlags : byte {
Pom = 1,
Wing = 1 << 1,
Claw = 1 << 2,
// Maw = 1 << 3, // Once you paint the Maw motif, it becomes a Madeen portrait.
MooglePortrait = 1 << 4,
MadeenPortrait = 1 << 5,
}

[FieldOffset(0x00)]
public byte palleteGauge;
[FieldOffset(0x02)]
public byte paint;

[NonSerialized]
[FieldOffset(0x03)]
private CanvasFlags canvasFlags;

public string creatureMotif {
get {
if (canvasFlags.HasFlag(CanvasFlags.Pom))
return "Pom";
if (canvasFlags.HasFlag(CanvasFlags.Wing))
return "Wing";
if (canvasFlags.HasFlag(CanvasFlags.Claw))
return "Claw";
if (canvasFlags.HasFlag(CanvasFlags.Maw))
return "Maw";
return "None";
}
}
public bool weaponMotif => canvasFlags.HasFlag(CanvasFlags.Weapon);
public bool landscapeMotif => canvasFlags.HasFlag(CanvasFlags.Landscape);

[NonSerialized]
[FieldOffset(0x04)]
private CreatureFlags creatureFlags;

public string[] depictions {
get {
var motifs = new List<string>();
if (creatureFlags.HasFlag(CreatureFlags.Pom))
motifs.Add("Pom");
if (creatureFlags.HasFlag(CreatureFlags.Wing))
motifs.Add("Wing");
if (creatureFlags.HasFlag(CreatureFlags.Claw))
motifs.Add("Claw");
return motifs.ToArray();
}
}

public bool mooglePortrait => creatureFlags.HasFlag(CreatureFlags.MooglePortrait);
public bool madeenPortrait => creatureFlags.HasFlag(CreatureFlags.MadeenPortrait);
}
}
}
10 changes: 10 additions & 0 deletions types/event.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,16 @@ export interface JobDetail {
blackMana: number;
manaStacks: number;
};
'PCT': {
palleteGauge: number;
paint: 0 | 1 | 2 | 3 | 4 | 5;
creatureMotif: 'Pom' | 'Wing' | 'Claw' | 'Maw' | 'None';
weaponMotif: boolean;
landscapeMotif: boolean;
depictions: ('Pom' | 'Wing' | 'Claw')[];
mooglePortrait: boolean;
madeenPortrait: boolean;
};
}

export type EnmityTargetCombatant = {
Expand Down
13 changes: 13 additions & 0 deletions ui/test/test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,19 @@ addOverlayListener('onPlayerChangedEvent', (e) => {
} else if (detail.job === 'RPR' && detail.jobDetail) {
jobInfo.innerText =
`${detail.jobDetail.soul} | ${detail.jobDetail.shroud} | ${detail.jobDetail.enshroudMilliseconds} | ${detail.jobDetail.lemureShroud} | ${detail.jobDetail.voidShroud}`;
} else if (detail.job === 'PCT' && detail.jobDetail) {
jobInfo.innerText =
`${detail.jobDetail.palleteGauge} | ${detail.jobDetail.paint} | (${detail.jobDetail.creatureMotif} | ${
detail.jobDetail.weaponMotif ? 'Weapon' : 'None'
} | ${detail.jobDetail.landscapeMotif ? 'Landscape' : 'None'}) | (${
detail.jobDetail.depictions.join('+') || 'None'
}) | ${
detail.jobDetail.mooglePortrait
? 'Moogle'
: detail.jobDetail.madeenPortrait
? 'Madeen'
: 'None'
}`;
} else {
jobInfo.innerText = '';
}
Expand Down
Loading