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

make pixel notes check notestyle not stage

Browse Source
This commit is contained in:
ArfieCat 2021-08-13 17:50:36 -07:00
parent c3020d9dff
commit 5f4dc939b9
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

@ -1436,21 +1436,17 @@ class PlayState extends MusicBeatState
var introAssets:Map<String, Array<String>> = new Map<String, Array<String>>(); var introAssets:Map<String, Array<String>> = new Map<String, Array<String>>();
introAssets.set('default', ['ready', "set", "go"]); introAssets.set('default', ['ready', "set", "go"]);
introAssets.set('school', ['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']);
introAssets.set('schoolEvil', ['weeb/pixelUI/ready-pixel', 'weeb/pixelUI/set-pixel', 'weeb/pixelUI/date-pixel']);
var introAlts:Array<String> = introAssets.get('default'); var introAlts:Array<String> = introAssets.get('default');
var altSuffix:String = ""; var altSuffix:String = "";
var week6Bullshit:String = null;
for (value in introAssets.keys()) if (SONG.noteStyle == 'pixel')
{ {
if (value == curStage) introAlts = introAssets.get('pixel');
{ altSuffix = '-pixel';
trace(value + " - " + curStage); week6Bullshit = 'week6';
introAlts = introAssets.get(value);
if (curStage.contains('school'))
altSuffix = '-pixel';
}
} }
switch (swagCounter) switch (swagCounter)
@ -1459,11 +1455,11 @@ class PlayState extends MusicBeatState
case 0: case 0:
FlxG.sound.play(Paths.sound('intro3' + altSuffix), 0.6); FlxG.sound.play(Paths.sound('intro3' + altSuffix), 0.6);
case 1: 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.scrollFactor.set();
ready.updateHitbox(); ready.updateHitbox();
if (curStage.startsWith('school')) if (SONG.noteStyle == 'pixel')
ready.setGraphicSize(Std.int(ready.width * daPixelZoom)); ready.setGraphicSize(Std.int(ready.width * daPixelZoom));
ready.screenCenter(); ready.screenCenter();
@ -1477,10 +1473,10 @@ class PlayState extends MusicBeatState
}); });
FlxG.sound.play(Paths.sound('intro2' + altSuffix), 0.6); FlxG.sound.play(Paths.sound('intro2' + altSuffix), 0.6);
case 2: 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(); set.scrollFactor.set();
if (curStage.startsWith('school')) if (SONG.noteStyle == 'pixel')
set.setGraphicSize(Std.int(set.width * daPixelZoom)); set.setGraphicSize(Std.int(set.width * daPixelZoom));
set.screenCenter(); set.screenCenter();
@ -1494,10 +1490,10 @@ class PlayState extends MusicBeatState
}); });
FlxG.sound.play(Paths.sound('intro1' + altSuffix), 0.6); FlxG.sound.play(Paths.sound('intro1' + altSuffix), 0.6);
case 3: 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(); go.scrollFactor.set();
if (curStage.startsWith('school')) if (SONG.noteStyle == 'pixel')
go.setGraphicSize(Std.int(go.width * daPixelZoom)); go.setGraphicSize(Std.int(go.width * daPixelZoom));
go.updateHitbox(); go.updateHitbox();
@ -1995,7 +1991,7 @@ class PlayState extends MusicBeatState
switch (noteTypeCheck) switch (noteTypeCheck)
{ {
case 'pixel': 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('green', [6]);
babyArrow.animation.add('red', [7]); babyArrow.animation.add('red', [7]);
babyArrow.animation.add('blue', [5]); babyArrow.animation.add('blue', [5]);
@ -3083,7 +3079,7 @@ class PlayState extends MusicBeatState
{ {
spr.animation.play('confirm', true); 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.centerOffsets();
spr.offset.x -= 13; spr.offset.x -= 13;
@ -3118,7 +3114,7 @@ class PlayState extends MusicBeatState
{ {
spr.animation.play('confirm', true); 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.centerOffsets();
spr.offset.x -= 13; spr.offset.x -= 13;
@ -3170,7 +3166,7 @@ class PlayState extends MusicBeatState
if (daNote.isSustainNote) if (daNote.isSustainNote)
{ {
daNote.x += daNote.width / 2 + 20; daNote.x += daNote.width / 2 + 20;
if (PlayState.curStage.startsWith('school')) if (SONG.noteStyle == 'pixel')
daNote.x -= 11; daNote.x -= 11;
} }
@ -3591,14 +3587,16 @@ class PlayState extends MusicBeatState
var pixelShitPart1:String = ""; var pixelShitPart1:String = "";
var pixelShitPart2:String = ''; var pixelShitPart2:String = '';
var pixelShitPart3:String = null;
if (curStage.startsWith('school')) if (SONG.noteStyle == 'pixel')
{ {
pixelShitPart1 = 'weeb/pixelUI/'; pixelShitPart1 = 'weeb/pixelUI/';
pixelShitPart2 = '-pixel'; pixelShitPart2 = '-pixel';
pixelShitPart3 = 'week6';
} }
rating.loadGraphic(Paths.image(pixelShitPart1 + daRating + pixelShitPart2)); rating.loadGraphic(Paths.image(pixelShitPart1 + daRating + pixelShitPart2, pixelShitPart3));
rating.screenCenter(); rating.screenCenter();
rating.y -= 50; rating.y -= 50;
rating.x = coolText.x - 125; rating.x = coolText.x - 125;
@ -3664,7 +3662,7 @@ class PlayState extends MusicBeatState
if (!PlayStateChangeables.botPlay || loadRep) if (!PlayStateChangeables.botPlay || loadRep)
add(currentTimingShown); 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.screenCenter();
comboSpr.x = rating.x; comboSpr.x = rating.x;
comboSpr.y = rating.y + 100; comboSpr.y = rating.y + 100;
@ -3682,7 +3680,7 @@ class PlayState extends MusicBeatState
if (!PlayStateChangeables.botPlay || loadRep) if (!PlayStateChangeables.botPlay || loadRep)
add(rating); add(rating);
if (!curStage.startsWith('school')) if (SONG.noteStyle != 'pixel')
{ {
rating.setGraphicSize(Std.int(rating.width * 0.7)); rating.setGraphicSize(Std.int(rating.width * 0.7));
rating.antialiasing = FlxG.save.data.antialiasing; rating.antialiasing = FlxG.save.data.antialiasing;
@ -3728,13 +3726,13 @@ class PlayState extends MusicBeatState
var daLoop:Int = 0; var daLoop:Int = 0;
for (i in seperatedScore) 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.screenCenter();
numScore.x = rating.x + (43 * daLoop) - 50; numScore.x = rating.x + (43 * daLoop) - 50;
numScore.y = rating.y + 100; numScore.y = rating.y + 100;
numScore.cameras = [camHUD]; numScore.cameras = [camHUD];
if (!curStage.startsWith('school')) if (SONG.noteStyle != 'pixel')
{ {
numScore.antialiasing = FlxG.save.data.antialiasing; numScore.antialiasing = FlxG.save.data.antialiasing;
numScore.setGraphicSize(Std.int(numScore.width * 0.5)); numScore.setGraphicSize(Std.int(numScore.width * 0.5));
@ -4016,7 +4014,7 @@ class PlayState extends MusicBeatState
{ {
spr.animation.play('confirm', true); 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.centerOffsets();
spr.offset.x -= 13; spr.offset.x -= 13;
@ -4045,7 +4043,7 @@ class PlayState extends MusicBeatState
if (!keys[spr.ID]) if (!keys[spr.ID])
spr.animation.play('static', false); 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.centerOffsets();
spr.offset.x -= 13; spr.offset.x -= 13;