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

Merge branch 'master' of https://github.com/KadeDev/Kade-Engine

Browse Source
This commit is contained in:
KadeDev
2021-04-29 15:07:56 -07:00
parent 70b6698a4a 9bc3038d56
commit bac824bf13
57 changed files with 236 additions and 22389 deletions
Download Patch File Download Diff File Expand all files Collapse all files

98
source/PlayState.hx
View File

@ -328,9 +328,9 @@ class PlayState extends MusicBeatState
dialogue = CoolUtil.coolTextFile(Paths.txt('thorns/thornsDialogue'));
}
switch(SONG.song.toLowerCase())
switch(SONG.stage)
{
case 'spookeez' | 'monster' | 'south':
case 'halloween':
{
curStage = 'spooky';
halloweenLevel = true;
@ -347,7 +347,7 @@ class PlayState extends MusicBeatState
isHalloween = true;
}
case 'pico' | 'blammed' | 'philly':
case 'philly':
{
curStage = 'philly';
@ -393,7 +393,7 @@ class PlayState extends MusicBeatState
var street:FlxSprite = new FlxSprite(-40, streetBehind.y).loadGraphic(Paths.image('philly/street'));
add(street);
}
case 'milf' | 'satin-panties' | 'high':
case 'limo':
{
curStage = 'limo';
defaultCamZoom = 0.90;
@ -441,7 +441,7 @@ class PlayState extends MusicBeatState
fastCar = new FlxSprite(-300, 160).loadGraphic(Paths.image('limo/fastCarLol'));
// add(limo);
}
case 'cocoa' | 'eggnog':
case 'mall':
{
curStage = 'mall';
@ -505,7 +505,7 @@ class PlayState extends MusicBeatState
add(santa);
}
}
case 'winter-horrorland':
case 'mallEvil':
{
curStage = 'mallEvil';
var bg:FlxSprite = new FlxSprite(-400, -500).loadGraphic(Paths.image('christmas/evilBG'));
@ -525,7 +525,7 @@ class PlayState extends MusicBeatState
evilSnow.antialiasing = true;
add(evilSnow);
}
case 'senpai' | 'roses':
case 'school':
{
curStage = 'school';
@ -596,7 +596,7 @@ class PlayState extends MusicBeatState
add(bgGirls);
}
}
case 'thorns':
case 'schoolEvil':
{
curStage = 'schoolEvil';
@ -652,6 +652,33 @@ class PlayState extends MusicBeatState
add(waveSpriteFG);
*/
}
case 'stage':
{
defaultCamZoom = 0.9;
curStage = 'stage';
var bg:FlxSprite = new FlxSprite(-600, -200).loadGraphic(Paths.image('stageback'));
bg.antialiasing = true;
bg.scrollFactor.set(0.9, 0.9);
bg.active = false;
add(bg);
var stageFront:FlxSprite = new FlxSprite(-650, 600).loadGraphic(Paths.image('stagefront'));
stageFront.setGraphicSize(Std.int(stageFront.width * 1.1));
stageFront.updateHitbox();
stageFront.antialiasing = true;
stageFront.scrollFactor.set(0.9, 0.9);
stageFront.active = false;
add(stageFront);
var stageCurtains:FlxSprite = new FlxSprite(-500, -300).loadGraphic(Paths.image('stagecurtains'));
stageCurtains.setGraphicSize(Std.int(stageCurtains.width * 0.9));
stageCurtains.updateHitbox();
stageCurtains.antialiasing = true;
stageCurtains.scrollFactor.set(1.3, 1.3);
stageCurtains.active = false;
add(stageCurtains);
}
default:
{
defaultCamZoom = 0.9;
@ -682,21 +709,20 @@ class PlayState extends MusicBeatState
}
var gfVersion:String = 'gf';
switch (curStage)
switch (SONG.gfVersion)
{
case 'limo':
case 'gf-car':
gfVersion = 'gf-car';
case 'mall' | 'mallEvil':
case 'gf-christmas':
gfVersion = 'gf-christmas';
case 'school':
gfVersion = 'gf-pixel';
case 'schoolEvil':
case 'gf-pixel':
gfVersion = 'gf-pixel';
case 'gf':
gfVersion = 'gf';
default:
gfVersion = 'gf';
}
if (curStage == 'limo')
gfVersion = 'gf-car';
gf = new Character(400, 130, gfVersion);
gf.scrollFactor.set(0.95, 0.95);
@ -1408,9 +1434,9 @@ class PlayState extends MusicBeatState
// FlxG.log.add(i);
var babyArrow:FlxSprite = new FlxSprite(0, strumLine.y);
switch (curStage)
switch (SONG.noteStyle)
{
case 'school' | 'schoolEvil':
case 'pixel':
babyArrow.loadGraphic(Paths.image('weeb/pixelUI/arrows-pixels'), true, 17, 17);
babyArrow.animation.add('green', [6]);
babyArrow.animation.add('red', [7]);
@ -1444,6 +1470,40 @@ class PlayState extends MusicBeatState
babyArrow.animation.add('pressed', [7, 11], 12, false);
babyArrow.animation.add('confirm', [15, 19], 24, false);
}
case 'normal':
babyArrow.frames = Paths.getSparrowAtlas('NOTE_assets');
babyArrow.animation.addByPrefix('green', 'arrowUP');
babyArrow.animation.addByPrefix('blue', 'arrowDOWN');
babyArrow.animation.addByPrefix('purple', 'arrowLEFT');
babyArrow.animation.addByPrefix('red', 'arrowRIGHT');
babyArrow.antialiasing = true;
babyArrow.setGraphicSize(Std.int(babyArrow.width * 0.7));
switch (Math.abs(i))
{
case 0:
babyArrow.x += Note.swagWidth * 0;
babyArrow.animation.addByPrefix('static', 'arrowLEFT');
babyArrow.animation.addByPrefix('pressed', 'left press', 24, false);
babyArrow.animation.addByPrefix('confirm', 'left confirm', 24, false);
case 1:
babyArrow.x += Note.swagWidth * 1;
babyArrow.animation.addByPrefix('static', 'arrowDOWN');
babyArrow.animation.addByPrefix('pressed', 'down press', 24, false);
babyArrow.animation.addByPrefix('confirm', 'down confirm', 24, false);
case 2:
babyArrow.x += Note.swagWidth * 2;
babyArrow.animation.addByPrefix('static', 'arrowUP');
babyArrow.animation.addByPrefix('pressed', 'up press', 24, false);
babyArrow.animation.addByPrefix('confirm', 'up confirm', 24, false);
case 3:
babyArrow.x += Note.swagWidth * 3;
babyArrow.animation.addByPrefix('static', 'arrowRIGHT');
babyArrow.animation.addByPrefix('pressed', 'right press', 24, false);
babyArrow.animation.addByPrefix('confirm', 'right confirm', 24, false);
}
default:
babyArrow.frames = Paths.getSparrowAtlas('NOTE_assets');