Skip to content

Commit

Permalink
m2s and m1s revisions
Browse files Browse the repository at this point in the history
  • Loading branch information
@xpdota
xpdota committed Aug 3, 2024
1 parent 71ccc35 commit deee372
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 40 deletions.
2 changes: 0 additions & 2 deletions triggers/triggers-dt/src/main/java/gg/xp/xivsupport/triggers/Arcadion/M1S.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@ public boolean enabled(EventContext context) {

private final ModifiableCallout<AbilityCastStart> oneTwoLeftFirst = ModifiableCallout.durationBasedCall("One Two - Left First", "Left then Right");
private final ModifiableCallout<AbilityCastStart> oneTwoRightFirst = ModifiableCallout.durationBasedCall("One Two - Right First", "Right then Left");
// TODO: these are not wired
private final ModifiableCallout<AbilityCastStart> oneTwoLeapingLeftFirst = ModifiableCallout.durationBasedCall("One Two (Leaping) - Left First", "Left then Right ({whereClone})");
private final ModifiableCallout<AbilityCastStart> oneTwoLeapingRightFirst = ModifiableCallout.durationBasedCall("One Two (Leaping) - Right First", "Right then Left ({whereClone})");
private final ModifiableCallout<AbilityUsedEvent> oneTwoLeft = new ModifiableCallout<>("One Two - Left Second", "Left");
Expand Down Expand Up @@ -157,7 +156,6 @@ public boolean enabled(EventContext context) {
for (int i = 0; i < 4; i++) {
log.info("mouser {}", i);
// var hm = s.waitEvent(HeadMarkerEvent.class, hme -> hme.getMarkerOffset() == 320);
// TODO: is offset even needed?
var hm = s.waitEvent(HeadMarkerEvent.class, hme -> true);
s.setParam("hm", hm);
var cast = s.waitEvent(AbilityCastStart.class, acs -> acs.abilityIdMatches(0x9446, 0x9448));
Expand Down
63 changes: 25 additions & 38 deletions triggers/triggers-dt/src/main/java/gg/xp/xivsupport/triggers/Arcadion/M2S.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,15 @@
import gg.xp.xivsupport.events.triggers.seq.SequentialTrigger;
import gg.xp.xivsupport.events.triggers.seq.SqtTemplates;
import gg.xp.xivsupport.events.triggers.support.NpcCastCallout;
import gg.xp.xivsupport.models.XivCombatant;
import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.time.Duration;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;

@CalloutRepo(name = "M2S", duty = KnownDuty.M2S)
public class M2S extends AutoChildEventHandler implements FilteredEventHandler {
Expand Down Expand Up @@ -70,29 +73,6 @@ private void resetPoisonBuff() {

private @Nullable PoisonBuff getPoisonBuff() {
return lastPosionBuff;
// // TODO: this should also call out when you get the buff
// XivCombatant boss = state.npcById(16941);
// // TODO: This is bad! Both abilities place the same debuff ID, just capture the ability.
// BuffApplied status = buffs.findStatusOnTarget(boss, ba -> ba.buffIdMatches(0xF4B, 0xF61));
// if (status == null) {
// log.warn("No debuff");
// return null;
// }
// AbilityUsedEvent preapp = status.getPreAppAbility();
// if (preapp == null) {
// log.warn("Preapp null");
// return null;
// }
// if (preapp.abilityIdMatches(0x9184, 0x9B0F)) {
// return PoisonBuff.SPREAD;
// }
// else if (preapp.abilityIdMatches(0x9185, 0x9B09)) {
// return PoisonBuff.BUDDY;
// }
// else {
// log.warn("Preapp did not match");
// return null;
// }
}

private int getPlayerHeartStacks() {
Expand Down Expand Up @@ -133,7 +113,7 @@ public void reset(PullStartedEvent unused) {

@AutoFeed
private final SequentialTrigger<BaseEvent> temptingTwist = SqtTemplates.sq(30_000,
AbilityCastStart.class, acs -> acs.abilityIdMatches(0x9187, 0x9B11),
AbilityCastStart.class, acs -> acs.abilityIdMatches(0x9187, 0x9B0D),
(e1, s) -> {
s.updateCall(temptingTwistInitial, e1);
s.waitEvent(AbilityUsedEvent.class, aue -> aue.getPrecursor() == e1);
Expand All @@ -142,7 +122,6 @@ public void reset(PullStartedEvent unused) {
// Wait
PoisonBuff pb = getPoisonBuff();
// s.waitMs(1000);
// TODO: reports of this being broken
if (pb == PoisonBuff.SPREAD) {
s.updateCall(spread);
}
Expand All @@ -157,7 +136,6 @@ else if (pb == PoisonBuff.BUDDY){

@AutoFeed
private final SequentialTrigger<BaseEvent> beeline = SqtTemplates.sq(30_000,
// TODO: 9B0C is unconfirmed
AbilityCastStart.class, acs -> acs.abilityIdMatches(0x9186, 0x9B0C),
(e1, s) -> {
s.updateCall(beelineInitial, e1);
Expand Down Expand Up @@ -194,7 +172,6 @@ else if (pb == PoisonBuff.BUDDY){
s.waitMs(1000);
s.waitEvent(AbilityUsedEvent.class, aue -> aue.abilityIdMatches(0x91B1, 0x91B2, 0x91B3, 0x91B4));
s.updateCall(outCards);
// TODO: are these always cards/inter?
// in + intercards
// out + intercards
// out + cards
Expand All @@ -210,7 +187,6 @@ else if (pb == PoisonBuff.BUDDY){
s.waitMs(1000);
s.waitEvent(AbilityUsedEvent.class, aue -> aue.abilityIdMatches(0x91B1, 0x91B2, 0x91B3, 0x91B4));
s.updateCall(inInter);
// TODO: are these always cards/inter?
// out + cards
// out + intercards
// in + intercards
Expand Down Expand Up @@ -331,11 +307,13 @@ else if (pb == PoisonBuff.BUDDY){
// Given that there is a magic vuln, I do not see how there can be different strategies for this mech
// 4 people have short defa, 4 have long defa
int defa = 0xF5E;
// List<BuffApplied> all = s.waitEventsQuickSuccession(8, BuffApplied.class, ba -> ba.buffIdMatches(defa));
BuffApplied playerBuff = s.findOrWaitForBuff(buffs, ba -> ba.buffIdMatches(defa) && ba.getTarget().isThePlayer());
// BuffApplied playerBuff = buffs.findStatusOnTarget(state.getPlayer(), defa);
// List<BuffApplied> shorts = all.stream().filter(ba -> ba.getInitialDuration().toSeconds() < 30).toList();
// List<BuffApplied> longs = all.stream().filter(ba -> ba.getInitialDuration().toSeconds() > 30).toList();
List<BuffApplied> allBuffs = s.waitEventsQuickSuccession(8, BuffApplied.class, ba -> ba.buffIdMatches(defa));
Set<XivCombatant> shortPlayers = allBuffs.stream()
.filter(buff -> buff.getInitialDuration().toSeconds() < 30)
.map(BuffApplied::getTarget)
.collect(Collectors.toSet());
BuffApplied playerBuff = allBuffs.stream().filter(ba -> ba.getTarget().isThePlayer()).findFirst().orElseThrow(() -> new RuntimeException("Player did not have a buff"));

boolean playerShort;
if (playerBuff == null) {
throw new RuntimeException("Player did not have defamation!");
Expand All @@ -350,31 +328,40 @@ else if (playerBuff.getInitialDuration().toSeconds() < 30) {
s.setParam("playerShort", false);
s.updateCall(hbl3longInitial, playerBuff);
}
// Outer/center handled elsewhere
// Outer/centerstage handled elsewhere, so just wait the approximate time for it to be over
s.waitMs(21_000);
// Call initial
if (playerShort) {
s.updateCall(hbl3defamationNow, playerBuff);
}
else {
s.updateCall(hbl3avoidDefa);
}
// TODO: these are broken because they don't wait for the defamation to naturally go off. A player dying
// will also trigger these early.
s.waitEvent(BuffRemoved.class, br -> br.buffIdMatches(defa));
// Wait for first defamations to go off
// Check against this set, as this logic could be confused by long players dying
while (!buffs.findBuffs(ba -> ba.buffIdMatches(defa) && shortPlayers.contains(ba.getTarget())).isEmpty()) {
s.waitEvent(BuffRemoved.class, br -> br.buffIdMatches(defa) && shortPlayers.contains(br.getTarget()));
}
// Tell player to take tower or avoid towers (if they had defa)
if (playerShort) {
s.updateCall(hbl3avoidTowers);
}
else {
s.updateCall(hbl3soakTowers);
}
// Wait for next set of towers to start
s.waitEvent(AbilityCastStart.class, acs -> acs.abilityIdMatches(0x91A3));
// Another outer/center handled elsewhere
if (!playerShort) {
s.updateCall(hbl3defamationNow, playerBuff);
}
else {
s.updateCall(hbl3avoidDefa);
}
s.waitEvent(BuffRemoved.class, br -> br.buffIdMatches(defa));
// Wait for final defamations to go off
while (!buffs.findBuffs(ba -> ba.buffIdMatches(defa)).isEmpty()) {
s.waitEvent(BuffRemoved.class, br -> br.buffIdMatches(defa));
}
if (!playerShort) {
s.updateCall(hbl3avoidTowers);
}
Expand Down

0 comments on commit deee372

Please sign in to comment.