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:
Kade M 2021-05-08 18:14:22 -07:00
commit 1f49941f54
5 changed files with 1400 additions and 1352 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ModCharts.md
View File

@ -16,7 +16,7 @@ Full Example
```lua ```lua
function start (song) function start (song)
print("Song: " .. song .. " @ " .. bpm .. " donwscroll: " .. downscroll) print("Song: " .. song .. " @ " .. bpm .. " downscroll: " .. downscroll)
end end

BIN
assets/shared/sounds/CLAP.ogg Normal file
View File

Binary file not shown.

BIN
assets/shared/sounds/SNAP.ogg Normal file
View File

Binary file not shown.

2740
source/ChartingState.hx
View File

File diff suppressed because it is too large Load Diff

10
source/PlayState.hx
View File

@ -3269,12 +3269,13 @@ class PlayState extends MusicBeatState
// Commented out until a reason to bring this back arises in the future // Commented out until a reason to bring this back arises in the future
/* if (SONG.notes[Math.floor(curStep / 16)].mustHitSection) /* if (SONG.notes[Math.floor(curStep / 16)].mustHitSection)
dad.dance(); */ dad.dance(); */
/* no because this is kinda dumb
if(dad.animation.curAnim.name.startsWith('sing')) if(dad.animation.curAnim.name.startsWith('sing'))
if(dad.animation.finished) if(dad.animation.finished)
dad.dance(); dad.dance();
else else
dad.dance(); dad.dance();
*/
} }
// FlxG.log.add('change bpm' + SONG.notes[Std.int(curStep / 16)].changeBPM); // FlxG.log.add('change bpm' + SONG.notes[Std.int(curStep / 16)].changeBPM);
wiggleShit.update(Conductor.crochet); wiggleShit.update(Conductor.crochet);
@ -3307,6 +3308,11 @@ class PlayState extends MusicBeatState
{ {
boyfriend.playAnim('idle'); boyfriend.playAnim('idle');
} }
if (!dad.animation.curAnim.name.startsWith("sing"))
{
dad.dance();
}
if (curBeat % 8 == 7 && curSong == 'Bopeebo') if (curBeat % 8 == 7 && curSong == 'Bopeebo')
{ {
@ -3381,4 +3387,4 @@ class PlayState extends MusicBeatState
} }
var curLight:Int = 0; var curLight:Int = 0;
} }