Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/PunishXIV/Splatoon
Browse files Browse the repository at this point in the history
  • Loading branch information
@Limiana
Limiana committed Nov 20, 2024
2 parents 50290f1 + 2d106b4 commit ed4aea3
Show file tree
Hide file tree
Showing 6 changed files with 177 additions and 152 deletions.
16 changes: 16 additions & 0 deletions Presets/Dawntrail/Dungeons/100 - Yuweyawata Field Station.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
## Yuweyawata Field Station

Contributions by `Enjoying Tofu`

### Lindblum Zaghnal
```
~Lv2~{"Name":"Lindblum Zaghnal Lighning Tower 1","Group":"100 - Yuweyawata Field Station","ZoneLockH":[1242],"DCond":5,"ElementsL":[{"Name":"Giant AOE","refX":81.24196,"refY":285.05148,"refZ":-0.7500019,"radius":26.1,"fillIntensity":0.402,"refActorTetherTimeMin":0.0,"refActorTetherTimeMax":0.0}],"UseTriggers":true,"Triggers":[{"Type":2,"Duration":9.0,"Match":"MapEffect: 14, 1, 2"}]}
~Lv2~{"Name":"Lindblum Zaghnal Lightning Tower 2","Group":"100 - Yuweyawata Field Station","ZoneLockH":[1242],"DCond":5,"ElementsL":[{"Name":"Giant AOE ","refX":81.148,"refY":268.954,"refZ":-0.7500019,"radius":26.0,"color":4278190335,"fillIntensity":0.404,"overlayPlaceholders":true,"refActorNPCNameID":13623,"refActorRequireCast":true,"refActorComparisonType":6,"includeRotation":true,"FaceMe":true,"refActorTetherTimeMin":0.0,"refActorTetherTimeMax":0.0}],"UseTriggers":true,"Triggers":[{"Type":2,"Duration":9.0,"Match":"MapEffect: 13, 1, 2"}]}
~Lv2~{"Name":"Lindblum Zaghnal Lightning Tower 3","Group":"100 - Yuweyawata Field Station","ZoneLockH":[1242],"DCond":5,"ElementsL":[{"Name":"Giant AOE","refX":64.88,"refY":285.12,"refZ":-0.75,"radius":26.0,"color":4278190335,"fillIntensity":0.426,"overlayPlaceholders":true,"refActorNPCNameID":13623,"refActorRequireCast":true,"refActorComparisonType":6,"includeRotation":true,"FaceMe":true,"refActorTetherTimeMin":0.0,"refActorTetherTimeMax":0.0}],"UseTriggers":true,"Triggers":[{"Type":2,"Duration":9.0,"Match":"MapEffect: 13, 16, 32"}]}
~Lv2~{"Name":"Lindblum Zaghnal Lightning Tower 4","Group":"100 - Yuweyawata Field Station","ZoneLockH":[1242],"DCond":5,"ElementsL":[{"Name":"Giant AOE","refX":64.952576,"refY":268.81625,"refZ":-0.75,"radius":26.0,"color":4278190335,"fillIntensity":0.415,"overlayPlaceholders":true,"refActorNPCNameID":13623,"refActorRequireCast":true,"refActorComparisonType":6,"includeRotation":true,"FaceMe":true,"refActorTetherTimeMin":0.0,"refActorTetherTimeMax":0.0}],"UseTriggers":true,"Triggers":[{"Type":2,"Duration":9.0,"Match":"MapEffect: 14, 16, 32"}]}
```

