Merge branch 'master' of https://github.com/KadeDev/Kade-Engine
This commit is contained in:
Kade M
@ -239,10 +239,10 @@ class PlayState extends MusicBeatState
|
||||
|
||||
// pre lowercasing the song name (create)
|
||||
var songLowercase = StringTools.replace(PlayState.SONG.song, " ", "-").toLowerCase();
|
||||
switch (songLowercase) {
|
||||
case 'dad-battle': songLowercase = 'dadbattle';
|
||||
case 'philly-nice': songLowercase = 'philly';
|
||||
}
|
||||
switch (songLowercase) {
|
||||
case 'dad-battle': songLowercase = 'dadbattle';
|
||||
case 'philly-nice': songLowercase = 'philly';
|
||||
}
|
||||
|
||||
#if windows
|
||||
executeModchart = FileSystem.exists(Paths.lua(songLowercase + "/modchart"));
|
||||
@ -310,7 +310,7 @@ class PlayState extends MusicBeatState
|
||||
persistentDraw = true;
|
||||
|
||||
if (SONG == null)
|
||||
SONG = Song.loadFromJson('tutorial');
|
||||
SONG = Song.loadFromJson('tutorial', 'tutorial');
|
||||
|
||||
Conductor.mapBPMChanges(SONG);
|
||||
Conductor.changeBPM(SONG.bpm);
|
||||
@ -345,7 +345,22 @@ class PlayState extends MusicBeatState
|
||||
dialogue = CoolUtil.coolTextFile(Paths.txt('thorns/thornsDialogue'));
|
||||
}
|
||||
|
||||
switch(SONG.stage)
|
||||
//defaults if no stage was found in chart
|
||||
var stageCheck:String = 'stage';
|
||||
|
||||
if (SONG.stage == null) {
|
||||
switch(storyWeek)
|
||||
{
|
||||
case 2: stageCheck = 'halloween';
|
||||
case 3: stageCheck = 'philly';
|
||||
case 4: stageCheck = 'limo';
|
||||
case 5: if (songLowercase == 'winter-horrorland') {stageCheck = 'mallEvil';} else {stageCheck = 'mall';}
|
||||
case 6: if (songLowercase == 'thorns') {stageCheck = 'schoolEvil';} else {stageCheck = 'school';}
|
||||
//i should check if its stage (but this is when none is found in chart anyway)
|
||||
}
|
||||
} else {stageCheck = SONG.stage;}
|
||||
|
||||
switch(stageCheck)
|
||||
{
|
||||
case 'halloween':
|
||||
{
|
||||
@ -724,21 +739,33 @@ class PlayState extends MusicBeatState
|
||||
add(stageCurtains);
|
||||
}
|
||||
}
|
||||
var gfVersion:String = 'gf';
|
||||
|
||||
switch (SONG.gfVersion)
|
||||
//defaults if no gf was found in chart
|
||||
var gfCheck:String = 'gf';
|
||||
|
||||
if (SONG.gfVersion == null) {
|
||||
switch(storyWeek)
|
||||
{
|
||||
case 4: gfCheck = 'gf-car';
|
||||
case 5: gfCheck = 'gf-christmas';
|
||||
case 6: gfCheck = 'gf-pixel';
|
||||
}
|
||||
} else {gfCheck = SONG.gfVersion;}
|
||||
|
||||
var curGf:String = '';
|
||||
switch (gfCheck)
|
||||
{
|
||||
case 'gf-car':
|
||||
gfVersion = 'gf-car';
|
||||
curGf = 'gf-car';
|
||||
case 'gf-christmas':
|
||||
gfVersion = 'gf-christmas';
|
||||
curGf = 'gf-christmas';
|
||||
case 'gf-pixel':
|
||||
gfVersion = 'gf-pixel';
|
||||
curGf = 'gf-pixel';
|
||||
default:
|
||||
gfVersion = 'gf';
|
||||
curGf = 'gf';
|
||||
}
|
||||
|
||||
gf = new Character(400, 130, gfVersion);
|
||||
gf = new Character(400, 130, curGf);
|
||||
gf.scrollFactor.set(0.95, 0.95);
|
||||
|
||||
dad = new Character(100, 100, SONG.player2);
|
||||
@ -1079,17 +1106,11 @@ class PlayState extends MusicBeatState
|
||||
senpaiEvil.updateHitbox();
|
||||
senpaiEvil.screenCenter();
|
||||
|
||||
// pre lowercasing the song name (schoolIntro)
|
||||
var songLowercase = StringTools.replace(PlayState.SONG.song, " ", "-").toLowerCase();
|
||||
switch (songLowercase) {
|
||||
case 'dad-battle': songLowercase = 'dadbattle';
|
||||
case 'philly-nice': songLowercase = 'philly';
|
||||
}
|
||||
if (songLowercase == 'roses' || songLowercase == 'thorns')
|
||||
if (StringTools.replace(PlayState.SONG.song, " ", "-").toLowerCase() == 'roses' || StringTools.replace(PlayState.SONG.song, " ", "-").toLowerCase() == 'thorns')
|
||||
{
|
||||
remove(black);
|
||||
|
||||
if (songLowercase == 'thorns')
|
||||
if (StringTools.replace(PlayState.SONG.song, " ", "-").toLowerCase() == 'thorns')
|
||||
{
|
||||
add(red);
|
||||
}
|
||||
@ -1109,7 +1130,7 @@ class PlayState extends MusicBeatState
|
||||
{
|
||||
inCutscene = true;
|
||||
|
||||
if (songLowercase == 'thorns')
|
||||
if (StringTools.replace(PlayState.SONG.song, " ", "-").toLowerCase() == 'thorns')
|
||||
{
|
||||
add(senpaiEvil);
|
||||
senpaiEvil.alpha = 0;
|
||||
@ -1170,10 +1191,16 @@ class PlayState extends MusicBeatState
|
||||
|
||||
|
||||
#if windows
|
||||
// pre lowercasing the song name (startCountdown)
|
||||
var songLowercase = StringTools.replace(PlayState.SONG.song, " ", "-").toLowerCase();
|
||||
switch (songLowercase) {
|
||||
case 'dad-battle': songLowercase = 'dadbattle';
|
||||
case 'philly-nice': songLowercase = 'philly';
|
||||
}
|
||||
if (executeModchart)
|
||||
{
|
||||
luaModchart = ModchartState.createModchartState();
|
||||
luaModchart.executeState('start',[PlayState.SONG.song]);
|
||||
luaModchart.executeState('start',[songLowercase]);
|
||||
}
|
||||
#end
|
||||
|
||||
@ -1385,14 +1412,15 @@ class PlayState extends MusicBeatState
|
||||
|
||||
var playerCounter:Int = 0;
|
||||
|
||||
// pre lowercasing the song name (generateSong)
|
||||
var songLowercase = StringTools.replace(PlayState.SONG.song, " ", "-").toLowerCase();
|
||||
switch (songLowercase) {
|
||||
case 'dad-battle': songLowercase = 'dadbattle';
|
||||
case 'philly-nice': songLowercase = 'philly';
|
||||
}
|
||||
// Per song offset check
|
||||
#if windows
|
||||
// pre lowercasing the song name (generateSong)
|
||||
var songLowercase = StringTools.replace(PlayState.SONG.song, " ", "-").toLowerCase();
|
||||
switch (songLowercase) {
|
||||
case 'dad-battle': songLowercase = 'dadbattle';
|
||||
case 'philly-nice': songLowercase = 'philly';
|
||||
}
|
||||
|
||||
var songPath = 'assets/data/' + songLowercase + '/';
|
||||
|
||||
for(file in sys.FileSystem.readDirectory(songPath))
|
||||
@ -1495,7 +1523,14 @@ class PlayState extends MusicBeatState
|
||||
// FlxG.log.add(i);
|
||||
var babyArrow:FlxSprite = new FlxSprite(0, strumLine.y);
|
||||
|
||||
switch (SONG.noteStyle)
|
||||
//defaults if no noteStyle was found in chart
|
||||
var noteTypeCheck:String = 'normal';
|
||||
|
||||
if (SONG.noteStyle == null) {
|
||||
switch(storyWeek) {case 6: noteTypeCheck = 'pixel';}
|
||||
} else {noteTypeCheck = SONG.noteStyle;}
|
||||
|
||||
switch (noteTypeCheck)
|
||||
{
|
||||
case 'pixel':
|
||||
babyArrow.loadGraphic(Paths.image('weeb/pixelUI/arrows-pixels'), true, 17, 17);
|
||||
@ -1835,9 +1870,9 @@ class PlayState extends MusicBeatState
|
||||
|
||||
super.update(elapsed);
|
||||
|
||||
scoreTxt.text = Ratings.CalculateRanking(songScore,songScoreDef,nps,maxNPS,accuracy);
|
||||
if (!FlxG.save.data.accuracyDisplay)
|
||||
scoreTxt.text = "Score: " + songScore;
|
||||
scoreTxt.text = Ratings.CalculateRanking(songScore,songScoreDef,nps,maxNPS,accuracy);
|
||||
if (!FlxG.save.data.accuracyDisplay)
|
||||
scoreTxt.text = "Score: " + songScore;
|
||||
|
||||
if (FlxG.keys.justPressed.ENTER && startedCountdown && canPause)
|
||||
{
|
||||
@ -2555,30 +2590,20 @@ class PlayState extends MusicBeatState
|
||||
}
|
||||
else
|
||||
{
|
||||
var difficulty:String = "";
|
||||
|
||||
// adjusting the song name to be compatible
|
||||
var songFormat = StringTools.replace(PlayState.storyPlaylist[0], " ", "-");
|
||||
switch (songFormat) {
|
||||
case 'Dad-Battle': songFormat = 'Dadbattle';
|
||||
case 'Philly-Nice': songFormat = 'Philly';
|
||||
}
|
||||
|
||||
if (storyDifficulty == 0)
|
||||
difficulty = '-easy';
|
||||
|
||||
if (storyDifficulty == 2)
|
||||
difficulty = '-hard';
|
||||
var poop:String = Highscore.formatSong(songFormat, storyDifficulty);
|
||||
|
||||
trace('LOADING NEXT SONG');
|
||||
// pre lowercasing the next story song name
|
||||
var nextSongLowercase = StringTools.replace(PlayState.storyPlaylist[0], " ", "-").toLowerCase();
|
||||
switch (nextSongLowercase) {
|
||||
case 'dad-battle': nextSongLowercase = 'dadbattle';
|
||||
case 'philly-nice': nextSongLowercase = 'philly';
|
||||
}
|
||||
trace(nextSongLowercase + difficulty);
|
||||
trace(poop);
|
||||
|
||||
// pre lowercasing the song name (endSong)
|
||||
var songLowercase = StringTools.replace(PlayState.SONG.song, " ", "-").toLowerCase();
|
||||
switch (songLowercase) {
|
||||
case 'dad-battle': songLowercase = 'dadbattle';
|
||||
case 'philly-nice': songLowercase = 'philly';
|
||||
}
|
||||
if (songLowercase == 'eggnog')
|
||||
if (StringTools.replace(PlayState.storyPlaylist[0], " ", "-").toLowerCase() == 'eggnog')
|
||||
{
|
||||
var blackShit:FlxSprite = new FlxSprite(-FlxG.width * FlxG.camera.zoom,
|
||||
-FlxG.height * FlxG.camera.zoom).makeGraphic(FlxG.width * 3, FlxG.height * 3, FlxColor.BLACK);
|
||||
@ -2593,7 +2618,8 @@ class PlayState extends MusicBeatState
|
||||
FlxTransitionableState.skipNextTransOut = true;
|
||||
prevCamFollow = camFollow;
|
||||
|
||||
PlayState.SONG = Song.loadFromJson(nextSongLowercase + difficulty, PlayState.storyPlaylist[0]);
|
||||
|
||||
PlayState.SONG = Song.loadFromJson(poop, PlayState.storyPlaylist[0]);
|
||||
FlxG.sound.music.stop();
|
||||
|
||||
LoadingState.loadAndSwitchState(new PlayState());
|
||||
@ -3556,25 +3582,28 @@ class PlayState extends MusicBeatState
|
||||
// FlxG.log.add('change bpm' + SONG.notes[Std.int(curStep / 16)].changeBPM);
|
||||
wiggleShit.update(Conductor.crochet);
|
||||
|
||||
// HARDCODING FOR MILF ZOOMS!
|
||||
if (curSong.toLowerCase() == 'milf' && curBeat >= 168 && curBeat < 200 && camZooming && FlxG.camera.zoom < 1.35)
|
||||
if (FlxG.save.data.camzoom)
|
||||
{
|
||||
FlxG.camera.zoom += 0.015;
|
||||
camHUD.zoom += 0.03;
|
||||
// HARDCODING FOR MILF ZOOMS!
|
||||
if (curSong.toLowerCase() == 'milf' && curBeat >= 168 && curBeat < 200 && camZooming && FlxG.camera.zoom < 1.35)
|
||||
{
|
||||
FlxG.camera.zoom += 0.015;
|
||||
camHUD.zoom += 0.03;
|
||||
}
|
||||
|
||||
if (camZooming && FlxG.camera.zoom < 1.35 && curBeat % 4 == 0)
|
||||
{
|
||||
FlxG.camera.zoom += 0.015;
|
||||
camHUD.zoom += 0.03;
|
||||
}
|
||||
|
||||
iconP1.setGraphicSize(Std.int(iconP1.width + 30));
|
||||
iconP2.setGraphicSize(Std.int(iconP2.width + 30));
|
||||
|
||||
iconP1.updateHitbox();
|
||||
iconP2.updateHitbox();
|
||||
}
|
||||
|
||||
if (camZooming && FlxG.camera.zoom < 1.35 && curBeat % 4 == 0)
|
||||
{
|
||||
FlxG.camera.zoom += 0.015;
|
||||
camHUD.zoom += 0.03;
|
||||
}
|
||||
|
||||
iconP1.setGraphicSize(Std.int(iconP1.width + 30));
|
||||
iconP2.setGraphicSize(Std.int(iconP2.width + 30));
|
||||
|
||||
iconP1.updateHitbox();
|
||||
iconP2.updateHitbox();
|
||||
|
||||
if (curBeat % gfSpeed == 0)
|
||||
{
|
||||
gf.dance();
|
||||
|
||||
Reference in New Issue
Block a user