Skip to content

Commit bd32d38

Browse files
LTS-FFXIVLTS-FFXIV
authored
Merge pull request #786 from FFXIV-CombatReborn/vfximprovements
Massive framerate improvements, Time Mage action improvement, and some UI changes
2 parents 2f19361 + 22fca7d commit bd32d38

File tree

10 files changed

+340
-244
lines changed

10 files changed

+340
-244
lines changed

‎BasicRotations/Duty/PhantomDefault.cs

Lines changed: 23 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public override bool EmergencyAbility(IAction nextGCD, out IAction? act)
2929
public override bool InterruptAbility(IAction nextGCD, out IAction? act)
3030
{
3131
act = null;
32-
if (Player.HasStatus(true, StatusID.Reawakened, StatusID.Overheated, StatusID.InnerRelease))
32+
if (HasLockoutStatus)
3333
{
3434
return false;
3535
}
@@ -50,7 +50,7 @@ public override bool InterruptAbility(IAction nextGCD, out IAction? act)
5050
public override bool DispelAbility(IAction nextGCD, out IAction? act)
5151
{
5252
act = null;
53-
if (Player.HasStatus(true, StatusID.Reawakened, StatusID.Overheated, StatusID.InnerRelease))
53+
if (HasLockoutStatus)
5454
{
5555
return false;
5656
}
@@ -66,7 +66,7 @@ public override bool DispelAbility(IAction nextGCD, out IAction? act)
6666
public override bool GeneralAbility(IAction nextGCD, out IAction? act)
6767
{
6868
act = null;
69-
if (Player.HasStatus(true, StatusID.Reawakened, StatusID.Overheated, StatusID.InnerRelease))
69+
if (HasLockoutStatus)
7070
{
7171
return false;
7272
}
@@ -102,7 +102,7 @@ public override bool GeneralAbility(IAction nextGCD, out IAction? act)
102102
public override bool AttackAbility(IAction nextGCD, out IAction? act)
103103
{
104104
act = null;
105-
if (Player.HasStatus(true, StatusID.Reawakened, StatusID.Overheated, StatusID.InnerRelease))
105+
if (HasLockoutStatus)
106106
{
107107
return false;
108108
}
@@ -153,7 +153,7 @@ public override bool AttackAbility(IAction nextGCD, out IAction? act)
153153
public override bool DefenseSingleAbility(IAction nextGCD, out IAction? act)
154154
{
155155
act = null;
156-
if (Player.HasStatus(true, StatusID.Reawakened, StatusID.Overheated, StatusID.InnerRelease))
156+
if (HasLockoutStatus)
157157
{
158158
return false;
159159
}
@@ -184,7 +184,7 @@ public override bool DefenseSingleAbility(IAction nextGCD, out IAction? act)
184184
public override bool DefenseAreaAbility(IAction nextGCD, out IAction? act)
185185
{
186186
act = null;
187-
if (Player.HasStatus(true, StatusID.Reawakened, StatusID.Overheated, StatusID.InnerRelease))
187+
if (HasLockoutStatus)
188188
{
189189
return false;
190190
}
@@ -240,7 +240,7 @@ public override bool DefenseAreaAbility(IAction nextGCD, out IAction? act)
240240
public override bool HealSingleAbility(IAction nextGCD, out IAction? act)
241241
{
242242
act = null;
243-
if (Player.HasStatus(true, StatusID.Reawakened, StatusID.Overheated, StatusID.InnerRelease))
243+
if (HasLockoutStatus)
244244
{
245245
return false;
246246
}
@@ -266,7 +266,7 @@ public override bool HealSingleAbility(IAction nextGCD, out IAction? act)
266266
public override bool HealAreaAbility(IAction nextGCD, out IAction? act)
267267
{
268268
act = null;
269-
if (Player.HasStatus(true, StatusID.Reawakened, StatusID.Overheated, StatusID.InnerRelease))
269+
if (HasLockoutStatus)
270270
{
271271
return false;
272272
}
@@ -287,7 +287,7 @@ public override bool HealAreaAbility(IAction nextGCD, out IAction? act)
287287
public override bool MoveForwardAbility(IAction nextGCD, out IAction? act)
288288
{
289289
act = null;
290-
if (Player.HasStatus(true, StatusID.Reawakened, StatusID.Overheated, StatusID.InnerRelease))
290+
if (HasLockoutStatus)
291291
{
292292
return false;
293293
}
@@ -303,7 +303,7 @@ public override bool MoveForwardAbility(IAction nextGCD, out IAction? act)
303303
public override bool MyInterruptGCD(out IAction? act)
304304
{
305305
act = null;
306-
if (Player.HasStatus(true, StatusID.Reawakened, StatusID.Overheated, StatusID.InnerRelease))
306+
if (HasLockoutStatus)
307307
{
308308
return false;
309309
}
@@ -319,7 +319,7 @@ public override bool MyInterruptGCD(out IAction? act)
319319
public override bool RaiseGCD(out IAction? act)
320320
{
321321
act = null;
322-
if (Player.HasStatus(true, StatusID.Reawakened, StatusID.Overheated, StatusID.InnerRelease))
322+
if (HasLockoutStatus)
323323
{
324324
return false;
325325
}
@@ -335,7 +335,7 @@ public override bool RaiseGCD(out IAction? act)
335335
public override bool DispelGCD(out IAction? act)
336336
{
337337
act = null;
338-
if (Player.HasStatus(true, StatusID.Reawakened, StatusID.Overheated, StatusID.InnerRelease))
338+
if (HasLockoutStatus)
339339
{
340340
return false;
341341
}
@@ -351,7 +351,7 @@ public override bool DispelGCD(out IAction? act)
351351
public override bool HealSingleGCD(out IAction? act)
352352
{
353353
act = null;
354-
if (Player.HasStatus(true, StatusID.Reawakened, StatusID.Overheated, StatusID.InnerRelease))
354+
if (HasLockoutStatus)
355355
{
356356
return false;
357357
}
@@ -367,7 +367,7 @@ public override bool HealSingleGCD(out IAction? act)
367367
public override bool HealAreaGCD(out IAction? act)
368368
{
369369
act = null;
370-
if (Player.HasStatus(true, StatusID.Reawakened, StatusID.Overheated, StatusID.InnerRelease))
370+
if (HasLockoutStatus)
371371
{
372372
return false;
373373
}
@@ -388,7 +388,7 @@ public override bool HealAreaGCD(out IAction? act)
388388
public override bool DefenseSingleGCD(out IAction? act)
389389
{
390390
act = null;
391-
if (Player.HasStatus(true, StatusID.Reawakened, StatusID.Overheated, StatusID.InnerRelease))
391+
if (HasLockoutStatus)
392392
{
393393
return false;
394394
}
@@ -404,7 +404,7 @@ public override bool DefenseSingleGCD(out IAction? act)
404404
public override bool DefenseAreaGCD(out IAction? act)
405405
{
406406
act = null;
407-
if (Player.HasStatus(true, StatusID.Reawakened, StatusID.Overheated, StatusID.InnerRelease))
407+
if (HasLockoutStatus)
408408
{
409409
return false;
410410
}
@@ -425,7 +425,7 @@ public override bool DefenseAreaGCD(out IAction? act)
425425
public override bool GeneralGCD(out IAction? act)
426426
{
427427
act = null;
428-
if (Player.HasStatus(true, StatusID.Reawakened, StatusID.Overheated, StatusID.InnerRelease))
428+
if (HasLockoutStatus)
429429
{
430430
return false;
431431
}
@@ -478,7 +478,12 @@ public override bool GeneralGCD(out IAction? act)
478478
return true;
479479
}
480480

481-
if (OccultCometPvE.CanUse(out act))
481+
if (IsRDM && HasSwift && OccultCometPvE.CanUse(out act))
482+
{
483+
return true;
484+
}
485+
486+
if (!IsRDM && OccultCometPvE.CanUse(out act))
482487
{
483488
return true;
484489
}

‎BasicRotations/Magical/BLM_Default.cs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,14 @@ protected override bool AttackAbility(IAction nextGCD, out IAction? act)
210210
return true;
211211
}
212212

213+
if (TriplecastPvE.CanUse(out act))
214+
{
215+
if (nextGCD.Equals(ActionID.OccultCometPvE))
216+
{
217+
return true;
218+
}
219+
}
220+
213221
return base.AttackAbility(nextGCD, out act);
214222
}
215223
#endregion

‎Resources/HostileCastingArea.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -762,13 +762,15 @@
762762
41188,
763763
41258,
764764
41267,
765+
41279,
765766
41333,
766767
41336,
767768
41361,
768769
41381,
769770
41424,
770771
41532,
771772
41675,
773+
41689,
772774
41762,
773775
41786,
774776
41809,

0 commit comments

Comments
 (0)