Skip to content

Commit

Permalink
Merge pull request #419 from FFXIV-CombatReborn/mergeWIP
Browse files Browse the repository at this point in the history 
some arena fixes
  • Loading branch information
@CarnifexOptimus
CarnifexOptimus authored Oct 28, 2024
2 parents 779e5d9 + 5391713 commit 255555a
Show file tree
Hide file tree
Showing 11 changed files with 217 additions and 64 deletions.
12 changes: 7 additions & 5 deletions BossMod/Modules/Dawntrail/Dungeon/D02WorqorZormor/D023Gurfurlur.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@ public override void AddGlobalHints(GlobalHints hints)

public override void AddAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints)
{
var orb = ActiveOrbs.FirstOrDefault();
var orbs = new List<Func<WPos, float>>();
if (ActiveOrbs.Any())
{
Expand Down Expand Up @@ -130,15 +129,17 @@ public override IEnumerable<AOEInstance> ActiveAOEs(int slot, Actor actor)
var source = Module.FindComponent<GreatFlood>()!.Sources(slot, actor).FirstOrDefault();
if (source == default)
{
var count1 = _aoesWave1.Count;
var count2 = _aoesWave2.Count;
if (_aoesWave1.Count > 0)
foreach (var a in _aoesWave1)
yield return a with { Color = Colors.Danger };
if (_aoesWave2.Count > 0)
foreach (var a in _aoesWave2)
yield return a with { Color = _aoesWave1.Count > 0 ? Colors.AOE : Colors.Danger, Risky = _aoesWave1.Count == 0 };
yield return a with { Color = count1 > 0 ? Colors.AOE : Colors.Danger, Risky = count1 == 0 };
if (_aoesWave1.Count == 0 && _aoesWave3.Count > 0)
foreach (var a in _aoesWave3)
yield return a with { Color = _aoesWave2.Count > 0 ? Colors.AOE : Colors.Danger, Risky = _aoesWave2.Count == 0 };
yield return a with { Color = count2 > 0 ? Colors.AOE : Colors.Danger, Risky = count2 == 0 };
}
else if ((_aoesWave3.Count > 0 || _aoesWave1.Count > 0) && source != default)
yield return new(safespot, source.Origin, source.Direction, source.Activation, Colors.SafeFromAOE);
Expand Down Expand Up @@ -220,6 +221,7 @@ private enum Pattern { None, EWEW, WEWE }
private static readonly Angle a165 = 165.Degrees();
private static readonly Angle a105 = 105.Degrees();
private static readonly Angle a75 = 75.Degrees();
private static readonly WDir offset = new(0, 1);

public override void OnActorCreated(Actor actor)
{
Expand All @@ -246,8 +248,8 @@ public override void AddAIHints(int slot, Actor actor, PartyRolesConfig.Assignme
if (timespan <= 3)
{
var patternWEWE = CurrentPattern == Pattern.WEWE;
forbidden.Add(ShapeDistance.InvertedCone(sources.Origin - (patternWEWE ? new WDir(0, 1) : new(0, 1)), 5, patternWEWE ? a15 : -a15, a15));
forbidden.Add(ShapeDistance.InvertedCone(sources.Origin - (patternWEWE ? new WDir(0, -1) : new(0, -1)), 5, patternWEWE ? -a165 : a165, a15));
forbidden.Add(ShapeDistance.InvertedCone(sources.Origin - offset, 5, patternWEWE ? a15 : -a15, a15));
forbidden.Add(ShapeDistance.InvertedCone(sources.Origin + offset, 5, patternWEWE ? -a165 : a165, a15));
forbidden.Add(ShapeDistance.InvertedCone(sources.Origin, 5, patternWEWE ? a105 : -a105, a15));
forbidden.Add(ShapeDistance.InvertedCone(sources.Origin, 5, patternWEWE ? -a75 : a75, a15));
}
Expand Down
8 changes: 8 additions & 0 deletions BossMod/Modules/Dawntrail/Dungeon/D03SkydeepCenote/D033Maulskull.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ class Stonecarver(BossModule module) : Components.GenericAOEs(module)
private readonly List<AOEInstance> _aoes = [];
private static readonly AOEShapeRect rect = new(40, 10);
private static readonly HashSet<AID> aids = [AID.Stonecarver1, AID.Stonecarver2, AID.Stonecarver3, AID.Stonecarver4];
private static readonly WDir offset = new(0, 20);

public override IEnumerable<AOEInstance> ActiveAOEs(int slot, Actor actor)
{
Expand All @@ -104,6 +105,13 @@ public override void OnCastFinished(Actor caster, ActorCastInfo spell)
if (_aoes.Count > 0 && aids.Contains((AID)spell.Action.ID))
_aoes.RemoveAt(0);
}

public override void AddAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints)
{
base.AddAIHints(slot, actor, assignment, hints);
if (_aoes.Count > 0)
hints.AddForbiddenZone(ShapeDistance.InvertedRect(Arena.Center + offset, Arena.Center - offset, 2), _aoes[0].Activation);
}
}

class Shatter(BossModule module) : Components.GenericAOEs(module)
Expand Down
8 changes: 7 additions & 1 deletion BossMod/Modules/Dawntrail/Trial/T03QueenEternal/DownburstPowerfulGust.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,13 @@ public override void AddAIHints(int slot, Actor actor, PartyRolesConfig.Assignme
hints.AddForbiddenZone(ShapeDistance.InvertedCone(source.Origin, 5, source.Direction + offset, 10.Degrees()), source.Activation);
}
else
hints.AddForbiddenZone(ShapeDistance.InvertedCross(source.Origin, source.Direction, 5, 0.5f), source.Activation);
{
var forbidden = new List<Func<WPos, float>>();
foreach (var a in Helpers.AnglesCardinals)
forbidden.Add(ShapeDistance.InvertedCone(source.Origin, 5, source.Direction + a, 10.Degrees()));
if (forbidden.Count > 0)
hints.AddForbiddenZone(p => forbidden.Select(f => f(p)).Max(), source.Activation);
}
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion BossMod/Modules/Dawntrail/Trial/T03QueenEternal/WaltzOfTheRegalia.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,4 @@ public override void OnActorDestroyed(Actor actor)
}
}

