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

Some 1.0 fixes #15360

Open
wants to merge 9 commits into
base: experimental
Choose a base branch
from
+63 −30
Open

Some 1.0 fixes #15360

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
42674bf
One
LarryFrosty Aug 20, 2024
a78d4cc
Update T
LarryFrosty Aug 20, 2024
8ce954b
Lua :pensive:
LarryFrosty Aug 20, 2024
21563ff
FlixelText.hx
LarryFrosty Aug 20, 2024
2404a3f
Remove text arg from getLuaObject
LarryFrosty Aug 31, 2024
57239a3
Change BaseStage.Countdown to Countdown in Template.hx
LarryFrosty Sep 8, 2024
f0c2458
nvm
LarryFrosty Sep 14, 2024
afb94c8
BRUH I WAS LOOKING IN THE WRONG PLACE
LarryFrosty Sep 14, 2024
525ca9d
Merge branch 'experimental' into testing
LarryFrosty Oct 1, 2024
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
4 changes: 2 additions & 2 deletions source/psychlua/DeprecatedFunctions.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ class DeprecatedFunctions

Lua_helper.add_callback(lua, "objectPlayAnimation", function(obj:String, name:String, forced:Bool = false, ?startFrame:Int = 0) {
FunkinLua.luaTrace("objectPlayAnimation is deprecated! Use playAnim instead", false, true);
if(PlayState.instance.getLuaObject(obj,false) != null) {
PlayState.instance.getLuaObject(obj,false).animation.play(name, forced, false, startFrame);
if(PlayState.instance.getLuaObject(obj) != null) {
PlayState.instance.getLuaObject(obj).animation.play(name, forced, false, startFrame);
return true;
}

Expand Down
26 changes: 14 additions & 12 deletions source/psychlua/FunkinLua.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -461,22 +461,23 @@ class FunkinLua {
if(tag != null)
{
var variables = MusicBeatState.getVariables();
tag = 'tween_' + LuaUtils.formatVariable(tag);
var originalTag = tag;
tag = LuaUtils.formatVariable('tween_$tag');
variables.set(tag, FlxTween.tween(penisExam, values, duration, {
type: myOptions.type,
ease: myOptions.ease,
startDelay: myOptions.startDelay,
loopDelay: myOptions.loopDelay,

onUpdate: function(twn:FlxTween) {
if(myOptions.onUpdate != null) game.callOnLuas(myOptions.onUpdate, [tag, vars]);
if(myOptions.onUpdate != null) game.callOnLuas(myOptions.onUpdate, [originalTag, vars]);
},
onStart: function(twn:FlxTween) {
if(myOptions.onStart != null) game.callOnLuas(myOptions.onStart, [tag, vars]);
if(myOptions.onStart != null) game.callOnLuas(myOptions.onStart, [originalTag, 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, [tag, vars]);
if(myOptions.onComplete != null) game.callOnLuas(myOptions.onComplete, [originalTag, vars]);
}
}));
return tag;
Expand Down Expand Up @@ -806,7 +807,7 @@ class FunkinLua {

Lua_helper.add_callback(lua, "getMidpointX", function(variable:String) {
var split:Array<String> = variable.split('.');
var obj:FlxSprite = LuaUtils.getObjectDirectly(split[0]);
var obj:FlxObject = LuaUtils.getObjectDirectly(split[0]);
if(split.length > 1) {
obj = LuaUtils.getVarInArray(LuaUtils.getPropertyLoop(split), split[split.length-1]);
}
Expand All @@ -816,7 +817,7 @@ class FunkinLua {
});
Lua_helper.add_callback(lua, "getMidpointY", function(variable:String) {
var split:Array<String> = variable.split('.');
var obj:FlxSprite = LuaUtils.getObjectDirectly(split[0]);
var obj:FlxObject = LuaUtils.getObjectDirectly(split[0]);
if(split.length > 1) {
obj = LuaUtils.getVarInArray(LuaUtils.getPropertyLoop(split), split[split.length-1]);
}
Expand Down Expand Up @@ -846,7 +847,7 @@ class FunkinLua {
});
Lua_helper.add_callback(lua, "getScreenPositionX", function(variable:String, ?camera:String = 'game') {
var split:Array<String> = variable.split('.');
var obj:FlxSprite = LuaUtils.getObjectDirectly(split[0]);
var obj:FlxObject = LuaUtils.getObjectDirectly(split[0]);
if(split.length > 1) {
obj = LuaUtils.getVarInArray(LuaUtils.getPropertyLoop(split), split[split.length-1]);
}
Expand All @@ -856,7 +857,7 @@ class FunkinLua {
});
Lua_helper.add_callback(lua, "getScreenPositionY", function(variable:String, ?camera:String = 'game') {
var split:Array<String> = variable.split('.');
var obj:FlxSprite = LuaUtils.getObjectDirectly(split[0]);
var obj:FlxObject = LuaUtils.getObjectDirectly(split[0]);
if(split.length > 1) {
obj = LuaUtils.getVarInArray(LuaUtils.getPropertyLoop(split), split[split.length-1]);
}
Expand Down Expand Up @@ -947,8 +948,8 @@ class FunkinLua {
});

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

Expand Down Expand Up @@ -1055,6 +1056,7 @@ class FunkinLua {
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);
return (obj != null && Std.isOfType(obj, FlxSound));
});
Expand Down Expand Up @@ -1086,7 +1088,7 @@ class FunkinLua {
}

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

if(spr==null){
var split:Array<String> = obj.split('.');
Expand Down
28 changes: 14 additions & 14 deletions source/psychlua/TextFunctions.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class TextFunctions
});

Lua_helper.add_callback(lua, "setTextString", function(tag:String, text:String) {
var obj:FlxText = MusicBeatState.getVariables().get(tag);
var obj:FlxText = LuaUtils.getObjectDirectly(tag);
if(obj != null)
{
obj.text = text;
Expand All @@ -28,7 +28,7 @@ class TextFunctions
return false;
});
Lua_helper.add_callback(lua, "setTextSize", function(tag:String, size:Int) {
var obj:FlxText = MusicBeatState.getVariables().get(tag);
var obj:FlxText = LuaUtils.getObjectDirectly(tag);
if(obj != null)
{
obj.size = size;
Expand All @@ -38,7 +38,7 @@ class TextFunctions
return false;
});
Lua_helper.add_callback(lua, "setTextWidth", function(tag:String, width:Float) {
var obj:FlxText = MusicBeatState.getVariables().get(tag);
var obj:FlxText = LuaUtils.getObjectDirectly(tag);
if(obj != null)
{
obj.fieldWidth = width;
Expand All @@ -48,7 +48,7 @@ class TextFunctions
return false;
});
Lua_helper.add_callback(lua, "setTextHeight", function(tag:String, height:Float) {
var obj:FlxText = MusicBeatState.getVariables().get(tag);
var obj:FlxText = LuaUtils.getObjectDirectly(tag);
if(obj != null)
{
obj.fieldHeight = height;
Expand All @@ -58,7 +58,7 @@ class TextFunctions
return false;
});
Lua_helper.add_callback(lua, "setTextAutoSize", function(tag:String, value:Bool) {
var obj:FlxText = MusicBeatState.getVariables().get(tag);
var obj:FlxText = LuaUtils.getObjectDirectly(tag);
if(obj != null)
{
obj.autoSize = value;
Expand All @@ -68,7 +68,7 @@ class TextFunctions
return false;
});
Lua_helper.add_callback(lua, "setTextBorder", function(tag:String, size:Float, color:String, ?style:String = 'outline') {
var obj:FlxText = MusicBeatState.getVariables().get(tag);
var obj:FlxText = LuaUtils.getObjectDirectly(tag);
if(obj != null)
{
CoolUtil.setTextBorderFromString(obj, (size > 0 ? style : 'none'));
Expand All @@ -82,7 +82,7 @@ class TextFunctions
return false;
});
Lua_helper.add_callback(lua, "setTextColor", function(tag:String, color:String) {
var obj:FlxText = MusicBeatState.getVariables().get(tag);
var obj:FlxText = LuaUtils.getObjectDirectly(tag);
if(obj != null)
{
obj.color = CoolUtil.colorFromString(color);
Expand All @@ -92,7 +92,7 @@ class TextFunctions
return false;
});
Lua_helper.add_callback(lua, "setTextFont", function(tag:String, newFont:String) {
var obj:FlxText = MusicBeatState.getVariables().get(tag);
var obj:FlxText = LuaUtils.getObjectDirectly(tag);
if(obj != null)
{
obj.font = Paths.font(newFont);
Expand All @@ -102,7 +102,7 @@ class TextFunctions
return false;
});
Lua_helper.add_callback(lua, "setTextItalic", function(tag:String, italic:Bool) {
var obj:FlxText = MusicBeatState.getVariables().get(tag);
var obj:FlxText = LuaUtils.getObjectDirectly(tag);
if(obj != null)
{
obj.italic = italic;
Expand All @@ -112,7 +112,7 @@ class TextFunctions
return false;
});
Lua_helper.add_callback(lua, "setTextAlignment", function(tag:String, alignment:String = 'left') {
var obj:FlxText = MusicBeatState.getVariables().get(tag);
var obj:FlxText = LuaUtils.getObjectDirectly(tag);
if(obj != null)
{
obj.alignment = LEFT;
Expand All @@ -130,7 +130,7 @@ class TextFunctions
});

Lua_helper.add_callback(lua, "getTextString", function(tag:String) {
var obj:FlxText = MusicBeatState.getVariables().get(tag);
var obj:FlxText = LuaUtils.getObjectDirectly(tag);
if(obj != null && obj.text != null)
{
return obj.text;
Expand All @@ -139,7 +139,7 @@ class TextFunctions
return null;
});
Lua_helper.add_callback(lua, "getTextSize", function(tag:String) {
var obj:FlxText = MusicBeatState.getVariables().get(tag);
var obj:FlxText = LuaUtils.getObjectDirectly(tag);
if(obj != null)
{
return obj.size;
Expand All @@ -148,7 +148,7 @@ class TextFunctions
return -1;
});
Lua_helper.add_callback(lua, "getTextFont", function(tag:String) {
var obj:FlxText = MusicBeatState.getVariables().get(tag);
var obj:FlxText = LuaUtils.getObjectDirectly(tag);
if(obj != null)
{
return obj.font;
Expand All @@ -157,7 +157,7 @@ class TextFunctions
return null;
});
Lua_helper.add_callback(lua, "getTextWidth", function(tag:String) {
var obj:FlxText = MusicBeatState.getVariables().get(tag);
var obj:FlxText = LuaUtils.getObjectDirectly(tag);
if(obj != null)
{
return obj.fieldWidth;
Expand Down
2 changes: 1 addition & 1 deletion source/states/PlayState.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -791,7 +791,7 @@ class PlayState extends MusicBeatState
#end
}

public function getLuaObject(tag:String, text:Bool=true):FlxSprite
public function getLuaObject(tag:String):Dynamic
return variables.get(tag);

function startCharacterPos(char:Character, ?gfCheck:Bool = false) {
Expand Down
33 changes: 32 additions & 1 deletion source/states/stages/Template.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,13 @@ class Template extends BaseStage
// Code here
}

override function destroy()
{
// Code here
}


override function countdownTick(count:BaseStage.Countdown, num:Int)
override function countdownTick(count:Countdown, num:Int)
{
switch(count)
{
Expand All @@ -37,6 +42,11 @@ class Template extends BaseStage
}
}

override function startSong()
{
// Code here
}

// Steps, Beats and Sections:
// curStep, curDecStep
// curBeat, curDecBeat
Expand Down Expand Up @@ -120,4 +130,25 @@ class Template extends BaseStage
}
}
}

// Note Hit/Miss
override function goodNoteHit(note:Note)
{
// Code here
}

override function opponentNoteHit(note:Note)
{
// Code here
}

override function noteMiss(note:Note)
{
// Code here
}

override function noteMissPress(direction:Int)
{
// Code here
}
}