From 90ff2303804fa97de1f62dc0f8476272a302fd95 Mon Sep 17 00:00:00 2001 From: Limiana <5073202+Limiana@users.noreply.github.com> Date: Mon, 12 Aug 2024 00:19:34 +0300 Subject: [PATCH] update script --- SplatoonScripts/Duties/Dawntrail/R4S Sunrise Sabbath.cs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/SplatoonScripts/Duties/Dawntrail/R4S Sunrise Sabbath.cs b/SplatoonScripts/Duties/Dawntrail/R4S Sunrise Sabbath.cs index 314d4a7c..2598d7a8 100644 --- a/SplatoonScripts/Duties/Dawntrail/R4S Sunrise Sabbath.cs +++ b/SplatoonScripts/Duties/Dawntrail/R4S Sunrise Sabbath.cs @@ -22,7 +22,7 @@ namespace SplatoonScriptsOfficial.Duties.Dawntrail; public class R4S_Sunrise_Sabbath : SplatoonScript { public override HashSet? ValidTerritories { get; } = [1232]; - public override Metadata? Metadata => new(3, "NightmareXIV"); + public override Metadata? Metadata => new(4, "NightmareXIV"); uint DebuffYellow = 4000; uint DebuffBlue = 4001; string GunYellow = "vfx/common/eff/m0888_stlp04_c0t1.avfx"; @@ -123,7 +123,8 @@ public override void OnUpdate() var gun = guns[i]; if(AttachedInfo.TryGetVfx(gun, out var vfx)) { - if(vfx.Where(x => x.Key.EqualsAny(this.GunBlue, this.GunYellow)).OrderBy(x => x.Value.AgeF).FirstOrDefault().Key == this.GunBlue) + var req = vfx?.Where(x => x.Key.EqualsAny(this.GunBlue, this.GunYellow) && x.Value.AgeF < 15f).OrderBy(x => x.Value.AgeF).FirstOrDefault().Key; + if(req == this.GunBlue) { if(showAoe) { @@ -133,7 +134,7 @@ public override void OnUpdate() } if(Player.Object.StatusList.Any(x => x.StatusId == this.DebuffYellow)) EnableTether(); } - else + else if(req == this.GunYellow) { if(showAoe) {