Skip to content

Commit

Permalink
psych repo -> foxa repo
Browse files Browse the repository at this point in the history
THIS ISNT FAIR SHADOW MARIO BRO
  • Loading branch information
charlesisfeline committed Dec 25, 2023
1 parent 8a8b6cb commit 94ffedf
Show file tree
Hide file tree
Showing 6 changed files with 102 additions and 128 deletions.
4 changes: 2 additions & 2 deletions foxaVersion.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
3.0 - 0.7.2-foxa
3.0 - 0.7.2h-foxa
- BUTTPLUG SUPPORT
- MORE OPTIONS + new useless gameplay changer that should've been a real option instead.
- MORE OPTIONS + new useless gameplay changers
- optional watermark ew
- most menus changed to have the checkboard backdrop and main menu has changed!
- credits editor and a few character editor & charter tweaks
Expand Down
2 changes: 1 addition & 1 deletion gitVersion.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.7.2-foxa
0.7.2h-foxa
4 changes: 2 additions & 2 deletions source/backend/Achievements.hx
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ class Achievements {
createAchievement('ur_bad', {name: "What a Funkin' Disaster!", description: "Complete a Song with a rating lower than 20%."});
createAchievement('ur_good', {name: "Perfectionist", description: "Complete a Song with a rating of 100%."});
createAchievement('roadkill_enthusiast', {name: "Roadkill Enthusiast", description: "Watch the Henchmen die 50 times.", maxScore: 50, maxDecimals: 0});
createAchievement('oversinging', {name: "Oversinging Much...?", description: "Hold down a note for 10 seconds."});
createAchievement('hype', {name: "Hyperactive", description: "Finish a Song without going Idle."});
createAchievement('oversinging', {name: "Oversinging Much...?", description: "Sing for 10 seconds without going back to Idle."});
createAchievement('hype', {name: "Hyperactive", description: "Finish a Song without going back to Idle."});
createAchievement('two_keys', {name: "Just the Two of Us", description: "Finish a Song pressing only two keys."});
createAchievement('toastie', {name: "Toaster Gamer", description: "Have you tried to run the game on a toaster?"});
createAchievement('debugger', {name: "Debugger", description: "Beat the \"Test\" Stage from the Chart Editor.", hidden: true});
Expand Down
8 changes: 6 additions & 2 deletions source/objects/Character.hx
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,11 @@ class Character extends FlxSprite {
}

try {
#if MODS_ALLOWED loadCharacterFile(cast Json.parse(File.getContent(path))); #else loadCharacterFile(cast Json.parse(Assets.getText(path))); #end
#if MODS_ALLOWED
loadCharacterFile(Json.parse(File.getContent(path)));
#else
loadCharacterFile(Json.parse(Assets.getText(path)));
#end
}
catch(e:Dynamic) {
trace('Error loading character file of "$character": $e');
Expand All @@ -119,7 +123,7 @@ class Character extends FlxSprite {
}
}

public function loadCharacterFile(json:CharacterFile)
public function loadCharacterFile(json:Dynamic)
{
isAnimateAtlas = false;

Expand Down
3 changes: 2 additions & 1 deletion source/states/MainMenuState.hx
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ typedef MainMenuData = {
}

class MainMenuState extends MusicBeatState {
public static var psychEngineVersion:String = '0.7.2-foxa'; //This is also used for Discord RPC
public static var psychEngineVersion:String = '0.7.2h-foxa'; //This is also used for Discord RPC
public static var curSelected:Int = 0;
private var colorRotation:Int = 1;

Expand Down Expand Up @@ -293,6 +293,7 @@ class MainMenuState extends MusicBeatState {
if(PlayState.SONG != null){
PlayState.SONG.arrowSkin = null;
PlayState.SONG.splashSkin = null;
PlayState.stageUI = 'normal';
}
}
});
Expand Down
Loading

0 comments on commit 94ffedf

Please sign in to comment.