diff --git a/assets/shared/images/credshit/jake.png b/assets/shared/images/credshit/jake.png new file mode 100644 index 00000000..b1368904 Binary files /dev/null and b/assets/shared/images/credshit/jake.png differ diff --git a/assets/shared/images/credshit/meredo.png b/assets/shared/images/credshit/meredo.png deleted file mode 100644 index 3a1bc4d4..00000000 Binary files a/assets/shared/images/credshit/meredo.png and /dev/null differ diff --git a/source/kec/backend/Constants.hx b/source/kec/backend/Constants.hx index 7f49dd09..08ec6e83 100644 --- a/source/kec/backend/Constants.hx +++ b/source/kec/backend/Constants.hx @@ -49,7 +49,10 @@ class Constants public static final defaultBF:String = 'bf'; public static final defaultOP:String = 'dad'; public static final defaultGF:String = 'gf'; + // Note Animation Names public static final noteColors:Array = ['purple', 'blue', 'green', 'red']; + // Animation Names + public static final singAnimations:Array = ['singLEFT', 'singDOWN', 'singUP', 'singRIGHT']; public static final discordRpc:String = "898970552600002561"; } diff --git a/source/kec/backend/Ratings.hx b/source/kec/backend/Ratings.hx index 3395a126..aad18f17 100644 --- a/source/kec/backend/Ratings.hx +++ b/source/kec/backend/Ratings.hx @@ -206,7 +206,7 @@ class RatingWindow var missArray:Array = [false, false, false, false, false]; var splashArray:Array = [false, false, false, true, true]; var suffixes:Array = ['s', 's', 's', 's', 's']; - var combos:Array = ['', 'FC', 'GFC', 'PFC', 'MFC']; + var combos:Array = ['FC', 'FC', 'GFC', 'PFC', 'MFC']; for (i in 0...ratings.length) { var rClass = new RatingWindow(ratings[i], timings[i], combos[i], colors[i], healthBonuses[i], scoreBonuses[i], acc[i], missArray[i], diff --git a/source/kec/states/PlayState.hx b/source/kec/states/PlayState.hx index 14553567..a84ad932 100644 --- a/source/kec/states/PlayState.hx +++ b/source/kec/states/PlayState.hx @@ -146,9 +146,6 @@ class PlayState extends MusicBeatState var allowedToHeadbang:Bool = true; // Will decide if gf is allowed to headbang depending on the song var allowedToCheer:Bool = false; // Will decide if gf is allowed to cheer depending on the song - // Note Animation Suffixes. - private var dataSuffix:Array = ['LEFT', 'DOWN', 'UP', 'RIGHT']; - // Tracks The Last Score (I Don't Know What It Does.) public static var lastScore:Array = []; @@ -1590,15 +1587,14 @@ class PlayState extends MusicBeatState if (PlayStateChangeables.opponentMode) char = dad; - if (char.animOffsets.exists('sing' + dataSuffix[direction] + 'miss')) - char.playAnim('sing' + dataSuffix[direction] + 'miss', true); + if (char.animOffsets.exists(Constants.singAnimations[direction] + 'miss')) + char.playAnim(Constants.singAnimations[direction] + 'miss', true); if (FlxG.save.data.missSounds) { var num = FlxG.random.int(1, 3); FlxG.sound.play(Paths.sound('styles/$styleName/missnote$num'), FlxG.random.float(0.1, 0.2)); } - boyfriend.playAnim('sing' + dataSuffix[direction] + 'miss', true); if (!SONG.splitVoiceTracks) vocals.volume = 0; else @@ -2635,7 +2631,7 @@ class PlayState extends MusicBeatState && daNote.sustainActive && !daNote.isSustainEnd && daNote.causesMisses - && !holdArray[Std.int(Math.abs(daNote.noteData))]) + && !holdArray[daNote.noteData]) { // there should be a ! infront of the wasGoodHit one but it'd cause a miss per every sustain note. // now it just misses on the slightest sustain end for some reason. @@ -3180,8 +3176,8 @@ class PlayState extends MusicBeatState if (PlayStateChangeables.opponentMode) char = dad; - if (char.animOffsets.exists('sing' + dataSuffix[direction] + 'miss')) - char.playAnim('sing' + dataSuffix[direction] + 'miss', true); + if (char.animOffsets.exists(Constants.singAnimations[direction] + 'miss')) + char.playAnim(Constants.singAnimations[direction] + 'miss', true); #if FEATURE_LUAMODCHART if (luaModchart != null) @@ -3291,7 +3287,7 @@ class PlayState extends MusicBeatState if (!daNote.isSustainEnd) { - var singData:Int = Std.int(Math.abs(daNote.noteData)); + final singData:Int = daNote.noteData; if (daNote.canPlayAnims) { @@ -3301,8 +3297,14 @@ class PlayState extends MusicBeatState if (daNote.noteType.toLowerCase() == 'gf' && gf != null) char = gf; - - char.playAnim('sing' + dataSuffix[daNote.noteData] + altAnim, true); + var animToPlay:String = Constants.singAnimations[daNote.noteData] + altAnim; + if (daNote.isSustainNote) + { + var holdAnim:String = animToPlay + '-hold'; + if (char.animOffsets.exists(holdAnim)) + animToPlay = holdAnim; + } + char.playAnim(animToPlay, true); char.holdTimer = 0; } @@ -3423,7 +3425,14 @@ class PlayState extends MusicBeatState if (note.noteType.toLowerCase() == 'gf' && gf != null) char = gf; - char.playAnim('sing' + dataSuffix[note.noteData] + altAnim, true); + var animToPlay:String = Constants.singAnimations[note.noteData] + altAnim; + if (note.isSustainNote) + { + var holdAnim:String = animToPlay + '-hold'; + if (char.animOffsets.exists(holdAnim)) + animToPlay = holdAnim; + } + char.playAnim(animToPlay, true); char.holdTimer = 0; } diff --git a/source/kec/states/TitleState.hx b/source/kec/states/TitleState.hx index 0b44d07c..a8d352ef 100644 --- a/source/kec/states/TitleState.hx +++ b/source/kec/states/TitleState.hx @@ -122,7 +122,7 @@ class TitleState extends MusicBeatState credTextShit.visible = false; - ngSpr = new FlxSprite(0, FlxG.height * 0.52).loadGraphic(Paths.image('credshit/meredo')); + ngSpr = new FlxSprite(0, FlxG.height * 0.52).loadGraphic(Paths.image('credshit/jake')); add(ngSpr); ngSpr.alpha = 0; ngSpr.setGraphicSize(Std.int(ngSpr.width * 0.8));