Skip to content

Commit

Permalink
Merge pull request #148 from FFXIV-CombatReborn/mergeWIP2
Browse files Browse the repository at this point in the history 
A Father First module
  • Loading branch information
@CarnifexOptimus
CarnifexOptimus authored Jul 1, 2024
2 parents 3232970 + 302c7b5 commit 8388918
Show file tree
Hide file tree
Showing 4 changed files with 206 additions and 5 deletions.
200 changes: 200 additions & 0 deletions BossMod/Modules/Dawntrail/Quests/MSQ/AFatherFirst.cs
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,200 @@
namespace BossMod.Dawntrail.Quest.MSQ.AFatherFirst;

public enum OID : uint
{
Boss = 0x4176, // R=5.0
GuloolJaJasShade = 0x4177, // R4.5
FireVoidzone = 0x1E8D9B, // R0.500, x0 (spawn during fight), EventObj type
Helper = 0x233C
}

public enum AID : uint
{
AutoAttack = 6497, // Boss->player, no cast, single-target
Teleport = 36400, // Boss/GuloolJaJasShade->location, no cast, single-target
FancyBladework = 36413, // Boss->self, 5.0s cast, range 60 circle
DualBlowsVisual1 = 36393, // Boss->self, 7.0s cast, single-target
DualBlowsVisual2 = 36394, // Boss->self, no cast, single-target
DualBlowsVisual3 = 36395, // Boss->self, 7.0s cast, single-target
DualBlowsVisual4 = 36396, // Boss->self, no cast, single-target
DualBlows1 = 35421, // Helper->self, 8.0s cast, range 30 180-degree cone
DualBlows2 = 35422, // Helper->self, 10.5s cast, range 30 180-degree cone
DualBlows3 = 35423, // Helper->self, 8.0s cast, range 30 180-degree cone
DualBlows4 = 35424, // Helper->self, 10.5s cast, range 30 180-degree cone
SteeledStrikeVisual1 = 36389, // Boss->location, 4.0s cast, single-target
SteeledStrikeVisual2 = 36391, // GuloolJaJasShade->location, 4.0s cast, single-target
SteeledStrikeVisual3 = 37062, // Helper->self, 5.2s cast, range 30 width 8 cross
SteeledStrikeVisual4 = 37063, // Helper->self, 5.2s cast, range 30 width 8 cross
SteeledStrike1 = 36390, // Helper->self, 5.2s cast, range 30 width 8 cross
SteeledStrike2 = 36392, // Helper->self, 5.2s cast, range 30 width 8 cross
CoiledStrikeVisual1 = 36405, // Boss->self, 5.0+1,0s cast, single-target
CoiledStrikeVisual2 = 36406, // Boss->self, 5.0+1,0s cast, single-target
CoiledStrike = 36407, // Helper->self, 6.0s cast, range 30 150-degree cone

BattleBreaker = 36414, // Boss->self, 5.0s cast, range 40 width 30 rect, knockback 50, dir foward
PhaseChange = 36415, // Boss->self, no cast, single-target
MorningStars1 = 39135, // Helper->location, 1.5s cast, range 4 circle
MorningStars2 = 38819, // Helper->location, 3.0s cast, range 4 circle
MorningStarsEnd = 38820, // Boss->self, no cast, single-target
BurningSunTelegraph1 = 36409, // Helper->location, 1.5s cast, range 4 circle
BurningSunTelegraph2 = 36410, // Helper->location, 1.5s cast, range 6 circle
BurningSunVisual = 36408, // Boss->self, 6.3+0,7s cast, single-target
BurningSun1 = 36411, // Helper->location, 1.0s cast, range 4 circle
BurningSun2 = 36412, // Helper->location, 1.0s cast, range 6 circle
BrawlEnder = 36397, // Boss->self, 5.0s cast, range 50 circle
BrawlEnderKB = 36398, // Boss->player, no cast, single-target, knockback 20, source forward (direction player is facing)
DoublingVisual1 = 38475, // Boss->self, 3.0s cast, single-target
DoublingVisual2 = 36424, // Boss->self, 3.0s cast, single-target
DoublingVisual3 = 38814, // GuloolJaJasShade->self, 3.0s cast, single-target
GloryBlaze = 36417, // GuloolJaJasShade->self, 8.0s cast, range 40 width 6 rect
TheThrillVisual1 = 38815, // GuloolJaJasShade->location, 5.0+1,5s cast, single-target
TheThrillVisual2 = 36418, // Boss->location, 5.0+1,5s cast, single-target
TheThrill1 = 38817, // Helper->self, 6.2s cast, range 3 circle
TheThrill2 = 36420, // Helper->self, 6.2s cast, range 3 circle
UnmitigatedExplosion1 = 36419, // Helper->self, no cast, range 45 circle, tower fail
UnmitigatedExplosion2 = 38816, // Helper->self, no cast, range 45 circle, tower fail

ContestofWillsPull = 38818, // Helper->self, no cast, range 40 circle, pull 30 between centers
ContestOfWills1 = 36421, // Boss->self, 2.0+1,0s cast, single-target
ContestOfWills2 = 36422, // Boss->self, no cast, single-target
ContestOfWillsEnrage = 36425, // Helper->self, no cast, range 50 circle, quick time event fail
IndigoBreeze = 34860 // Helper->self, no cast, single-target
}

