gabry/CodenameEngine
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Made it possible to select characters

Browse Source
This commit is contained in:
NeeEoo
2024-04-16 18:43:13 +02:00
parent 243577b459
commit 80299334d3
2 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/funkin/editors/stage/elements/StageCharacterButton.hx
+5 -1
View File
@@ -33,9 +33,13 @@ class StageCharacterButton extends StageElementButton {
}
public override function onSelect() {
StageEditor.instance.selectSprite(char);
}
/*public override function onSelect() {
UIState.state.displayNotification(new UIBaseNotification("Selecting a character isnt implemented yet!", 2, BOTTOM_LEFT));
CoolUtil.playMenuSFX(WARNING, 0.45);
}
}*/
public override function onEdit() {
FlxG.state.openSubState(new StageCharacterEditScreen(this));
source/funkin/editors/ui/UISoftcodedWindow.hx
+21 -8
View File
@@ -43,6 +43,9 @@ class UISoftcodedWindow extends UISubstateWindow {
function get(name:String):Dynamic {
return interp.variables.get(name);
}
function varExists(name:String):Bool {
return interp.variables.exists(name);
}
function execString(input:String):String {
if(input == null) return null;
@@ -116,6 +119,10 @@ class UISoftcodedWindow extends UISubstateWindow {
}
set("last", null);
if(varExists("winTitle")) winTitle = get("winTitle");
if(varExists("winWidth")) winWidth = get("winWidth");
if(varExists("winHeight")) winHeight = get("winHeight");
winTitle = execString(layout.getAtt("title").getDefault(winTitle));
winWidth = Std.parseInt(layout.getAtt("width")).getDefault(winWidth);
winHeight = Std.parseInt(layout.getAtt("height")).getDefault(winHeight);
@@ -175,11 +182,11 @@ class UISoftcodedWindow extends UISubstateWindow {
addLabelOn(textBox, label);
textBox;
case "title":
cast add(new UIText(x, y, 0, execString(el.getAtt("text")), execAtt(el, "size", 28)));
cast add(new UIText(x, y, execAtt(el, "width", 0), execString(el.getAtt("text")), execAtt(el, "size", 28)));
case "label":
cast add(new UIText(x, y - 24, 0, execString(el.getAtt("text")), execAtt(el, "size", 15)));
cast add(new UIText(x, y - 24, execAtt(el, "width", 0), execString(el.getAtt("text")), execAtt(el, "size", 15)));
case "text":
cast add(new UIText(x, y, 0, execString(el.getAtt("text")), execAtt(el, "size", 15)));
cast add(new UIText(x, y, execAtt(el, "width", 0), execString(el.getAtt("text")), execAtt(el, "size", 15)));
case "stepper":
// x:Float, y:Float, value:Float = 0, step:Float = 1, precision:Int = 0, ?min:Float, ?max:Float, w:Int = 180, h:Int = 32
var stepper = new UINumericStepper(
@@ -244,22 +251,28 @@ class UISoftcodedWindow extends UISubstateWindow {
addLayout(getArr(layout.elements));
if(get("hasSaveButtons")) {
if(get("hasSaveButton")) {
saveButton = new UIButton(windowSpr.x + windowSpr.bWidth - 20, windowSpr.y + windowSpr.bHeight - 20, "Save & Close", function() {
saveData();
close();
}, 125);
saveButton.x -= saveButton.bWidth;
saveButton.y -= saveButton.bHeight;
add(saveButton);
}
closeButton = new UIButton(saveButton.x - 20, saveButton.y, "Close", function() {
if(get("hasCloseButton")) {
var x = saveButton != null ? saveButton.x - 20 : windowSpr.x + windowSpr.bWidth - 20;
var y = saveButton != null ? saveButton.y : windowSpr.y + windowSpr.bHeight - 20;
closeButton = new UIButton(x, y, "Close", function() {
close();
}, 125);
closeButton.color = 0xFFFF0000;
if(saveButton != null)
closeButton.color = 0xFFFF0000;
closeButton.x -= closeButton.bWidth;
//closeButton.y -= closeButton.bHeight;
if(saveButton == null)
closeButton.y -= closeButton.bHeight;
add(closeButton);
add(saveButton);
}
}