some cleaner script group/layer stuff

MaybeMaru · Dec 11, 2023 · e9b09cb · e9b09cb
1 parent a683a10
commit e9b09cb
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 21 deletions.
diff --git a/source/funkin/objects/note/Note.hx b/source/funkin/objects/note/Note.hx
@@ -31,7 +31,7 @@ class Note extends FlxSpriteExt implements INoteData {
         if (isSustainNote) {
             if (init) { // Offset sustain
                 final _off = getPosMill(NoteUtil.swagHeight * 0.5, NotesGroup.songSpeed);
-                initSusLength += _off - (NoteUtil.swagHeight * 0.5 / Math.pow(NotesGroup.songSpeed, 2));
+                initSusLength += _off - (NoteUtil.swagHeight * 0.5 / NotesGroup.songSpeed);
             }
         } else {
             loadFromSprite(refSprite);

diff --git a/source/funkin/states/editors/StageDebug.hx b/source/funkin/states/editors/StageDebug.hx
@@ -45,6 +45,7 @@ class StageDebug extends MusicBeatState {
 
         // TODO add a better layer system you big goof
         Stage.createStageObjects(stageData.layers, null, ["bg" => bgGroup, "fg" => fgGroup]);
+        FlxG.camera.zoom = stageData.zoom;
     }
 
     final speed = 50;

diff --git a/source/funkin/states/menus/FreeplayState.hx b/source/funkin/states/menus/FreeplayState.hx
@@ -159,9 +159,10 @@ class FreeplayState extends MusicBeatState {
 		if (Math.abs(lerpScore - intendedScore) <= 10) lerpScore = intendedScore;
 		scoreText.text = "PERSONAL BEST: " + lerpScore;
 
-		for (i in [scoreText,diffText,scoreBG]) {
-			i.x = CoolUtil.coolLerp(i.x, lerpPosition, 0.2);
-		}
+		//for (i in [scoreText,diffText,scoreBG]) i.x = CoolUtil.coolLerp(i.x, lerpPosition, 0.2);
+		scoreBG.x = Math.max(CoolUtil.coolLerp(scoreBG.x, lerpPosition, 0.2), 0);
+		scoreText.x = Math.max(CoolUtil.coolLerp(scoreText.x, lerpPosition, 0.2), 0);
+		diffText.x = CoolUtil.coolLerp(diffText.x, lerpPosition, 0.2);
 
 		if (getKey('UI_LEFT-P'))	changeDiff(-1);
 		if (getKey('UI_RIGHT-P'))	changeDiff(1);

diff --git a/source/funkin/util/modding/FunkScript.hx b/source/funkin/util/modding/FunkScript.hx
@@ -223,12 +223,7 @@ class FunkScript extends hscript.Script implements IFlxDestroyable {
 		});
 
 		set('existsSpr', function(key:String):Null<Dynamic> {
-			for (i in ['fg', 'bg']) {
-				if (ScriptUtil.objMap.exists(ScriptUtil.getSpriteKey(i, key))) {
-					return true;
-				}
-			}
-			return false;						
+			return ScriptUtil.existsSprite(key);					
 		});
 
 		set('removeSpr', function(key:String) {
@@ -245,21 +240,16 @@ class FunkScript extends hscript.Script implements IFlxDestroyable {
 		set('makeGroup', function(key:String, ?order:Int):FlxTypedGroup<Dynamic> {
 			var newGroup:FlxTypedGroup<Dynamic> = new FlxTypedGroup<Dynamic>();
 			order != null ? FlxG.state.insert(order, newGroup) : FlxG.state.add(newGroup);
-			if (cast FlxG.state is PlayState) ScriptUtil.objMap.set('_group_$key', newGroup);
+			if (cast FlxG.state is PlayState) ScriptUtil.objMap.set(ScriptUtil.getGroupKey(key), newGroup);
 			return newGroup;
 		});
 
 		set('getGroup', function(key:String):Null<FlxTypedGroup<Dynamic>> {
-			if (ScriptUtil.objMap.exists('_group_$key'))
-				return ScriptUtil.objMap.get('_group_$key');
-			else {
-				errorPrint('Group not found: $key');
-				return null;
-			}
+			return ScriptUtil.getGroup(key);
 		});
 
 		set('existsGroup', function(key:String):Bool {
-			return ScriptUtil.objMap.exists('_group_$key');						
+			return ScriptUtil.existsGroup(key);			
 		});
 
 		set('cacheCharacter', function(name:String):Character {

diff --git a/source/funkin/util/modding/ScriptUtil.hx b/source/funkin/util/modding/ScriptUtil.hx
@@ -30,12 +30,20 @@ class ScriptUtil {
 
     public static function getSprite(key:String) {
         for (i in ['fg', 'bg']) {
-            final sprKey = '_${i}_sprite_$key';
+            final sprKey = getSpriteKey(i, key);
             if (objMap.exists(sprKey))
                 return objMap.get(sprKey);
         }
         ModdingUtil.errorPrint('Sprite not found: $key');
-        return null;	
+        return null;
+    }
+
+    public static function existsSprite(key:String) {
+        for (i in ['fg', 'bg']) {
+            if (objMap.exists(getSpriteKey(i, key)))
+                return true;
+        }
+        return false;	
     }
 
     inline public static function formatSpriteKey(key:String, layer:SpriteLayer) {
@@ -46,8 +54,26 @@ class ScriptUtil {
         return '_${group}_sprite_$key';
     }
 
+    inline public static function existsGroup(key:String) {
+        return objMap.exists(getGroupKey(key));
+    }
+
     inline public static function getGroup(key:String) {
-        return key == 'fg' ? PlayState.instance.fgSpr : PlayState.instance.bgSpr;
+        switch(key) {
+            case "bg": return PlayState.instance.bgSpr;
+            case "fg": return PlayState.instance.fgSpr;
+            default:
+            if (existsGroup(key))
+                return objMap.get(getGroupKey(key));
+            else {
+                ModdingUtil.errorPrint('Group not found: $key');
+                return null;	
+            }
+        }
+    }
+
+    inline public static function getGroupKey(key:String) {
+        return '_group_$key';
     }
 
     public static var stateQueue:{state:MusicBeatState, skipTrans:Bool} = null;