Skip to content

Commit 48f226a

Browse files
committed
Merge branch 'Archipelago' of https://github.com/Z11Coding/Mixtape-Engine-Rework into Archipelago
2 parents 5c90836 + eb5bf34 commit 48f226a

File tree

1 file changed

+6
-8
lines changed

1 file changed

+6
-8
lines changed

source/archipelago/APPlayState.hx

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -290,12 +290,12 @@ class APPlayState extends PlayState {
290290
'spin' => function() {
291291
var ttl:Float = 15;
292292
var onEnd:(Void->Void) = function() {
293-
//modManager.setValue('roll', 0);
293+
modManager.setValue('roll', 0);
294294
};
295295
var playSound:String = "spin";
296296
var playSoundVol:Float = 1;
297297
var noIcon:Bool = false;
298-
//modManager.setValue('roll', (FlxG.random.bool() ? 1 : -1) * FlxG.random.float(333 * 0.8, 333 * 1.15));
298+
modManager.setValue('roll', (FlxG.random.bool() ? 1 : -1) * FlxG.random.float(333 * 0.8, 333 * 1.15));
299299
applyEffect(ttl, onEnd, playSound, playSoundVol, noIcon, 'spin');
300300
},
301301
'songslower' => function() {
@@ -586,13 +586,13 @@ class APPlayState extends PlayState {
586586
'ghost' => function() {
587587
var ttl:Float = 15;
588588
var onEnd:(Void->Void) = function() {
589-
//modManager.setValue('sudden', 0);
589+
modManager.setValue('sudden', 0);
590590
};
591591
var playSound:String = "ghost";
592592
var playSoundVol:Float = 0.5;
593593
var noIcon:Bool = false;
594594

595-
//modManager.setValue('sudden', 1);
595+
modManager.setValue('sudden', 1);
596596

597597
applyEffect(ttl, onEnd, playSound, playSoundVol, noIcon);
598598
},
@@ -798,7 +798,6 @@ class APPlayState extends PlayState {
798798
camAngle = 180;
799799
camHUD.angle = camAngle;
800800
camGame.angle = camAngle;
801-
802801
applyEffect(ttl, onEnd, playSound, playSoundVol, noIcon, 'flip');
803802
},
804803
'invuln' => function() {
@@ -869,7 +868,6 @@ class APPlayState extends PlayState {
869868
addNoteSvCLegacy(4, lastPoint, lastPoint, -1);
870869
},
871870
'randomize' => function() {
872-
/*
873871
var ttl:Float = 10;
874872
var availableS:String = "";
875873
switch (FlxG.random.bool(15)) {
@@ -889,7 +887,7 @@ class APPlayState extends PlayState {
889887
modManager.queueEase(curStep, curStep+3, availableS, .96, "sineInOut");
890888
trace(availableS);
891889

892-
applyEffect(ttl, onEnd, playSound, playSoundVol, noIcon, 'randomize');*/
890+
applyEffect(ttl, onEnd, playSound, playSoundVol, noIcon, 'randomize');
893891
},
894892
'randomizeAlt' => function() {
895893
var ttl:Float = 10;
@@ -1525,7 +1523,7 @@ class APPlayState extends PlayState {
15251523
{
15261524
timeTxt.y = (effectiveDownScroll ? FlxG.height - 44 : 19);
15271525
timeBar.y = (timeTxt.y + (timeTxt.height / 4)) + 4;
1528-
//modManager.queueEase(curStep, curStep+3, 'reverse', effectiveDownScroll ? 1 : 0, "sineInOut");
1526+
modManager.queueEase(curStep, curStep+3, 'reverse', effectiveDownScroll ? 1 : 0, "sineInOut");
15291527
healthBar.y = (effectiveDownScroll ? FlxG.height * 0.1 : FlxG.height * 0.875) + 4;
15301528
//healthBar2.y = (effectiveDownScroll ? FlxG.height * 0.1 : FlxG.height * 0.875) + 4;
15311529
iconP1.y = healthBar.y - (iconP1.height / 2);

0 commit comments

Comments
 (0)