more freeplay DJ functions + dialog reorganization

KoloInDaCrib · Nov 22, 2024 · 5690316 · 5690316
1 parent 472fd38
commit 5690316
Show file tree

Hide file tree

Showing 12 changed files with 79 additions and 13 deletions.
diff --git a/...nents/dialogs/FreeplayDJSettingsDialog.hx → ...logs/freeplay/FreeplayDJSettingsDialog.hx b/...nents/dialogs/FreeplayDJSettingsDialog.hx → ...logs/freeplay/FreeplayDJSettingsDialog.hx
@@ -1,4 +1,4 @@
-package funkin.ui.debug.char.components.dialogs;
+package funkin.ui.debug.char.components.dialogs.freeplay;
 
 import funkin.ui.debug.char.pages.CharCreatorFreeplayPage;
 import funkin.data.freeplay.player.PlayerRegistry;

diff --git a/...components/dialogs/FreeplayStyleDialog.hx → ...s/dialogs/freeplay/FreeplayStyleDialog.hx b/...components/dialogs/FreeplayStyleDialog.hx → ...s/dialogs/freeplay/FreeplayStyleDialog.hx
@@ -1,4 +1,4 @@
-package funkin.ui.debug.char.components.dialogs;
+package funkin.ui.debug.char.components.dialogs.freeplay;
 
 import funkin.data.freeplay.style.FreeplayStyleRegistry;
 import funkin.data.freeplay.player.PlayerRegistry;

diff --git a/.../char/components/dialogs/AddAnimDialog.hx → ...ponents/dialogs/gameplay/AddAnimDialog.hx b/.../char/components/dialogs/AddAnimDialog.hx → ...ponents/dialogs/gameplay/AddAnimDialog.hx
@@ -1,4 +1,4 @@
-package funkin.ui.debug.char.components.dialogs;
+package funkin.ui.debug.char.components.dialogs.gameplay;
 
 import funkin.ui.debug.char.pages.CharCreatorGameplayPage.CharDialogType;
 import funkin.data.character.CharacterData.CharacterRenderType;

