AirDog46/Kade-Engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1735 from ArfieCat/master

Browse Source 
Fix null object reference when switching to pixel UI outside of school stages
This commit is contained in:
Kade M 2021-08-13 18:43:57 -07:00 committed by GitHub
commit e3e37d9d3d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
source/PlayState.hx
View File

@ -1438,21 +1438,17 @@ class PlayState extends MusicBeatState
var introAssets:Map<String, Array<String>> = new Map<String, Array<String>>();
introAssets.set('default', ['ready', "set", "go"]);
introAssets.set('school', ['weeb/pixelUI/ready-pixel', 'weeb/pixelUI/set-pixel', 'weeb/pixelUI/date-pixel']);
introAssets.set('schoolEvil', ['weeb/pixelUI/ready-pixel', 'weeb/pixelUI/set-pixel', 'weeb/pixelUI/date-pixel']);
introAssets.set('pixel', ['weeb/pixelUI/ready-pixel', 'weeb/pixelUI/set-pixel', 'weeb/pixelUI/date-pixel']);
var introAlts:Array<String> = introAssets.get('default');
var altSuffix:String = "";
var week6Bullshit:String = null;
for (value in introAssets.keys())
if (SONG.noteStyle == 'pixel')
{
if (value == curStage)
{
trace(value + " - " + curStage);
introAlts = introAssets.get(value);
if (curStage.contains('school'))
altSuffix = '-pixel';
}
introAlts = introAssets.get('pixel');
altSuffix = '-pixel';
week6Bullshit = 'week6';
}
switch (swagCounter)
@ -1461,11 +1457,11 @@ class PlayState extends MusicBeatState
case 0:
FlxG.sound.play(Paths.sound('intro3' + altSuffix), 0.6);
case 1:
var ready:FlxSprite = new FlxSprite().loadGraphic(Paths.image(introAlts[0]));
var ready:FlxSprite = new FlxSprite().loadGraphic(Paths.image(introAlts[0], week6Bullshit));
ready.scrollFactor.set();
ready.updateHitbox();
if (curStage.startsWith('school'))
if (SONG.noteStyle == 'pixel')
ready.setGraphicSize(Std.int(ready.width * daPixelZoom));
ready.screenCenter();
@ -1479,10 +1475,10 @@ class PlayState extends MusicBeatState
});
FlxG.sound.play(Paths.sound('intro2' + altSuffix), 0.6);
case 2:
var set:FlxSprite = new FlxSprite().loadGraphic(Paths.image(introAlts[1]));
var set:FlxSprite = new FlxSprite().loadGraphic(Paths.image(introAlts[1], week6Bullshit));
set.scrollFactor.set();
if (curStage.startsWith('school'))
if (SONG.noteStyle == 'pixel')
set.setGraphicSize(Std.int(set.width * daPixelZoom));
set.screenCenter();
@ -1496,10 +1492,10 @@ class PlayState extends MusicBeatState
});
FlxG.sound.play(Paths.sound('intro1' + altSuffix), 0.6);
case 3:
var go:FlxSprite = new FlxSprite().loadGraphic(Paths.image(introAlts[2]));
var go:FlxSprite = new FlxSprite().loadGraphic(Paths.image(introAlts[2], week6Bullshit));
go.scrollFactor.set();
if (curStage.startsWith('school'))
if (SONG.noteStyle == 'pixel')
go.setGraphicSize(Std.int(go.width * daPixelZoom));
go.updateHitbox();
@ -1997,7 +1993,7 @@ class PlayState extends MusicBeatState
switch (noteTypeCheck)
{
case 'pixel':
babyArrow.loadGraphic(Paths.image('weeb/pixelUI/arrows-pixels'), true, 17, 17);
babyArrow.loadGraphic(Paths.image('weeb/pixelUI/arrows-pixels', 'week6'), true, 17, 17);
babyArrow.animation.add('green', [6]);
babyArrow.animation.add('red', [7]);
babyArrow.animation.add('blue', [5]);
@ -3090,7 +3086,7 @@ class PlayState extends MusicBeatState
{
spr.animation.play('confirm', true);
}
if (spr.animation.curAnim.name == 'confirm' && !curStage.startsWith('school'))
if (spr.animation.curAnim.name == 'confirm' && SONG.noteStyle != 'pixel')
{
spr.centerOffsets();
spr.offset.x -= 13;
@ -3125,7 +3121,7 @@ class PlayState extends MusicBeatState
{
spr.animation.play('confirm', true);
}
if (spr.animation.curAnim.name == 'confirm' && !curStage.startsWith('school'))
if (spr.animation.curAnim.name == 'confirm' && SONG.noteStyle != 'pixel')
{
spr.centerOffsets();
spr.offset.x -= 13;
@ -3177,7 +3173,7 @@ class PlayState extends MusicBeatState
if (daNote.isSustainNote)
{
daNote.x += daNote.width / 2 + 20;
if (PlayState.curStage.startsWith('school'))
if (SONG.noteStyle == 'pixel')
daNote.x -= 11;
}
@ -3604,14 +3600,16 @@ class PlayState extends MusicBeatState
var pixelShitPart1:String = "";
var pixelShitPart2:String = '';
var pixelShitPart3:String = null;
if (curStage.startsWith('school'))
if (SONG.noteStyle == 'pixel')
{
pixelShitPart1 = 'weeb/pixelUI/';
pixelShitPart2 = '-pixel';
pixelShitPart3 = 'week6';
}
rating.loadGraphic(Paths.image(pixelShitPart1 + daRating + pixelShitPart2));
rating.loadGraphic(Paths.image(pixelShitPart1 + daRating + pixelShitPart2, pixelShitPart3));
rating.screenCenter();
rating.y -= 50;
rating.x = coolText.x - 125;
@ -3677,7 +3675,7 @@ class PlayState extends MusicBeatState
if (!PlayStateChangeables.botPlay || loadRep)
add(currentTimingShown);
var comboSpr:FlxSprite = new FlxSprite().loadGraphic(Paths.image(pixelShitPart1 + 'combo' + pixelShitPart2));
var comboSpr:FlxSprite = new FlxSprite().loadGraphic(Paths.image(pixelShitPart1 + 'combo' + pixelShitPart2, pixelShitPart3));
comboSpr.screenCenter();
comboSpr.x = rating.x;
comboSpr.y = rating.y + 100;
@ -3695,7 +3693,7 @@ class PlayState extends MusicBeatState
if (!PlayStateChangeables.botPlay || loadRep)
add(rating);
if (!curStage.startsWith('school'))
if (SONG.noteStyle != 'pixel')
{
rating.setGraphicSize(Std.int(rating.width * 0.7));
rating.antialiasing = FlxG.save.data.antialiasing;
@ -3741,13 +3739,13 @@ class PlayState extends MusicBeatState
var daLoop:Int = 0;
for (i in seperatedScore)
{
var numScore:FlxSprite = new FlxSprite().loadGraphic(Paths.image(pixelShitPart1 + 'num' + Std.int(i) + pixelShitPart2));
var numScore:FlxSprite = new FlxSprite().loadGraphic(Paths.image(pixelShitPart1 + 'num' + Std.int(i) + pixelShitPart2, pixelShitPart3));
numScore.screenCenter();
numScore.x = rating.x + (43 * daLoop) - 50;
numScore.y = rating.y + 100;
numScore.cameras = [camHUD];
if (!curStage.startsWith('school'))
if (SONG.noteStyle != 'pixel')
{
numScore.antialiasing = FlxG.save.data.antialiasing;
numScore.setGraphicSize(Std.int(numScore.width * 0.5));
@ -4029,7 +4027,7 @@ class PlayState extends MusicBeatState
{
spr.animation.play('confirm', true);
}
if (spr.animation.curAnim.name == 'confirm' && !curStage.startsWith('school'))
if (spr.animation.curAnim.name == 'confirm' && SONG.noteStyle != 'pixel')
{
spr.centerOffsets();
spr.offset.x -= 13;
@ -4058,7 +4056,7 @@ class PlayState extends MusicBeatState
if (!keys[spr.ID])
spr.animation.play('static', false);
if (spr.animation.curAnim.name == 'confirm' && !curStage.startsWith('school'))
if (spr.animation.curAnim.name == 'confirm' && SONG.noteStyle != 'pixel')
{
spr.centerOffsets();
spr.offset.x -= 13;