Parker2991/Funkin
1
0
Fork 0
mirror of https://github.com/FunkinCrew/Funkin.git synced 2024-11-14 19:25:16 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'feature/gold-perfect-anim-for-modders' into rewrite/master

Browse source
This commit is contained in:
Cameron Taylor 2024-09-18 15:20:38 -04:00
commit f30c0cff49
4 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
assets

@ -1 +1 @@
Subproject commit da96dc519a00bb8eb24a164bae64a4c6c064e87d Subproject commit 252d48f4c996d5832cb981fb2f3ed945c020f289

1
source/funkin/data/freeplay/player/PlayerData.hx
View file

@ -270,6 +270,7 @@ typedef PlayerResultsData =
{ {
var music:PlayerResultsMusicData; var music:PlayerResultsMusicData;
var perfectGold:Array<PlayerResultsAnimationData>;
var perfect:Array<PlayerResultsAnimationData>; var perfect:Array<PlayerResultsAnimationData>;
var excellent:Array<PlayerResultsAnimationData>; var excellent:Array<PlayerResultsAnimationData>;
var great:Array<PlayerResultsAnimationData>; var great:Array<PlayerResultsAnimationData>;

4
source/funkin/ui/freeplay/charselect/PlayableCharacter.hx
View file

@ -113,7 +113,9 @@ class PlayableCharacter implements IRegistryEntry<PlayerData>
switch (rank) switch (rank)
{ {
case PERFECT | PERFECT_GOLD: case PERFECT_GOLD:
return _data.results.perfectGold;
case PERFECT:
return _data.results.perfect; return _data.results.perfect;
case EXCELLENT: case EXCELLENT:
return _data.results.excellent; return _data.results.excellent;

4
source/funkin/util/Constants.hx
View file

@ -481,10 +481,6 @@ class Constants
public static final JUDGEMENT_BAD_COMBO_BREAK:Bool = true; public static final JUDGEMENT_BAD_COMBO_BREAK:Bool = true;
public static final JUDGEMENT_SHIT_COMBO_BREAK:Bool = true; public static final JUDGEMENT_SHIT_COMBO_BREAK:Bool = true;
// % Sick
public static final RANK_PERFECT_PLAT_THRESHOLD:Float = 1.0; // % Sick
public static final RANK_PERFECT_GOLD_THRESHOLD:Float = 0.85; // % Sick
// % Hit // % Hit
public static final RANK_PERFECT_THRESHOLD:Float = 1.00; public static final RANK_PERFECT_THRESHOLD:Float = 1.00;
public static final RANK_EXCELLENT_THRESHOLD:Float = 0.90; public static final RANK_EXCELLENT_THRESHOLD:Float = 0.90;