Skip to content

Commit

Permalink
fondle my balls
Browse files Browse the repository at this point in the history
eyy
  • Loading branch information
Joalor64GH authored Jun 10, 2024
1 parent e83a63b commit 71daab2
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion source/animateatlas/AtlasFrameMaker.hx
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class AtlasFrameMaker extends FlxFramesCollection
var frameCollection:FlxFramesCollection;
var frameArray:Array<Array<FlxFrame>> = [];

if (Paths.fileExists('images/$key/spritemap1.json', TEXT))
if (Paths.fileExists('images/$key/spritemap1.json'))
{
PlayState.instance.addTextToDebug("Only Spritemaps made with Adobe Animate 2018 are supported", FlxColor.RED);
trace("Only Spritemaps made with Adobe Animate 2018 are supported");
Expand Down
8 changes: 4 additions & 4 deletions source/meta/data/scripts/FunkinHscript.hx
Original file line number Diff line number Diff line change
Expand Up @@ -482,7 +482,7 @@ class FunkinHscript extends InterpEx {
var path:String = Paths.json('${Paths.formatToSongPath(PlayState.SONG.song)}/$dialogueFile');
PlayState.instance.addTextToDebug('Trying to load dialogue: $path');

if (Paths.exists(path, TEXT)) {
if (Paths.exists(path)) {
var shit:DialogueFile = DialogueBoxPsych.parseDialogue(path);
if (shit.dialogue.length > 0) {
PlayState.instance.startDialogue(shit, music);
Expand Down Expand Up @@ -514,7 +514,7 @@ class FunkinHscript extends InterpEx {
var cervix = '$name.hscript';
var doPush = false;
cervix = Paths.getPath(cervix);
if (Paths.exists(cervix, TEXT)) {
if (Paths.exists(cervix)) {
doPush = true;
}

Expand All @@ -534,7 +534,7 @@ class FunkinHscript extends InterpEx {
var cervix = '$name.hscript';
var doPush = false;
cervix = Paths.getPath(cervix);
if (Paths.exists(cervix, TEXT)) {
if (Paths.exists(cervix)) {
doPush = true;
}

Expand Down Expand Up @@ -917,4 +917,4 @@ class SysCustom
}
}
#end
#end
#end
6 changes: 3 additions & 3 deletions source/meta/state/editors/CharacterEditorState.hx
Original file line number Diff line number Diff line change
Expand Up @@ -823,11 +823,11 @@ class CharacterEditorState extends MusicBeatState
lastAnim = char.animation.curAnim.name;
}
var anims:Array<AnimArray> = char.animationsArray.copy();
if(Paths.fileExists('images/' + char.imageFile + '/Animation.json', TEXT)) {
if(Paths.fileExists('images/' + char.imageFile + '/Animation.json')) {
char.frames = AtlasFrameMaker.construct(char.imageFile);
} else if(Paths.fileExists('images/' + char.imageFile + '.txt', TEXT)) {
} else if(Paths.fileExists('images/' + char.imageFile + '.txt')) {
char.frames = Paths.getPackerAtlas(char.imageFile);
} else if(Paths.fileExists('images/' + char.imageFile + '.json', TEXT)){
} else if(Paths.fileExists('images/' + char.imageFile + '.json')){
char.frames = Paths.fromI8(char.imageFile);
} else {
char.frames = Paths.getSparrowAtlas(char.imageFile);
Expand Down
6 changes: 3 additions & 3 deletions source/meta/state/editors/CreditsEditorState.hx
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ class CreditsEditorState extends MusicBeatState
else icon = creditsStuff[curSelected][1];

var pathIcon:String;
if(Paths.fileExists('images/credits/' + icon + '.png', IMAGE)) pathIcon = 'credits/' + icon;
if(Paths.fileExists('images/credits/' + icon + '.png')) pathIcon = 'credits/' + icon;
else pathIcon = 'credits/none';

var iconSprite:FlxSprite = new FlxSprite(0, 0).loadGraphic(Paths.image(pathIcon));
Expand Down Expand Up @@ -297,7 +297,7 @@ class CreditsEditorState extends MusicBeatState
}

var icon:AttachedSprite;
if(Paths.fileExists('images/credits/' + creditsStuff[i][1] + '.png', IMAGE)) icon = new AttachedSprite('credits/' + creditsStuff[i][1]);
if(Paths.fileExists('images/credits/' + creditsStuff[i][1] + '.png')) icon = new AttachedSprite('credits/' + creditsStuff[i][1]);
else {
icon = new AttachedSprite('credits/unknown'); // If the icon didnt load
if(creditsStuff[i][1] == null || creditsStuff[i][1] == '') icon = new AttachedSprite('credits/none');
Expand Down Expand Up @@ -647,7 +647,7 @@ class CreditsEditorState extends MusicBeatState
if(text.length == 0){
daColor = Std.parseInt('0xFFFFC31E'); // no input then
} else {
if(!Paths.fileExists('images/credits/' + text + '.png', IMAGE)) daColor = Std.parseInt('0xFFFF004C'); // icon not found
if(!Paths.fileExists('images/credits/' + text + '.png')) daColor = Std.parseInt('0xFFFF004C'); // icon not found
else daColor = Std.parseInt('0xFF00FF37'); // icon was found
}
iconExistCheck.color = daColor;
Expand Down
4 changes: 2 additions & 2 deletions source/objects/userinterface/HealthIcon.hx
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ class HealthIcon extends FlxSprite
public function changeIcon(char:String) {
if(this.char != char) {
var name:String = 'icons/' + char;
if(!Paths.fileExists('images/' + name + '.png', IMAGE)) name = 'icons/' + char; //Older versions of psych engine's support
if(!Paths.fileExists('images/' + name + '.png', IMAGE)) name = 'icons/face'; //Prevents crash from missing icon
if(!Paths.fileExists('images/' + name + '.png')) name = 'icons/' + char; //Older versions of psych engine's support
if(!Paths.fileExists('images/' + name + '.png')) name = 'icons/face'; //Prevents crash from missing icon
var file:Dynamic = Paths.image(name);

loadGraphic(file); //Load stupidly first for getting the file size
Expand Down

0 comments on commit 71daab2

Please sign in to comment.