class WaltzOfTheRegalia(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.WaltzOfTheRegalia), new AOEShapeRect(7, 2, 7));
class WaltzOfTheRegalia(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.WaltzOfTheRegalia), new AOEShapeRect(7, 2, 7));
61 changes: 50 additions & 11 deletions BossMod/Modules/RealmReborn/Dungeon/D13CastrumMeridianum/D131BlackEft.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,28 @@

public enum OID : uint
{
Boss = 0x38CA, // x1
Helper = 0x233C, // x3
AddSignifer = 0x38CC, // x2, and more spawn during fight
AddLaquearius = 0x38CB, // x2, and more spawn during fight
AddMagitekColossus = 0x394C, // spawn during fight
Boss = 0x38CA, // R3.0
EigthCohortSignifer = 0x38CC, // R0.5, x2, and more spawn during fight
EigthCohortLaquearius = 0x38CB, // R0.5, x2, and more spawn during fight
MagitekColossus = 0x394C, // R2.5, spawn during fight
Helper = 0x233C
}

public enum AID : uint
{
AutoAttack = 870, // EigthCohortLaquearius/MagitekColossus->player, no cast, single-target

Fire = 966, // EigthCohortSignifer->player, 1.0s cast, single-target
Fortis = 28777, // EigthCohortLaquearius/EigthCohortSignifer->self, 6.0s cast, single-target
PhotonStream = 28776, // Boss->player, no cast, single-target, auto-attack
IncendiarySupport = 29268, // Boss->self, 3.0s cast, single-target, visual
IncendiarySupportAOE = 29269, // Helper->self, no cast, range 60 circle, raidwide
IncendiarySupportVisual = 29268, // Boss->self, 3.0s cast, single-target, visual
IncendiarySupport = 29269, // Helper->self, no cast, range 60 circle, raidwide
HighPoweredMagitekRay = 28773, // Boss->self, 5.0s cast, range 60 width 4 rect aoe
RequestAssistance = 28774, // Boss->self, 4.0s cast, single-target, summon adds
MagitekCannon = 28775, // Boss->location, 3.0s cast, range 6 circle aoe
MagitekCannon = 28775 // Boss->location, 3.0s cast, range 6 circle aoe
}

