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

Jump to bottom

Implement hscript-improved #13304

Closed
wants to merge 11 commits into from
+478 −526
Closed

Implement hscript-improved #13304

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
b86d976
implement hscript-improved
TheLeerName Sep 19, 2023
4e83741
HScript.hscriptTrace
TheLeerName Sep 19, 2023
3fd4522
if u got error in runHaxeCode, it stops executing
TheLeerName Sep 19, 2023
197bfcc
#if HSCRIPT_ALLOWED things
TheLeerName Sep 19, 2023
36e3096
it returns void not null
TheLeerName Sep 19, 2023
6d174c1
Lua_helper.add_callback() to just set()
TheLeerName Sep 19, 2023
d2d6207
trace of elapsed time after loading script
TheLeerName Sep 19, 2023
8fdd943
u can just set function itself, not create new
TheLeerName Sep 19, 2023
423d358
remove spam!!!!
TheLeerName Sep 19, 2023
f33a803
cool idea, CrowPlexus
TheLeerName Sep 19, 2023
42d1040
import same classes as in SScript
TheLeerName Sep 20, 2023
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
Prev Previous commit
Next Next commit
u can just set function itself, not create new
  • Loading branch information
@TheLeerName
TheLeerName committed Sep 19, 2023
commit 8fdd943fd0e39f138039ce9a6c03a1931ffc0ad4
20 changes: 5 additions & 15 deletions source/psychlua/ExtraFunctions.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,9 +228,7 @@ class ExtraFunctions
}
return false;
});
funk.set("getTextFromFile", function(path:String, ?ignoreModFolders:Bool = false, ?absolute:Bool = false) {
return Paths.getTextFromFile(path, ignoreModFolders, absolute);
});
funk.set("getTextFromFile", Paths.getTextFromFile);
funk.set("directoryFileList", function(folder:String) {
var list:Array<String> = [];
#if sys
Expand All @@ -246,18 +244,12 @@ class ExtraFunctions
});

// String tools
funk.set("stringStartsWith", function(str:String, start:String) {
return str.startsWith(start);
});
funk.set("stringEndsWith", function(str:String, end:String) {
return str.endsWith(end);
});
funk.set("stringStartsWith", StringTools.startsWith);
funk.set("stringEndsWith", StringTools.endsWith);
funk.set("stringSplit", function(str:String, split:String) {
return str.split(split);
});
funk.set("stringTrim", function(str:String) {
return str.trim();
});
funk.set("stringTrim", StringTools.trim);

// Randomization
funk.set("getRandomInt", function(min:Int, max:Int = FlxMath.MAX_VALUE_INT, exclude:String = '') {
Expand All @@ -278,8 +270,6 @@ class ExtraFunctions
}
return FlxG.random.float(min, max, toExclude);
});
funk.set("getRandomBool", function(chance:Float = 50) {
return FlxG.random.bool(chance);
});
funk.set("getRandomBool", FlxG.random.bool);
}
}
44 changes: 12 additions & 32 deletions source/psychlua/FunkinLua.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,9 +357,7 @@ class FunkinLua {
PlayState.instance.variables.set(varName, value);
return value;
});
set("getVar", function(varName:String) {
return PlayState.instance.variables.get(varName);
});
set("getVar", PlayState.instance.variables.get);

set("addLuaScript", function(luaFile:String, ?ignoreAlreadyRunning:Bool = false) { //would be dope asf.
var foundScript:String = findScript(luaFile);
Expand Down Expand Up @@ -673,10 +671,7 @@ class FunkinLua {
}
});

set("cancelTween", function(tag:String) {
LuaUtils.cancelTween(tag);
});

set("cancelTween", LuaUtils.cancelTween);
set("runTimer", function(tag:String, time:Float = 1, loops:Int = 1) {
LuaUtils.cancelTimer(tag);
game.modchartTimers.set(tag, new FlxTimer().start(time, function(tmr:FlxTimer) {
Expand All @@ -687,9 +682,7 @@ class FunkinLua {
//trace('Timer Completed: ' + tag);
}, loops));
});
set("cancelTimer", function(tag:String) {
LuaUtils.cancelTimer(tag);
});
set("cancelTimer", LuaUtils.cancelTimer);

//stupid bietch ass functions
set("addScore", function(value:Int = 0) {
Expand Down Expand Up @@ -737,9 +730,9 @@ class FunkinLua {
});

//Identical functions
set("FlxColor", function(color:String) return FlxColor.fromString(color));
set("getColorFromName", function(color:String) return FlxColor.fromString(color));
set("getColorFromString", function(color:String) return FlxColor.fromString(color));
set("FlxColor", FlxColor.fromString);
set("getColorFromName", FlxColor.fromString);
set("getColorFromString", FlxColor.fromString);
set("getColorFromHex", function(color:String) return FlxColor.fromString('#$color'));

// precaching
Expand All @@ -754,12 +747,8 @@ class FunkinLua {
set("precacheImage", function(name:String, ?allowGPU:Bool = true) {
Paths.image(name, allowGPU);
});
set("precacheSound", function(name:String) {
Paths.sound(name);
});
set("precacheMusic", function(name:String) {
Paths.music(name);
});
set("precacheSound", Paths.sound);
set("precacheMusic", Paths.music);

// others
set("triggerEvent", function(name:String, arg1:Dynamic, arg2:Dynamic) {
Expand All @@ -770,10 +759,7 @@ class FunkinLua {
return true;
});

set("startCountdown", function() {
game.startCountdown();
return true;
});
set("startCountdown", game.startCountdown);
set("endSong", function() {
game.KillNotes();
game.endSong();
Expand Down Expand Up @@ -1147,15 +1133,9 @@ class FunkinLua {
}
});

set("luaSpriteExists", function(tag:String) {
return game.modchartSprites.exists(tag);
});
set("luaTextExists", function(tag:String) {
return game.modchartTexts.exists(tag);
});
set("luaSoundExists", function(tag:String) {
return game.modchartSounds.exists(tag);
});
set("luaSpriteExists", game.modchartSprites.exists);
set("luaTextExists", game.modchartTexts.exists);
set("luaSoundExists", game.modchartSounds.exists);

set("setHealthBarColors", function(left:String, right:String) {
game.healthBar.setColors(CoolUtil.colorFromString(left), CoolUtil.colorFromString(right));
Expand Down
Loading