### Lunipyati
```
~Lv2~{"Name":"Lunipyati","Group":"100 - Yuweyawata Field Station","ZoneLockH":[1242],"ElementsL":[{"Name":"Boulder Dance","type":1,"radius":7.0,"color":4278190335,"fillIntensity":0.431,"refActorNPCNameID":13610,"refActorRequireCast":true,"refActorCastId":[40607,40608],"refActorUseCastTime":true,"refActorCastTimeMax":10.5,"refActorUseOvercast":true,"refActorComparisonType":6,"includeRotation":true,"FaceMe":true,"refActorTetherTimeMin":0.0,"refActorTetherTimeMax":0.0},{"Name":"Leporine Loaf","type":1,"radius":15.0,"Donut":23.56,"fillIntensity":0.429,"refActorNameIntl":{"En":"Lunipyati"},"refActorRequireCast":true,"refActorCastId":[40603,40765,40603,40765],"refActorTetherTimeMin":0.0,"refActorTetherTimeMax":0.0},{"Name":"Raging Claws","type":4,"radius":50.0,"coneAngleMin":-90,"coneAngleMax":90,"fillIntensity":0.265,"refActorNPCNameID":13610,"refActorRequireCast":true,"refActorCastId":[30427,30428,30429,30458,30459,30460,30479,30480,30483,30484,30485,40612,40613,40614,30427,30428,30429,30458,30459,30460,30479,30480,30483,30484,30485,40612,40613,40614],"refActorUseCastTime":true,"refActorCastTimeMax":10.5,"refActorUseOvercast":true,"refActorComparisonType":6,"includeRotation":true,"refActorTetherTimeMin":0.0,"refActorTetherTimeMax":0.0},{"Name":"Crater Carve","type":1,"radius":11.0,"color":4278453500,"fillIntensity":0.425,"refActorNPCNameID":13610,"refActorRequireCast":true,"refActorCastId":[40605],"refActorComparisonType":6,"includeRotation":true,"FaceMe":true,"refActorTetherTimeMin":0.0,"refActorTetherTimeMax":0.0}]}
```
8 changes: 8 additions & 0 deletions Presets/Dawntrail/Extreme Trials/EX3 - Sphene's Burden.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,11 @@ Contributions by `Enjoying Tofu`
```
~Lv2~{"Name":"Laws Of Ice","Group":"EX3 - Sphene's Burden","ZoneLockH":[1243],"Scenes":[4],"DCond":5,"ElementsL":[{"Name":"Tether AOE 1","type":1,"radius":16.0,"color":4278190335,"fillIntensity":0.409,"refActorComparisonType":7,"includeRotation":true,"FaceMe":true,"LimitDistance":true,"DistanceSourceX":88.0,"DistanceSourceY":80.0,"DistanceSourceZ":1.9073486E-06,"DistanceMax":10.0,"refActorVFXPath":"vfx/channeling/eff/chn_teke02x.avfx","refActorVFXMax":1111000,"refActorTetherTimeMin":0.0,"refActorTetherTimeMax":0.0},{"Name":"Tether AOE 2","type":1,"radius":16.0,"color":4278190335,"fillIntensity":0.404,"refActorComparisonType":7,"includeRotation":true,"FaceMe":true,"LimitDistance":true,"DistanceSourceX":112.0,"DistanceSourceY":80.0,"DistanceSourceZ":-1.9073486E-06,"DistanceMax":10.0,"refActorVFXPath":"vfx/channeling/eff/chn_teke02x.avfx","refActorVFXMax":1111000,"refActorTetherTimeMin":0.0,"refActorTetherTimeMax":0.0}],"UseTriggers":true,"Triggers":[{"Type":2,"Duration":34.0,"Match":"(13029>41013)"}]}
```
## Laws Of Ice Platforms

```
~Lv2~{"Name":"Ice Platforms 1","Group":"EX3 - Sphene's Burden","ZoneLockH":[1243],"DCond":5,"ElementsL":[{"Name":"South East","type":2,"refX":108.01806,"refY":104.03931,"offX":102.00574,"offY":104.03847,"radius":2.0,"color":3355443202,"fillIntensity":1.0,"thicc":1.0,"refActorTetherTimeMin":0.0,"refActorTetherTimeMax":0.0}],"UseTriggers":true,"Triggers":[{"Type":2,"Duration":2.0,"Match":"MapEffect: 7, 16, 32"},{"Type":3,"Match":"MapEffect: 7, 1, 64"}]}
~Lv2~{"Name":"Ice Platforms 2","Group":"EX3 - Sphene's Burden","ZoneLockH":[1243],"DCond":5,"ElementsL":[{"Name":"South West","type":2,"refX":98.06571,"refY":104.085915,"offX":91.98256,"offY":104.094086,"offZ":3.8146973E-06,"radius":2.0,"color":3355443200,"fillIntensity":1.0,"refActorTetherTimeMin":0.0,"refActorTetherTimeMax":0.0}],"UseTriggers":true,"Triggers":[{"Type":2,"Match":"MapEffect: 5, 16, 32"},{"Type":3,"Match":"MapEffect: 5, 1, 64"}]}
~Lv2~{"Name":"Ice Platforms 3","Group":"EX3 - Sphene's Burden","ZoneLockH":[1243],"DCond":5,"ElementsL":[{"Name":"North East","type":2,"refX":107.9629,"refY":96.04138,"refZ":-1.9073486E-06,"offX":101.98989,"offY":95.98861,"offZ":3.8146973E-06,"radius":2.0,"color":3355443200,"fillIntensity":1.0,"thicc":1.0,"refActorTetherTimeMin":0.0,"refActorTetherTimeMax":0.0}],"UseTriggers":true,"Triggers":[{"Type":2,"Match":"MapEffect: 6, 16, 32"},{"Type":3,"Match":"MapEffect: 6, 1, 64"}]}
~Lv2~{"Name":"Ice Platforms 4","Group":"EX3 - Sphene's Burden","ZoneLockH":[1243],"DCond":5,"ElementsL":[{"Name":"North West","type":2,"refX":97.99662,"refY":96.0683,"offX":92.03926,"offY":96.02868,"offZ":1.9073486E-06,"radius":2.0,"color":3355443202,"fillIntensity":1.0,"refActorTetherTimeMin":0.0,"refActorTetherTimeMax":0.0}],"UseTriggers":true,"Triggers":[{"Type":2,"Match":"MapEffect: 4, 16, 32"},{"Type":3,"Match":"MapEffect: 4, 1, 64"}]}
```
5 changes: 4 additions & 1 deletion SplatoonScripts/Duties/Endwalker/The Omega Protocol/Cosmo Meteor Adjuster.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ private enum StackPos
private List<FlareContainer> _flarePos = new List<FlareContainer>();
private bool _gimmickActive = false;
private bool _isFlareMine = false;
private bool _isFindRange = false;
private GameObjectManager* _gom = GameObjectManager.Instance();
private (string, string)[] _flareData = new (string, string)[3];
private Config C => Controller.GetConfig<Config>();
Expand Down Expand Up @@ -95,9 +96,10 @@ public override void OnVFXSpawn(uint target, string vfxPath)