class IncendiarySupport(BossModule module) : Components.CastHint(module, ActionID.MakeSpell(AID.IncendiarySupport), "Raidwide x3");
class IncendiarySupport(BossModule module) : Components.RaidwideCastDelay(module, ActionID.MakeSpell(AID.IncendiarySupportVisual), ActionID.MakeSpell(AID.IncendiarySupport), 1, "Raidwide x3");
class HighPoweredMagitekRay(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.HighPoweredMagitekRay), new AOEShapeRect(50, 2));
class MagitekCannon(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.MagitekCannon), 6);

Expand All @@ -39,5 +43,40 @@ public D131BlackEftStates(BossModule module) : base(module)
// first wave = 3x signifier + 3x laquearius
// second wave = 2x colossus
// third wave = 2x colossus + 2x signifier + 2x laquearius
[ModuleInfo(BossModuleInfo.Maturity.Verified, Contributors = "veyn", GroupType = BossModuleInfo.GroupType.CFC, GroupID = 15, NameID = 557)]
public class D131BlackEft(WorldState ws, Actor primary) : BossModule(ws, primary, new(10, -40), new ArenaBoundsSquare(20));
[ModuleInfo(BossModuleInfo.Maturity.Verified, Contributors = "veyn, Malediktus", GroupType = BossModuleInfo.GroupType.CFC, GroupID = 15, NameID = 557)]
public class D131BlackEft(WorldState ws, Actor primary) : BossModule(ws, primary, arena.Center, arena)
{
private static readonly WPos[] vertices = [new(12.14f, -73.48f), new(12.44f, -73), new(12.44f, -71.9f), new(12.74f, -71.3f), new(13.13f, -70.8f),
new(14.31f, -70.32f), new(14.92f, -70.35f), new(15.56f, -70.61f), new(16.13f, -70.92f), new(16.46f, -71.45f),
new(16.68f, -71.98f), new(16.68f, -72.5f), new(17.4f, -72.64f), new(18.91f, -72.52f), new(19.53f, -72.62f),
new(21.04f, -72.53f), new(21.62f, -72.63f), new(23.79f, -72.52f), new(24.31f, -72.74f), new(25.82f, -72.9f),
new(26.5f, -72.76f), new(26.9f, -71.49f), new(27.15f, -71.02f), new(30.92f, -68.56f), new(32.19f, -67.16f),
new(32.23f, -66.49f), new(32.15f, -65.2f), new(31.38f, -61.39f), new(31.59f, -51.28f), new(31.72f, -50.07f),
new(32.17f, -49.85f), new(32.84f, -49.87f), new(32.96f, -49.35f), new(33.1f, -43.09f), new(32.8f, -42.43f),
new(32.34f, -41.87f), new(32.26f, -41.19f), new(32.39f, -30.8f), new(32.34f, -30.14f), new(32.44f, -29.65f),
new(32.82f, -29.25f), new(34.14f, -29.04f), new(34.56f, -28.75f), new(34.51f, -26.78f), new(34.67f, -26.17f),
new(34.91f, -25.53f), new(35.3f, -25.1f), new(36.22f, -24.24f), new(36.7f, -23.91f), new(37.36f, -23.78f),
new(37.93f, -23.44f), new(39.51f, -19.31f), new(38.94f, -19.25f), new(38.45f, -18.85f), new(38.13f, -18.26f),
new(38.9f, -15.76f), new(39.17f, -15.22f), new(41.47f, -13.7f), new(39.97f, -10.11f), new(39.6f, -9.75f),
new(38.28f, -9.88f), new(37, -9.59f), new(36.52f, -9.32f), new(35.07f, -7.95f), new(34.68f, -7.49f),
new(34.85f, -5.75f), new(34.3f, -5.68f), new(33.65f, -5.66f), new(33.05f, -5.48f), new(32.34f, -5.33f),
new(31.71f, -5.34f), new(31.07f, -5.21f), new(30.46f, -4.98f), new(29.74f, -4.98f), new(29.21f, -5.43f),
new(28.76f, -5.9f), new(27.55f, -6.21f), new(26.91f, -6.13f), new(26.3f, -5.8f), new(25.81f, -5.45f),
new(25.52f, -4.82f), new(25.36f, -4.21f), new(25.58f, -2.94f), new(25.56f, -2.18f), new(14.1f, -0.16f),
new(13.75f, -0.74f), new(13.56f, -2.05f), new(13.21f, -2.58f), new(12.8f, -3.06f), new(12.15f, -3.27f),
new(11.54f, -3.55f), new(10.92f, -3.32f), new(9.78f, -2.59f), new(9.22f, -1.36f), new(8.57f, -1.1f),
new(7.87f, -1.1f), new(7.24f, -1.01f), new(6.62f, -0.76f), new(6.41f, -1.27f), new(6.58f, -1.92f),
new(7.01f, -2.45f), new(7.26f, -3.78f), new(6.97f, -4.3f), new(4.51f, -4.9f), new(3.83f, -5.02f),
new(3.41f, -4.73f), new(2.79f, -3.67f), new(2.47f, -3.23f), new(0.05f, -6.12f), new(-10.46f, -65.92f),
new(-10.32f, -66.6f), new(-9.43f, -69.1f), new(-9.18f, -69.62f), new(-7.8f, -68.49f), new(-7.31f, -68.23f),
new(-6.85f, -68.53f), new(-4.91f, -70.35f), new(-4.89f, -70.86f), new(-5.72f, -71.82f), new(-5.86f, -72.3f),
new(-5.22f, -72.55f), new(-4.3f, -72.65f), new(-3.72f, -72.47f), new(-3.82f, -71.92f), new(-3.07f, -70.9f),
new(-1.82f, -70.34f), new(-1.22f, -70.34f), new(0.02f, -70.85f), new(0.34f, -71.37f), new(0.61f, -71.94f),
new(0.61f, -73.48f), new(12.14f, -73.48f)];
private static readonly ArenaBoundsComplex arena = new([new PolygonCustom(vertices)]);

protected override void DrawEnemies(int pcSlot, Actor pc)
{
Arena.Actors(Enemies(OID.EigthCohortLaquearius).Concat([PrimaryActor]).Concat(Enemies(OID.EigthCohortSignifer)).Concat(Enemies(OID.MagitekColossus)));
}
}
11 changes: 6 additions & 5 deletions BossMod/Modules/RealmReborn/Dungeon/D13CastrumMeridianum/D132MagitekVanguardF1.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,14 @@