class DualBlowsSteeledStrike(BossModule module) : Components.GenericAOEs(module)
{
private readonly List<AOEInstance> _aoes = [];

private static readonly AOEShapeCone cone = new(30, 90.Degrees());
private static readonly AOEShapeCross cross = new(30, 4);

public override IEnumerable<AOEInstance> ActiveAOEs(int slot, Actor actor)
{
if (_aoes.Count > 0)
yield return new(_aoes[0].Shape, _aoes[0].Origin, _aoes[0].Rotation, _aoes[0].Activation, ArenaColor.Danger);
if (_aoes.Count > 1)
yield return new(_aoes[1].Shape, _aoes[1].Origin, _aoes[1].Rotation, _aoes[1].Activation, Risky: false);
}

public override void OnCastStarted(Actor caster, ActorCastInfo spell)
{
if ((AID)spell.Action.ID is AID.DualBlows1 or AID.DualBlows2 or AID.DualBlows3 or AID.DualBlows4)
_aoes.Add(new(cone, caster.Position, spell.Rotation, spell.NPCFinishAt));
if ((AID)spell.Action.ID is AID.SteeledStrike1 or AID.SteeledStrike2)
_aoes.Add(new(cross, caster.Position, spell.Rotation, spell.NPCFinishAt));
}

public override void OnCastFinished(Actor caster, ActorCastInfo spell)
{
if ((AID)spell.Action.ID is AID.DualBlows1 or AID.DualBlows2 or AID.DualBlows3 or AID.DualBlows4 or AID.SteeledStrike1 or AID.SteeledStrike2)
{
if (_aoes.Count > 0)
_aoes.RemoveAt(0);
}
}
}

class BurningSun(BossModule module) : Components.GenericAOEs(module)
{
private readonly List<AOEInstance> _aoes = [];
private static readonly AOEShapeCircle circleSmall = new(4);
private static readonly AOEShapeCircle circleBig = new(6);

public override IEnumerable<AOEInstance> ActiveAOEs(int slot, Actor actor)
{
if (_aoes.Count > 0)
for (var i = 1; i < Math.Clamp(_aoes.Count, 0, 9); ++i)
yield return new(_aoes[i].Shape, _aoes[i].Origin, default, _aoes[i].Activation, ArenaColor.Danger);
if (_aoes.Count > 9)
for (var i = 9; i < _aoes.Count; ++i)
yield return new(_aoes[i].Shape, _aoes[i].Origin, default, _aoes[i].Activation, Risky: false);
}

public override void OnCastStarted(Actor caster, ActorCastInfo spell)
{
if ((AID)spell.Action.ID == AID.BurningSunTelegraph1)
_aoes.Add(new(circleSmall, spell.LocXZ, default, spell.NPCFinishAt.AddSeconds(4)));
if ((AID)spell.Action.ID == AID.BurningSunTelegraph2)
_aoes.Add(new(circleBig, spell.LocXZ, default, spell.NPCFinishAt.AddSeconds(4)));
}

public override void OnEventCast(Actor caster, ActorCastEvent spell)
{
if (_aoes.Count > 0 && (AID)spell.Action.ID is AID.BurningSun1 or AID.BurningSun2)
_aoes.RemoveAt(0);
}
}

class BrawlEnder(BossModule module) : Components.Knockback(module)
{
private DateTime activation;

public override IEnumerable<Source> Sources(int slot, Actor actor)
{
if (activation != default)
yield return new(actor.Position, 20, activation, default, actor.Rotation, Kind.DirForward);
}

public override void OnCastStarted(Actor caster, ActorCastInfo spell)
{
if ((AID)spell.Action.ID == AID.BrawlEnder)
activation = spell.NPCFinishAt.AddSeconds(0.9f);
}

public override void OnEventCast(Actor caster, ActorCastEvent spell)
{
if ((AID)spell.Action.ID == AID.BrawlEnder)
activation = default;
}
}

