Improvements for cassette music maps

EverestAPI · Dec 3, 2021 · 24adfde · 24adfde
1 parent 8cb5b5e
commit 24adfde
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/Celeste.Mod.mm/Mod/Meta/MapMeta.cs b/Celeste.Mod.mm/Mod/Meta/MapMeta.cs
@@ -527,6 +527,7 @@ public MapMetaCassetteModifier(BinaryPacker.Element meta) {
         public int TicksPerSwap { get; set; } = 2;
         public int Blocks { get; set; } = 2;
         public int BeatsMax { get; set; } = 256;
+        public int BeatIndexOffset { get; set; } = 0;
         public bool OldBehavior { get; set; } = false;
 
         public void Parse(BinaryPacker.Element meta) {
@@ -536,6 +537,7 @@ public void Parse(BinaryPacker.Element meta) {
             meta.AttrIfInt("TicksPerSwap", v => TicksPerSwap = v);
             meta.AttrIfInt("Blocks", v => Blocks = v);
             meta.AttrIfInt("BeatsMax", v => BeatsMax = v);
+            meta.AttrIfInt("BeatIndexOffset", v => BeatIndexOffset = v);
             meta.AttrIfBool("OldBehavior", v => OldBehavior = v);
         }
     }

diff --git a/Celeste.Mod.mm/Patches/CassetteBlockManager.cs b/Celeste.Mod.mm/Patches/CassetteBlockManager.cs
@@ -52,6 +52,7 @@ public override void Awake(Scene scene) {
                 beatsPerTick = meta.BeatsPerTick;
                 ticksPerSwap = meta.TicksPerSwap;
                 beatIndexMax = meta.BeatsMax;
+                beatIndexOffset = meta.BeatIndexOffset;
             }
         }
 
@@ -114,7 +115,7 @@ public override void Awake(Scene scene) {
                 maxBeat = level.CassetteBlockBeats;
                 tempoMult = level.CassetteBlockTempo;
 
-                if (beatIndex % 8 >= 5) {
+                if (beatIndex % (beatsPerTick * ticksPerSwap) > ((beatsPerTick * ticksPerSwap) / 2)) {
                     currentIndex = maxBeat - 2;
                 } else {
                     currentIndex = maxBeat - 1;