public enum OID : uint
{
Boss = 0x38CD, // x1
Helper = 0x233C, // x7
Boss = 0x38CD, // R4.4
Helper = 0x233C
}

public enum AID : uint
{
AutoAttack = 870, // Boss->player, no cast, single-target

ThermobaricStrike = 28778, // Boss->self, 4.0s cast, single-target, visual
ThermobaricCharge = 28779, // Helper->self, 7.0s cast, range 60 circle aoe with ? falloff
Hypercharge = 28780, // Boss->self, 4.1s cast, single-target, visual
Expand All @@ -17,7 +18,7 @@ public enum AID : uint
TargetedSupport = 28783, // Boss->self, 4.0s cast, single-target, visual
TargetedSupportAOE = 28784, // Helper->self, 3.0s cast, range 5 circle aoe
CermetDrill = 28785, // Boss->player, 5.0s cast, single-target tankbuster
Overcharge = 29146, // Boss->self, 3.0s cast, range 11 120-degree cone aoe
Overcharge = 29146 // Boss->self, 3.0s cast, range 11 120-degree cone aoe
}

class ThermobaricCharge(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.ThermobaricCharge), new AOEShapeCircle(20));
Expand All @@ -41,5 +42,5 @@ public D132MagitekVanguardF1States(BossModule module) : base(module)
}
}

[ModuleInfo(BossModuleInfo.Maturity.Verified, Contributors = "veyn", GroupType = BossModuleInfo.GroupType.CFC, GroupID = 15, NameID = 2116)]
public class D132MagitekVanguardF1(WorldState ws, Actor primary) : BossModule(ws, primary, new(-13, 31), new ArenaBoundsRect(20, 20, 20.Degrees()));
[ModuleInfo(BossModuleInfo.Maturity.Verified, Contributors = "veyn, Malediktus", GroupType = BossModuleInfo.GroupType.CFC, GroupID = 15, NameID = 2116)]
public class D132MagitekVanguardF1(WorldState ws, Actor primary) : BossModule(ws, primary, new(-13, 31), new ArenaBoundsSquare(19.5f, 11.Degrees()));
12 changes: 8 additions & 4 deletions BossMod/Modules/RealmReborn/Dungeon/D13CastrumMeridianum/D133Livia.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

