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

Moved modifiers code to resource

Browse source
This commit is contained in:
Marco 2025-02-14 16:18:33 +01:00
commit f9aab9718a
12 changed files with 132 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Scripts/AttackPatterns/SpiralPattern.cs
View file

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

77
Scripts/Bullet.cs
View file

@ -25,7 +25,7 @@ public partial class Bullet : Area2D
public BulletInfo BulletInfo => _bulletInfo;
private List<TimeModifier> _modifiers = new();
private List<ModifierWrapper> _modifiers = new();
private GameManager _gameManager;
@ -35,52 +35,57 @@ public partial class Bullet : Area2D
_gameManager = gameManager;
_modifiers = _bulletInfo.TimeModifiers;
// Need to clone them here
// _modifiers = _bulletInfo.TimeModifiers.Select(x => x.MakeClone()).ToList();
// var clonedModifiers = _bulletInfo.TimeModifiers.Select(x => x.MakeClone());
// _modifiers = clonedModifiers.ToList();
// Ugly hack to make instances unique
//_modifiers = _bulletInfo.TimeModifiers.Select(x => x.Wrap()).ToList();
_modifiers = _bulletInfo.TimeModifiers.Select(x => x.Wrap()).ToList();
}
private void ApplyTimeModifiers()
private void ApplyTimeModifiers(double delta)
{
foreach (var modifier in _modifiers)
{
if (modifier.Applied)
if (_elapsedTime >= modifier.TimeModifier.TimeInSeconds)
{
continue;
}
if (_elapsedTime >= modifier.TimeInSeconds)
{
GD.Print("Applied time modifier");
switch (modifier.ModifierType)
{
case TimeModifierType.SpeedChange:
//_bulletInfo.Speed += modifier.Value;
Speed = modifier.Value;
break;
case TimeModifierType.RotationChange:
RotateBullet(modifier.Value);
//Rotation += Mathf.DegToRad(modifier.Value);
break;
case TimeModifierType.FacePlayer:
FacePlayer();
break;
}
if (!modifier.Continuous)
if (!modifier.Applied)
{
modifier.Applied = true;
modifier.TimeModifier.Start(this);
}
modifier.TimeModifier.Update(this, delta);
// switch (modifier.ModifierType)
// {
// case TimeModifierType.SpeedChange:
// //_bulletInfo.Speed += modifier.Value;
// Speed = modifier.Value;
// break;
// case TimeModifierType.RotationChange:
// RotateBullet(modifier.Value);
// //Rotation += Mathf.DegToRad(modifier.Value);
// break;
// case TimeModifierType.FacePlayer:
// FacePlayer();
// break;
// }
// if (!modifier.Continuous)
// {
// modifier.Applied = true;
// }
}
}
}
protected virtual void RotateBullet(float degrees)
public virtual void RotateBullet(float degrees)
{
float radians = Mathf.DegToRad(degrees);
_direction = _direction.Rotated(radians).Normalized(); // Rotate direction
@ -88,7 +93,7 @@ public partial class Bullet : Area2D
//Rotation = radians;
}
private void FacePlayer()
public void FacePlayer()
{
if (_gameManager.Player != null)
{
@ -123,14 +128,16 @@ public partial class Bullet : Area2D
public override void _Process(double delta)
{
_elapsedTime += delta;
if (_bulletInfo != null)
{
ApplyTimeModifiers();
}
}
public override void _PhysicsProcess(double delta)
{
if (_bulletInfo != null)
{
ApplyTimeModifiers(delta);
}
this.Position += ((float)(Speed * delta) * _direction);
}

2
Scripts/Resources/BulletResource.cs
View file

@ -39,7 +39,7 @@ public partial class BulletResource : Resource
Modifier = Modifier,
LifeTime = LifeTime,
DestructionParticlesScene = DestructionParticlesScene,
TimeModifiers = TimeModifiers.Select(x => x.MakeClone()).ToList()
TimeModifiers = TimeModifiers.Select(x => x).ToList()
// TimeModifiers = TimeModifiers?.Where(mod => mod is TimeModifier).Cast<TimeModifier>().Select(m => new ModifierWrapper()
// {
// TimeModifier = m,

12
Scripts/Resources/Modifiers/DelayedPlayerFacingModifier.cs Normal file
View file

@ -0,0 +1,12 @@
using Godot;
namespace Cirno.Scripts.Resources.Modifiers;
[GlobalClass]
public partial class DelayedPlayerFacingModifier : TimeModifier
{
public override void Start(Bullet bullet)
{
bullet.FacePlayer();
}
}

12
Scripts/Resources/Modifiers/DelayedRotationModifier.cs Normal file
View file

@ -0,0 +1,12 @@
using Godot;
namespace Cirno.Scripts.Resources.Modifiers;
[GlobalClass]
public partial class DelayedRotationModifier : TimeModifier
{
public override void Start(Bullet bullet)
{
bullet.RotateBullet(this.Value);
}
}

8
Scripts/Resources/Modifiers/DelayedSpeedModifier.cs
View file

@ -1,9 +1,13 @@
using Godot;
using Cirno.Scripts.Actors;
using Godot;
namespace Cirno.Scripts.Resources.Modifiers;
[GlobalClass]
public partial class DelayedSpeedModifier : TimeModifier
{
public override void Start(Bullet bullet)
{
bullet.Speed = this.Value;
}
}

13
Scripts/Resources/TimeModifier.cs
View file

@ -1,4 +1,5 @@
using Godot;
using Cirno.Scripts.Actors;
using Godot;
namespace Cirno.Scripts.Resources;
@ -24,6 +25,16 @@ public partial class TimeModifier : Resource
{
return this.MemberwiseClone() as TimeModifier;
}
public virtual void Start(Bullet bullet)
{
}
public virtual void Update(Bullet bullet, double delta)
{
}
}
public class ModifierWrapper

2
Scripts/Weapons/LaserBullet.cs
View file

@ -63,7 +63,7 @@ public partial class LaserBullet : Bullet
_lethalTimer.Start();
}
protected override void RotateBullet(float degrees)
public override void RotateBullet(float degrees)
{
base.RotateBullet(degrees);