Skip to content

Commit

Permalink
[add] fix script, md (#184)
Browse files Browse the repository at this point in the history
  • Loading branch information
@Redmoonwow
Redmoonwow authored Oct 6, 2024
1 parent fd60720 commit c00dccc
Show file tree
Hide file tree
Showing 8 changed files with 263 additions and 264 deletions.
5 changes: 5 additions & 0 deletions Presets/Endwalker/Duties/Ultimate - The Omega Protocol/Phase 1 - Omega.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@ https://github.com/PunishXIV/Splatoon/raw/main/SplatoonScripts/Duties/Endwalker/
https://github.com/PunishXIV/Splatoon/raw/main/SplatoonScripts/Duties/Endwalker/The%20Omega%20Protocol/Pantokrator.cs
```

[International] [Script] Pantoraktor. Tank invincible Timing Reminder. Displays when tank invincible is about to expire.
```
https://raw.githubusercontent.com/PunishXIV/Splatoon/refs/heads/main/SplatoonScripts/Duties/Endwalker/The%20Omega%20Protocol/Pantokrator%20invincible%20Reminder.cs
```

[International] P1 Basic Mulipreset / 基本繪制 (Some circles instead of ranges)
```
~Lv2~{"Name":"P1 Basic Mulipreset / 基本繪制","Group":"Omega / 絶オメガ検証戦","ZoneLockH":[1122],"ElementsL":[{"Name":"Tower Finder / 塔 ","type":1,"radius":2.5,"Donut":0.5,"color":4278255612,"thicc":3.0,"refActorNPCID":2013245,"refActorObjectLife":true,"refActorLifetimeMin":0.0,"refActorLifetimeMax":9.0,"refActorComparisonType":4,"tether":true},{"Name":"Tower Reminder / 進塔提醒","type":1,"overlayBGColor":2684354560,"overlayTextColor":4278253567,"overlayVOffset":2.0,"overlayFScale":2.0,"thicc":0.0,"overlayText":">>> !!! TOWER !!! <<<","refActorRequireBuff":true,"refActorBuffId":[3456],"refActorUseBuffTime":true,"refActorBuffTimeMax":11.0,"refActorComparisonType":1,"onlyVisible":true},{"Name":"Laser / 集合提醒 (激光)","type":1,"radius":4.52,"color":4294940160,"overlayBGColor":3355443200,"overlayTextColor":4294940160,"overlayVOffset":2.0,"overlayFScale":2.0,"thicc":4.6,"overlayText":" >>> STACK <<< ","refActorPlaceholder":["<1>","<2>","<3>","<4>","<5>","<6>","<7>","<8>"],"refActorRequireBuff":true,"refActorBuffId":[3507,3508,3509,3510],"refActorUseBuffTime":true,"refActorBuffTimeMax":5.0,"FillStep":0.778,"refActorComparisonType":5,"onlyVisible":true},{"Name":"Missile / 分散提醒 (射弾)","type":1,"radius":5.0,"color":3355507967,"overlayBGColor":3355443200,"overlayTextColor":4278255600,"overlayVOffset":2.0,"overlayFScale":2.0,"thicc":4.9,"overlayText":" <<< OUT >>> ","refActorRequireBuff":true,"refActorBuffId":[3424,3495,3496,3497],"refActorUseBuffTime":true,"refActorBuffTimeMax":5.0,"refActorComparisonType":1,"onlyVisible":true},{"Name":"Induced AOE / 靠近AOE","type":1,"radius":3.0,"color":4278255612,"overlayBGColor":3472883712,"overlayTextColor":4278255615,"overlayVOffset":2.0,"overlayFScale":2.0,"thicc":3.0,"overlayText":" <<< SPREAD >>> ","refActorComparisonType":7,"includeRotation":true,"FaceMe":true,"refActorVFXPath":"vfx/lockon/eff/lockon5_t0h.avfx","refActorVFXMax":3000}]}
Expand Down
7 changes: 6 additions & 1 deletion Presets/Endwalker/Duties/Ultimate - The Omega Protocol/Phase 2 - Omega M and F.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,12 @@
~Lv2~{"Name":"P2 Optical unit finder - early beam","Group":"TOP","ZoneLockH":[1122],"DCond":5,"ElementsL":[{"Name":"","type":3,"refY":25.0,"refZ":20.0,"offY":25.0,"radius":2.0,"color":3372220160,"overlayBGColor":0,"overlayTextColor":4278190080,"overlayFScale":7.0,"thicc":5.0,"overlayText":"EYE","refActorNPCNameID":7640,"refActorComparisonType":6,"includeRotation":true,"Filled":true},{"Name":"","type":3,"refX":-25.0,"refZ":20.0,"offX":-25.0,"radius":2.0,"color":3372220160,"overlayBGColor":0,"overlayTextColor":4278190080,"overlayFScale":7.0,"thicc":5.0,"overlayText":"EYE","refActorNPCNameID":7640,"refActorComparisonType":6,"includeRotation":true,"AdditionalRotation":1.5707964,"Filled":true}],"UseTriggers":true,"Triggers":[{"Type":2,"Duration":20.0,"Match":"(7635>31550)","MatchDelay":5.0}]}
```

[International] [Script] [Configuration required] Stack swap informer. Will inform you about need to swap with a player on stacks, and optionally - write in chat (for you only, not sending to server) - for any swap. Can be configured: furthest or closest player to adjust.
[International] [Script] [Configuration required] Party Synergy MultiScript
* Stack swap informer. Will inform you about need to swap with a player on stacks, and optionally - write in chat (for you only, not sending to server) - for any swap. Can be configured: furthest or closest player to adjust.
* Full Tether Guide. Will display tether a my player. [Configuration required]
Full Tether Guide is need priority List setting. The priority is adjusted from right to left from top to bottom of the list.
The default display and guide is New toolbox strat Left Swap. For other strats, please modify the position in the element editor. (Do not modify anything other than the position)

```
https://github.com/PunishXIV/Splatoon/raw/main/SplatoonScripts/Duties/Endwalker/The%20Omega%20Protocol/Party%20Synergy.cs
```
Expand Down
5 changes: 5 additions & 0 deletions ...ets/Endwalker/Duties/Ultimate - The Omega Protocol/Phase 4 - Restarted Omega.md
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
[International] Wave repeater
- Import from phase 3 page: https://github.com/PunishXIV/Splatoon/blob/main/Presets/Endwalker%20content/Duties/Ultimate%20-%20The%20Omega%20Protocol/Phase%203%20-%20Final%20omega.md#intermission

[International] Dispersal position display. A strategy will be displayed where one healer stands due south and the other stands to the west.
```
~Lv2~{"Name":"P4 BSOD Position","Group":"TOP_P4","ZoneLockH":[1122],"Scenes":[5,4],"DCond":5,"ElementsL":[{"Name":"","refX":87.84,"refY":94.604,"refZ":-5.456968E-12,"color":3372180736,"fillIntensity":1.0,"refActorTetherTimeMin":0.0,"refActorTetherTimeMax":0.0},{"Name":"","refX":86.28,"refY":99.904,"refZ":-5.456968E-12,"fillIntensity":1.0,"refActorTetherTimeMin":0.0,"refActorTetherTimeMax":0.0},{"Name":"","refX":88.0,"refY":105.944,"refZ":-5.456968E-12,"color":3355508509,"fillIntensity":1.0,"refActorTetherTimeMin":0.0,"refActorTetherTimeMax":0.0},{"Name":"","refX":91.98,"refY":110.504,"refZ":-5.456968E-12,"fillIntensity":1.0,"refActorTetherTimeMin":0.0,"refActorTetherTimeMax":0.0},{"Name":"","refX":100.04,"refY":113.164,"refZ":-5.456968E-12,"color":3372155119,"fillIntensity":1.0,"refActorTetherTimeMin":0.0,"refActorTetherTimeMax":0.0},{"Name":"","refX":107.74,"refY":110.884,"refZ":-5.456968E-12,"fillIntensity":1.0,"refActorTetherTimeMin":0.0,"refActorTetherTimeMax":0.0},{"Name":"","refX":111.86,"refY":105.844,"refZ":-5.456968E-12,"color":3372180736,"fillIntensity":1.0,"refActorTetherTimeMin":0.0,"refActorTetherTimeMax":0.0},{"Name":"","refX":113.58,"refY":99.824,"refZ":-5.456968E-12,"fillIntensity":1.0,"refActorTetherTimeMin":0.0,"refActorTetherTimeMax":0.0}],"UseTriggers":true,"Triggers":[{"Type":2,"Match":"(7636>31560)","FireOnce":true},{"Type":3,"Match":"(7636>31611)"}]}
```

[International] Wave cannon snapshot lines
```
~Lv2~{"Name":"P4 Wave Cannon","Group":"TOP","ZoneLockH":[1122],"ElementsL":[{"Name":"Snapshot","type":3,"refY":20.0,"radius":3.0,"color":1191182080,"refActorNPCNameID":7636,"refActorRequireCast":true,"refActorCastId":[31616],"refActorComparisonType":6,"includeRotation":true},{"Name":"Target you (1st)","type":3,"refY":20.0,"radius":3.0,"color":1174405375,"refActorNPCNameID":7636,"refActorRequireCast":true,"refActorCastId":[31617],"refActorComparisonType":6,"includeRotation":true,"FaceMe":true}]}
Expand Down
9 changes: 8 additions & 1 deletion ...lker/Duties/Ultimate - The Omega Protocol/Phase 5 - Dynamis Omega - 1. Delta.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,13 @@
https://github.com/PunishXIV/Splatoon/raw/main/SplatoonScripts/Duties/Endwalker/The%20Omega%20Protocol/Dynamis%20Delta.cs
```

[International] [Script] This script makes up for the shortcomings of the above script.
The last standing position will be displayed as Japanese strat.
Please check the setting to make it perfectly synchronized with the above script.
```
https://raw.githubusercontent.com/PunishXIV/Splatoon/refs/heads/main/SplatoonScripts/Duties/Endwalker/The%20Omega%20Protocol/P5%20Delta%20Hello%20Guide.cs
```

# Layouts
[International] Optical unit finder - early beam
```
Expand Down Expand Up @@ -85,7 +92,7 @@ https://github.com/PunishXIV/Splatoon/raw/main/SplatoonScripts/Duties/Endwalker/
~Lv2~{"Name":"P5 D1 Omega - final pos new Dylan right","Group":"TOP","ZoneLockH":[1122],"DCond":5,"ElementsL":[{"Name":"LASOR","type":3,"refX":15.0,"refY":10.0,"offX":15.0,"offY":-43.0,"radius":15.0,"color":1342242815,"overlayBGColor":4294967295,"overlayTextColor":4278190080,"thicc":5.0,"overlayText":"Broken green","refActorModelID":3771,"refActorComparisonType":1,"includeRotation":true,"AdditionalRotation":3.403392},{"Name":"green near omega","type":1,"offY":1.78,"radius":1.0,"color":3355508503,"overlayBGColor":2617245696,"overlayTextColor":4278255360,"thicc":3.0,"overlayText":"Green","refActorModelID":3771,"refActorComparisonType":1,"includeRotation":true,"AdditionalRotation":0.8953539},{"Name":"green far from omega","type":1,"offY":37.1,"radius":1.0,"color":3355508503,"overlayBGColor":2617245696,"overlayTextColor":4278255360,"thicc":3.0,"overlayText":"Green","refActorModelID":3771,"refActorComparisonType":1,"includeRotation":true,"AdditionalRotation":0.2932153},{"Name":"near taker inner","type":1,"offY":10.56,"radius":1.0,"color":4278237622,"overlayBGColor":4278236333,"overlayTextColor":4278190080,"thicc":5.0,"overlayText":"Near taker (blue)","refActorModelID":3771,"refActorComparisonType":1,"includeRotation":true,"AdditionalRotation":0.3700098},{"Name":"near taker outer","type":1,"offY":12.4,"radius":1.0,"color":4278237622,"overlayBGColor":4278236333,"overlayTextColor":4278190080,"thicc":5.0,"overlayText":"Near taker (blue)","refActorModelID":3771,"refActorComparisonType":1,"includeRotation":true,"AdditionalRotation":0.8813913},{"Name":"broken tether chill spot","type":1,"offY":34.54,"radius":1.0,"color":4294967295,"overlayBGColor":4294967295,"overlayTextColor":4278190080,"thicc":5.0,"overlayText":"Broken green (chill)","refActorModelID":3771,"refActorComparisonType":1,"includeRotation":true,"AdditionalRotation":0.48171088},{"Name":"near source","type":1,"offY":20.86,"radius":1.0,"color":4278225677,"overlayBGColor":4278220288,"overlayTextColor":4294967295,"thicc":5.0,"overlayText":"Near debuff","refActorModelID":3771,"refActorComparisonType":1,"includeRotation":true,"AdditionalRotation":0.31415927},{"Name":"far source","type":1,"offY":27.42,"radius":1.0,"color":4288326400,"overlayBGColor":4285363712,"overlayTextColor":4294967295,"thicc":5.0,"overlayText":"Far debuff","refActorModelID":3771,"refActorComparisonType":1,"includeRotation":true,"AdditionalRotation":0.7679449}],"UseTriggers":true,"Triggers":[{"Type":2,"Duration":10.0,"Match":" (7695>31637)"}]}
```

### [International] [Untested] Japanese strat
### [International] Japanese strat
![image](https://github.com/NightmareXIV/Splatoon/assets/5073202/23f098ff-4f2b-4aef-8e39-1fcf73c61480)


Expand Down
5 changes: 5 additions & 0 deletions Presets/Endwalker/Duties/Ultimate - The Omega Protocol/Phase 6 - Alpha Omega.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@
https://github.com/PunishXIV/Splatoon/raw/main/SplatoonScripts/Duties/Endwalker/The%20Omega%20Protocol/Exasquares.cs
```

[International] [Script] MultiScript.
```
https://raw.githubusercontent.com/PunishXIV/Splatoon/refs/heads/main/SplatoonScripts/Duties/Endwalker/The%20Omega%20Protocol/P6%20MultiScript.cs
```

[International] Exaflare predictions. Import all presets.
```
~Lv2~{"Name":"P6 Exaflares 1","Group":"TOP","ZoneLockH":[1122],"ElementsL":[{"Name":"","type":1,"radius":8.0,"color":1174405375,"refActorName":"*","refActorRequireCast":true,"refActorCastId":[31661],"refActorUseCastTime":true,"refActorCastTimeMax":0.5,"Filled":true}],"Freezing":true,"FreezeFor":12.5,"IntervalBetweenFreezes":0.75}
Expand Down
77 changes: 41 additions & 36 deletions SplatoonScripts/Duties/Endwalker/The Omega Protocol/Oversampled Wave Cannon.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@

namespace SplatoonScriptsOfficial.Duties.Endwalker.The_Omega_Protocol;

public unsafe class Oversampled_Wave_Cannon : SplatoonScript
public unsafe class Oversampled_Wave_Cannon :SplatoonScript
{
public override HashSet<uint>? ValidTerritories { get; } = [1122];
public override Metadata? Metadata => new(7, "NightmareXIV");
public override Metadata? Metadata => new(8, "NightmareXIV");

private readonly string[] strings = { "front", "right", "back", "left" };
private readonly string[] monitorRlString = { "right", "left" };
Expand Down Expand Up @@ -86,6 +86,8 @@ public override void OnSetup()
Controller.RegisterElementFromCode("WestM1Point", "{\"Name\":\"WestM1Point\",\"type\":5,\"Enabled\":false,\"refX\":89.933,\"refY\":90.989174,\"refZ\":-5.456968E-12,\"radius\":4.0,\"coneAngleMin\":90,\"coneAngleMax\":270,\"overlayBGColor\":4278190080,\"overlayTextColor\":4294967295,\"thicc\":1.0,\"overlayText\":\"Inner edge\",\"includeRotation\":true,\"tether\":true,\"Filled\":true}");
Controller.RegisterElementFromCode("WestM2Point", "{\"Name\":\"WestM2Point\",\"type\":5,\"Enabled\":false,\"refX\":89.937,\"refY\":108.96221,\"refZ\":-5.456968E-12,\"radius\":4.0,\"coneAngleMin\":-90,\"coneAngleMax\":90,\"overlayBGColor\":4278190080,\"overlayTextColor\":4294967295,\"thicc\":1.0,\"overlayText\":\"Inner edge\",\"includeRotation\":true,\"tether\":true,\"Filled\":true}");
Controller.RegisterElementFromCode("WestM3Point", "{\"Name\":\"WestM3Point\",\"type\":5,\"Enabled\":false,\"refX\":110.04,\"refY\":109.85926,\"refZ\":-9.536798E-07,\"radius\":4.0,\"coneAngleMin\":-180,\"overlayBGColor\":4278190080,\"overlayTextColor\":4294967295,\"thicc\":1.0,\"overlayText\":\"IN MARKER\",\"includeRotation\":true,\"tether\":true,\"Filled\":true}");

Conf.LockFace = false;
}

public override void OnUpdate()
Expand Down Expand Up @@ -144,57 +146,60 @@ private void OffAll()

public override void OnSettingsDraw()
{
ImGui.Checkbox("Lock face", ref Conf.LockFace);
ImGui.SameLine();
ImGuiEx.HelpMarker("This feature might be dangerous. Do NOT use when streaming. Make sure no other software implements similar option.\n\nThis will lock your face to the monitor, use with caution.", EColor.RedBright, FontAwesomeIcon.ExclamationTriangle.ToIconString());
if(Conf.LockFace)
if(false) // this function is unstable
{
ImGui.Indent();
ImGui.Text("Monitor rotation Settings Set this if you want to use a tactic other than the default. Set the direction you want the monitor to face.\nFor example, if the monitor appears to your right and faces north, set it to \"right\".");
var i = 0;
foreach(var x in Conf.EastMoniterRotation)
ImGui.Checkbox("Lock face", ref Conf.LockFace);
ImGui.SameLine();
ImGuiEx.HelpMarker("This feature might be dangerous. Do NOT use when streaming. Make sure no other software implements similar option.\n\nThis will lock your face to the monitor, use with caution.", EColor.RedBright, FontAwesomeIcon.ExclamationTriangle.ToIconString());

if(Conf.LockFace)
{
ImGui.Text($"East boss monitor {i + 1}");
ImGui.SameLine();
ImGui.SetNextItemWidth(200);
if(ImGui.BeginCombo($"##eastmon{i}", x))
ImGui.Indent();
ImGui.Text("Monitor rotation Settings Set this if you want to use a tactic other than the default. Set the direction you want the monitor to face.\nFor example, if the monitor appears to your right and faces north, set it to \"right\".");
var i = 0;
foreach(var x in Conf.EastMoniterRotation)
{
foreach(var y in strings)
ImGui.Text($"East boss monitor {i + 1}");
ImGui.SameLine();
ImGui.SetNextItemWidth(200);
if(ImGui.BeginCombo($"##eastmon{i}", x))
{
if(ImGui.Selectable(y))
foreach(var y in strings)
{
Conf.EastMoniterRotation[i] = y;
if(ImGui.Selectable(y))
{
Conf.EastMoniterRotation[i] = y;
}
}
ImGui.EndCombo();
}
ImGui.EndCombo();
i++;
}
i++;
}

i = 0;
i = 0;

foreach(var x in Conf.WestMoniterRotation)
{
ImGui.Text($"West boss monitor {i + 1}");
ImGui.SameLine();
ImGui.SetNextItemWidth(200);
if(ImGui.BeginCombo($"##westmon{i}", x))
foreach(var x in Conf.WestMoniterRotation)
{
foreach(var y in strings)
ImGui.Text($"West boss monitor {i + 1}");
ImGui.SameLine();
ImGui.SetNextItemWidth(200);
if(ImGui.BeginCombo($"##westmon{i}", x))
{
if(ImGui.Selectable(y))
foreach(var y in strings)
{
Conf.WestMoniterRotation[i] = y;
if(ImGui.Selectable(y))
{
Conf.WestMoniterRotation[i] = y;
}
}
ImGui.EndCombo();
}
ImGui.EndCombo();
i++;
}
i++;
ImGui.Unindent();
}
ImGui.Unindent();
ImGui.Dummy(new Vector2(0f, 10f));
}

ImGui.Dummy(new Vector2(0f, 10f));
ImGuiEx.Text($"Priority list:");
ImGui.SameLine();
if(ImGui.SmallButton("Test"))
Expand Down Expand Up @@ -388,7 +393,7 @@ private void FaceTarget(float rotation, ulong unkObjId = 0xE0000000)
ActionManager->AutoFaceTargetPosition(&position, unkObjId);
}

public class Config : IEzConfig
public class Config :IEzConfig
{
public List<string[]> Priorities = [];
public bool LockFace = false;
Expand Down
Loading

0 comments on commit c00dccc

Please sign in to comment.