Skip to content

Commit

Permalink
Character Specific Judgements Go pico yeah update
Browse files Browse the repository at this point in the history
  • Loading branch information
poec987 committed Sep 14, 2024
1 parent 64190ce commit a352af8
Show file tree
Hide file tree
Showing 21 changed files with 31 additions and 6 deletions.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
Binary file added assets/shared/images/judgements/jo/bad.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/shared/images/judgements/jo/bruh.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/shared/images/judgements/jo/cinema.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/shared/images/judgements/jo/good.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/shared/images/judgements/jo/meh.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/shared/images/judgements/jo/shit.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions assets/shared/images/judgements/judgeConfig.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
bf-pixel::jo
bf-pixel-good::jo
unfairJo::jo
Nugget::nugget
nuggetdance::nugget
Binary file added assets/shared/images/judgements/nugget/bad.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/shared/images/judgements/nugget/bruh.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/shared/images/judgements/nugget/cinema.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/shared/images/judgements/nugget/good.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/shared/images/judgements/nugget/meh.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
29 changes: 23 additions & 6 deletions source/ResultsSubState.hx
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ import flixel.util.FlxColor;
import flixel.FlxG;
import flixel.FlxSprite;

using StringTools;

typedef FunkinResults = {
var sick:Int;
var good:Int;
Expand Down Expand Up @@ -37,6 +39,7 @@ class ResultsSubState extends MusicBeatSubstate {
var music:FlxSound;
var judgement:FlxSound;
var beef:FlxSprite;
var character:String = "bf";

var textTimer:FlxTimer;
var soundTimer:FlxTimer;
Expand Down Expand Up @@ -126,20 +129,34 @@ class ResultsSubState extends MusicBeatSubstate {
else
selectedJudgement = "worst";

var judgeFile:Array<String> = CoolUtil.coolTextFile(Paths.txtImages("judgements/judgeConfig"));

for (i in 0...judgeFile.length) {
judgeFile[i].trim();
var line:Array<String> = judgeFile[i].split("::");

if (PlayState.SONG.player1 == line[0]) {
character = line[1];
break;
}

character = "bf";
}

switch (selectedJudgement) {
case "pfc":
beef = new FlxSprite(700, 100).loadGraphic(Paths.image('judgements/cinema'), true, 500, 600);
beef = new FlxSprite(700, 100).loadGraphic(Paths.image('judgements/'+character+'/cinema'), true, 500, 600);
beef.animation.add("jorking", [0, 1], 15, true);
case "good":
beef = new FlxSprite(400, -50).loadGraphic(Paths.image('judgements/good'));
beef = new FlxSprite(400, -50).loadGraphic(Paths.image('judgements/'+character+'/good'));
case "meh":
beef = new FlxSprite(400, -50).loadGraphic(Paths.image('judgements/meh'));
beef = new FlxSprite(400, -50).loadGraphic(Paths.image('judgements/'+character+'/meh'));
case "bad":
beef = new FlxSprite(400, -50).loadGraphic(Paths.image('judgements/bad'));
beef = new FlxSprite(400, -50).loadGraphic(Paths.image('judgements/'+character+'/bad'));
case "shit":
beef = new FlxSprite(400, -50).loadGraphic(Paths.image('judgements/shit'));
beef = new FlxSprite(400, -50).loadGraphic(Paths.image('judgements/'+character+'/shit'));
case "worst":
beef = new FlxSprite(500, 100).loadGraphic(Paths.image('judgements/bruh'));
beef = new FlxSprite(500, 100).loadGraphic(Paths.image('judgements/'+character+'/bruh'));
}

if (playJudgement) {
Expand Down
3 changes: 3 additions & 0 deletions vscode-project.hxml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#automatically generated do not edit
#@date Fri Sep 13 2024 21:31:15 GMT-0500 (Central Daylight Time)
-cp c:\users\cam\appdata\local\temp\8e05707c7e067ab4e2ebd5dea47d22f51847e1bb

0 comments on commit a352af8

Please sign in to comment.