From 21b361f9d740b3767c8b8c06ae94babbd4f1ec2b Mon Sep 17 00:00:00 2001 From: jonathan Date: Mon, 3 Nov 2025 20:21:30 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=A8=20Live=20review=20changes?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ActionDetails/MinigameActionDetail.cs.uid | 1 + .../ActionDetails/TargetSelectActionDetail.cs | 2 +- .../CSharp/Common/Fight/AllFightersVisual.cs | 2 ++ .../CSharp/Common/Fight/FightSceneSwitcher.cs | 2 +- scripts/CSharp/Common/Fight/FightWorld.cs | 1 + .../Common/Fight/FighterFormation.cs.uid | 1 + scripts/CSharp/Common/Fight/FighterVisual.cs | 21 +------------------ .../CSharp/Common/Minigame/RegionVisual.cs | 6 ------ 8 files changed, 8 insertions(+), 28 deletions(-) create mode 100644 scripts/CSharp/Common/Fight/ActionDetails/MinigameActionDetail.cs.uid create mode 100644 scripts/CSharp/Common/Fight/FighterFormation.cs.uid diff --git a/scripts/CSharp/Common/Fight/ActionDetails/MinigameActionDetail.cs.uid b/scripts/CSharp/Common/Fight/ActionDetails/MinigameActionDetail.cs.uid new file mode 100644 index 0000000..8e083f7 --- /dev/null +++ b/scripts/CSharp/Common/Fight/ActionDetails/MinigameActionDetail.cs.uid @@ -0,0 +1 @@ +uid://dtn4la0ycl5wx diff --git a/scripts/CSharp/Common/Fight/ActionDetails/TargetSelectActionDetail.cs b/scripts/CSharp/Common/Fight/ActionDetails/TargetSelectActionDetail.cs index a160b07..85097e9 100644 --- a/scripts/CSharp/Common/Fight/ActionDetails/TargetSelectActionDetail.cs +++ b/scripts/CSharp/Common/Fight/ActionDetails/TargetSelectActionDetail.cs @@ -6,7 +6,7 @@ public class TargetSelectActionDetail : FighterAction.FighterActionDetail { public enum VisualRange { - Single + Single } // settings diff --git a/scripts/CSharp/Common/Fight/AllFightersVisual.cs b/scripts/CSharp/Common/Fight/AllFightersVisual.cs index 31cd711..e24f218 100644 --- a/scripts/CSharp/Common/Fight/AllFightersVisual.cs +++ b/scripts/CSharp/Common/Fight/AllFightersVisual.cs @@ -14,6 +14,7 @@ public partial class AllFightersVisual : Node [Export] private Node2D _enemyFighters = null!; + // TODO: move type to prefab mapping to Resource [ExportCategory("Fighter Visual Scenes")] [Export] private PackedScene _blobFighterVisual = null!; [Export] private PackedScene _bigBlobFighterVisual = null!; @@ -112,6 +113,7 @@ public partial class AllFightersVisual : Node private void ShowTargetSelect(TargetSelectActionDetail targetDetail) { + // TODO: use Event bus if (targetDetail.selectEnemy) _fighterVisuals .Where(kv => kv.Key.IsInFormation(HappeningData.enemyFighterFormation)) diff --git a/scripts/CSharp/Common/Fight/FightSceneSwitcher.cs b/scripts/CSharp/Common/Fight/FightSceneSwitcher.cs index 2bc99ca..3e4f9c2 100644 --- a/scripts/CSharp/Common/Fight/FightSceneSwitcher.cs +++ b/scripts/CSharp/Common/Fight/FightSceneSwitcher.cs @@ -32,7 +32,7 @@ public partial class FightSceneSwitcher : Node public void SwitchRoom(int pathIndex) { Debug.Assert(FightWorld.Instance.currentRoom != null, "FightWorld.Instance.currentRoom!=null"); - + if (!FightWorld.Instance.currentRoom.paths.TryGetValue(pathIndex, out var nextRoom)) throw new Exception("Trying to go down a non-existent path"); diff --git a/scripts/CSharp/Common/Fight/FightWorld.cs b/scripts/CSharp/Common/Fight/FightWorld.cs index 39929e8..be34387 100644 --- a/scripts/CSharp/Common/Fight/FightWorld.cs +++ b/scripts/CSharp/Common/Fight/FightWorld.cs @@ -164,6 +164,7 @@ public partial class FightWorld : Node { var typeRoll = GD.RandRange(0, 99); + // Disabled generating different types due to lack of fighter visual type implementation //var type = typeRoll switch //{ // < 50 => Fighter.Type.Blob, diff --git a/scripts/CSharp/Common/Fight/FighterFormation.cs.uid b/scripts/CSharp/Common/Fight/FighterFormation.cs.uid new file mode 100644 index 0000000..635abe9 --- /dev/null +++ b/scripts/CSharp/Common/Fight/FighterFormation.cs.uid @@ -0,0 +1 @@ +uid://oipfvb87uyq3 diff --git a/scripts/CSharp/Common/Fight/FighterVisual.cs b/scripts/CSharp/Common/Fight/FighterVisual.cs index 04b29ba..b5924df 100644 --- a/scripts/CSharp/Common/Fight/FighterVisual.cs +++ b/scripts/CSharp/Common/Fight/FighterVisual.cs @@ -63,16 +63,6 @@ public partial class FighterVisual : Node2D } // Animations - //public void AttackAnimation(FightAttack attack) - //{ - // EmitSignalAttacking(); - // var tween = GetTree().CreateTween(); - // tween.TweenProperty(this, "global_position", attack.target.GlobalPosition, 0.15); - // tween.TweenCallback(Callable.From(() => attack.target?.HitAnimation(attack))); - // tween.TweenProperty(this, "position", new Vector2(0, 0), 0.7) - // .SetTrans(Tween.TransitionType.Cubic).SetEase(Tween.EaseType.Out); - //} - public async Task AnimatePosToTarget(FighterVisual targetVisual, double duration = 0.15) { var tween = GetTree().CreateTween(); @@ -96,16 +86,7 @@ public partial class FighterVisual : Node2D await ToSignal(tween, "finished"); } - - //private void HitAnimation(FightAttack attack) - //{ - // EmitSignalDamageTaken(); - // var tween = GetTree().CreateTween(); - // tween.TweenProperty(this, "scale", new Vector2(1.4f, 0.6f), 0.15); - // tween.TweenProperty(this, "scale", new Vector2(1, 1), 0.4) - // .SetTrans(Tween.TransitionType.Cubic).SetEase(Tween.EaseType.Out); - //} - // + // Keep for reference for new Heal animation //public void HealAnimation() //{ // EmitSignalHealed(); diff --git a/scripts/CSharp/Common/Minigame/RegionVisual.cs b/scripts/CSharp/Common/Minigame/RegionVisual.cs index 9e6efa2..47c2f25 100644 --- a/scripts/CSharp/Common/Minigame/RegionVisual.cs +++ b/scripts/CSharp/Common/Minigame/RegionVisual.cs @@ -11,12 +11,6 @@ public partial class RegionVisual : Node [Export(PropertyHint.DictionaryType)] private Dictionary _fillColors = new(); - - public override void _EnterTree() - { - //_sliceSprite.Material = new Material() - } - public void Setup(Vector2 normalAngles, Color color, string regionText, MinigameController.RegionTheme regionTheme) { var mat = (_sliceSprite.Material as ShaderMaterial)!;