Skip to content

Commit

Permalink
tehe
Browse files Browse the repository at this point in the history
  • Loading branch information
xanunderscore committed Oct 7, 2024
1 parent 5952ce5 commit 038e6c9
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 4 deletions.
13 changes: 9 additions & 4 deletions BossMod/Modules/Endwalker/Ultimate/TOP/TOPStates.cs
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,8 @@ private void Phase4(uint id)

private void Phase5(uint id)
{
ActorTargetable(id, _module.BossP5, true, 15.5f, "Boss appears");
ActorTargetable(id, _module.BossP5, true, 15.5f, "Boss appears")
.SetHint(StateMachine.StateHint.DowntimeEnd);
P5SolarRay(id + 0x10000, 3.1f, false);
P5RunMiDelta(id + 0x20000, 8.4f);
P5SolarRay(id + 0x30000, 9.2f, false);
Expand Down Expand Up @@ -133,7 +134,8 @@ private void P1WaveCannons(uint id, float delay)

private void P2FirewallSolarRay(uint id, float delay)
{
ActorTargetable(id, _module.BossP2M, true, delay, "M/F appear");
ActorTargetable(id, _module.BossP2M, true, delay, "M/F appear")
.SetHint(StateMachine.StateHint.DowntimeEnd);
ActorCast(id + 0x10, _module.BossP2M, AID.FirewallM, 1.2f, 3);
ActorCast(id + 0x20, _module.BossP2M, AID.SolarRayM, 3.2f, 5, false, "Tankbusters")
.ActivateOnEnter<SolarRayM>()
Expand Down Expand Up @@ -234,6 +236,7 @@ private void P3Intermission(uint id, float delay)
.DeactivateOnExit<P3ColossalBlow>();

ActorTargetable(id + 0x100, _module.BossP3, true, 3.5f, "Boss reappears")
.SetHint(StateMachine.StateHint.DowntimeEnd)
.DeactivateOnExit<P3IntermissionVoidzone>(); // voidzone disappears ~1.6s before boss appears
}

Expand Down Expand Up @@ -278,7 +281,8 @@ private void P3OversampledWaveCannon(uint id, float delay)

private void P4WaveCannon(uint id, float delay)
{
ActorTargetable(id, _module.BossP3, true, delay, "Boss reappear");
ActorTargetable(id, _module.BossP3, true, delay, "Boss reappear")
.SetHint(StateMachine.StateHint.DowntimeEnd);
ActorCast(id + 0x10, _module.BossP3, AID.P4WaveCannonVisualStart, 9.3f, 5, true)
.ActivateOnEnter<P4WaveCannonProtean>()
.ActivateOnEnter<P4WaveCannonStack>(); // ~2.5s into cast: targets for stacks 1
Expand Down Expand Up @@ -483,7 +487,8 @@ private void P6FlashGales(uint id, float delay)

private void P6CosmoMemory(uint id, float delay)
{
ActorTargetable(id, _module.BossP6, true, delay, "Boss appears");
ActorTargetable(id, _module.BossP6, true, delay, "Boss appears")
.SetHint(StateMachine.StateHint.DowntimeEnd);
ActorCast(id + 0x1000, _module.BossP6, AID.P6CosmoMemory, 7.2f, 6, true, "Raidwide (tank LB3)")
.SetHint(StateMachine.StateHint.Raidwide);
}
Expand Down
Binary file added BossMod/Pathfinding/ObstacleMaps/270.335.1.bmp
Binary file not shown.
15 changes: 15 additions & 0 deletions BossMod/Pathfinding/ObstacleMaps/maplist.json
Original file line number Diff line number Diff line change
Expand Up @@ -456,5 +456,20 @@
"ViewHeight": 60,
"Filename": "314.363.1.bmp"
}
],
"270.335": [
{
"MinBoundsX": -499.5,
"MinBoundsY": -33,
"MinBoundsZ": -549,
"MaxBoundsX": 485.5,
"MaxBoundsY": 55.5,
"MaxBoundsZ": 726.5,
"OriginX": -499.5,
"OriginZ": -549,
"ViewWidth": 60,
"ViewHeight": 60,
"Filename": "270.335.1.bmp"
}
]
}

0 comments on commit 038e6c9

Please sign in to comment.