Skip to content

Commit cd3a18e

Browse files
committed
Fuck.
1 parent 9117171 commit cd3a18e

File tree

3 files changed

+23
-4
lines changed

3 files changed

+23
-4
lines changed

source/archipelago/APNote.hx

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,22 @@ class APNote extends objects.Note {
6060
var location:Int = locations[i % locations.length];
6161
var apNote = new APNote(note, location, null); // Create a new APNote with the location
6262
newNotes.push(apNote);
63-
note.isCheck = true;
64-
note = apNote; // Replace the original note with the APNote
63+
notes[randomIndices[i]] = apNote; // Replace the original note with the APNote
64+
for (queue in apNote.field.noteQueue) {
65+
for (i in 0...queue.length) {
66+
if (queue[i] == note) {
67+
queue[i] = apNote; // Replace the note with apNote in the double-array
68+
queue[i].rgbShader.r = apNote.rgbShader.r; // Set the color of the new note
69+
queue[i].rgbShader.g = apNote.rgbShader.g; // Set the color of the new note
70+
queue[i].rgbShader.b = apNote.rgbShader.b; // Set the color of the new note
71+
note.rgbShader.r = 0xFF0000; // Set the color of the original note to red
72+
note.rgbShader.g = 0xFF0000; // Set the color of the original note to red
73+
note.rgbShader.b = 0xFF0000; // Set the color of the original note to red
74+
break; // Break out of the loop once the note is found and replaced
75+
}
76+
}
77+
}
78+
apNote.isCheck = true; // Set the isCheck property to true
6579
}
6680

6781
return newNotes;

source/archipelago/APPlayState.hx

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1497,7 +1497,7 @@ class APPlayState extends PlayState {
14971497
{
14981498
super.generateSong();
14991499
if (PlayState.SONG == null) return;
1500-
archipelago.APNote.replaceNotes(allNotes, apGame.excludeCheckedLocations(apGame.noteData(PlayState.SONG.song, currentMod)));
1500+
archipelago.APNote.replaceNotes(unspawnNotes, apGame.excludeCheckedLocations(apGame.noteData(PlayState.SONG.song, currentMod)));
15011501

15021502
for (field in playfields.members)
15031503
field.clearStackedNotes();
@@ -2026,8 +2026,12 @@ class APPlayState extends PlayState {
20262026
ghostChat = false;
20272027
}
20282028

2029-
for (note in checkedNotes)
2029+
trace("Sending checks for all checked notes...");
2030+
for (note in checkedNotes) {
2031+
trace("Sending check for note: " + note);
20302032
note.sendCheck();
2033+
}
2034+
trace("All checks sent.");
20312035

20322036
ClientPrefs.data.downScroll = ogScroll;
20332037

source/objects/Note.hx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -357,6 +357,7 @@ class Note extends NoteObject
357357
//TODO: Make this it's own object to help de-clutter Note
358358
//Maybe even make note like BaseNote or something to make hardcoded sub-notetypes or something
359359
public var isCheck:Bool = false;
360+
public var checkInfo:{note:archipelago.APNote, loc:Int};
360361
public var isMine:Bool = false;
361362
public var isAlert:Bool = false;
362363
public var isHeal:Bool = false;

0 commit comments

Comments
 (0)