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:
KadeDeveloper 2021-07-27 22:25:03 -07:00
commit c5d147402a
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source/Options.hx
View File

@ -824,6 +824,7 @@ class LockWeeksOption extends Option
} }
FlxG.save.data.weekUnlocked = 1; FlxG.save.data.weekUnlocked = 1;
StoryMenuState.weekUnlocked = [true, true]; StoryMenuState.weekUnlocked = [true, true];
confirm = false;
trace('Weeks Locked'); trace('Weeks Locked');
display = updateDisplay(); display = updateDisplay();
return true; return true;
@ -894,6 +895,8 @@ class ResetSettings extends Option
FlxG.save.data.weekUnlocked = null; FlxG.save.data.weekUnlocked = null;
FlxG.save.data.newInput = null; FlxG.save.data.newInput = null;
FlxG.save.data.downscroll = null; FlxG.save.data.downscroll = null;
FlxG.save.data.antialiasing = null;
FlxG.save.data.missSounds = null;
FlxG.save.data.dfjk = null; FlxG.save.data.dfjk = null;
FlxG.save.data.accuracyDisplay = null; FlxG.save.data.accuracyDisplay = null;
FlxG.save.data.offset = null; FlxG.save.data.offset = null;
@ -909,6 +912,7 @@ class ResetSettings extends Option
FlxG.save.data.watermark = null; FlxG.save.data.watermark = null;
FlxG.save.data.ghost = null; FlxG.save.data.ghost = null;
FlxG.save.data.distractions = null; FlxG.save.data.distractions = null;
FlxG.save.data.stepMania = null;
FlxG.save.data.flashing = null; FlxG.save.data.flashing = null;
FlxG.save.data.resetButton = null; FlxG.save.data.resetButton = null;
FlxG.save.data.botplay = null; FlxG.save.data.botplay = null;
@ -916,7 +920,12 @@ class ResetSettings extends Option
FlxG.save.data.strumline = null; FlxG.save.data.strumline = null;
FlxG.save.data.customStrumLine = null; FlxG.save.data.customStrumLine = null;
FlxG.save.data.camzoom = null; FlxG.save.data.camzoom = null;
FlxG.save.data.stepMania = null; FlxG.save.data.scoreScreen = null;
FlxG.save.data.inputShow = null;
FlxG.save.data.optimize = null;
FlxG.save.data.cacheImages = null;
FlxG.save.data.editor = null;
KadeEngineData.initSave(); KadeEngineData.initSave();
confirm = false; confirm = false;
trace('All settings have been reset'); trace('All settings have been reset');

12
source/PlayState.hx
View File

@ -4002,7 +4002,7 @@ class PlayState extends MusicBeatState
FlxG.stage.window.onFocusIn.add(focusIn); FlxG.stage.window.onFocusIn.add(focusIn);
var ourSource:String = "assets/videos/daWeirdVid/dontDelete.webm"; var ourSource:String = "assets/videos/daWeirdVid/dontDelete.webm";
WebmPlayer.SKIP_STEP_LIMIT = 90; //WebmPlayer.SKIP_STEP_LIMIT = 90;
var str1:String = "WEBM SHIT"; var str1:String = "WEBM SHIT";
webmHandler = new WebmHandler(); webmHandler = new WebmHandler();
webmHandler.source(ourSource); webmHandler.source(ourSource);
@ -4464,13 +4464,13 @@ class PlayState extends MusicBeatState
if (curSong == 'Tutorial' && dad.curCharacter == 'gf') if (curSong == 'Tutorial' && dad.curCharacter == 'gf')
{ {
if (curStep < 64 || SONG.notes[Math.floor(curStep / 16)].mustHitSection) if (SONG.notes[Math.floor(curStep / 16)].mustHitSection)
dad.dance(); dad.dance();
else else
{ {
if (curStep % 2 == 0 && dad.animOffsets.exists('danceLeft')) if (curBeat == 73 || curBeat % 4 == 0 || curBeat % 4 == 1)
dad.playAnim('danceLeft', true); dad.playAnim('danceLeft', true);
else if (curStep % 2 == 1 && dad.animOffsets.exists('danceRight')) else
dad.playAnim('danceRight', true); dad.playAnim('danceRight', true);
} }
} }
@ -4482,7 +4482,7 @@ class PlayState extends MusicBeatState
// Dad doesnt interupt his own notes // Dad doesnt interupt his own notes
if ((SONG.notes[Math.floor(curStep / 16)].mustHitSection || !dad.animation.curAnim.name.startsWith("sing")) && dad.curCharacter != 'gf') if ((SONG.notes[Math.floor(curStep / 16)].mustHitSection || !dad.animation.curAnim.name.startsWith("sing")) && dad.curCharacter != 'gf')
if (curBeat % idleBeat == 0 || dad.curCharacter == "spooky") if ((curBeat % idleBeat == 0 || !idleToBeat) || dad.curCharacter == "spooky")
dad.dance(idleToBeat); dad.dance(idleToBeat);
} }
// FlxG.log.add('change bpm' + SONG.notes[Std.int(curStep / 16)].changeBPM); // FlxG.log.add('change bpm' + SONG.notes[Std.int(curStep / 16)].changeBPM);
@ -4515,7 +4515,7 @@ class PlayState extends MusicBeatState
gf.dance(); gf.dance();
} }
if (!boyfriend.animation.curAnim.name.startsWith("sing") && curBeat % idleBeat == 0) if (!boyfriend.animation.curAnim.name.startsWith("sing") && (curBeat % idleBeat == 0 || !idleToBeat))
{ {
boyfriend.playAnim('idle', idleToBeat); boyfriend.playAnim('idle', idleToBeat);
} }