diff --git a/.../components/dialogs/CharMetadataDialog.hx → ...ts/dialogs/gameplay/CharMetadataDialog.hx b/.../components/dialogs/CharMetadataDialog.hx → ...ts/dialogs/gameplay/CharMetadataDialog.hx
@@ -1,4 +1,4 @@
-package funkin.ui.debug.char.components.dialogs;
+package funkin.ui.debug.char.components.dialogs.gameplay;
 
 @:xml('<?xml version="1.0" encoding="utf-8"?>
 <collapsible-dialog title="Character Metadata" width="400" height="400">

diff --git a/...components/dialogs/GhostSettingsDialog.hx → ...s/dialogs/gameplay/GhostSettingsDialog.hx b/...components/dialogs/GhostSettingsDialog.hx → ...s/dialogs/gameplay/GhostSettingsDialog.hx
@@ -1,4 +1,4 @@
-package funkin.ui.debug.char.components.dialogs;
+package funkin.ui.debug.char.components.dialogs.gameplay;
 
 import haxe.ui.core.Screen;
 import haxe.ui.containers.Grid;

diff --git a/...ar/components/dialogs/HealthIconDialog.hx → ...ents/dialogs/gameplay/HealthIconDialog.hx b/...ar/components/dialogs/HealthIconDialog.hx → ...ents/dialogs/gameplay/HealthIconDialog.hx
@@ -1,4 +1,4 @@
-package funkin.ui.debug.char.components.dialogs;
+package funkin.ui.debug.char.components.dialogs.gameplay;
 
 import funkin.play.components.HealthIcon;
 import funkin.util.FileUtil;

diff --git a/...r/components/dialogs/ResultsAnimDialog.hx → ...ents/dialogs/results/ResultsAnimDialog.hx b/...r/components/dialogs/ResultsAnimDialog.hx → ...ents/dialogs/results/ResultsAnimDialog.hx
@@ -1,4 +1,4 @@
-package funkin.ui.debug.char.components.dialogs;
+package funkin.ui.debug.char.components.dialogs.results;
 
 import haxe.ui.containers.VBox;
 import haxe.ui.containers.HBox;

diff --git a/...ialogs/PlayableCharacterSettingsDialog.hx → ...select/PlayableCharacterSettingsDialog.hx b/...ialogs/PlayableCharacterSettingsDialog.hx → ...select/PlayableCharacterSettingsDialog.hx
@@ -1,4 +1,4 @@
-package funkin.ui.debug.char.components.dialogs;
+package funkin.ui.debug.char.components.dialogs.select;
 
 import haxe.ui.containers.HBox;
 import haxe.ui.components.Button;

diff --git a/source/funkin/ui/debug/char/pages/CharCreatorFreeplayPage.hx b/source/funkin/ui/debug/char/pages/CharCreatorFreeplayPage.hx
@@ -1,6 +1,7 @@
 package funkin.ui.debug.char.pages;
 
 import haxe.ui.components.Label;
+import haxe.ui.components.VerticalRule;
 import haxe.ui.containers.Box;
 import haxe.ui.containers.HBox;
 import haxe.ui.containers.menus.Menu;
@@ -10,7 +11,8 @@ import funkin.ui.freeplay.LetterSort;
 import funkin.ui.freeplay.CapsuleText;
 import flixel.text.FlxText;
 import funkin.ui.freeplay.FreeplayState.DifficultySprite;
-import funkin.ui.debug.char.components.dialogs.*;
+import funkin.ui.debug.char.components.dialogs.freeplay.*;
+import funkin.ui.debug.char.components.dialogs.DefaultPageDialog;
 import funkin.graphics.FunkinSprite;
 import funkin.ui.freeplay.FreeplayStyle;
 import funkin.data.animation.AnimationData;
@@ -93,6 +95,8 @@ class CharCreatorFreeplayPage extends CharCreatorDefaultPage
     dj = new CharSelectAtlasSprite(640, 366, null, playuh?.getFreeplayDJData()?.getAtlasPath() != null ? playuh.getFreeplayDJData().getAtlasPath() : null);
     add(dj);
 
+    generateUI();
+
     if (playuh != null)
     {
       @:privateAccess
@@ -108,10 +112,16 @@ class CharCreatorFreeplayPage extends CharCreatorDefaultPage
   {
     super.update(elapsed);
 
+    // no need for handleKeybinds function since these are the only functions in update methinks
     if (FlxG.keys.justPressed.SPACE) playDJAnimation();
 
     if (FlxG.keys.justPressed.W) changeDJAnimation(-1);
     if (FlxG.keys.justPressed.S) changeDJAnimation(1);
+
+    if (FlxG.keys.justPressed.UP) changeDJAnimationOffsets(0, 5);
+    if (FlxG.keys.justPressed.DOWN) changeDJAnimationOffsets(0, -5);
+    if (FlxG.keys.justPressed.LEFT) changeDJAnimationOffsets(5);
+    if (FlxG.keys.justPressed.RIGHT) changeDJAnimationOffsets(-5);
   }
 
   public function changeDJAnimation(change:Int = 0)
@@ -126,10 +136,25 @@ class CharCreatorFreeplayPage extends CharCreatorDefaultPage
 
   function playDJAnimation()
   {
-    dj.playAnimation(djAnims[currentDJAnimation].prefix);
+    labelAnimName.text = djAnims[currentDJAnimation].name;
+    labelAnimOffsetX.text = "" + (djAnims[currentDJAnimation].offsets[0] ?? 0.0);
+    labelAnimOffsetY.text = "" + (djAnims[currentDJAnimation].offsets[1] ?? 0.0);
+
+    dj.playAnimation(djAnims[currentDJAnimation].prefix, true);
     dj.offset.set(djAnims[currentDJAnimation].offsets[0] ?? 0.0, djAnims[currentDJAnimation].offsets[1] ?? 0.0);
   }
 
+  function changeDJAnimationOffsets(xOff:Float = 0, yOff:Float = 0)
+  {
+    if (currentDJAnimation >= djAnims.length) return; // this should in theory detect if we have dj animations loaded from an imported character
+    if (djAnims[currentDJAnimation].offsets.length < 2) djAnims[currentDJAnimation].offsets = [0.0, 0.0];
+
+    djAnims[currentDJAnimation].offsets[0] += xOff;
+    djAnims[currentDJAnimation].offsets[1] += yOff;
+
+    playDJAnimation();
+  }
+
   override public function fillUpPageSettings(menu:Menu)
   {
     var settingsDialog = new MenuCheckBox();
@@ -149,6 +174,44 @@ class CharCreatorFreeplayPage extends CharCreatorDefaultPage
     }
   }
 
+  var labelAnimName:Label = new Label();
+  var labelAnimOffsetX:Label = new Label();
+  var labelAnimOffsetY:Label = new Label();
+
+  function generateUI()
+  {
+    labelAnimName.styleNames = labelAnimOffsetX.styleNames = labelAnimOffsetY.styleNames = "infoText";
+    labelAnimName.verticalAlign = labelAnimOffsetX.verticalAlign = labelAnimOffsetY.verticalAlign = "center";
+
+    labelAnimName.tooltip = "Left/Right Click to play the Next/Previous Animation";
+    labelAnimOffsetX.tooltip = "Left/Right Click to Increase/Decrease the Horizontal Offset.";
+    labelAnimOffsetY.tooltip = "Left/Right Click to Increase/Decrease the Vertical Offset.";
+
+    labelAnimName.text = "None";
+    labelAnimOffsetX.text = labelAnimOffsetY.text = "0";
+
+    labelAnimName.onClick = _ -> changeDJAnimation(1);
+    labelAnimName.onRightClick = _ -> changeDJAnimation(-1);
+
+    labelAnimOffsetX.onClick = _ -> changeDJAnimationOffsets(5);
+    labelAnimOffsetX.onRightClick = _ -> changeDJAnimationOffsets(-5);
+    labelAnimOffsetY.onClick = _ -> changeDJAnimationOffsets(0, 5);
+    labelAnimOffsetY.onRightClick = _ -> changeDJAnimationOffsets(0, -5);
+  }
+
+  override public function fillUpBottomBar(left:Box, middle:Box, right:Box)
+  {
+    var rule1 = new VerticalRule();
+    var rule2 = new VerticalRule();
+    rule1.percentHeight = rule2.percentHeight = 80;
+
+    middle.addComponent(labelAnimName);
+    middle.addComponent(rule1);
+    middle.addComponent(labelAnimOffsetX);
+    middle.addComponent(rule2);
+    middle.addComponent(labelAnimOffsetY);
+  }
+
   var pinkBack:FunkinSprite;
   var orangeBackShit:FunkinSprite;
 

diff --git a/source/funkin/ui/debug/char/pages/CharCreatorGameplayPage.hx b/source/funkin/ui/debug/char/pages/CharCreatorGameplayPage.hx
@@ -14,7 +14,8 @@ import funkin.data.character.CharacterRegistry;
 import funkin.play.character.BaseCharacter.CharacterType;
 import funkin.play.stage.StageProp;
 import funkin.data.stage.StageRegistry;
-import funkin.ui.debug.char.components.dialogs.*;
+import funkin.ui.debug.char.components.dialogs.gameplay.*;
+import funkin.ui.debug.char.components.dialogs.DefaultPageDialog;
 import flixel.util.FlxColor;
 
 using StringTools;

diff --git a/source/funkin/ui/debug/char/pages/CharCreatorResultsPage.hx b/source/funkin/ui/debug/char/pages/CharCreatorResultsPage.hx
@@ -10,7 +10,8 @@ import haxe.ui.containers.menus.MenuItem;
 import haxe.ui.containers.menus.MenuCheckBox;
 import funkin.graphics.adobeanimate.FlxAtlasSprite;
 import funkin.graphics.FunkinSprite;
-import funkin.ui.debug.char.components.dialogs.*;
+import funkin.ui.debug.char.components.dialogs.results.*;
+import funkin.ui.debug.char.components.dialogs.DefaultPageDialog;
 import funkin.data.freeplay.player.PlayerRegistry;
 import funkin.play.components.TallyCounter;
 import funkin.play.components.ClearPercentCounter;

diff --git a/source/funkin/ui/debug/char/pages/CharCreatorSelectPage.hx b/source/funkin/ui/debug/char/pages/CharCreatorSelectPage.hx
@@ -13,7 +13,8 @@ import funkin.graphics.FunkinSprite;
 import funkin.graphics.shaders.MosaicEffect;
 import funkin.ui.debug.char.animate.CharSelectAtlasSprite;
 import funkin.ui.debug.char.pages.subpages.CharSelectIndexSubPage;
-import funkin.ui.debug.char.components.dialogs.*;
+import funkin.ui.debug.char.components.dialogs.select.*;
+import funkin.ui.debug.char.components.dialogs.DefaultPageDialog;
 import funkin.util.FileUtil;
 import flixel.group.FlxSpriteGroup.FlxTypedSpriteGroup;
 import flixel.group.FlxSpriteGroup;