diff --git a/mods/Friday Night Funkin'/data/song data/2hot/script.hx b/mods/Friday Night Funkin'/data/song data/2hot/script.hx index a36081d33c..7dc0d1cab3 100644 --- a/mods/Friday Night Funkin'/data/song data/2hot/script.hx +++ b/mods/Friday Night Funkin'/data/song data/2hot/script.hx @@ -81,12 +81,7 @@ function shootNextCan() { } function darkenStageProps() { - // Darken the background, then fade it back. - var dumb:Array = []; - for (penis in PlayState.instance.stage.stage_Objects) { - dumb.push(penis[1]); - } - for (stageProp in dumb) { + for (stageProp in PlayState.instance.stage.members) { // If not excluded, darken. stageProp.color = 0xFF111111; new FlxTimer().start(1 / 24, (tmr) -> { diff --git a/mods/Friday Night Funkin'/data/stage data/streets.hx b/mods/Friday Night Funkin'/data/stage data/streets.hx index a852506145..d0963b4a7f 100644 --- a/mods/Friday Night Funkin'/data/stage data/streets.hx +++ b/mods/Friday Night Funkin'/data/stage data/streets.hx @@ -113,12 +113,12 @@ function startCountdown() { } function createStage() { - scrollingSky = new FlxTiledSprite(Paths.image('phillyStreets/phillySkybox'), 2922, 718, true, false); + scrollingSky = new FlxTiledSprite(Paths.image('streets/phillySkybox', 'stages'), 2922, 718, true, false); scrollingSky.setPosition(-650, -375); scrollingSky.scrollFactor.set(0.1, 0.1); scrollingSky.scale.set(0.65, 0.65); - PlayState.instance.stage.add(scrollingSky); + PlayState.instance.stage.insert(0, scrollingSky); addProp(phillyTraffic_lightmap, 'phillyTraffic_lightmap'); addProp(phillyHighwayLights_lightmap, 'phillyHighwayLights_lightmap'); resetCar(true, true); diff --git a/source/game/graphics/ABotVis.hx b/source/game/graphics/ABotVis.hx index d62903f600..4d0b5d312a 100644 --- a/source/game/graphics/ABotVis.hx +++ b/source/game/graphics/ABotVis.hx @@ -62,29 +62,29 @@ class ABotVis extends FlxSpriteGroup //analyzer.maxDb = -35; } - override function draw() + override function update(elapsed:Float) { #if desktop if(FlxG.sound.music != null){ var levels = analyzer.getLevels(); - + var grp = group.members.length; var lvls = levels.length; for (i in 0...(grp > lvls ? lvls : grp)) - { - var animFrame:Int = Math.round(levels[i].value * 5 * FlxG.sound.volume); - animFrame = Math.floor(FlxMath.bound(animFrame, 0, 5)); - - //animFrame = Math.floor(Math.min(5, animFrame)); - //animFrame = Math.floor(Math.max(0, animFrame)); - + { + var animFrame:Int = Math.round(levels[i].value * 5 * FlxG.sound.volume); + animFrame = Math.floor(FlxMath.bound(animFrame, 0, 5)); + + //animFrame = Math.floor(Math.min(5, animFrame)); + //animFrame = Math.floor(Math.max(0, animFrame)); + animFrame = Std.int(Math.abs(animFrame - 5)); // shitty dumbass flip, cuz dave got da shit backwards lol! - + group.members[i].animation.curAnim.curFrame = animFrame; } - + } #end - super.draw(); + super.update(elapsed); } } \ No newline at end of file