Skip to content

Commit

Permalink
revert
Browse files Browse the repository at this point in the history
  • Loading branch information
@LarryFrosty
LarryFrosty authored Aug 23, 2024
1 parent 64e9330 commit e873d7a
Showing 1 changed file with 26 additions and 44 deletions.
70 changes: 26 additions & 44 deletions source/psychlua/FunkinLua.hx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,6 @@ class FunkinLua {
set('songLength', FlxG.sound.music.length);
set('songName', PlayState.SONG.song);
set('songPath', Paths.formatToSongPath(PlayState.SONG.song));
set('loadedSongName', Song.loadedSongName);
set('loadedSongPath', Paths.formatToSongPath(Song.loadedSongName));
set('chartPath', Song.chartPath);
set('startedCountdown', false);
set('curStage', PlayState.SONG.stage);

Expand Down Expand Up @@ -355,20 +352,12 @@ class FunkinLua {
}
}
});*/
Lua_helper.add_callback(lua, "isRunning", function(file:String, ?checkForHaxe:Bool = false) {
var foundScript:String = findScript(file, (checkForHaxe ? '.hx' : '.lua'));
if (foundScript != null) {
if (checkForHaxe) {
for (hscriptInstance in game.hscriptArray)
if (hscriptInstance.origin == foundScript)
return true;
}
else {
for (luaInstance in game.luaArray)
if (luaInstance.scriptName == foundScript)
return true;
}
}
Lua_helper.add_callback(lua, "isRunning", function(luaFile:String) {
var foundScript:String = findScript(luaFile);
if(foundScript != null)
for (luaInstance in game.luaArray)
if(luaInstance.scriptName == foundScript)
return true;
return false;
});

Expand Down Expand Up @@ -460,12 +449,12 @@ class FunkinLua {

Lua_helper.add_callback(lua, "loadSong", function(?name:String = null, ?difficultyNum:Int = -1) {
if(name == null || name.length < 1)
name = Song.loadedSongName;
name = PlayState.SONG.song;
if (difficultyNum == -1)
difficultyNum = PlayState.storyDifficulty;

var poop = Highscore.formatSong(name, difficultyNum);
Song.loadFromJson(poop, name);
PlayState.SONG = Song.loadFromJson(poop, name);
PlayState.storyDifficulty = difficultyNum;
FlxG.state.persistentUpdate = false;
LoadingState.loadAndSwitchState(new PlayState());
Expand Down Expand Up @@ -559,7 +548,6 @@ class FunkinLua {
if(tag != null)
{
var variables = MusicBeatState.getVariables();
var originalTag:String = tag;
tag = LuaUtils.formatVariable('tween_$tag');
variables.set(tag, FlxTween.tween(penisExam, values, duration, {
type: myOptions.type,
Expand All @@ -568,14 +556,14 @@ class FunkinLua {
loopDelay: myOptions.loopDelay,

onUpdate: function(twn:FlxTween) {
if(myOptions.onUpdate != null) game.callOnLuas(myOptions.onUpdate, [originalTag, vars]);
if(myOptions.onUpdate != null) game.callOnLuas(myOptions.onUpdate, [tag, vars]);
},
onStart: function(twn:FlxTween) {
if(myOptions.onStart != null) game.callOnLuas(myOptions.onStart, [originalTag, vars]);
if(myOptions.onStart != null) game.callOnLuas(myOptions.onStart, [tag, vars]);
},
onComplete: function(twn:FlxTween) {
if(twn.type == FlxTweenType.ONESHOT || twn.type == FlxTweenType.BACKWARD) variables.remove(tag);
if(myOptions.onComplete != null) game.callOnLuas(myOptions.onComplete, [originalTag, vars]);
if(myOptions.onComplete != null) game.callOnLuas(myOptions.onComplete, [tag, vars]);
}
}));
}
Expand Down Expand Up @@ -879,18 +867,18 @@ class FunkinLua {
Lua_helper.add_callback(lua, "setRatingFC", function(value:String) {
return game.ratingFC = value;
});
Lua_helper.add_callback(lua, "getMouseX", function(camera:String = 'game') {
Lua_helper.add_callback(lua, "getMouseX", function(camera:String) {
var cam:FlxCamera = LuaUtils.cameraFromString(camera);
return FlxG.mouse.getScreenPosition(cam).x;
});
Lua_helper.add_callback(lua, "getMouseY", function(camera:String = 'game') {
Lua_helper.add_callback(lua, "getMouseY", function(camera:String) {
var cam:FlxCamera = LuaUtils.cameraFromString(camera);
return FlxG.mouse.getScreenPosition(cam).y;
});

Lua_helper.add_callback(lua, "getMidpointX", function(variable:String) {
var split:Array<String> = variable.split('.');
var obj:FlxObject = LuaUtils.getObjectDirectly(split[0]);
var obj:FlxSprite = LuaUtils.getObjectDirectly(split[0]);
if(split.length > 1) {
obj = LuaUtils.getVarInArray(LuaUtils.getPropertyLoop(split), split[split.length-1]);
}
Expand All @@ -900,7 +888,7 @@ class FunkinLua {
});
Lua_helper.add_callback(lua, "getMidpointY", function(variable:String) {
var split:Array<String> = variable.split('.');
var obj:FlxObject = LuaUtils.getObjectDirectly(split[0]);
var obj:FlxSprite = LuaUtils.getObjectDirectly(split[0]);
if(split.length > 1) {
obj = LuaUtils.getVarInArray(LuaUtils.getPropertyLoop(split), split[split.length-1]);
}
Expand Down Expand Up @@ -928,9 +916,9 @@ class FunkinLua {

return 0;
});
Lua_helper.add_callback(lua, "getScreenPositionX", function(variable:String, ?camera:String = 'game') {
Lua_helper.add_callback(lua, "getScreenPositionX", function(variable:String, ?camera:String) {
var split:Array<String> = variable.split('.');
var obj:FlxObject = LuaUtils.getObjectDirectly(split[0]);
var obj:FlxSprite = LuaUtils.getObjectDirectly(split[0]);
var cam:FlxCamera = LuaUtils.cameraFromString(camera);
if(split.length > 1) {
obj = LuaUtils.getVarInArray(LuaUtils.getPropertyLoop(split), split[split.length-1]);
Expand All @@ -939,9 +927,9 @@ class FunkinLua {

return 0;
});
Lua_helper.add_callback(lua, "getScreenPositionY", function(variable:String, ?camera:String = 'game') {
Lua_helper.add_callback(lua, "getScreenPositionY", function(variable:String, ?camera:String) {
var split:Array<String> = variable.split('.');
var obj:FlxObject = LuaUtils.getObjectDirectly(split[0]);
var obj:FlxSprite = LuaUtils.getObjectDirectly(split[0]);
var cam:FlxCamera = LuaUtils.cameraFromString(camera);
if(split.length > 1) {
obj = LuaUtils.getVarInArray(LuaUtils.getPropertyLoop(split), split[split.length-1]);
Expand Down Expand Up @@ -1120,12 +1108,7 @@ class FunkinLua {
return;
}

var split:Array<String> = obj.split('.');
var poop:FlxSprite = LuaUtils.getObjectDirectly(split[0]);
if(split.length > 1) {
poop = LuaUtils.getVarInArray(LuaUtils.getPropertyLoop(split), split[split.length-1]);
}

var poop:FlxSprite = Reflect.getProperty(LuaUtils.getTargetInstance(), obj);
if(poop != null) {
poop.updateHitbox();
return;
Expand Down Expand Up @@ -1162,12 +1145,11 @@ class FunkinLua {
return (obj != null && Std.isOfType(obj, FlxSprite));
});
Lua_helper.add_callback(lua, "luaTextExists", function(tag:String) {
var obj:FlxText = MusicBeatState.getVariables().get(tag);
var obj:FlxSprite = MusicBeatState.getVariables().get(tag);
return (obj != null && Std.isOfType(obj, FlxText));
});
Lua_helper.add_callback(lua, "luaSoundExists", function(tag:String) {
tag = LuaUtils.formatVariable('sound_$tag');
var obj:FlxSound = MusicBeatState.getVariables().get(tag);
var obj:FlxSprite = MusicBeatState.getVariables().get(tag);
return (obj != null && Std.isOfType(obj, FlxSound));
});

Expand All @@ -1190,15 +1172,15 @@ class FunkinLua {
game.timeBar.setColors(left_color, right_color);
});

Lua_helper.add_callback(lua, "setObjectCamera", function(obj:String, camera:String = 'game') {
Lua_helper.add_callback(lua, "setObjectCamera", function(obj:String, camera:String = '') {
var real = game.getLuaObject(obj);
if(real!=null){
real.cameras = [LuaUtils.cameraFromString(camera)];
return true;
}

var split:Array<String> = obj.split('.');
var object:FlxBasic = LuaUtils.getObjectDirectly(split[0]);
var object:FlxSprite = LuaUtils.getObjectDirectly(split[0]);
if(split.length > 1) {
object = LuaUtils.getVarInArray(LuaUtils.getPropertyLoop(split), split[split.length-1]);
}
Expand Down Expand Up @@ -1231,7 +1213,7 @@ class FunkinLua {
return false;
});
Lua_helper.add_callback(lua, "screenCenter", function(obj:String, pos:String = 'xy') {
var spr:FlxObject = game.getLuaObject(obj);
var spr:FlxSprite = game.getLuaObject(obj);

if(spr==null){
var split:Array<String> = obj.split('.');
Expand Down Expand Up @@ -1289,7 +1271,7 @@ class FunkinLua {
});
Lua_helper.add_callback(lua, "startDialogue", function(dialogueFile:String, music:String = null) {
var path:String;
var songPath:String = Paths.formatToSongPath(Song.loadedSongName);
var songPath:String = Paths.formatToSongPath(PlayState.SONG.song);
#if TRANSLATIONS_ALLOWED
path = Paths.getPath('data/$songPath/${dialogueFile}_${ClientPrefs.data.language}.json', TEXT);
#if MODS_ALLOWED
Expand Down

0 comments on commit e873d7a

Please sign in to comment.