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

Merge pull request #1647 from Spel0/botplay-light-strums

Browse Source 
Botplay light player strums
This commit is contained in:
Kade M 2021-08-07 23:05:46 -07:00 committed by GitHub
commit 6c28a104ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 48 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
source/PlayState.hx
View File

@ -194,7 +194,7 @@ class PlayState extends MusicBeatState
var notesHitArray:Array<Date> = []; var notesHitArray:Array<Date> = [];
var currentFrames:Int = 0; var currentFrames:Int = 0;
var idleToBeat:Bool = true; // change if bf and dad would idle to the beat of the song var idleToBeat:Bool = false; // change if bf and dad would idle to the beat of the song
var idleBeat:Int = 4; // how frequently bf and dad would play their idle animation(1 - every beat, 2 - every 2 beats and so on) var idleBeat:Int = 4; // how frequently bf and dad would play their idle animation(1 - every beat, 2 - every 2 beats and so on)
public var dialogue:Array<String> = ['dad:blah blah blah', 'bf:coolswag']; public var dialogue:Array<String> = ['dad:blah blah blah', 'bf:coolswag'];
@ -3259,6 +3259,17 @@ class PlayState extends MusicBeatState
spr.centerOffsets(); spr.centerOffsets();
} }
}); });
if (PlayStateChangeables.botPlay)
{
playerStrums.forEach(function(spr:FlxSprite)
{
if (spr.animation.finished)
{
spr.animation.play('static');
spr.centerOffsets();
}
});
}
} }
if (!inCutscene && songStarted) if (!inCutscene && songStarted)
@ -3928,6 +3939,24 @@ class PlayState extends MusicBeatState
{ {
goodNoteHit(daNote); goodNoteHit(daNote);
boyfriend.holdTimer = daNote.sustainLength; boyfriend.holdTimer = daNote.sustainLength;
if (FlxG.save.data.cpuStrums)
{
playerStrums.forEach(function(spr:FlxSprite)
{
if (Math.abs(daNote.noteData) == spr.ID)
{
spr.animation.play('confirm', true);
}
if (spr.animation.curAnim.name == 'confirm' && !curStage.startsWith('school'))
{
spr.centerOffsets();
spr.offset.x -= 13;
spr.offset.y -= 13;
}
else
spr.centerOffsets();
});
}
} }
} }
} }
@ -3939,22 +3968,25 @@ class PlayState extends MusicBeatState
boyfriend.playAnim('idle'); boyfriend.playAnim('idle');
} }
playerStrums.forEach(function(spr:FlxSprite) if (!PlayStateChangeables.botPlay)
{ {
if (keys[spr.ID] && spr.animation.curAnim.name != 'confirm') playerStrums.forEach(function(spr:FlxSprite)
spr.animation.play('pressed', false);
if (!keys[spr.ID])
spr.animation.play('static', false);
if (spr.animation.curAnim.name == 'confirm' && !curStage.startsWith('school'))
{ {
spr.centerOffsets(); if (keys[spr.ID] && spr.animation.curAnim.name != 'confirm')
spr.offset.x -= 13; spr.animation.play('pressed', false);
spr.offset.y -= 13; if (!keys[spr.ID])
} spr.animation.play('static', false);
else
spr.centerOffsets(); if (spr.animation.curAnim.name == 'confirm' && !curStage.startsWith('school'))
}); {
spr.centerOffsets();
spr.offset.x -= 13;
spr.offset.y -= 13;
}
else
spr.centerOffsets();
});
}
} }
public function findByTime(time:Float):Array<Dynamic> public function findByTime(time:Float):Array<Dynamic>

2
source/ResultsScreen.hx
View File

@ -88,7 +88,7 @@ class ResultsScreen extends FlxSubState
var bads = PlayState.isStoryMode ? PlayState.campaignBads : PlayState.bads; var bads = PlayState.isStoryMode ? PlayState.campaignBads : PlayState.bads;
var shits = PlayState.isStoryMode ? PlayState.campaignShits : PlayState.shits; var shits = PlayState.isStoryMode ? PlayState.campaignShits : PlayState.shits;
comboText = new FlxText(20,-75,0,'Judgements:\nSicks - ${PlayState.sicks}\nGoods - ${sicks}\nBads - ${bads}\n\nCombo Breaks: ${(PlayState.isStoryMode ? PlayState.campaignMisses : PlayState.misses)}\nHighest Combo: ${PlayState.highestCombo + 1}\nScore: ${PlayState.instance.songScore}\nAccuracy: ${HelperFunctions.truncateFloat(PlayState.instance.accuracy,2)}%\n\n${Ratings.GenerateLetterRank(PlayState.instance.accuracy)}\n\n${!PlayState.loadRep ? "F1 - View replay\nF2 - Replay song" : ""} comboText = new FlxText(20,-75,0,'Judgements:\nSicks - ${sicks}\nGoods - ${goods}\nBads - ${bads}\n\nCombo Breaks: ${(PlayState.isStoryMode ? PlayState.campaignMisses : PlayState.misses)}\nHighest Combo: ${PlayState.highestCombo + 1}\nScore: ${PlayState.instance.songScore}\nAccuracy: ${HelperFunctions.truncateFloat(PlayState.instance.accuracy,2)}%\n\n${Ratings.GenerateLetterRank(PlayState.instance.accuracy)}\n\n${!PlayState.loadRep ? "F1 - View replay\nF2 - Replay song" : ""}
'); ');
comboText.size = 28; comboText.size = 28;
comboText.setBorderStyle(FlxTextBorderStyle.OUTLINE,FlxColor.BLACK,4,1); comboText.setBorderStyle(FlxTextBorderStyle.OUTLINE,FlxColor.BLACK,4,1);