From c318bd8c1317150328c2902fa5a7a176b178e052 Mon Sep 17 00:00:00 2001 From: Marco Date: Fri, 14 Feb 2025 13:47:20 +0100 Subject: [PATCH] Changed casting for timemodifiers --- Cirno.sln.DotSettings.user | 1 + Scenes/player.tscn | 6 +++--- Scripts/AttackPatterns/SpiralPattern.cs | 3 +-- Scripts/Bullet.cs | 6 +----- Scripts/Components/BulletSpawner.cs | 2 +- Scripts/PlayerMovement.cs | 2 +- Scripts/Resources/BulletResource.cs | 13 +++++++------ 7 files changed, 15 insertions(+), 18 deletions(-) diff --git a/Cirno.sln.DotSettings.user b/Cirno.sln.DotSettings.user index 3fa66cfb..8bea53eb 100644 --- a/Cirno.sln.DotSettings.user +++ b/Cirno.sln.DotSettings.user @@ -3,6 +3,7 @@ ForceIncluded ForceIncluded ForceIncluded + ForceIncluded ForceIncluded ForceIncluded ForceIncluded diff --git a/Scenes/player.tscn b/Scenes/player.tscn index dc455591..8c4d7c07 100644 --- a/Scenes/player.tscn +++ b/Scenes/player.tscn @@ -148,9 +148,9 @@ y_sort_enabled = true collision_layer = 2 collision_mask = 99 script = ExtResource("1_m27vu") -Speed = 3000 -StrafeSpeed = 2200 -CrosshairDistance = 20.0 +Speed = 45 +StrafeSpeed = 35 +CrosshairDistance = 35.0 SelectorScene = ExtResource("3_8wt6s") GameOverScene = "res://Scenes/GameOver.tscn" Muzzle = NodePath("Muzzle") diff --git a/Scripts/AttackPatterns/SpiralPattern.cs b/Scripts/AttackPatterns/SpiralPattern.cs index c3fbeea5..539b84b0 100644 --- a/Scripts/AttackPatterns/SpiralPattern.cs +++ b/Scripts/AttackPatterns/SpiralPattern.cs @@ -98,8 +98,7 @@ public partial class SpiralPattern : AttackPattern BulletScene = BulletScene, RotationOffset = angleOffset, Modifier = _modifier, - TimeModifiers = ((_timeModifiers?.Where(mod => mod != null)) ?? Array.Empty()).Select(m => - m.Wrap()).ToList() + TimeModifiers = _timeModifiers?.Where(mod => mod != null).ToList() ?? new List() }; } diff --git a/Scripts/Bullet.cs b/Scripts/Bullet.cs index 3186658f..2b5f8878 100644 --- a/Scripts/Bullet.cs +++ b/Scripts/Bullet.cs @@ -36,11 +36,7 @@ public partial class Bullet : Area2D _gameManager = gameManager; // Ugly hack to make instances unique - _modifiers = _bulletInfo.TimeModifiers.Select(x => new ModifierWrapper() - { - TimeModifier = x.TimeModifier, - Applied = x.Applied - }).ToList(); + _modifiers = _bulletInfo.TimeModifiers.Select(x => x.Wrap()).ToList(); } diff --git a/Scripts/Components/BulletSpawner.cs b/Scripts/Components/BulletSpawner.cs index 87daff4d..d87507f0 100644 --- a/Scripts/Components/BulletSpawner.cs +++ b/Scripts/Components/BulletSpawner.cs @@ -99,7 +99,7 @@ public class BulletInfo public PackedScene BulletScene { get; set; } public PackedScene DestructionParticlesScene { get; set; } public IBulletModifier Modifier { get; set; } - public List TimeModifiers { get; set; } = new List(); + public List TimeModifiers { get; set; } = new List(); #region Laser public bool IsLaser { get; set; } diff --git a/Scripts/PlayerMovement.cs b/Scripts/PlayerMovement.cs index b279f3ae..99fe073e 100644 --- a/Scripts/PlayerMovement.cs +++ b/Scripts/PlayerMovement.cs @@ -368,7 +368,7 @@ public partial class PlayerMovement : CharacterBody2D, IDestructible // { // _facingDirection = _movementDirection; // } - Velocity = _movementDirection * (float)( MovementSpeed * delta); + Velocity = _movementDirection * (float)( MovementSpeed/* * delta*/); MoveAndSlide(); diff --git a/Scripts/Resources/BulletResource.cs b/Scripts/Resources/BulletResource.cs index e435274b..9de60bcd 100644 --- a/Scripts/Resources/BulletResource.cs +++ b/Scripts/Resources/BulletResource.cs @@ -20,7 +20,7 @@ public partial class BulletResource : Resource [Export] public BulletCreationModifier Modifier; - [Export] public Array TimeModifiers; + [Export] public Array TimeModifiers; public BulletInfo MakeBullet(Vector2 position, int count = 1, float spread = 0f, float rotationOffset = 0f) { @@ -39,11 +39,12 @@ public partial class BulletResource : Resource Modifier = Modifier, LifeTime = LifeTime, DestructionParticlesScene = DestructionParticlesScene, - TimeModifiers = TimeModifiers?.Where(mod => mod is TimeModifier).Cast().Select(m => new ModifierWrapper() - { - TimeModifier = m, - Applied = false - }).ToList() + TimeModifiers = TimeModifiers.ToList() + // TimeModifiers = TimeModifiers?.Where(mod => mod is TimeModifier).Cast().Select(m => new ModifierWrapper() + // { + // TimeModifier = m, + // Applied = false + // }).ToList() // TimeModifiers = TimeModifiers?.Select(x => new ModifierWrapper() // { // Applied = false,