class TheThrill(BossModule module) : Components.GenericTowers(module)
{
public override void OnCastStarted(Actor caster, ActorCastInfo spell)
{
if ((AID)spell.Action.ID is AID.TheThrill1 or AID.TheThrill2)
Towers.Add(new(caster.Position, 3, activation: spell.NPCFinishAt));
}

public override void OnEventCast(Actor caster, ActorCastEvent spell)
{
if ((AID)spell.Action.ID is AID.TheThrill1 or AID.TheThrill2 && Towers.Count > 0)
Towers.RemoveAt(0);
}

public override void AddAIHints(int slot, Actor actor, PartyRolesConfig.Assignment assignment, AIHints hints)
{
if (Towers.Count > 0)
hints.AddForbiddenZone(ShapeDistance.InvertedCircle(Towers[0].Position, 3));
}
}

class FireVoidzone(BossModule module) : Components.PersistentVoidzone(module, 6, m => m.Enemies(OID.FireVoidzone).Where(z => z.EventState != 7));
class FancyBladework(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.FancyBladework));
class CoiledStrike(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.CoiledStrike), new AOEShapeCone(30, 75.Degrees()));
class GloryBlaze(BossModule module) : Components.SelfTargetedAOEs(module, ActionID.MakeSpell(AID.GloryBlaze), new AOEShapeRect(40, 3));
class BattleBreaker(BossModule module) : Components.RaidwideCast(module, ActionID.MakeSpell(AID.BattleBreaker));
class MorningStars1(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.MorningStars1), 4);
class MorningStars2(BossModule module) : Components.LocationTargetedAOEs(module, ActionID.MakeSpell(AID.MorningStars2), 4);

class AFatherFirstStates : StateMachineBuilder
{
public AFatherFirstStates(BossModule module) : base(module)
{
TrivialPhase()
.ActivateOnEnter<DualBlowsSteeledStrike>()
.ActivateOnEnter<FancyBladework>()
.ActivateOnEnter<GloryBlaze>()
.ActivateOnEnter<CoiledStrike>()
.ActivateOnEnter<MorningStars1>()
.ActivateOnEnter<MorningStars2>()
.ActivateOnEnter<FireVoidzone>()
.ActivateOnEnter<BurningSun>()
.ActivateOnEnter<TheThrill>()
.ActivateOnEnter<BattleBreaker>()
.ActivateOnEnter<BrawlEnder>();
}
}

[ModuleInfo(BossModuleInfo.Maturity.Verified, Contributors = "The Combat Reborn Team (Malediktus)", GroupType = BossModuleInfo.GroupType.Quest, GroupID = 70419, NameID = 12675)]
public class AFatherFirst(WorldState ws, Actor primary) : BossModule(ws, primary, new(0, 49), new ArenaBoundsRect(14.55f, 19.5f));
5 changes: 3 additions & 2 deletions BossMod/Modules/Endwalker/Dungeon/D09AlzadaalsLegacy/D093Kapikulu.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,15 +69,16 @@ public override void OnTethered(Actor source, ActorTetherInfo tether)

public override void Update()
{
if (_target != default)
if (_target != default) // Helper can teleport after tether started, this fixes the rare problem
{
if (_target.Position == new WPos(110, -45.5f)) // green cloth tethered
foreach (var c in currentPattern == Pattern.Pattern1 ? aoePositionsSet1 : aoePositionsSet2)
_aoes.Add(new(circle, c, default, _activation));
else if (_target.Position == new WPos(110, -90.5f)) // yellow cloth tethered
foreach (var c in currentPattern == Pattern.Pattern1 ? aoePositionsSet2 : aoePositionsSet1)
_aoes.Add(new(circle, c, default, _activation));
_target = default;
if (_aoes.Count > 0)
_target = default;
}
}

Expand Down
4 changes: 2 additions & 2 deletions BossMod/Modules/Endwalker/Dungeon/D11LapisManalis/D112GalateaMagna.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -190,13 +190,13 @@ public override void OnEventEnvControl(byte index, uint state)
position = new(340, -394);
break;
}
Towers.Add(new(position, 5, 1, 1));
Towers.Add(new(position, 5, activation: Module.WorldState.FutureTime(6)));
}
}

public override void OnEventCast(Actor caster, ActorCastEvent spell)
{
if ((AID)spell.Action.ID is AID.Burst or AID.BigBurst)
if ((AID)spell.Action.ID == AID.Burst)
Towers.RemoveAll(t => t.Position.AlmostEqual(caster.Position, 1));
}

Expand Down
2 changes: 1 addition & 1 deletion BossMod/Modules/Shadowbringers/Dungeon/D05MtGulg/D053ForgivenWhimsy.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ class JudgmentDay(BossModule module) : Components.GenericTowers(module)
public override void OnActorCreated(Actor actor)
{
if ((OID)actor.OID == OID.Towers)
Towers.Add(new(actor.Position, 5, 1, 1));
Towers.Add(new(actor.Position, 5, activation: Module.WorldState.FutureTime(7.6f)));
}

public override void OnEventCast(Actor caster, ActorCastEvent spell)
Expand Down

0 comments on commit 8388918

Please sign in to comment.