Skip to content

Commit 3e57ad6

Browse files
committed
Update scripts
1 parent 827bd29 commit 3e57ad6

38 files changed

+82
-137
lines changed

Splatoon/Memory/DirectorUpdateProcessor.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ namespace Splatoon.Memory
77
{
88
internal static unsafe class DirectorUpdateProcessor
99
{
10-
internal static void ProcessDirectorUpdate(long a1, long a2, DirectorUpdateCategory a3, uint a4, uint a5, int a6, int a7)
10+
internal static void ProcessDirectorUpdate(long a1, long a2, DirectorUpdateCategory a3, uint a4, uint a5, int a6, int a7, int a8, int a9)
1111
{
1212
if(P.Config.Logging)
1313
{
14-
var text = $"Director Update: {a3:X}, {a4:X8}, {a5:X8}, {a6:X8}, {a7:X8}";
14+
var text = $"Director Update: {a3:X}, {a4:X8}, {a5:X8}, {a6:X8}, {a7:X8}, {a8:X8}, {a9:X8}";
1515
Logger.Log(text);
1616
PluginLog.Verbose(text);
1717
P.LogWindow.Log(text);

Splatoon/Splatoon.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
44
<Authors>NightmareXIV</Authors>
5-
<Version>3.8.4.9</Version>
5+
<Version>3.8.5.0</Version>
66
</PropertyGroup>
77

88
<PropertyGroup>

SplatoonScripts/Duties/Dawntrail/EX4 Escelons Fall.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,15 @@
1717
using System.Collections.Generic;
1818
using System.Linq;
1919
using System.Numerics;
20+
using Player = ECommons.GameHelpers.LegacyPlayer.Player;
21+
using ECommons.GameHelpers.LegacyPlayer;
2022

2123
namespace SplatoonScriptsOfficial.Duties.Dawntrail;
2224
public unsafe class EX4_Escelons_Fall : SplatoonScript
2325
{
2426
public override HashSet<uint>? ValidTerritories { get; } = [1271];
2527

26-
public override Metadata? Metadata => new(8, "NightmareXIV, Redmoonwow");
28+
public override Metadata? Metadata => new(9, "NightmareXIV, Redmoonwow");
2729

2830
private uint StatusCloseFar = 2970;
2931
private uint StatusParamClose = 758;

SplatoonScripts/Duties/Dawntrail/M6S Color Riot.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
using ECommons.DalamudServices;
66
using ECommons.ExcelServices;
77
using ECommons.GameFunctions;
8-
using ECommons.GameHelpers;
98
using ECommons.Hooks.ActionEffectTypes;
109
using ECommons.ImGuiMethods;
1110
using ECommons.MathHelpers;
@@ -16,6 +15,8 @@
1615
using System.Collections.Generic;
1716
using System.Linq;
1817
using System.Numerics;
18+
using Player = ECommons.GameHelpers.LegacyPlayer.Player;
19+
using ECommons.GameHelpers.LegacyPlayer;
1920

2021
namespace SplatoonScriptsOfficial.Duties.Dawntrail;
2122

@@ -38,7 +39,7 @@ public enum BaitType
3839
private bool _nearIsRed;
3940

4041
public override HashSet<uint>? ValidTerritories => [1259];
41-
public override Metadata? Metadata => new(4, "Garume, Redmoon");
42+
public override Metadata? Metadata => new(6, "Garume, Redmoon");
4243

4344
private static IBattleNpc? Enemy =>
4445
Svc.Objects.Where(x => x.DataId == 0x479F).OfType<IBattleNpc>().FirstOrDefault();

SplatoonScripts/Duties/Dawntrail/M8S Pack Predation Telegraphs.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,15 @@
1515
using System.Numerics;
1616
using System.Text;
1717
using System.Threading.Tasks;
18+
using Player = ECommons.GameHelpers.LegacyPlayer.Player;
19+
using ECommons.GameHelpers.LegacyPlayer;
1820

1921
namespace SplatoonScriptsOfficial.Duties.Dawntrail;
2022
public unsafe sealed class M8S_Pack_Predation_Telegraphs : SplatoonScript
2123
{
2224
public override HashSet<uint>? ValidTerritories => [1263];
2325

24-
public override Metadata? Metadata => new(1, "NightmareXIV");
26+
public override Metadata? Metadata => new(2, "NightmareXIV");
2527

2628
public override void OnSetup()
2729
{

SplatoonScripts/Duties/Dawntrail/M8S Quad Beckon Moonlight Universal.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,14 @@
1919
using System.Text;
2020
using Dalamud.Game.Text;
2121
using Dalamud.Game.Text.SeStringHandling;
22+
using Player = ECommons.GameHelpers.LegacyPlayer.Player;
23+
using ECommons.GameHelpers.LegacyPlayer;
2224

2325
namespace SplatoonScriptsOfficial.Duties.Dawntrail;
2426
public class M8S_Quad_Beckon_Moonlight_Universal : SplatoonScript
2527
{
2628
public override HashSet<uint>? ValidTerritories { get; } = [1263];
27-
public override Metadata? Metadata => new(2, "NightmareXIV,Alex");
29+
public override Metadata? Metadata => new(3, "NightmareXIV,Alex");
2830

2931
public override void OnSetup()
3032
{

SplatoonScripts/Duties/Dawntrail/M8S Quad Beckon Moonlight.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,15 @@
1616
using System.Collections.Generic;
1717
using System.Linq;
1818
using System.Numerics;
19+
using Player = ECommons.GameHelpers.LegacyPlayer.Player;
20+
using ECommons.GameHelpers.LegacyPlayer;
1921

2022
namespace SplatoonScriptsOfficial.Duties.Dawntrail;
2123
public class M8S_Quad_Beckon_Moonlight : SplatoonScript
2224
{
2325
public override HashSet<uint>? ValidTerritories { get; } = [1263];
2426

25-
public override Metadata? Metadata => new(2, "NightmareXIV");
27+
public override Metadata? Metadata => new(3, "NightmareXIV");
2628

2729
public override void OnSetup()
2830
{

SplatoonScripts/Duties/Dawntrail/M8S Rise of the Howling Wind.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
using System.Linq;
1414
using System.Numerics;
1515
using ECommons.Logging;
16+
using Player = ECommons.GameHelpers.LegacyPlayer.Player;
17+
using ECommons.GameHelpers.LegacyPlayer;
1618

1719
namespace SplatoonScriptsOfficial.Duties.Dawntrail;
1820
internal class M8S_Rise_of_the_Howling_Wind : SplatoonScript
@@ -107,7 +109,7 @@ private enum WindState
107109
*/
108110
#region Public Fields
109111
public override HashSet<uint>? ValidTerritories => [1263];
110-
public override Metadata? Metadata => new(5, "Redmoon, NightmareXIV");
112+
public override Metadata? Metadata => new(6, "Redmoon, NightmareXIV");
111113
#endregion
112114

113115
/*

SplatoonScripts/Duties/Dawntrail/M8S Ultraviolent Ray 4th.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,15 @@
77
using ECommons.DalamudServices;
88
using ECommons.ExcelServices;
99
using ECommons.GameFunctions;
10-
using ECommons.GameHelpers;
1110
using ECommons.Hooks.ActionEffectTypes;
1211
using ECommons.ImGuiMethods;
1312
using ECommons.Logging;
1413
using Dalamud.Bindings.ImGui;
1514
using Splatoon;
1615
using Splatoon.SplatoonScripting;
1716
using Splatoon.SplatoonScripting.Priority;
17+
using Player = ECommons.GameHelpers.LegacyPlayer.Player;
18+
using ECommons.GameHelpers.LegacyPlayer;
1819

1920
namespace SplatoonScriptsOfficial.Duties.Dawntrail;
2021

@@ -87,7 +88,7 @@ private class PartyData
8788
#region public values
8889

8990
public override HashSet<uint>? ValidTerritories => [1263];
90-
public override Metadata? Metadata => new(1, "Redmoon");
91+
public override Metadata? Metadata => new(2, "Redmoon");
9192

9293
#endregion
9394

0 commit comments

Comments
 (0)