cowarin
/
Funkin
mirror of https://github.com/ninjamuffin99/Funkin.git
1
0
Fork 0
Code Issues Releases Wiki Activity

fix crash

This commit is contained in:
Cameron Taylor 2020-12-17 15:03:33 -05:00
parent 3493436364
commit c1a7259074
4 changed files with 4 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -6,6 +6,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [UNRELEASED]
### Fixed
- Crash when playing Week 3 and then playing a non-week 3 song
- When pausing music at the start, it doesn't continue the song anyways. ([shoutouts gedehari for the Pull Request!](https://github.com/ninjamuffin99/Funkin/pull/48))
- IDK i think backing out of song menu should play main menu songs again hehe ([shoutouts gedehari for the Pull Request!](https://github.com/ninjamuffin99/Funkin/pull/48))

BIN
assets/images/lucky_guitar_assets.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 622 KiB

123
assets/images/lucky_guitar_assets.xml
View File

@ -1,123 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<TextureAtlas imagePath="lucky_guitar_assets.png">
<!-- Created with Adobe Animate version 20.0.1.19255 -->
<!-- http://www.adobe.com/products/animate.html -->
<SubTexture name="lucky DOWN note0000" x="0" y="0" width="654" height="489" frameX="-258" frameY="-87" frameWidth="912" frameHeight="579"/>
<SubTexture name="lucky DOWN note0001" x="654" y="0" width="811" height="573" frameX="0" frameY="-6" frameWidth="912" frameHeight="579"/>
<SubTexture name="lucky DOWN note0002" x="654" y="0" width="811" height="573" frameX="0" frameY="-6" frameWidth="912" frameHeight="579"/>
<SubTexture name="lucky DOWN note0003" x="1465" y="0" width="664" height="533" frameX="-217" frameY="-42" frameWidth="912" frameHeight="579"/>
<SubTexture name="lucky DOWN note0004" x="1465" y="0" width="664" height="533" frameX="-217" frameY="-42" frameWidth="912" frameHeight="579"/>
<SubTexture name="lucky DOWN note0005" x="1465" y="0" width="664" height="533" frameX="-217" frameY="-42" frameWidth="912" frameHeight="579"/>
<SubTexture name="lucky DOWN note0006" x="2129" y="0" width="754" height="544" frameX="-136" frameY="-30" frameWidth="912" frameHeight="579"/>
<SubTexture name="lucky DOWN note0007" x="2129" y="0" width="754" height="544" frameX="-136" frameY="-30" frameWidth="912" frameHeight="579"/>
<SubTexture name="lucky DOWN note0008" x="2129" y="0" width="754" height="544" frameX="-136" frameY="-30" frameWidth="912" frameHeight="579"/>
<SubTexture name="lucky DOWN note0009" x="2883" y="0" width="667" height="519" frameX="-216" frameY="-55" frameWidth="912" frameHeight="579"/>
<SubTexture name="lucky DOWN note0010" x="2883" y="0" width="667" height="519" frameX="-216" frameY="-55" frameWidth="912" frameHeight="579"/>
<SubTexture name="lucky DOWN note0011" x="2883" y="0" width="667" height="519" frameX="-216" frameY="-55" frameWidth="912" frameHeight="579"/>
<SubTexture name="lucky DOWN note0012" x="0" y="573" width="736" height="575" frameX="-145" frameY="0" frameWidth="912" frameHeight="579"/>
<SubTexture name="lucky DOWN note0013" x="0" y="573" width="736" height="575" frameX="-145" frameY="0" frameWidth="912" frameHeight="579"/>
<SubTexture name="lucky DOWN note0014" x="0" y="573" width="736" height="575" frameX="-145" frameY="0" frameWidth="912" frameHeight="579"/>
<SubTexture name="lucky DOWN note0015" x="1465" y="0" width="664" height="533" frameX="-217" frameY="-42" frameWidth="912" frameHeight="579"/>
<SubTexture name="lucky DOWN note0016" x="1465" y="0" width="664" height="533" frameX="-217" frameY="-42" frameWidth="912" frameHeight="579"/>
<SubTexture name="lucky DOWN note0017" x="1465" y="0" width="664" height="533" frameX="-217" frameY="-42" frameWidth="912" frameHeight="579"/>
<SubTexture name="lucky DOWN note0018" x="0" y="573" width="736" height="575" frameX="-145" frameY="0" frameWidth="912" frameHeight="579"/>
<SubTexture name="lucky DOWN note0019" x="0" y="573" width="736" height="575" frameX="-145" frameY="0" frameWidth="912" frameHeight="579"/>
<SubTexture name="lucky DOWN note0020" x="0" y="573" width="736" height="575" frameX="-145" frameY="0" frameWidth="912" frameHeight="579"/>
<SubTexture name="lucky DOWN note0021" x="0" y="573" width="736" height="575" frameX="-145" frameY="0" frameWidth="912" frameHeight="579"/>
<SubTexture name="lucky DOWN note0022" x="0" y="573" width="736" height="575" frameX="-145" frameY="0" frameWidth="912" frameHeight="579"/>
<SubTexture name="lucky DOWN note0023" x="0" y="573" width="736" height="575" frameX="-145" frameY="0" frameWidth="912" frameHeight="579"/>
<SubTexture name="lucky DOWN note0024" x="0" y="573" width="736" height="575" frameX="-145" frameY="0" frameWidth="912" frameHeight="579"/>
<SubTexture name="lucky UP NOTE0000" x="3049" y="1721" width="767" height="575" frameX="-173" frameY="-9" frameWidth="953" frameHeight="625"/>
<SubTexture name="lucky UP NOTE0001" x="3049" y="1721" width="767" height="575" frameX="-173" frameY="-9" frameWidth="953" frameHeight="625"/>
<SubTexture name="lucky UP NOTE0002" x="0" y="2307" width="654" height="489" frameX="-286" frameY="-95" frameWidth="953" frameHeight="625"/>
<SubTexture name="lucky UP NOTE0003" x="0" y="2307" width="654" height="489" frameX="-286" frameY="-95" frameWidth="953" frameHeight="625"/>
<SubTexture name="lucky UP NOTE0004" x="654" y="2307" width="792" height="589" frameX="-40" frameY="0" frameWidth="953" frameHeight="625"/>
<SubTexture name="lucky UP NOTE0005" x="654" y="2307" width="792" height="589" frameX="-40" frameY="0" frameWidth="953" frameHeight="625"/>
<SubTexture name="lucky UP NOTE0006" x="1446" y="2307" width="878" height="572" frameX="0" frameY="-12" frameWidth="953" frameHeight="625"/>
<SubTexture name="lucky UP NOTE0007" x="1446" y="2307" width="878" height="572" frameX="0" frameY="-12" frameWidth="953" frameHeight="625"/>
<SubTexture name="lucky UP NOTE0008" x="2324" y="2307" width="847" height="572" frameX="-22" frameY="-14" frameWidth="953" frameHeight="625"/>
<SubTexture name="lucky UP NOTE0009" x="2324" y="2307" width="847" height="572" frameX="-22" frameY="-14" frameWidth="953" frameHeight="625"/>
<SubTexture name="lucky UP NOTE0010" x="3171" y="2307" width="811" height="574" frameX="-28" frameY="-14" frameWidth="953" frameHeight="625"/>
<SubTexture name="lucky UP NOTE0011" x="3171" y="2307" width="811" height="574" frameX="-28" frameY="-14" frameWidth="953" frameHeight="625"/>
<SubTexture name="lucky UP NOTE0012" x="0" y="2896" width="953" height="610" frameX="0" frameY="-15" frameWidth="953" frameHeight="625"/>
<SubTexture name="lucky UP NOTE0013" x="0" y="2896" width="953" height="610" frameX="0" frameY="-15" frameWidth="953" frameHeight="625"/>
<SubTexture name="lucky UP NOTE0014" x="953" y="2896" width="931" height="611" frameX="-22" frameY="-14" frameWidth="953" frameHeight="625"/>
<SubTexture name="lucky UP NOTE0015" x="953" y="2896" width="931" height="611" frameX="-22" frameY="-14" frameWidth="953" frameHeight="625"/>
<SubTexture name="lucky UP NOTE0016" x="953" y="2896" width="931" height="611" frameX="-22" frameY="-14" frameWidth="953" frameHeight="625"/>
<SubTexture name="lucky UP NOTE0017" x="953" y="2896" width="931" height="611" frameX="-22" frameY="-14" frameWidth="953" frameHeight="625"/>
<SubTexture name="lucky UP NOTE0018" x="953" y="2896" width="931" height="611" frameX="-22" frameY="-14" frameWidth="953" frameHeight="625"/>
<SubTexture name="lucky guitar idle0000" x="736" y="573" width="664" height="533" frameX="-72" frameY="-42" frameWidth="751" frameHeight="575"/>
<SubTexture name="lucky guitar idle0001" x="736" y="573" width="664" height="533" frameX="-72" frameY="-42" frameWidth="751" frameHeight="575"/>
<SubTexture name="lucky guitar idle0002" x="1400" y="573" width="736" height="575" frameX="0" frameY="0" frameWidth="751" frameHeight="575"/>
<SubTexture name="lucky guitar idle0003" x="1400" y="573" width="736" height="575" frameX="0" frameY="0" frameWidth="751" frameHeight="575"/>
<SubTexture name="lucky guitar idle0004" x="2136" y="573" width="638" height="482" frameX="-113" frameY="-87" frameWidth="751" frameHeight="575"/>
<SubTexture name="lucky guitar idle0005" x="2136" y="573" width="638" height="482" frameX="-113" frameY="-87" frameWidth="751" frameHeight="575"/>
<SubTexture name="lucky guitar idle0006" x="2774" y="573" width="679" height="527" frameX="-72" frameY="-42" frameWidth="751" frameHeight="575"/>
<SubTexture name="lucky guitar idle0007" x="2774" y="573" width="679" height="527" frameX="-72" frameY="-42" frameWidth="751" frameHeight="575"/>
<SubTexture name="lucky guitar idle0008" x="0" y="1148" width="730" height="573" frameX="0" frameY="0" frameWidth="751" frameHeight="575"/>
<SubTexture name="lucky guitar idle0009" x="0" y="1148" width="730" height="573" frameX="0" frameY="0" frameWidth="751" frameHeight="575"/>
<SubTexture name="lucky guitar idle0010" x="730" y="1148" width="617" height="486" frameX="-113" frameY="-87" frameWidth="751" frameHeight="575"/>
<SubTexture name="lucky guitar idle0011" x="730" y="1148" width="617" height="486" frameX="-113" frameY="-87" frameWidth="751" frameHeight="575"/>
<SubTexture name="lucky guitar idle0012" x="736" y="573" width="664" height="533" frameX="-72" frameY="-42" frameWidth="751" frameHeight="575"/>
<SubTexture name="lucky guitar idle0013" x="736" y="573" width="664" height="533" frameX="-72" frameY="-42" frameWidth="751" frameHeight="575"/>
<SubTexture name="lucky guitar idle0014" x="1400" y="573" width="736" height="575" frameX="0" frameY="0" frameWidth="751" frameHeight="575"/>
<SubTexture name="lucky guitar idle0015" x="1400" y="573" width="736" height="575" frameX="0" frameY="0" frameWidth="751" frameHeight="575"/>
<SubTexture name="lucky guitar idle0016" x="2136" y="573" width="638" height="482" frameX="-113" frameY="-87" frameWidth="751" frameHeight="575"/>
<SubTexture name="lucky guitar idle0017" x="2136" y="573" width="638" height="482" frameX="-113" frameY="-87" frameWidth="751" frameHeight="575"/>
<SubTexture name="lucky guitar idle0018" x="2774" y="573" width="679" height="527" frameX="-72" frameY="-42" frameWidth="751" frameHeight="575"/>
<SubTexture name="lucky guitar idle0019" x="2774" y="573" width="679" height="527" frameX="-72" frameY="-42" frameWidth="751" frameHeight="575"/>
<SubTexture name="lucky guitar idle0020" x="0" y="1148" width="730" height="573" frameX="0" frameY="0" frameWidth="751" frameHeight="575"/>
<SubTexture name="lucky guitar idle0021" x="0" y="1148" width="730" height="573" frameX="0" frameY="0" frameWidth="751" frameHeight="575"/>
<SubTexture name="lucky guitar idle0022" x="1347" y="1148" width="617" height="486" frameX="-113" frameY="-87" frameWidth="751" frameHeight="575"/>
<SubTexture name="lucky guitar idle0023" x="1347" y="1148" width="617" height="486" frameX="-113" frameY="-87" frameWidth="751" frameHeight="575"/>
<SubTexture name="lucky guitar idle0024" x="736" y="573" width="664" height="533" frameX="-72" frameY="-42" frameWidth="751" frameHeight="575"/>
<SubTexture name="lucky guitar idle0025" x="736" y="573" width="664" height="533" frameX="-72" frameY="-42" frameWidth="751" frameHeight="575"/>
<SubTexture name="lucky guitar idle0026" x="1400" y="573" width="736" height="575" frameX="0" frameY="0" frameWidth="751" frameHeight="575"/>
<SubTexture name="lucky guitar idle0027" x="1400" y="573" width="736" height="575" frameX="0" frameY="0" frameWidth="751" frameHeight="575"/>
<SubTexture name="lucky guitar idle0028" x="2136" y="573" width="638" height="482" frameX="-113" frameY="-87" frameWidth="751" frameHeight="575"/>
<SubTexture name="lucky guitar idle0029" x="2136" y="573" width="638" height="482" frameX="-113" frameY="-87" frameWidth="751" frameHeight="575"/>
<SubTexture name="lucky guitar idle0030" x="2774" y="573" width="679" height="527" frameX="-72" frameY="-42" frameWidth="751" frameHeight="575"/>
<SubTexture name="lucky guitar idle0031" x="2774" y="573" width="679" height="527" frameX="-72" frameY="-42" frameWidth="751" frameHeight="575"/>
<SubTexture name="lucky guitar idle0032" x="1964" y="1148" width="730" height="573" frameX="0" frameY="0" frameWidth="751" frameHeight="575"/>
<SubTexture name="lucky guitar idle0033" x="1964" y="1148" width="730" height="573" frameX="0" frameY="0" frameWidth="751" frameHeight="575"/>
<SubTexture name="lucky guitar idle0034" x="2694" y="1148" width="617" height="486" frameX="-113" frameY="-87" frameWidth="751" frameHeight="575"/>
<SubTexture name="lucky guitar idle0035" x="2694" y="1148" width="617" height="486" frameX="-113" frameY="-87" frameWidth="751" frameHeight="575"/>
<SubTexture name="lucky sing left0000" x="3049" y="1721" width="767" height="575" frameX="-173" frameY="-9" frameWidth="953" frameHeight="625"/>
<SubTexture name="lucky sing left0001" x="3049" y="1721" width="767" height="575" frameX="-173" frameY="-9" frameWidth="953" frameHeight="625"/>
<SubTexture name="lucky sing left0002" x="0" y="2307" width="654" height="489" frameX="-286" frameY="-95" frameWidth="953" frameHeight="625"/>
<SubTexture name="lucky sing left0003" x="0" y="2307" width="654" height="489" frameX="-286" frameY="-95" frameWidth="953" frameHeight="625"/>
<SubTexture name="lucky sing left0004" x="654" y="2307" width="792" height="589" frameX="-40" frameY="0" frameWidth="953" frameHeight="625"/>
<SubTexture name="lucky sing left0005" x="654" y="2307" width="792" height="589" frameX="-40" frameY="0" frameWidth="953" frameHeight="625"/>
<SubTexture name="lucky sing left0006" x="1446" y="2307" width="878" height="572" frameX="0" frameY="-12" frameWidth="953" frameHeight="625"/>
<SubTexture name="lucky sing left0007" x="1446" y="2307" width="878" height="572" frameX="0" frameY="-12" frameWidth="953" frameHeight="625"/>
<SubTexture name="lucky sing left0008" x="2324" y="2307" width="847" height="572" frameX="-22" frameY="-14" frameWidth="953" frameHeight="625"/>
<SubTexture name="lucky sing left0009" x="2324" y="2307" width="847" height="572" frameX="-22" frameY="-14" frameWidth="953" frameHeight="625"/>
<SubTexture name="lucky sing left0010" x="3171" y="2307" width="811" height="574" frameX="-28" frameY="-14" frameWidth="953" frameHeight="625"/>
<SubTexture name="lucky sing left0011" x="3171" y="2307" width="811" height="574" frameX="-28" frameY="-14" frameWidth="953" frameHeight="625"/>
<SubTexture name="lucky sing left0012" x="0" y="2896" width="953" height="610" frameX="0" frameY="-15" frameWidth="953" frameHeight="625"/>
<SubTexture name="lucky sing left0013" x="0" y="2896" width="953" height="610" frameX="0" frameY="-15" frameWidth="953" frameHeight="625"/>
<SubTexture name="lucky sing left0014" x="953" y="2896" width="931" height="611" frameX="-22" frameY="-14" frameWidth="953" frameHeight="625"/>
<SubTexture name="lucky sing left0015" x="953" y="2896" width="931" height="611" frameX="-22" frameY="-14" frameWidth="953" frameHeight="625"/>
<SubTexture name="lucky sing left0016" x="953" y="2896" width="931" height="611" frameX="-22" frameY="-14" frameWidth="953" frameHeight="625"/>
<SubTexture name="lucky sing left0017" x="953" y="2896" width="931" height="611" frameX="-22" frameY="-14" frameWidth="953" frameHeight="625"/>
<SubTexture name="lucky sing left0018" x="953" y="2896" width="931" height="611" frameX="-22" frameY="-14" frameWidth="953" frameHeight="625"/>
<SubTexture name="lucky sing right0000" x="3049" y="1721" width="767" height="575" frameX="-173" frameY="-9" frameWidth="953" frameHeight="625"/>
<SubTexture name="lucky sing right0001" x="3049" y="1721" width="767" height="575" frameX="-173" frameY="-9" frameWidth="953" frameHeight="625"/>
<SubTexture name="lucky sing right0002" x="0" y="2307" width="654" height="489" frameX="-286" frameY="-95" frameWidth="953" frameHeight="625"/>
<SubTexture name="lucky sing right0003" x="0" y="2307" width="654" height="489" frameX="-286" frameY="-95" frameWidth="953" frameHeight="625"/>
<SubTexture name="lucky sing right0004" x="654" y="2307" width="792" height="589" frameX="-40" frameY="0" frameWidth="953" frameHeight="625"/>
<SubTexture name="lucky sing right0005" x="654" y="2307" width="792" height="589" frameX="-40" frameY="0" frameWidth="953" frameHeight="625"/>
<SubTexture name="lucky sing right0006" x="1446" y="2307" width="878" height="572" frameX="0" frameY="-12" frameWidth="953" frameHeight="625"/>
<SubTexture name="lucky sing right0007" x="1446" y="2307" width="878" height="572" frameX="0" frameY="-12" frameWidth="953" frameHeight="625"/>
<SubTexture name="lucky sing right0008" x="2324" y="2307" width="847" height="572" frameX="-22" frameY="-14" frameWidth="953" frameHeight="625"/>
<SubTexture name="lucky sing right0009" x="2324" y="2307" width="847" height="572" frameX="-22" frameY="-14" frameWidth="953" frameHeight="625"/>
<SubTexture name="lucky sing right0010" x="3171" y="2307" width="811" height="574" frameX="-28" frameY="-14" frameWidth="953" frameHeight="625"/>
<SubTexture name="lucky sing right0011" x="3171" y="2307" width="811" height="574" frameX="-28" frameY="-14" frameWidth="953" frameHeight="625"/>
<SubTexture name="lucky sing right0012" x="0" y="2896" width="953" height="610" frameX="0" frameY="-15" frameWidth="953" frameHeight="625"/>
<SubTexture name="lucky sing right0013" x="0" y="2896" width="953" height="610" frameX="0" frameY="-15" frameWidth="953" frameHeight="625"/>
<SubTexture name="lucky sing right0014" x="953" y="2896" width="931" height="611" frameX="-22" frameY="-14" frameWidth="953" frameHeight="625"/>
<SubTexture name="lucky sing right0015" x="953" y="2896" width="931" height="611" frameX="-22" frameY="-14" frameWidth="953" frameHeight="625"/>
<SubTexture name="lucky sing right0016" x="953" y="2896" width="931" height="611" frameX="-22" frameY="-14" frameWidth="953" frameHeight="625"/>
<SubTexture name="lucky sing right0017" x="953" y="2896" width="931" height="611" frameX="-22" frameY="-14" frameWidth="953" frameHeight="625"/>
<SubTexture name="lucky sing right0018" x="953" y="2896" width="931" height="611" frameX="-22" frameY="-14" frameWidth="953" frameHeight="625"/>
</TextureAtlas>

3
source/PlayState.hx
View File

@ -135,6 +135,7 @@ class PlayState extends MusicBeatState
if (SONG.song.toLowerCase() == 'spookeez' || SONG.song.toLowerCase() == 'monster' || SONG.song.toLowerCase() == 'south')
{
curState = "spooky";
halloweenLevel = true;
var hallowTex = FlxAtlasFrames.fromSparrow(AssetPaths.halloween_bg__png, AssetPaths.halloween_bg__xml);
@ -192,6 +193,7 @@ class PlayState extends MusicBeatState
}
else
{
curStage = 'stage';
var bg:FlxSprite = new FlxSprite(-600, -200).loadGraphic(AssetPaths.stageback__png);
// bg.setGraphicSize(Std.int(bg.width * 2.5));
// bg.updateHitbox();
@ -974,6 +976,7 @@ class PlayState extends MusicBeatState
trace(PlayState.storyPlaylist[0].toLowerCase() + difficulty);
PlayState.SONG = Song.loadFromJson(PlayState.storyPlaylist[0].toLowerCase() + difficulty, PlayState.storyPlaylist[0]);
FlxG.sound.music.stop();
FlxG.switchState(new PlayState());
}
}