public enum OID : uint
{
Boss = 0x38CE, // x1
Helper = 0x233C, // x50
Boss = 0x38CE, // R1.507
Helper = 0x233C
}

public enum AID : uint
Expand Down Expand Up @@ -215,5 +215,9 @@ public D133LiviaStates(BossModule module) : base(module)
}
}

[ModuleInfo(BossModuleInfo.Maturity.Verified, Contributors = "veyn", GroupType = BossModuleInfo.GroupType.CFC, GroupID = 15, NameID = 2118)]
public class D133Livia(WorldState ws, Actor primary) : BossModule(ws, primary, new(-98, -33), new ArenaBoundsCircle(20));
[ModuleInfo(BossModuleInfo.Maturity.Verified, Contributors = "veyn, Malediktus", GroupType = BossModuleInfo.GroupType.CFC, GroupID = 15, NameID = 2118)]
public class D133Livia(WorldState ws, Actor primary) : BossModule(ws, primary, arena.Center, arena)
{
private static readonly ArenaBoundsComplex arena = new([new Polygon(new(-98, -33), 19.5f / MathF.Cos(MathF.PI / 36), 36)],
[new Rectangle(new(-78.187f, -36.886f), 20, 1.25f, 79.Degrees())]);
}
17 changes: 11 additions & 6 deletions BossMod/Modules/RealmReborn/Dungeon/D14Praetorium/D141Colossus.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,28 @@

public enum OID : uint
{
Boss = 0x3872, // x1
Helper = 0x233C, // x8
Boss = 0x3872, // R3.5
Helper = 0x233C
}

public enum AID : uint
{
AutoAttack = 870, // Boss->player, no cast, single-target

CeruleumVent = 28474, // Boss->self, 5.0s cast, raidwide
Teleport = 28467, // Boss->location, no cast, single-target, teleport
PrototypeLaserAlpha = 28468, // Boss->self, 5.0s cast, single-target, visual
IronKissAlpha1 = 28469, // Helper->location, 7.0s cast, range 6 circle aoe (inner set)
IronKissAlpha2 = 28470, // Helper->location, 9.0s cast, range 6 circle aoe (outer set)
PrototypeLaserBeta = 28471, // Boss->self, 5.0s cast, single-target, visual
IronKissBeta = 28472, // Helper->player, 5.0s cast, range 5 circle spread
GrandSword = 28473, // Boss->self, 5.0s cast, range 25 90-degree cone aoe
GrandSword = 28473 // Boss->self, 5.0s cast, range 25 90-degree cone aoe
}

class CeruleumVent(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.CeruleumVent));
class PrototypeLaserAlpha1(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.IronKissAlpha1), 6);
class PrototypeLaserAlpha2(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.IronKissAlpha2), 6);
class PrototypeLaserBeta(BossModule module) : Components.SpreadFromCastTargets(module, ActionID.MakeSpell(AID.IronKissBeta), 5, false);
class PrototypeLaserBeta(BossModule module) : Components.SpreadFromCastTargets(module, ActionID.MakeSpell(AID.IronKissBeta), 5);
class GrandSword(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.GrandSword), new AOEShapeCone(25, 45.Degrees()));

class D141ColossusStates : StateMachineBuilder
Expand All @@ -38,5 +39,9 @@ public D141ColossusStates(BossModule module) : base(module)
}
}

[ModuleInfo(BossModuleInfo.Maturity.Verified, Contributors = "veyn", GroupType = BossModuleInfo.GroupType.CFC, GroupID = 16, NameID = 2134)]
public class D141Colossus(WorldState ws, Actor primary) : BossModule(ws, primary, new(192, 0), new ArenaBoundsCircle(15));
[ModuleInfo(BossModuleInfo.Maturity.Verified, Contributors = "veyn, Malediktus", GroupType = BossModuleInfo.GroupType.CFC, GroupID = 16, NameID = 2134)]
public class D141Colossus(WorldState ws, Actor primary) : BossModule(ws, primary, arena.Center, arena)
{
private static readonly ArenaBoundsComplex arena = new([new Polygon(new(192, 0), 14.5f / MathF.Cos(MathF.PI / 48), 48)],
[new Rectangle(new(207, 0), 20, 1.25f, 90.Degrees()), new Rectangle(new(177, 0), 20, 1.8f, 90.Degrees())]);
}
Loading

0 comments on commit 255555a

Please sign in to comment.