Skip to content

Commit d497387

Browse files
Yuta12342Yuta12342
committed
Merge branch 'Archipelago' of https://github.com/Z11Coding/Mixtape-Engine-Rework into Archipelago
2 parents 3fcfc99 + a500c0a commit d497387

File tree

5 files changed

+51
-36
lines changed

5 files changed

+51
-36
lines changed

‎source/archipelago/APGameState.hx‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -147,15 +147,15 @@ class APGameState {
147147
}
148148

149149
public function noteData(songName:String, modName:String, ?week:String):Array<Int> {
150-
trace("Starting noteData function with songName: " + songName + " and modName: " + modName);
150+
//trace("Starting noteData function with songName: " + songName + " and modName: " + modName);
151151
var matchingNotes:Array<Int> = [];
152152
var reg = new EReg("^Note \\d+: " + EReg.escape(songName + (modName != "" ? " (" + modName + ")" : "")) + "$", "");
153153
var apInfo = info();
154154

155-
trace("Looking for locations matching pattern: " + "Note #: " + songName + (modName != "" ? " (" + modName + ")" : ""));
155+
//trace("Looking for locations matching pattern: " + "Note #: " + songName + (modName != "" ? " (" + modName + ")" : ""));
156156

157157
// Initial matching using the regular expression
158-
trace("Iterating through APLocations...");
158+
//trace("Iterating through APLocations...");
159159
for (location in APLocations) {
160160
var locationName = apInfo.get_location_name(location);
161161
if (reg.match(locationName)) {
@@ -222,8 +222,8 @@ class APGameState {
222222
}
223223
}
224224

225-
trace("Finished iterating through APLocations.");
226-
trace("Returning matching notes: " + matchingNotes);
225+
//trace("Finished iterating through APLocations.");
226+
//trace("Returning matching notes: " + matchingNotes);
227227
return matchingNotes;
228228
}
229229

‎source/archipelago/APPlayState.hx‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1495,11 +1495,6 @@ class APPlayState extends PlayState {
14951495
private override function generateSong():Void
14961496
{
14971497
super.generateSong();
1498-
if (PlayState.SONG == null) return;
1499-
archipelago.APNote.replaceNotes(allNotes, apGame.excludeCheckedLocations(apGame.noteData(PlayState.SONG.song, currentMod)));
1500-
1501-
for (field in playfields.members)
1502-
field.clearStackedNotes();
15031498
}
15041499

15051500
// override public function generateNotes(song:SwagSong, AI:Array<Array<Float>>):Void

‎source/states/FreeplayState.hx‎

Lines changed: 28 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -508,12 +508,12 @@ class FreeplayState extends MusicBeatState
508508
{
509509
colors = [146, 113, 253];
510510
}
511-
var songNameThing:String = song[0];
512-
var modName:String = leWeek.folder;
513-
var locationIds:Null<Array<Int>> = APEntryState.apGame.locationData(songNameThing).concat(APEntryState.apGame.noteData(songNameThing, modName));
514-
var isMissing:Bool = APEntryState.apGame.areLocationsMissing(locationIds);
515511
if (CategoryState.loadWeekForce == "unplayed")
516512
{
513+
var songNameThing:String = song[0];
514+
var modName:String = leWeek.folder;
515+
var locationIds:Null<Array<Int>> = APEntryState.apGame.locationData(songNameThing).concat(APEntryState.apGame.noteData(songNameThing, modName));
516+
var isMissing:Bool = APEntryState.apGame.areLocationsMissing(locationIds);
517517
for (songName in curUnlocked.keys())
518518
{
519519
if (((songNameThing.trim().toLowerCase().replace('-', ' ') == songName.trim().toLowerCase().replace('-', ' ')) && leWeek.folder == curUnlocked.get(songName)) && isMissing)
@@ -522,6 +522,10 @@ class FreeplayState extends MusicBeatState
522522
}
523523
else if (CategoryState.loadWeekForce == "unlocked")
524524
{
525+
var songNameThing:String = song[0];
526+
var modName:String = leWeek.folder;
527+
var locationIds:Null<Array<Int>> = APEntryState.apGame.locationData(songNameThing).concat(APEntryState.apGame.noteData(songNameThing, modName));
528+
var isMissing:Bool = APEntryState.apGame.areLocationsMissing(locationIds);
525529
for (songName in curUnlocked.keys())
526530
{
527531
if (((songNameThing.trim().toLowerCase().replace('-', ' ') == songName.trim().toLowerCase().replace('-', ' ')) && leWeek.folder == curUnlocked.get(songName)) && !isMissing)
@@ -530,6 +534,10 @@ class FreeplayState extends MusicBeatState
530534
}
531535
else if (CategoryState.loadWeekForce == 'hinted')
532536
{
537+
var songNameThing:String = song[0];
538+
var modName:String = leWeek.folder;
539+
var locationIds:Null<Array<Int>> = APEntryState.apGame.locationData(songNameThing).concat(APEntryState.apGame.noteData(songNameThing, modName));
540+
var isMissing:Bool = APEntryState.apGame.areLocationsMissing(locationIds);
533541
for (songName in curHinted.keys())
534542
{
535543
if (((songNameThing.trim().toLowerCase().replace('-', ' ') == songName.trim().toLowerCase().replace('-', ' ')) && leWeek.folder == curHinted.get(songName)) && !isMissing)
@@ -539,6 +547,10 @@ class FreeplayState extends MusicBeatState
539547
}
540548
else if (categoryWhaat.toLowerCase() == CategoryState.loadWeekForce || (CategoryState.loadWeekForce == "mods" && categoryWhaat == null) || CategoryState.loadWeekForce == "all")
541549
{
550+
var songNameThing:String = song[0];
551+
var modName:String = leWeek.folder;
552+
var locationIds:Null<Array<Int>> = APEntryState.apGame.locationData(songNameThing).concat(APEntryState.apGame.noteData(songNameThing, modName));
553+
var isMissing:Bool = APEntryState.apGame.areLocationsMissing(locationIds);
542554
if (APEntryState.inArchipelagoMode)
543555
{
544556
if (locationIds != null && locationIds.isNotEmpty())
@@ -558,12 +570,12 @@ class FreeplayState extends MusicBeatState
558570
colors = [146, 113, 253];
559571
}
560572

561-
var songNameThing:String = song[0];
562-
var modName:String = leWeek.folder;
563-
var locationIds:Null<Array<Int>> = APEntryState.apGame.locationData(songNameThing).concat(APEntryState.apGame.noteData(songNameThing, modName));
564-
var isMissing:Bool = APEntryState.apGame.areLocationsMissing(locationIds);
565573
if (CategoryState.loadWeekForce == "unplayed")
566-
{
574+
{
575+
var songNameThing:String = song[0];
576+
var modName:String = leWeek.folder;
577+
var locationIds:Null<Array<Int>> = APEntryState.apGame.locationData(songNameThing).concat(APEntryState.apGame.noteData(songNameThing, modName));
578+
var isMissing:Bool = APEntryState.apGame.areLocationsMissing(locationIds);
567579
for (songName in curUnlocked.keys())
568580
{
569581
if (((songNameThing.trim().toLowerCase().replace('-', ' ') == songName.trim().toLowerCase().replace('-', ' ')) && leWeek.folder == curUnlocked.get(songName)) && isMissing)
@@ -572,6 +584,10 @@ class FreeplayState extends MusicBeatState
572584
}
573585
else if (CategoryState.loadWeekForce == "unlocked")
574586
{
587+
var songNameThing:String = song[0];
588+
var modName:String = leWeek.folder;
589+
var locationIds:Null<Array<Int>> = APEntryState.apGame.locationData(songNameThing).concat(APEntryState.apGame.noteData(songNameThing, modName));
590+
var isMissing:Bool = APEntryState.apGame.areLocationsMissing(locationIds);
575591
for (songName in curUnlocked.keys())
576592
{
577593
if (((songNameThing.trim().toLowerCase().replace('-', ' ') == songName.trim().toLowerCase().replace('-', ' ')) && leWeek.folder == curUnlocked.get(songName)) && !isMissing)
@@ -582,6 +598,9 @@ class FreeplayState extends MusicBeatState
582598
{
583599
if (APEntryState.inArchipelagoMode)
584600
{
601+
var songNameThing:String = song[0];
602+
var modName:String = leWeek.folder;
603+
var locationIds:Null<Array<Int>> = APEntryState.apGame.locationData(songNameThing).concat(APEntryState.apGame.noteData(songNameThing, modName));
585604
if (locationIds != null && locationIds.isNotEmpty())
586605
addSong(song[0], i, song[1], FlxColor.fromRGB(colors[0], colors[1], colors[2]));
587606
}

‎source/states/PlayState.hx‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -382,6 +382,7 @@ class PlayState extends MusicBeatState
382382
public var saveMod:String = ""; // The modifier that allows sperate saves depending how how you want to play the game
383383
public var lyrics:FlxText;
384384
public var rainIntensity:Float = 0;
385+
public var skipTxt:FlxText;
385386
var lastUpdateTime:Float = 0.0;
386387
var endingTimeLimit:Int = 20;
387388
var metadata:MetadataFile;
@@ -390,7 +391,6 @@ class PlayState extends MusicBeatState
390391
var whiteBG:FlxSprite;
391392
var needSkip:Bool = false;
392393
var skipActive:Bool = false;
393-
var skipText:FlxText;
394394
var skipTo:Float;
395395
var blackOverlay:FlxSprite;
396396
var blackUnderlay:FlxSprite;
@@ -2192,21 +2192,21 @@ class PlayState extends MusicBeatState
21922192
if (needSkip && !skipActive)
21932193
{
21942194
skipActive = true;
2195-
skipText = new FlxText(healthBar.x + 80, healthBar.y - 110, 500);
2196-
skipText.text = "Press Space to Skip Intro";
2197-
skipText.size = 30;
2198-
skipText.color = FlxColor.WHITE;
2199-
skipText.setBorderStyle(FlxTextBorderStyle.OUTLINE, FlxColor.BLACK, 2, 1);
2200-
skipText.cameras = [camHUD];
2201-
skipText.alpha = 0;
2202-
skipText.font = Paths.font('comboFont.ttf');
2203-
FlxTween.tween(skipText, {alpha: 1}, 0.2);
2204-
add(skipText);
2195+
skipTxt = new FlxText(healthBar.x + 80, healthBar.y - 110, 500);
2196+
skipTxt.text = "Press Space to Skip Intro";
2197+
skipTxt.size = 30;
2198+
skipTxt.color = FlxColor.WHITE;
2199+
skipTxt.setBorderStyle(FlxTextBorderStyle.OUTLINE, FlxColor.BLACK, 2, 1);
2200+
skipTxt.cameras = [camHUD];
2201+
skipTxt.alpha = 0;
2202+
skipTxt.font = Paths.font('comboFont.ttf');
2203+
FlxTween.tween(skipTxt, {alpha: 1}, 0.2);
2204+
add(skipTxt);
22052205
}
22062206
else
22072207
{
2208-
if (skipText != null)
2209-
FlxTween.tween(skipText, {alpha: 0}, 0.2);
2208+
if (skipTxt != null)
2209+
FlxTween.tween(skipTxt, {alpha: 0}, 0.2);
22102210
}
22112211

22122212
setOnScripts('songLength', songLength);
@@ -2450,7 +2450,7 @@ class PlayState extends MusicBeatState
24502450
}
24512451
return false;
24522452
})();
2453-
var apLoc = APNotes.filter(function(apNoteData) return apNoteData.index == i)[0].loc;
2453+
var apLoc = APNotes.filter(function(apNoteData) return apNoteData.index == i)[0]?.loc;
24542454
if (Math.isNaN(holdLength)) holdLength = 0.0;
24552455

24562456
if (chartModifier != "4K Only" && chartModifier != "ManiaConverter") {
@@ -3869,7 +3869,7 @@ class PlayState extends MusicBeatState
38693869

38703870
if (skipActive && Conductor.songPosition >= skipTo)
38713871
{
3872-
remove(skipText);
3872+
remove(skipTxt);
38733873
skipActive = false;
38743874
}
38753875

@@ -3892,10 +3892,10 @@ class PlayState extends MusicBeatState
38923892
opponentVocals.play();
38933893
gfVocals.time = Conductor.songPosition;
38943894
gfVocals.play();
3895-
FlxTween.tween(skipText, {alpha: 0}, 0.2, {
3895+
FlxTween.tween(skipTxt, {alpha: 0}, 0.2, {
38963896
onComplete: function(tw)
38973897
{
3898-
remove(skipText);
3898+
remove(skipTxt);
38993899
}
39003900
});
39013901
skipActive = false;

‎source/substates/RankingSubstate.hx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,7 @@ class RankingSubstate extends MusicBeatSubstate
192192
var locationId = (PlayState.SONG.song);
193193
trace('Combo Gotten:' + comboRankLimit + " Combo Required: " + comboRankSetLimit);
194194
trace('Accuracy Gotten:' + accRankLimit + " Accuracy Required: " + accRankSetLimit);
195+
195196
trace(archipelago.APPlayState.currentMod);
196197
if (archipelago.APPlayState.currentMod.trim() != "")
197198
{

0 commit comments

Comments
 (0)