Skip to content

Commit dfedee6

Browse files
committed
I love indie cross
and there's other stuff too
1 parent efb12a9 commit dfedee6

File tree

4 files changed

+29
-16
lines changed

4 files changed

+29
-16
lines changed

source/archipelago/APPlayState.hx

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -184,15 +184,15 @@ class APPlayState extends PlayState {
184184
'colorblind' => function() {
185185
var ttl:Float = 16;
186186
var onEnd:(Void->Void) = function() {
187-
camHUDfilters.remove(filterMap.get("Grayscale").filter);
188-
camGamefilters.remove(filterMap.get("Grayscale").filter);
187+
camHUD.filters.remove(filterMap.get("Grayscale").filter);
188+
camGame.filters.remove(filterMap.get("Grayscale").filter);
189189
};
190190
var playSound:String = "colorblind";
191191
var playSoundVol:Float = 0.8;
192192
var noIcon:Bool = false;
193193

194-
camHUDfilters.push(filterMap.get("Grayscale").filter);
195-
camGamefilters.push(filterMap.get("Grayscale").filter);
194+
camGame.filters.push(filterMap.get("Grayscale").filter);
195+
camGame.filters.push(filterMap.get("Grayscale").filter);
196196

197197
applyEffect(ttl, onEnd, playSound, playSoundVol, noIcon, 'colorblind');
198198
},
@@ -304,12 +304,12 @@ class APPlayState extends PlayState {
304304
'spin' => function() {
305305
var ttl:Float = 15;
306306
var onEnd:(Void->Void) = function() {
307-
modManager.setValue('roll', 0);
307+
modManager.setValue('twirl', 0);
308308
};
309309
var playSound:String = "spin";
310310
var playSoundVol:Float = 1;
311311
var noIcon:Bool = false;
312-
modManager.setValue('roll', (FlxG.random.bool() ? 1 : -1) * FlxG.random.float(333 * 0.8, 333 * 1.15));
312+
modManager.setValue('twirl', 1);
313313
applyEffect(ttl, onEnd, playSound, playSoundVol, noIcon, 'spin');
314314
},
315315
'songslower' => function() {
@@ -1982,6 +1982,7 @@ class APPlayState extends PlayState {
19821982
super.update(elapsed);
19831983
}
19841984

1985+
var alreadySent:Bool = false;
19851986
override function doDeathCheck(?skipHealthCheck:Bool = false):Bool
19861987
{
19871988
if (activeItems[0] <= 0)
@@ -1996,8 +1997,10 @@ class APPlayState extends PlayState {
19961997
noiseSound.pause();
19971998
}
19981999
}
1999-
if (health <= 0 && bfkilledcheck && !deathByLink)
2000+
if (health <= 0 && bfkilledcheck && !deathByLink && !alreadySent) {
2001+
alreadySent = true; // because indie cross likes to spam this every frame for some reason
20002002
APEntryState.apGame.info().sendDeathLink(COD.COD);
2003+
}
20012004
super.doDeathCheck();
20022005
return true;
20032006
}

source/states/FirstCheckState.hx

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,12 @@ class FirstCheckState extends MusicBeatState
158158
trace('versions arent matching!');
159159
MusicBeatState.switchState(new states.OutdatedState());
160160
}
161-
else FlxG.switchState(new APCheckState());
161+
else {
162+
if (ClientPrefs.data.checkAPWorld)
163+
FlxG.switchState(new APCheckState());
164+
else
165+
FlxG.switchState(new states.SplashScreen());
166+
}
162167
}
163168

164169
http.onError = function(error)
@@ -255,7 +260,12 @@ class FirstCheckState extends MusicBeatState
255260
trace('versions arent matching!');
256261
MusicBeatState.switchState(new states.OutdatedState());
257262
}
258-
else FlxG.switchState(new APCheckState());
263+
else {
264+
if (ClientPrefs.data.checkAPWorld)
265+
FlxG.switchState(new APCheckState());
266+
else
267+
FlxG.switchState(new states.SplashScreen());
268+
}
259269
}
260270

