From 3702e4b7f34f22fc264ec46c9156758388abfb10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=AC=E3=83=AB=E3=83=A0?= Date: Wed, 14 Aug 2024 23:54:18 +0900 Subject: [PATCH 1/3] [fix] Raining Cats script include tethered players --- SplatoonScripts/Duties/Dawntrail/R1S Raining Cats.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SplatoonScripts/Duties/Dawntrail/R1S Raining Cats.cs b/SplatoonScripts/Duties/Dawntrail/R1S Raining Cats.cs index 0d03318e..3ac565d1 100644 --- a/SplatoonScripts/Duties/Dawntrail/R1S Raining Cats.cs +++ b/SplatoonScripts/Duties/Dawntrail/R1S Raining Cats.cs @@ -17,7 +17,7 @@ public unsafe class R1S_Raining_Cats : SplatoonScript private readonly List TetheredPlayers = new(2); public override HashSet? ValidTerritories { get; } = new() { 1226 }; - public override Metadata Metadata => new(1, "Garume"); + public override Metadata Metadata => new(2, "Garume"); private IBattleNpc? BlackCat => Svc.Objects.OfType() .FirstOrDefault(x => x is { IsTargetable: true, NameId: BlackCatNameId }); @@ -56,7 +56,7 @@ public override void OnUpdate() var players = Svc.Objects .OfType() - .Where(x => !TetheredPlayers.Contains(x) && !x.IsDead) + .Where(x => !x.IsDead) .OrderBy(x => Vector3.Distance(x.Position, BlackCat.Position)) .ToList(); From 105889581e4921881f2f73877bdb6330c3d64a91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=AC=E3=83=AB=E3=83=A0?= Date: Thu, 15 Aug 2024 03:28:28 +0900 Subject: [PATCH 2/3] Revert "[fix] Raining Cats script include tethered players" This reverts commit 3702e4b7f34f22fc264ec46c9156758388abfb10. --- SplatoonScripts/Duties/Dawntrail/R1S Raining Cats.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SplatoonScripts/Duties/Dawntrail/R1S Raining Cats.cs b/SplatoonScripts/Duties/Dawntrail/R1S Raining Cats.cs index 3ac565d1..0d03318e 100644 --- a/SplatoonScripts/Duties/Dawntrail/R1S Raining Cats.cs +++ b/SplatoonScripts/Duties/Dawntrail/R1S Raining Cats.cs @@ -17,7 +17,7 @@ public unsafe class R1S_Raining_Cats : SplatoonScript private readonly List TetheredPlayers = new(2); public override HashSet? ValidTerritories { get; } = new() { 1226 }; - public override Metadata Metadata => new(2, "Garume"); + public override Metadata Metadata => new(1, "Garume"); private IBattleNpc? BlackCat => Svc.Objects.OfType() .FirstOrDefault(x => x is { IsTargetable: true, NameId: BlackCatNameId }); @@ -56,7 +56,7 @@ public override void OnUpdate() var players = Svc.Objects .OfType() - .Where(x => !x.IsDead) + .Where(x => !TetheredPlayers.Contains(x) && !x.IsDead) .OrderBy(x => Vector3.Distance(x.Position, BlackCat.Position)) .ToList(); From 5059b58ad01f7f214064fce1c18b92ea827cd011 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=AC=E3=83=AB=E3=83=A0?= Date: Thu, 15 Aug 2024 03:29:32 +0900 Subject: [PATCH 3/3] [fix] Raining Cats script include tethered players --- SplatoonScripts/Duties/Dawntrail/R1S Raining Cats.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SplatoonScripts/Duties/Dawntrail/R1S Raining Cats.cs b/SplatoonScripts/Duties/Dawntrail/R1S Raining Cats.cs index 0d03318e..3ac565d1 100644 --- a/SplatoonScripts/Duties/Dawntrail/R1S Raining Cats.cs +++ b/SplatoonScripts/Duties/Dawntrail/R1S Raining Cats.cs @@ -17,7 +17,7 @@ public unsafe class R1S_Raining_Cats : SplatoonScript private readonly List TetheredPlayers = new(2); public override HashSet? ValidTerritories { get; } = new() { 1226 }; - public override Metadata Metadata => new(1, "Garume"); + public override Metadata Metadata => new(2, "Garume"); private IBattleNpc? BlackCat => Svc.Objects.OfType() .FirstOrDefault(x => x is { IsTargetable: true, NameId: BlackCatNameId }); @@ -56,7 +56,7 @@ public override void OnUpdate() var players = Svc.Objects .OfType() - .Where(x => !TetheredPlayers.Contains(x) && !x.IsDead) + .Where(x => !x.IsDead) .OrderBy(x => Vector3.Distance(x.Position, BlackCat.Position)) .ToList();