importable scripts through stage.xml + new call

extensions feature
This commit is contained in:
⍚~Nex
2024-09-18 16:10:19 +02:00
parent ff4c1491c1
commit 15a18bb3da
6 changed files with 37 additions and 6 deletions
+1
View File
@@ -1,3 +1,4 @@
//
import funkin.game.HudCamera;
import funkin.backend.scripting.events.NoteHitEvent;
-1
View File
@@ -1,5 +1,4 @@
function create() {
importScript("data/scripts/pixel");
isSpooky = true;
// Make transition work between school types
+1
View File
@@ -1,5 +1,6 @@
<!DOCTYPE codename-engine-stage>
<stage zoom="1" name="school-evil" folder="stages/school/" startCamPosY="550" startCamPosX="600">
<use-extension script="pixel"/>
<sprite name="bg" x="400" y="200" sprite="animatedEvilSchool"
antialiasing="false" scale="6" scrollx="0.8" scrolly="0.9" type="loop"/>
</stage>
+1 -1
View File
@@ -1,5 +1,5 @@
//
function create() {
importScript("data/scripts/pixel");
if (PlayState.SONG.meta.name.toLowerCase() == "roses") {
bgGirls.animation.remove("danceLeft");
bgGirls.animation.remove("danceRight");
+2
View File
@@ -1,5 +1,7 @@
<!DOCTYPE codename-engine-stage>
<stage zoom="1" folder="stages/school/" startCamPosY="550" startCamPosX="600">
<use-extension script="pixel"/>
<sprite name="bgSky" x="-12" y="0" sprite="weebSky"
antialiasing="false" scale="6" scroll="0.1" updateHitbox="true"/>
+32 -4
View File
@@ -6,6 +6,7 @@ import flixel.math.FlxPoint;
import flixel.FlxState;
import haxe.xml.Access;
import funkin.backend.system.interfaces.IBeatReceiver;
import funkin.backend.scripting.DummyScript;
import funkin.backend.scripting.Script;
import haxe.io.Path;
@@ -18,6 +19,7 @@ class Stage extends FlxBasic implements IBeatReceiver {
public var stageScript:Script;
public var state:FlxState;
public var characterPoses:Map<String, StageCharPos> = [];
public var xmlImportedScripts:Map<Script, Bool> = [];
private var spritesParentFolder = "";
@@ -45,6 +47,7 @@ class Stage extends FlxBasic implements IBeatReceiver {
stageScript.load();
}
var event = null;
if (stageXML != null) {
if (PlayState.instance != null) {
var parsed:Null<Float>;
@@ -68,8 +71,8 @@ class Stage extends FlxBasic implements IBeatReceiver {
}
if (PlayState.instance != null) {
var event = PlayState.instance.scripts.event("onStageXMLParsed", EventManager.get(StageXMLEvent).recycle(this, stageXML, elems));
elems = event.elems;
event = EventManager.get(StageXMLEvent).recycle(this, stageXML, elems);
elems = PlayState.instance.scripts.event("onStageXMLParsed", event).elems;
}
for(node in elems) {
@@ -86,7 +89,7 @@ class Stage extends FlxBasic implements IBeatReceiver {
state.add(spr);
spr;
case "box" | "solid":
if ( !node.has.name || !node.has.width || !node.has.height) continue;
if (!node.has.name || !node.has.width || !node.has.height) continue;
var spr = new FlxSprite(
(node.has.x) ? Std.parseFloat(node.att.x).getDefault(0) : 0,
@@ -134,6 +137,22 @@ class Stage extends FlxBasic implements IBeatReceiver {
);
PlayState.instance.add(PlayState.instance.comboGroup);
PlayState.instance.comboGroup;
case "use-extension" | "extension" | "ext":
if (!node.has.script || PlayState.instance == null) continue;
var folder = node.getAtt("folder").getDefault("data/scripts/");
if (!folder.endsWith("/")) folder += "/";
var path = folder + node.getAtt("script");
var daScript = Script.create(Paths.script(path));
if (daScript is DummyScript) throw 'Script at ${path} does not exist.';
else {
xmlImportedScripts.set(daScript, node.getAtt("isShortLived") == "true");
PlayState.instance.scripts.add(daScript);
daScript.load();
}
null;
default: null;
}
@@ -173,8 +192,17 @@ class Stage extends FlxBasic implements IBeatReceiver {
});
if (PlayState.instance == null) return;
for(k=>e in stageSprites) {
for (k=>e in stageSprites)
stageScript.set(k, e);
// idk lemme check anyways just in case scripts did smth - Nex
if (event != null) PlayState.instance.scripts.event("onPostStageCreation", event);
// shortlived scripts destroy when the stage finishes setting up - Nex
for (s=>b in xmlImportedScripts) if (b) {
PlayState.instance.scripts.remove(s);
s.destroy();
}
}