261271
http.onError = function(error)

source/states/FreeplayState.hx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -527,7 +527,7 @@ class FreeplayState extends MusicBeatState
527527
{
528528
colors = [146, 113, 253];
529529
}
530-
if ((ClientPrefs.data.showMods && leWeek.folder.toLowerCase() == CategoryState.loadWeekForce.toLowerCase()) || (CategoryState.loadWeekForce == "all" && (leWeek.folder != '' || leWeek.folder != null)))
530+
if ((ClientPrefs.data.showMods && leWeek.folder.toLowerCase() == CategoryState.loadWeekForce.toLowerCase()) || (CategoryState.loadWeekForce == "all" && (leWeek.folder != '' || leWeek.folder != null) && !APEntryState.inArchipelagoMode))
531531
{
532532
addSong(song[0], i, song[1], FlxColor.fromRGB(colors[0], colors[1], colors[2]));
533533
}

source/states/PlayState.hx

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3820,7 +3820,7 @@ class PlayState extends MusicBeatState
38203820

38213821
super.update(elapsed);
38223822
vocals.volume *= vocalVolumeMultiplier;
3823-
FlxG.sound.music.volume *= instVolumeMultiplier;
3823+
FlxG.sound.music.volume = 1 * instVolumeMultiplier;
38243824
updateVisualPosition();
38253825
modManager.update(elapsed, curDecBeat, curDecStep);
38263826

@@ -4232,7 +4232,7 @@ class PlayState extends MusicBeatState
42324232
case SINGLE:
42334233
iconP1.animation.curAnim.curFrame = 0;
42344234
case WINNING:
4235-
iconP1.animation.curAnim.curFrame = (healthBar.percent > 80 ? 2 : (healthBar.percent < 20 ? 1 : 0));
4235+
iconP1.animation.curAnim.curFrame = (healthBar.percent > 80 ? 0 : (healthBar.percent < 20 ? 2 : 0));
42364236
default:
42374237
iconP1.animation.curAnim.curFrame = (healthBar.percent < 20 ? 1 : 0);
42384238
}
@@ -5676,7 +5676,7 @@ class PlayState extends MusicBeatState
56765676
public var totalPlayed:Int = 0;
56775677
public var totalNotesHit:Float = 0.0;
56785678

5679-
public var showCombo:Bool = false;
5679+
public var showCombo:Bool = true;
56805680
public var showComboNum:Bool = true;
56815681
public var showRating:Bool = true;
56825682

@@ -5831,7 +5831,7 @@ class PlayState extends MusicBeatState
58315831
if(showComboNum)
58325832
comboGroup.add(numScore);
58335833

5834-
FlxTween.tween(numScore, {alpha: 0}, 0.2 / playbackRate, {
5834+
FlxTween.tween(numScore, {alpha: 0, angle: FlxG.random.int(-25, 25)}, 0.2 / playbackRate, {
58355835
onComplete: function(tween:FlxTween)
58365836
{
58375837
numScore.destroy();
@@ -5843,11 +5843,11 @@ class PlayState extends MusicBeatState
58435843
if(numScore.x > xThing) xThing = numScore.x;
58445844
}
58455845
comboSpr.x = xThing + 50;
5846-
FlxTween.tween(rating, {alpha: 0}, 0.2 / playbackRate, {
5846+
FlxTween.tween(rating, {alpha: 0, angle: FlxG.random.int(-25, 25)}, 0.2 / playbackRate, {
58475847
startDelay: Conductor.crochet * 0.001 / playbackRate
58485848
});
58495849

5850-
FlxTween.tween(comboSpr, {alpha: 0}, 0.2 / playbackRate, {
5850+
FlxTween.tween(comboSpr, {alpha: 0, angle: FlxG.random.int(-25, 25)}, 0.2 / playbackRate, {
58515851
onComplete: function(tween:FlxTween)
58525852
{
58535853
comboSpr.destroy();

0 commit comments

Comments
 (0)