muskit/WacK
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add the rest of the notes

Browse Source
This commit is contained in:
msk
2023-09-29 17:48:09 -07:00
parent 0dfb606216
commit 3b871463a7
18 changed files with 296 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Scripts/Data/Chart/Chart.cs
+5 -5
View File
@@ -180,21 +180,21 @@ namespace WacK.Data.Chart
curNote = new NotePlay(
curTime, mb,
chartNote.Item2.position, chartNote.Item2.size,
type: NotePlayType.Untimed
type: NotePlayType.Chain
);
break;
case MerType.SwipeIn:
curNote = new NotePlay(
curTime, mb,
chartNote.Item2.position, chartNote.Item2.size,
type: NotePlayType.SwipeIn
type: NotePlayType.SnapIn
);
break;
case MerType.SwipeOut:
curNote = new NotePlay(
curTime, mb,
chartNote.Item2.position, chartNote.Item2.size,
type: NotePlayType.SwipeOut
type: NotePlayType.SnapOut
);
break;
case MerType.SwipeCW:
@@ -291,8 +291,8 @@ namespace WacK.Data.Chart
List<Note> chordableNotes = new List<Note>();
foreach (NotePlay n in pair.Value)
{
if (n.type != NotePlayType.HoldEnd && n.type != NotePlayType.Untimed)
if (!(new NotePlayType[] { NotePlayType.HoldEnd, NotePlayType.Untimed, NotePlayType.HoldMid }).Contains(n.type))
if (n.type != NotePlayType.HoldEnd && n.type != NotePlayType.Chain)
if (!(new NotePlayType[] { NotePlayType.HoldEnd, NotePlayType.Chain, NotePlayType.HoldMid }).Contains(n.type))
chordableNotes.Add(n);
}
if (chordableNotes.Count >= 2)
Scripts/Data/Chart/NotePlay.cs
+3 -3
View File
@@ -8,9 +8,9 @@ namespace WacK.Data.Chart
HoldStart,
HoldMid,
HoldEnd,
Untimed,
SwipeIn,
SwipeOut,
Chain,
SnapIn,
SnapOut,
SwipeCW,
SwipeCCW,
}
Scripts/Scenes/Play/Audio/BGM.cs
+1 -1
View File
@@ -31,7 +31,7 @@ public partial class BGM : AudioStreamPlayer
GD.PrintErr($"Unable to open {path} for loading audio! {FileAccess.GetOpenError()}");
return;
}
GD.Print("hi");
var ext = path.Split('.')[^1].ToLower();
switch (ext)
{
Scripts/Scenes/Play/Play.cs
+18 -2
View File
@@ -34,6 +34,10 @@ namespace WacK.Scenes
public static PackedScene noteTouch = GD.Load<PackedScene>("res://Things/TunnelObjects/Notes/NoteTouch.tscn");
public static PackedScene noteHold = GD.Load<PackedScene>("res://Things/TunnelObjects/Notes/NoteHold.tscn");
public static PackedScene noteChain = GD.Load<PackedScene>("res://Things/TunnelObjects/Notes/NoteChain.tscn");
public static PackedScene noteCW = GD.Load<PackedScene>("res://Things/TunnelObjects/Notes/NoteSwipeCW.tscn");
public static PackedScene noteCCW = GD.Load<PackedScene>("res://Things/TunnelObjects/Notes/NoteSwipeCCW.tscn");
public static PackedScene noteIn = GD.Load<PackedScene>("res://Things/TunnelObjects/Notes/NoteSnapIn.tscn");
public static PackedScene noteOut = GD.Load<PackedScene>("res://Things/TunnelObjects/Notes/NoteSnapOut.tscn");
[ExportCategory("Audio")]
[Export]
@@ -104,9 +108,21 @@ namespace WacK.Scenes
case NotePlayType.Touch:
nNote = noteTouch.Instantiate<THNotePlay>();
break;
case NotePlayType.Untimed:
case NotePlayType.Chain:
nNote = noteChain.Instantiate<THNotePlay>();
break;
case NotePlayType.SwipeCW:
nNote = noteCW.Instantiate<THNotePlay>();
break;
case NotePlayType.SwipeCCW:
nNote = noteCCW.Instantiate<THNotePlay>();
break;
case NotePlayType.SnapIn:
nNote = noteIn.Instantiate<THNotePlay>();
break;
case NotePlayType.SnapOut:
nNote = noteOut.Instantiate<THNotePlay>();
break;
default:
continue;
}
@@ -124,7 +140,7 @@ namespace WacK.Scenes
double time = bgmController.GetPlaybackPosition() + AudioServer.GetTimeSinceLastMix() - AudioServer.GetOutputLatency();
var nPos = noteDisplay.Position;
nPos.Y = (bgmController.CurTime * scrollPxPerSec) + 1910;
nPos.Y = bgmController.CurTime * scrollPxPerSec;
noteDisplay.Position = nPos;
scrollDisplay.Position = nPos;
}