maddo/cirnogodot
1
0
Fork 0
mirror of https://gitlab.com/MaddoScientisto/cirnogodot.git synced 2026-06-11 22:05:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Changed casting for timemodifiers

Browse source
This commit is contained in:
Marco 2025-02-14 13:47:20 +01:00
commit c318bd8c13
7 changed files with 15 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Scripts/AttackPatterns/SpiralPattern.cs
View file

@ -98,8 +98,7 @@ public partial class SpiralPattern : AttackPattern
BulletScene = BulletScene,
RotationOffset = angleOffset,
Modifier = _modifier,
TimeModifiers = ((_timeModifiers?.Where(mod => mod != null)) ?? Array.Empty<TimeModifier>()).Select(m =>
m.Wrap()).ToList()
TimeModifiers = _timeModifiers?.Where(mod => mod != null).ToList() ?? new List<TimeModifier>()
};
}

6
Scripts/Bullet.cs
View file

@ -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();
}

2
Scripts/Components/BulletSpawner.cs
View file

@ -99,7 +99,7 @@ public class BulletInfo
public PackedScene BulletScene { get; set; }
public PackedScene DestructionParticlesScene { get; set; }
public IBulletModifier Modifier { get; set; }
public List<ModifierWrapper> TimeModifiers { get; set; } = new List<ModifierWrapper>();
public List<TimeModifier> TimeModifiers { get; set; } = new List<TimeModifier>();
#region Laser
public bool IsLaser { get; set; }

2
Scripts/PlayerMovement.cs
View file

@ -368,7 +368,7 @@ public partial class PlayerMovement : CharacterBody2D, IDestructible
// {
// _facingDirection = _movementDirection;
// }
Velocity = _movementDirection * (float)( MovementSpeed * delta);
Velocity = _movementDirection * (float)( MovementSpeed/* * delta*/);
MoveAndSlide();

13
Scripts/Resources/BulletResource.cs
View file

@ -20,7 +20,7 @@ public partial class BulletResource : Resource
[Export]
public BulletCreationModifier Modifier;
[Export] public Array<Resource> TimeModifiers;
[Export] public Array<TimeModifier> 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<TimeModifier>().Select(m => new ModifierWrapper()
{
TimeModifier = m,
Applied = false
}).ToList()
TimeModifiers = TimeModifiers.ToList()
// TimeModifiers = TimeModifiers?.Where(mod => mod is TimeModifier).Cast<TimeModifier>().Select(m => new ModifierWrapper()
// {
// TimeModifier = m,
// Applied = false
// }).ToList()
// TimeModifiers = TimeModifiers?.Select(x => new ModifierWrapper()
// {
// Applied = false,