diff --git a/SplatoonScripts/Duties/Dawntrail/R1S Multiscript.cs b/SplatoonScripts/Duties/Dawntrail/R1S Multiscript.cs index 409acecc..e1b5bb6b 100644 --- a/SplatoonScripts/Duties/Dawntrail/R1S Multiscript.cs +++ b/SplatoonScripts/Duties/Dawntrail/R1S Multiscript.cs @@ -16,7 +16,7 @@ public class R1S_Multiscript : SplatoonScript private List clonePositions = new List(); - public override Metadata? Metadata => new(1, "damolitionn"); + public override Metadata? Metadata => new(2, "damolitionn"); private bool IsLeapingCleave = false; private bool LeftFirst = false; @@ -28,8 +28,6 @@ public class R1S_Multiscript : SplatoonScript private Vector3 jumpTargetPosition; IBattleNpc? BlackCat => Svc.Objects.FirstOrDefault(x => x is IBattleNpc b && b.DataId == 17193 && b.IsTargetable) as IBattleNpc; - IBattleNpc? JumpMarker => Svc.Objects.FirstOrDefault(x => x is IBattleNpc b && b.DataId == 17195 && !b.IsTargetable) as IBattleNpc; - IBattleNpc? Clone => Svc.Objects.FirstOrDefault(x => x is IBattleNpc b && b.DataId == 17196) as IBattleNpc; public override void OnSetup() { @@ -519,7 +517,7 @@ public override void OnUpdate() } } - private void Reset() + public override void OnReset() { IsLeapingCleave = false; LeftFirst = false; @@ -537,16 +535,5 @@ private void Reset() { e2.Enabled = false; } - - } - - public override void OnCombatEnd() - { - Reset(); - } - - public override void OnCombatStart() - { - Reset(); } -} +} \ No newline at end of file