Skip to content

Commit bc1e4e8

Browse files
xpdotaxpdota
committed
Fixed some more ucob things
1 parent f7efd55 commit bc1e4e8

File tree

1 file changed

+47
-38
lines changed
  • triggers/triggers-sb/src/main/java/gg/xp/xivsupport/events/triggers/duties

1 file changed

+47
-38
lines changed

‎triggers/triggers-sb/src/main/java/gg/xp/xivsupport/events/triggers/duties/UCoB.java

Lines changed: 47 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -19,44 +19,48 @@
1919
@CalloutRepo(name = "The Unending Coil of Bahamut", duty = KnownDuty.UCoB)
2020
public class UCoB extends AutoChildEventHandler implements FilteredEventHandler {
2121

22-
public UCoB(XivState state) {this.state = state; }
23-
24-
public XivState getState() {return state;}
22+
public UCoB(XivState state) {
23+
this.state = state;
24+
}
2525

2626
private static final Logger log = LoggerFactory.getLogger(UCoB.class);
2727
private final XivState state;
2828

2929
//Twintania
30+
@NpcCastCallout(0x26AA)
3031
private final ModifiableCallout<AbilityCastStart> twister = ModifiableCallout.durationBasedCall("Twister", "Twister");
32+
@NpcCastCallout(0x26A8)
3133
private final ModifiableCallout<AbilityCastStart> plummet = ModifiableCallout.durationBasedCall("Plummet", "Frontal on {event.target}");
32-
private final ModifiableCallout<HeadMarkerEvent> fireballOnYou = new ModifiableCallout<>("Fireball (headmark)", "Stack");
33-
private final ModifiableCallout<AbilityCastStart> deathSentece = ModifiableCallout.durationBasedCall("Death Sentence","Death Sentence on {event.target}!");
34+
// private final ModifiableCallout<HeadMarkerEvent> fireballOnYou = new ModifiableCallout<>("Fireball (headmark)", "Stack");
35+
@NpcCastCallout(0x26A9)
36+
private final ModifiableCallout<AbilityCastStart> deathSentece = ModifiableCallout.durationBasedCall("Death Sentence", "Death Sentence on {event.target}!");
37+
@NpcCastCallout(0x26AD)
3438
private final ModifiableCallout<AbilityCastStart> liquidHell = ModifiableCallout.durationBasedCall("Liquid Hell", "Move");
3539

3640
//Nael quotes
37-
private final ModifiableCallout<ChatLineEvent> inStack = new ModifiableCallout<>("O hallowed moon, take fire and scorch my foes!", "in stack");
38-
private final ModifiableCallout<ChatLineEvent> inOut = new ModifiableCallout<>("O hallowed moon, shine you the iron path!", "in out");
39-
private final ModifiableCallout<ChatLineEvent> stackOut = new ModifiableCallout<>("Blazing path, lead me to iron rule!", "stack out");
40-
private final ModifiableCallout<ChatLineEvent> stackIn = new ModifiableCallout<>("Take fire, O hallowed moon!", "stack in");
41-
private final ModifiableCallout<ChatLineEvent> spreadOut = new ModifiableCallout<>("From on high I descend, the iron path to call!", "spread out");
42-
private final ModifiableCallout<ChatLineEvent> spreadOutMore = new ModifiableCallout<>("From on high I descend, the iron path to walk!", "spread out");
43-
private final ModifiableCallout<ChatLineEvent> spreadIn = new ModifiableCallout<>("From on high I descend, the hallowed moon to call!", "Spread in");
44-
private final ModifiableCallout<ChatLineEvent> tankBusterStack = new ModifiableCallout<>("Fleeting light! 'Neath the red moon, scorch you the earth!", "Away from tank and stack");
45-
private final ModifiableCallout<ChatLineEvent> spreadTankBuster = new ModifiableCallout<>("Fleeting light! Amid a rain of stars, exalt you the red moon! ", "spread away from tank");
41+
private final ModifiableCallout<ChatLineEvent> inStack = new ModifiableCallout<>("O hallowed moon, take fire and scorch my foes!", "In, Stack");
42+
private final ModifiableCallout<ChatLineEvent> inOut = new ModifiableCallout<>("O hallowed moon, shine you the iron path!", "In, Out");
43+
private final ModifiableCallout<ChatLineEvent> stackOut = new ModifiableCallout<>("Blazing path, lead me to iron rule!", "Stack, Out");
44+
private final ModifiableCallout<ChatLineEvent> stackIn = new ModifiableCallout<>("Take fire, O hallowed moon!", "Stack, In");
45+
private final ModifiableCallout<ChatLineEvent> spreadOut = new ModifiableCallout<>("From on high I descend, the iron path to call!", "Spread, Out");
46+
private final ModifiableCallout<ChatLineEvent> spreadOutMore = new ModifiableCallout<>("From on high I descend, the iron path to walk!", "Spread, Out");
47+
private final ModifiableCallout<ChatLineEvent> spreadIn = new ModifiableCallout<>("From on high I descend, the hallowed moon to call!", "Spread, In");
48+
private final ModifiableCallout<ChatLineEvent> tankBusterStack = new ModifiableCallout<>("Fleeting light! 'Neath the red moon, scorch you the earth!", "Away from Tank and Stack");
49+
private final ModifiableCallout<ChatLineEvent> spreadTankBuster = new ModifiableCallout<>("Fleeting light! Amid a rain of stars, exalt you the red moon! ", "Spread Away from Tank");
4650

4751
//Bahamut
4852
// Consider adding specific triggers for trios
4953
@NpcCastCallout(0x26D5)
5054
private final ModifiableCallout<AbilityCastStart> flatten = new ModifiableCallout<>("Flatten", "Flatten on {event.Target}");
5155

52-
private final ModifiableCallout<ChatLineEvent> InSpreadNeuroLinkSpread = new ModifiableCallout<>("From hallowed moon I descend, a rain of stars to bring!", "In Spread neuro Spread");
53-
private final ModifiableCallout<ChatLineEvent> SpreadInNeuroLinkSpread = new ModifiableCallout<>("From on high I descend, the moon and stars to bring","Spread In neuro Spread");
56+
private final ModifiableCallout<ChatLineEvent> InSpreadNeuroLinkSpread = new ModifiableCallout<>("From hallowed moon I descend, a rain of stars to bring!", "In, Spread, Neuro Spread");
57+
private final ModifiableCallout<ChatLineEvent> SpreadInNeuroLinkSpread = new ModifiableCallout<>("From on high I descend, the moon and stars to bring", "Spread, In, Neuro, Spread");
5458

5559
//Adds
56-
private final ModifiableCallout<ChatLineEvent> inOutSpread = new ModifiableCallout<>("From hallowed moon I bare iron, in my descent to wield", "In out spread");
57-
private final ModifiableCallout<ChatLineEvent> outBusterStack = new ModifiableCallout<>("Unbending iron, descend with fiery edge!","Out tankbuster Stack");
58-
private final ModifiableCallout<ChatLineEvent> inBusterStack = new ModifiableCallout<>("From hallowed moon I descend, upon burning earth to tread!", "In tankbuster stack");
59-
private final ModifiableCallout<ChatLineEvent> outStackBuster = new ModifiableCallout<>("Unbending iron, take fire and descend!", "Out stack tankbuster");
60+
private final ModifiableCallout<ChatLineEvent> inOutSpread = new ModifiableCallout<>("From hallowed moon I bare iron, in my descent to wield", "In, Out, Spread");
61+
private final ModifiableCallout<ChatLineEvent> outSpreadStack = new ModifiableCallout<>("Unbending iron, descend with fiery edge!", "Out, Spread, Stack");
62+
private final ModifiableCallout<ChatLineEvent> inSpreadStack = new ModifiableCallout<>("From hallowed moon I descend, upon burning earth to tread!", "In, Spread, Stack");
63+
private final ModifiableCallout<ChatLineEvent> outStackSpread = new ModifiableCallout<>("Unbending iron, take fire and descend!", "Out, Stack, Spread");
6064

6165
//Golden
6266
// Todo: add triggers for Akh morn and Morn Afah
@@ -65,21 +69,24 @@ public boolean enabled(EventContext context) {
6569
return context.getStateInfo().get(XivStateImpl.class).zoneIs(0x2DD);
6670
}
6771

72+
// @HandleEvents
73+
// public void basicCasts(EventContext context, AbilityCastStart event) {
74+
// int id = (int) event.getAbility().getId();
75+
// ModifiableCallout<AbilityCastStart> call;
76+
// switch (id) {
77+
// case 0x26AA -> call = twister;
78+
// case 0x26A8 -> call = plummet;
79+
// case 0x26A9 -> call = deathSentece;
80+
// case 0x26AD -> call = liquidHell;
81+
// default -> {
82+
// return;
83+
// }
84+
// }
85+
// context.accept(call.getModified(event));
86+
// }
87+
6888
@HandleEvents
69-
public void basicCasts(EventContext context, AbilityCastStart event){
70-
int id = (int) event.getAbility().getId();
71-
ModifiableCallout<AbilityCastStart> call;
72-
switch (id) {
73-
case 0x26AA -> call = twister;
74-
case 0x26A8 -> call = plummet;
75-
case 0x26A9 -> call = deathSentece;
76-
case 0x26AD -> call = liquidHell;
77-
default -> {return;}
78-
}
79-
context.accept(call.getModified(event));
80-
}
81-
@HandleEvents
82-
public void ChatEvents(EventContext context, ChatLineEvent lineEvent){
89+
public void ChatEvents(EventContext context, ChatLineEvent lineEvent) {
8390
String identifier = lineEvent.getLine().toLowerCase();
8491
ModifiableCallout<ChatLineEvent> call;
8592
switch (identifier) {
@@ -95,11 +102,13 @@ public void ChatEvents(EventContext context, ChatLineEvent lineEvent){
95102
case "from hallowed moon i descend, a rain of stars to bring!" -> call = InSpreadNeuroLinkSpread;
96103
case "from on high i descend, the moon and stars to bring!" -> call = SpreadInNeuroLinkSpread;
97104
case "from hallowed moon i bare iron, in my descent to wield!" -> call = inOutSpread;
98-
case "unbending iron, descend with fiery edge!" -> call = outBusterStack;
99-
case "from hallowed moon i descend, upon burning earth to tread!" -> call = inBusterStack;
100-
case "unbending iron, take fire and descend!" -> call = outStackBuster;
105+
case "unbending iron, descend with fiery edge!" -> call = outSpreadStack;
106+
case "from hallowed moon i descend, upon burning earth to tread!" -> call = inSpreadStack;
107+
case "unbending iron, take fire and descend!" -> call = outStackSpread;
101108

102-
default -> {return;}
109+
default -> {
110+
return;
111+
}
103112

104113
}
105114
context.accept(call.getModified(lineEvent));

0 commit comments

Comments
 (0)