refactor

InventiveRhythm · Dec 14, 2024 · d3cdf2a · d3cdf2a
1 parent cf841fd
commit d3cdf2a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 12 deletions.
diff --git a/fluXis.Game/Map/Structures/Events/LaneSwitchEvent.cs b/fluXis.Game/Map/Structures/Events/LaneSwitchEvent.cs
@@ -1,3 +1,4 @@
+using System.Linq;
 using fluXis.Game.Map.Structures.Bases;
 using Newtonsoft.Json;
 using osu.Framework.Graphics;
@@ -173,6 +174,9 @@ public class LaneSwitchEvent : IMapEvent, IHasDuration, IHasEasing
 
     public static bool[] GetRow(int count, int keycount, bool newLayout)
     {
+        if (count == keycount)
+            return Enumerable.Repeat(true, keycount).ToArray();
+
         var layout = newLayout ? SWITCH_VISIBILITY_V2 : SWITCH_VISIBILITY;
 
         var m = layout[keycount - 2];

diff --git a/fluXis.Game/Screens/Edit/Tabs/Charting/Effect/EditorLaneSwitchEvent.cs b/fluXis.Game/Screens/Edit/Tabs/Charting/Effect/EditorLaneSwitchEvent.cs
@@ -82,20 +82,14 @@ private void update()
         else
             length = clock.TrackLength - Event.Time;
 
-        var visibility = LaneSwitchEvent.GetRow(Event.Count, map.RealmMap.KeyCount, map.MapInfo.NewLaneSwitchLayout);
+        var current = LaneSwitchEvent.GetRow(Event.Count, map.RealmMap.KeyCount, map.MapInfo.NewLaneSwitchLayout);
         StateChange[] states = new StateChange[map.RealmMap.KeyCount];
 
-        var current = Event.Count == map.RealmMap.KeyCount
-            ? Enumerable.Repeat(true, map.RealmMap.KeyCount).ToArray()
-            : visibility;
-
         var previousEvent = map.MapEvents.LaneSwitchEvents.LastOrDefault(e => e.Time < Event.Time);
 
         if (previousEvent != null)
         {
-            var prev = previousEvent.Count == map.RealmMap.KeyCount
-                ? Enumerable.Repeat(true, map.RealmMap.KeyCount).ToArray()
-                : visibility;
+            var prev = LaneSwitchEvent.GetRow(previousEvent.Count, map.RealmMap.KeyCount, map.MapInfo.NewLaneSwitchLayout);
 
             for (int i = 0; i < map.RealmMap.KeyCount; i++)
             {

diff --git a/fluXis.Game/Screens/Gameplay/Ruleset/LaneSwitchManager.cs b/fluXis.Game/Screens/Gameplay/Ruleset/LaneSwitchManager.cs
@@ -99,10 +99,6 @@ private void build()
     private IEnumerable<int> getWidths(LaneSwitchEvent ev)
     {
         var w = skin.SkinJson.GetKeymode(ev.Count).ColumnWidth;
-
-        if (ev.Count == keycount)
-            return Enumerable.Repeat(0, keycount).Select(_ => w);
-
         return LaneSwitchEvent.GetRow(ev.Count, keycount, newLayout).Select(l => l ? w : 0);
     }
 }