if(RangedDps.Contains(character.GetJob()))
{
_isFindRange = true;
_stackPos = StackPos.South;
}
else if(_flarePos.Count >= 3)
else if(_flarePos.Count >= 3 && _isFindRange == false)
{
_stackPos = StackPos.North;
}
Expand Down Expand Up @@ -167,6 +169,7 @@ public override void OnReset()
_isFlareMine = false;
_gimmickActive = false;
_flareData = new (string, string)[3];
_isFindRange = false;
Controller.GetRegisteredElements().Each(x => x.Value.Enabled = false);
}

Expand Down
38 changes: 19 additions & 19 deletions SplatoonScripts/Duties/Endwalker/The Omega Protocol/Dynamis Delta.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ class Effects

public override void OnSetup()
{
for(var i = 0; i < 8; i++)
for (var i = 0; i < 8; i++)
{
Controller.RegisterElement($"Debug{i}", new(0) { Enabled = false });
}
Expand All @@ -82,7 +82,7 @@ public override void OnUpdate()
{
var beetle = GetBeetle();
var final = GetFinalOmega();
if(beetle != null || FakeParty.Get().Any(x => x.HasEffect(Effects.GreenTether)))
if (beetle != null || FakeParty.Get().Any(x => x.HasEffect(Effects.GreenTether)))
{
if(Stage == 0 && (HasEffect(Effects.UpcomingBlueTether) || HasEffect(Effects.UpcomingGreenTether)))
{
Expand All @@ -104,7 +104,7 @@ public override void OnUpdate()
}*/
isMeClose = Vector3.Distance(myPartner.Position, new Vector3(100, 0, 100)) > Vector3.Distance(Player.Position, new Vector3(100, 0, 100));
//InternalLog.Information($"Me close: {isMeClose}");
if(myTether == Effects.UpcomingBlueTether)
if (myTether == Effects.UpcomingBlueTether)
{
Alert("Blue - to beetle!", ImGuiColors.TankBlue);
Controller.GetElementByName("Beetle").Enabled = true;
Expand All @@ -114,10 +114,10 @@ public override void OnUpdate()
Alert("Green - to final (stretch)", ImGuiColors.HealerGreen);
Controller.GetElementByName("Final").Enabled = true;
}
if(Svc.Objects.Count(x => x.DataId.EqualsAny<uint>(HandRed, HandBlue)) == 8)
if (Svc.Objects.Count(x => x.DataId.EqualsAny<uint>(HandRed, HandBlue)) == 8)
{
DuoLog.Information($"Snapshotting: you are {(myTether == Effects.UpcomingBlueTether ? "blue" : "green")} " + (isMeClose ? "close" : "far"));
foreach(var player in FakeParty.Get())
foreach (var player in FakeParty.Get())
{
var h = Svc.Objects.Where(x => x.DataId.EqualsAny<uint>(HandRed, HandBlue)).OrderBy(x => Vector3.Distance(x.Position, player.Position)).First();
PlayerHands[player.EntityId] = h.DataId;
Expand All @@ -127,7 +127,7 @@ public override void OnUpdate()
DuoLog.Information("Stage 1");
}
}
else if(Stage == 1)
else if (Stage == 1)
{
if(isMeClose && PlayerHands[GetClosestPlayer().EntityId] == PlayerHands[Svc.ClientState.LocalPlayer.EntityId])
{
Expand Down Expand Up @@ -184,19 +184,19 @@ public override void OnUpdate()
//green tether
}
}
if(FakeParty.Get().Any(x => x.HasEffect(Effects.MonitorLeft) || x.HasEffect(Effects.MonitorRight)))
if (FakeParty.Get().Any(x => x.HasEffect(Effects.MonitorLeft) || x.HasEffect(Effects.MonitorRight)))
{
Stage = 2;
DuoLog.Information("Stage 2");
}
}
else if(Stage == 2)
else if (Stage == 2)
{
var arms = GetArms().ToArray();
if(arms.Length == 6)
{
IBattleChara? myArm = null;
if(myTether == Effects.UpcomingBlueTether)
if (myTether == Effects.UpcomingBlueTether)
{
if(isMeClose)
{
Expand All @@ -221,19 +221,19 @@ public override void OnUpdate()
myArm = arms.OrderBy(x => Vector3.Distance(x.Position, final.Position)).ToArray()[0..2].OrderBy(x => Vector3.Distance(Player.Position, x.Position)).First();
}
}
if(myArm != null && Controller.TryGetElementByName("Bait", out var e))
if (myArm != null && Controller.TryGetElementByName("Bait", out var e))
{
e.Enabled = true;
e.SetRefPosition(myArm.Position);
}
if(arms.Any(x => x.CastActionId == 31600))
if (arms.Any(x => x.CastActionId == 31600))
{
Stage = 3;
DuoLog.Information($"Stage 3");
}
}
}
else if(Stage == 3)
else if (Stage == 3)
{
if(HasEffect(Effects.BlueTether))
{
Expand All @@ -246,7 +246,7 @@ public override void OnUpdate()
Alert("Break - go far!", GradientColor.Get(ImGuiColors.DalamudRed, ImGuiColors.DalamudYellow, 200));
}
}
if(myTether == Effects.UpcomingBlueTether)
if (myTether == Effects.UpcomingBlueTether)
{
if(!HasEffect(Effects.TwiceRuin))
{
Expand All @@ -268,7 +268,7 @@ public override void OnUpdate()
DuoLog.Information("Stage 4");
}
}
else if(Stage == 4)
else if (Stage == 4)
{
if(HasEffect(Effects.NearWorld))
{
Expand All @@ -280,7 +280,7 @@ public override void OnUpdate()
}
else
{
if(myTether == Effects.UpcomingBlueTether)
if (myTether == Effects.UpcomingBlueTether)
{
Alert("Bait near world");
}
Expand Down Expand Up @@ -310,13 +310,13 @@ public override void OnUpdate()
}
}
}
if(!FakeParty.Get().Any(x => x.HasEffect(Effects.NearWorld)))
if (!FakeParty.Get().Any(x => x.HasEffect(Effects.NearWorld)))
{
Stage = 5;
DuoLog.Information("Stage 5");
}
}
else if(Stage == 5)
else if (Stage == 5)
{
if(HasEffect(Effects.GreenTether))
{
Expand Down Expand Up @@ -381,7 +381,7 @@ void Alert(string? text = null, Vector4? color = null)
else
{
e.Enabled = true;
if(color != null)
if (color != null)
{
e.overlayBGColor = color.Value.ToUint();
}
Expand All @@ -397,7 +397,7 @@ void Alert(string? text = null, Vector4? color = null)

IEnumerable<IBattleChara> GetArms()
{
foreach(var x in Svc.Objects)
foreach (var x in Svc.Objects)
{
if(x is IBattleChara b && b.DataId.EqualsAny<uint>(15719, 15718)) yield return x as IBattleChara;
}
Expand Down
14 changes: 2 additions & 12 deletions SplatoonScripts/Duties/Endwalker/The Omega Protocol/P6 MultiScript.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -251,19 +251,9 @@ public override void OnActionEffectEvent(ActionEffectSet set)
else if(set.Action.Value.RowId == CastID.CosmoMeteorSpread)
{
++_cosmoMeteorCount;
if(_cosmoMeteorCount >= 8)
if(_cosmoMeteorCount >= 16)
{
if(healer.Contains(Svc.ClientState.LocalPlayer.GetJob()))
{
_ = new TickScheduler(delegate
{
ChangeGimmick(Gimmick.None);
}, 10000);
}
else
{
ChangeGimmick(Gimmick.None);
}
ChangeGimmick(Gimmick.None);
}
}
}
Expand Down
Loading

0 comments on commit ed4aea3

Please sign in to comment.