Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Lua Cleanup #15705

Open
wants to merge 14 commits into
base: main
Choose a base branch
from
Open

Lua Cleanup #15705

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
f67b554
Update FunkinLua.hx
LarryFrosty Oct 15, 2024
88da298
Update LuaUtils.hx
LarryFrosty Oct 15, 2024
8c2a00d
Update ShaderFunctions.hx
LarryFrosty Oct 15, 2024
d60ead7
i cant do git clone :(
LarryFrosty Oct 15, 2024
7c572a4
Update ReflectionFunctions.hx
LarryFrosty Oct 15, 2024
1ea32ea
Update CoolUtil.hx
LarryFrosty Oct 15, 2024
936f038
Update windows.bat
LarryFrosty Oct 15, 2024
d246b0a
Update unix.sh
LarryFrosty Oct 15, 2024
93ad099
check 0x and make sure it's a hex color
LarryFrosty Oct 16, 2024
46be73b
Why the fuck
LarryFrosty Oct 19, 2024
f760d38
add removeVar
LarryFrosty Oct 21, 2024
e53e53b
reflect members on (set/get)PropertyFromGroup
LarryFrosty Oct 22, 2024
487a443
Merge branch 'main' into fixing
LarryFrosty Oct 24, 2024
b9f5c39
Merge branch 'main' into fixing
LarryFrosty Jan 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion source/backend/CoolUtil.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class CoolUtil
{
var hideChars = ~/[\t\n\r]/;
var color:String = hideChars.split(color).join('').trim();
if(color.startsWith('0x')) color = color.substring(color.length - 6);
if(color.startsWith('0x')) color = color.substring(color.length - (color.length >= 10 ? 8 : 6));

var colorNum:Null<FlxColor> = FlxColor.fromString(color);
if(colorNum == null) colorNum = FlxColor.fromString('#$color');
Expand Down
195 changes: 50 additions & 145 deletions source/psychlua/FunkinLua.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,7 @@ class FunkinLua {
set('healthBarAlpha', ClientPrefs.data.healthBarAlpha);
set('noResetButton', ClientPrefs.data.noReset);
set('lowQuality', ClientPrefs.data.lowQuality);
set('antialiasing', ClientPrefs.data.antialiasing);
set('shadersEnabled', ClientPrefs.data.shaders);
set('scriptName', scriptName);
set('currentModDirectory', Mods.currentModDirectory);
Expand Down Expand Up @@ -290,6 +291,9 @@ class FunkinLua {
Lua_helper.add_callback(lua, "getVar", function(varName:String) {
return MusicBeatState.getVariables().get(varName);
});
Lua_helper.add_callback(lua, "removeVar", function(varName:String) {
return MusicBeatState.getVariables().remove(varName);
});

Lua_helper.add_callback(lua, "addLuaScript", function(luaFile:String, ?ignoreAlreadyRunning:Bool = false) {
var luaPath:String = findScript(luaFile);
Expand Down Expand Up @@ -388,35 +392,34 @@ class FunkinLua {

FlxG.sound.music.pause();
FlxG.sound.music.volume = 0;
if(game != null && game.vocals != null)
if(game != null)
{
game.vocals.pause();
game.vocals.volume = 0;
if(game.vocals != null)
{
game.vocals.pause();
game.vocals.volume = 0;
}

if(game.opponentVocals != null)
{
game.opponentVocals.pause();
game.opponentVocals.volume = 0;
}
}
FlxG.camera.followLerp = 0;
});

Lua_helper.add_callback(lua, "loadGraphic", function(variable:String, image:String, ?gridX:Int = 0, ?gridY:Int = 0) {
var split:Array<String> = variable.split('.');
var spr:FlxSprite = LuaUtils.getObjectDirectly(split[0]);
var spr:FlxSprite = LuaUtils.getObjectLoop(variable);
var animated = gridX != 0 || gridY != 0;

if(split.length > 1) {
spr = LuaUtils.getVarInArray(LuaUtils.getPropertyLoop(split), split[split.length-1]);
}

if(spr != null && image != null && image.length > 0)
{
spr.loadGraphic(Paths.image(image), animated, gridX, gridY);
}
});
Lua_helper.add_callback(lua, "loadFrames", function(variable:String, image:String, spriteType:String = 'auto') {
var split:Array<String> = variable.split('.');
var spr:FlxSprite = LuaUtils.getObjectDirectly(split[0]);
if(split.length > 1) {
spr = LuaUtils.getVarInArray(LuaUtils.getPropertyLoop(split), split[split.length-1]);
}

var spr:FlxSprite = LuaUtils.getObjectLoop(variable);
if(spr != null && image != null && image.length > 0)
{
LuaUtils.loadFrames(spr, image, spriteType);
Expand All @@ -425,7 +428,7 @@ class FunkinLua {

//shitass stuff for epic coders like me B) *image of obama giving himself a medal*
Lua_helper.add_callback(lua, "getObjectOrder", function(obj:String, ?group:String = null) {
var leObj:FlxBasic = LuaUtils.getObjectDirectly(obj);
var leObj:FlxBasic = LuaUtils.getObjectLoop(obj);
if(leObj != null)
{
if(group != null)
Expand Down Expand Up @@ -454,7 +457,7 @@ class FunkinLua {
return -1;
});
Lua_helper.add_callback(lua, "setObjectOrder", function(obj:String, position:Int, ?group:String = null) {
var leObj:FlxBasic = LuaUtils.getObjectDirectly(obj);
var leObj:FlxBasic = LuaUtils.getObjectLoop(obj);
if(leObj != null)
{
if(group != null)
Expand Down Expand Up @@ -496,7 +499,8 @@ class FunkinLua {
if(tag != null)
{
var variables = MusicBeatState.getVariables();
var originalTag:String = 'tween_' + LuaUtils.formatVariable(tag);
var originalTag = tag;
tag = LuaUtils.formatVariable('tween_$tag');
variables.set(tag, FlxTween.tween(penisExam, values, duration, myOptions != null ? {
type: myOptions.type,
ease: myOptions.ease,
Expand Down Expand Up @@ -565,15 +569,19 @@ class FunkinLua {
Lua_helper.add_callback(lua, "doTweenColor", function(tag:String, vars:String, targetColor:String, duration:Float, ?ease:String = 'linear') {
var penisExam:Dynamic = LuaUtils.tweenPrepare(tag, vars);
if(penisExam != null) {
targetColor = targetColor.trim();
var newColor:FlxColor = CoolUtil.colorFromString(targetColor);
if(targetColor.startsWith('0x') && targetColor.length == 8 || !FlxColor.colorLookup.exists(targetColor.toUpperCase()) && targetColor.length == 6) newColor.alphaFloat = penisExam.alpha;

var curColor:FlxColor = penisExam.color;
curColor.alphaFloat = penisExam.alpha;

if(tag != null)
{
var originalTag:String = tag;
tag = LuaUtils.formatVariable('tween_$tag');
var variables = MusicBeatState.getVariables();
variables.set(tag, FlxTween.color(penisExam, duration, curColor, CoolUtil.colorFromString(targetColor), {ease: LuaUtils.getTweenEaseByString(ease),
variables.set(tag, FlxTween.color(penisExam, duration, curColor, newColor, {ease: LuaUtils.getTweenEaseByString(ease),
onComplete: function(twn:FlxTween)
{
variables.remove(tag);
Expand Down Expand Up @@ -855,61 +863,37 @@ class FunkinLua {
});

Lua_helper.add_callback(lua, "getMidpointX", function(variable:String) {
var split:Array<String> = variable.split('.');
var obj:FlxObject = LuaUtils.getObjectDirectly(split[0]);
if(split.length > 1) {
obj = LuaUtils.getVarInArray(LuaUtils.getPropertyLoop(split), split[split.length-1]);
}
var obj:FlxObject = LuaUtils.getObjectLoop(variable);
if(obj != null) return obj.getMidpoint().x;

return 0;
});
Lua_helper.add_callback(lua, "getMidpointY", function(variable:String) {
var split:Array<String> = variable.split('.');
var obj:FlxObject = LuaUtils.getObjectDirectly(split[0]);
if(split.length > 1) {
obj = LuaUtils.getVarInArray(LuaUtils.getPropertyLoop(split), split[split.length-1]);
}
var obj:FlxObject = LuaUtils.getObjectLoop(variable);
if(obj != null) return obj.getMidpoint().y;

return 0;
});
Lua_helper.add_callback(lua, "getGraphicMidpointX", function(variable:String) {
var split:Array<String> = variable.split('.');
var obj:FlxSprite = LuaUtils.getObjectDirectly(split[0]);
if(split.length > 1) {
obj = LuaUtils.getVarInArray(LuaUtils.getPropertyLoop(split), split[split.length-1]);
}
var obj:FlxSprite = LuaUtils.getObjectLoop(variable);
if(obj != null) return obj.getGraphicMidpoint().x;

return 0;
});
Lua_helper.add_callback(lua, "getGraphicMidpointY", function(variable:String) {
var split:Array<String> = variable.split('.');
var obj:FlxSprite = LuaUtils.getObjectDirectly(split[0]);
if(split.length > 1) {
obj = LuaUtils.getVarInArray(LuaUtils.getPropertyLoop(split), split[split.length-1]);
}
var obj:FlxSprite = LuaUtils.getObjectLoop(variable);
if(obj != null) return obj.getGraphicMidpoint().y;

return 0;
});
Lua_helper.add_callback(lua, "getScreenPositionX", function(variable:String, ?camera:String = 'game') {
var split:Array<String> = variable.split('.');
var obj:FlxObject = LuaUtils.getObjectDirectly(split[0]);
if(split.length > 1) {
obj = LuaUtils.getVarInArray(LuaUtils.getPropertyLoop(split), split[split.length-1]);
}
var obj:FlxObject = LuaUtils.getObjectLoop(variable);
if(obj != null) return obj.getScreenPosition(LuaUtils.cameraFromString(camera)).x;

return 0;
});
Lua_helper.add_callback(lua, "getScreenPositionY", function(variable:String, ?camera:String = 'game') {
var split:Array<String> = variable.split('.');
var obj:FlxObject = LuaUtils.getObjectDirectly(split[0]);
if(split.length > 1) {
obj = LuaUtils.getVarInArray(LuaUtils.getPropertyLoop(split), split[split.length-1]);
}
var obj:FlxObject = LuaUtils.getObjectLoop(variable);
if(obj != null) return obj.getScreenPosition(LuaUtils.cameraFromString(camera)).y;

return 0;
Expand Down Expand Up @@ -943,7 +927,7 @@ class FunkinLua {
});

Lua_helper.add_callback(lua, "makeGraphic", function(obj:String, width:Int = 256, height:Int = 256, color:String = 'FFFFFF') {
var spr:FlxSprite = LuaUtils.getObjectDirectly(obj);
var spr:FlxSprite = LuaUtils.getObjectLoop(obj);
if(spr != null) spr.makeGraphic(width, height, CoolUtil.colorFromString(color));
});
Lua_helper.add_callback(lua, "addAnimationByPrefix", function(obj:String, name:String, prefix:String, framerate:Float = 24, loop:Bool = true) {
Expand Down Expand Up @@ -997,12 +981,7 @@ class FunkinLua {
});

Lua_helper.add_callback(lua, "setScrollFactor", function(obj:String, scrollX:Float, scrollY:Float) {
if(game.getLuaObject(obj) != null) {
game.getLuaObject(obj).scrollFactor.set(scrollX, scrollY);
return;
}

var object:FlxObject = Reflect.getProperty(LuaUtils.getTargetInstance(), obj);
var object:FlxObject = LuaUtils.getObjectLoop(obj);
if(object != null) {
object.scrollFactor.set(scrollX, scrollY);
}
Expand All @@ -1023,19 +1002,7 @@ class FunkinLua {
}
});
Lua_helper.add_callback(lua, "setGraphicSize", function(obj:String, x:Float, y:Float = 0, updateHitbox:Bool = true) {
if(game.getLuaObject(obj)!=null) {
var shit:FlxSprite = game.getLuaObject(obj);
shit.setGraphicSize(x, y);
if(updateHitbox) shit.updateHitbox();
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 = LuaUtils.getObjectLoop(obj);
if(poop != null) {
poop.setGraphicSize(x, y);
if(updateHitbox) poop.updateHitbox();
Expand All @@ -1044,19 +1011,7 @@ class FunkinLua {
luaTrace('setGraphicSize: Couldnt find object: ' + obj, false, false, FlxColor.RED);
});
Lua_helper.add_callback(lua, "scaleObject", function(obj:String, x:Float, y:Float, updateHitbox:Bool = true) {
if(game.getLuaObject(obj)!=null) {
var shit:FlxSprite = game.getLuaObject(obj);
shit.scale.set(x, y);
if(updateHitbox) shit.updateHitbox();
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 = LuaUtils.getObjectLoop(obj);
if(poop != null) {
poop.scale.set(x, y);
if(updateHitbox) poop.updateHitbox();
Expand All @@ -1065,18 +1020,7 @@ class FunkinLua {
luaTrace('scaleObject: Couldnt find object: ' + obj, false, false, FlxColor.RED);
});
Lua_helper.add_callback(lua, "updateHitbox", function(obj:String) {
if(game.getLuaObject(obj)!=null) {
var shit:FlxSprite = game.getLuaObject(obj);
shit.updateHitbox();
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 = LuaUtils.getObjectLoop(obj);
if(poop != null) {
poop.updateHitbox();
return;
Expand Down Expand Up @@ -1110,7 +1054,7 @@ class FunkinLua {
return (obj != null && Std.isOfType(obj, FlxText));
});
Lua_helper.add_callback(lua, "luaSoundExists", function(tag:String) {
var obj:FlxSound = MusicBeatState.getVariables().get('sound_$tag');
var obj:FlxSound = MusicBeatState.getVariables().get(LuaUtils.formatVariable('sound_$tag'));
return (obj != null && Std.isOfType(obj, FlxSound));
});

Expand All @@ -1134,18 +1078,7 @@ class FunkinLua {
});

Lua_helper.add_callback(lua, "setObjectCamera", function(obj:String, camera:String = 'game') {
var real:FlxBasic = 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]);
if(split.length > 1) {
object = LuaUtils.getVarInArray(LuaUtils.getPropertyLoop(split), split[split.length-1]);
}

var object:FlxBasic = LuaUtils.getObjectLoop(obj);
if(object != null) {
object.cameras = [LuaUtils.cameraFromString(camera)];
return true;
Expand All @@ -1154,18 +1087,7 @@ class FunkinLua {
return false;
});
Lua_helper.add_callback(lua, "setBlendMode", function(obj:String, blend:String = '') {
var real:FlxSprite = game.getLuaObject(obj);
if(real != null) {
real.blend = LuaUtils.blendModeFromString(blend);
return true;
}

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

var spr:FlxSprite = LuaUtils.getObjectLoop(obj);
if(spr != null) {
spr.blend = LuaUtils.blendModeFromString(blend);
return true;
Expand All @@ -1174,53 +1096,36 @@ class FunkinLua {
return false;
});
Lua_helper.add_callback(lua, "screenCenter", function(obj:String, pos:String = 'xy') {
var spr:FlxObject = game.getLuaObject(obj);

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

var spr:FlxObject = LuaUtils.getObjectLoop(obj);
if(spr != null)
{
switch(pos.trim().toLowerCase())
{
case 'x':
spr.screenCenter(X);
return;
case 'y':
spr.screenCenter(Y);
return;
default:
spr.screenCenter(XY);
return;
}
return;
}
luaTrace("screenCenter: Object " + obj + " doesn't exist!", false, false, FlxColor.RED);
});
Lua_helper.add_callback(lua, "objectsOverlap", function(obj1:String, obj2:String) {
var namesArray:Array<String> = [obj1, obj2];
var objectsArray:Array<FlxBasic> = [];
for (i in 0...namesArray.length)
for (tag in namesArray)
{
var real:FlxBasic = game.getLuaObject(namesArray[i]);
if(real != null)
objectsArray.push(real);
else
objectsArray.push(Reflect.getProperty(LuaUtils.getTargetInstance(), namesArray[i]));
var obj:FlxBasic = LuaUtils.getObjectLoop(tag);
if(obj != null) {
objectsArray.push(obj);
}
}
return (!objectsArray.contains(null) && FlxG.overlap(objectsArray[0], objectsArray[1]));
});
Lua_helper.add_callback(lua, "getPixelColor", function(obj:String, x:Int, y:Int) {
var split:Array<String> = obj.split('.');
var spr:FlxSprite = LuaUtils.getObjectDirectly(split[0]);
if(split.length > 1) {
spr = LuaUtils.getVarInArray(LuaUtils.getPropertyLoop(split), split[split.length-1]);
}

var spr:FlxSprite = LuaUtils.getObjectLoop(obj);
if(spr != null) return spr.pixels.getPixel32(x, y);
return FlxColor.BLACK;
});
Expand Down
Loading
Loading