From b3ec450352f8bec01163064195e41e29d7d7fa1a Mon Sep 17 00:00:00 2001
From: Cameron Taylor <cameron.taylor.ninja@gmail.com>
Date: Fri, 12 Feb 2021 01:20:20 -0500
Subject: [PATCH] more seamless storymode transitions
---
CHANGELOG.md | 3 +++
source/MainMenuState.hx | 4 ++++
source/PauseSubState.hx | 1 +
source/PlayState.hx | 39 +++++++++++++++++----------------------
source/StoryMenuState.hx | 4 ++++
5 files changed, 29 insertions(+), 22 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 66c4e9db8..85f61e9a0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,8 +5,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## [unreleased]
+### Changed
+- Made the transitions between the story mode levels more seamless.
### Fixed
- Chart's and chart editor now support changeBPM, GOD BLESS MTH FOR THIS ONE I BEEN STRUGGLIN WIT THAT SINCE OCTOBER LMAO ([GOD BLESS MTH](https://github.com/ninjamuffin99/Funkin/pull/382))
+- Antialiasing on the skyscraper lights
## [0.2.7] - 2021-02-02
### Added
diff --git a/source/MainMenuState.hx b/source/MainMenuState.hx
index e1a1db228..f686c51ce 100644
--- a/source/MainMenuState.hx
+++ b/source/MainMenuState.hx
@@ -3,6 +3,7 @@ package;
import flixel.FlxG;
import flixel.FlxObject;
import flixel.FlxSprite;
+import flixel.addons.transition.FlxTransitionableState;
import flixel.effects.FlxFlicker;
import flixel.graphics.frames.FlxAtlasFrames;
import flixel.group.FlxGroup.FlxTypedGroup;
@@ -32,6 +33,9 @@ class MainMenuState extends MusicBeatState
override function create()
{
+ transIn = FlxTransitionableState.defaultTransIn;
+ transOut = FlxTransitionableState.defaultTransOut;
+
if (!FlxG.sound.music.playing)
{
FlxG.sound.playMusic('assets/music/freakyMenu' + TitleState.soundExt);
diff --git a/source/PauseSubState.hx b/source/PauseSubState.hx
index ac747dbca..928d32ac1 100644
--- a/source/PauseSubState.hx
+++ b/source/PauseSubState.hx
@@ -4,6 +4,7 @@ import Controls.Control;
import flixel.FlxG;
import flixel.FlxSprite;
import flixel.FlxSubState;
+import flixel.addons.transition.FlxTransitionableState;
import flixel.group.FlxGroup.FlxTypedGroup;
import flixel.input.keyboard.FlxKey;
import flixel.system.FlxSound;
diff --git a/source/PlayState.hx b/source/PlayState.hx
index 3432630a7..cb4f4876b 100644
--- a/source/PlayState.hx
+++ b/source/PlayState.hx
@@ -211,6 +211,7 @@ class PlayState extends MusicBeatState
light.visible = false;
light.setGraphicSize(Std.int(light.width * 0.85));
light.updateHitbox();
+ light.antialiasing = true;
phillyCityLights.add(light);
}
@@ -485,8 +486,6 @@ class PlayState extends MusicBeatState
defaultCamZoom = 0.9;
curStage = 'stage';
var bg:FlxSprite = new FlxSprite(-600, -200).loadGraphic('assets/images/stageback.png');
- // bg.setGraphicSize(Std.int(bg.width * 2.5));
- // bg.updateHitbox();
bg.antialiasing = true;
bg.scrollFactor.set(0.9, 0.9);
bg.active = false;
@@ -516,9 +515,7 @@ class PlayState extends MusicBeatState
{
case 'limo':
gfVersion = 'gf-car';
- case 'mall':
- gfVersion = 'gf-christmas';
- case 'mallEvil':
+ case 'mall' | 'mallEvil':
gfVersion = 'gf-christmas';
case 'school':
gfVersion = 'gf-pixel';
@@ -772,6 +769,7 @@ class PlayState extends MusicBeatState
senpaiEvil.frames = FlxAtlasFrames.fromSparrow('assets/images/weeb/senpaiCrazy.png', 'assets/images/weeb/senpaiCrazy.xml');
senpaiEvil.animation.addByPrefix('idle', 'Senpai Pre Explosion', 24, false);
senpaiEvil.setGraphicSize(Std.int(senpaiEvil.width * 6));
+ senpaiEvil.scrollFactor.set();
senpaiEvil.updateHitbox();
senpaiEvil.screenCenter();
@@ -1158,9 +1156,12 @@ class PlayState extends MusicBeatState
babyArrow.updateHitbox();
babyArrow.scrollFactor.set();
- babyArrow.y -= 10;
- babyArrow.alpha = 0;
- FlxTween.tween(babyArrow, {y: babyArrow.y + 10, alpha: 1}, 1, {ease: FlxEase.circOut, startDelay: 0.5 + (0.2 * i)});
+ if (!isStoryMode)
+ {
+ babyArrow.y -= 10;
+ babyArrow.alpha = 0;
+ FlxTween.tween(babyArrow, {y: babyArrow.y + 10, alpha: 1}, 1, {ease: FlxEase.circOut, startDelay: 0.5 + (0.2 * i)});
+ }
babyArrow.ID = i;
@@ -1412,7 +1413,6 @@ class PlayState extends MusicBeatState
FlxG.watch.addQuick("beatShit", curBeat);
FlxG.watch.addQuick("stepShit", curStep);
-
if (curSong == 'Fresh')
{
switch (curBeat)
@@ -1514,8 +1514,6 @@ class PlayState extends MusicBeatState
altAnim = '-alt';
}
- trace("DA ALT THO?: " + SONG.notes[Math.floor(curStep / 16)].altAnim);
-
switch (Math.abs(daNote.noteData))
{
case 2:
@@ -1592,6 +1590,9 @@ class PlayState extends MusicBeatState
{
FlxG.sound.playMusic('assets/music/freakyMenu' + TitleState.soundExt);
+ transIn = FlxTransitionableState.defaultTransIn;
+ transOut = FlxTransitionableState.defaultTransOut;
+
FlxG.switchState(new StoryMenuState());
// if ()
@@ -1630,20 +1631,14 @@ class PlayState extends MusicBeatState
FlxG.sound.play('assets/sounds/Lights_Shut_off' + TitleState.soundExt);
}
- if (SONG.song.toLowerCase() == 'senpai')
- {
- transIn = null;
- transOut = null;
- prevCamFollow = camFollow;
- }
+ FlxTransitionableState.skipNextTransIn = true;
+ FlxTransitionableState.skipNextTransOut = true;
+ prevCamFollow = camFollow;
PlayState.SONG = Song.loadFromJson(PlayState.storyPlaylist[0].toLowerCase() + difficulty, PlayState.storyPlaylist[0]);
FlxG.sound.music.stop();
FlxG.switchState(new PlayState());
-
- transIn = FlxTransitionableState.defaultTransIn;
- transOut = FlxTransitionableState.defaultTransOut;
}
}
else
@@ -2237,8 +2232,8 @@ class PlayState extends MusicBeatState
Conductor.changeBPM(SONG.notes[Math.floor(curStep / 16)].bpm);
FlxG.log.add('CHANGED BPM!');
}
- //else
- //Conductor.changeBPM(SONG.bpm);
+ // else
+ // Conductor.changeBPM(SONG.bpm);
// Dad doesnt interupt his own notes
if (SONG.notes[Math.floor(curStep / 16)].mustHitSection)
diff --git a/source/StoryMenuState.hx b/source/StoryMenuState.hx
index d5787c526..f0a4e888a 100644
--- a/source/StoryMenuState.hx
+++ b/source/StoryMenuState.hx
@@ -2,6 +2,7 @@ package;
import flixel.FlxG;
import flixel.FlxSprite;
+import flixel.addons.transition.FlxTransitionableState;
import flixel.graphics.frames.FlxAtlasFrames;
import flixel.group.FlxGroup.FlxTypedGroup;
import flixel.group.FlxGroup;
@@ -69,6 +70,9 @@ class StoryMenuState extends MusicBeatState
override function create()
{
+ transIn = FlxTransitionableState.defaultTransIn;
+ transOut = FlxTransitionableState.defaultTransOut;
+
if (FlxG.sound.music != null)
{
if (!FlxG.sound.music.playing)