Grazing particles and sound

Scripts/Components/Actors/3D/PlayerAnimationProvider3D.cs

@@ -33,10 +33,14 @@ public partial class PlayerAnimationProvider3D : Node3D
     private GTween _blinkTween;
     
     [Signal] public delegate void OnAnimationEndedEventHandler(StringName animationName);
+
+    private ShaderMaterial _shaderMaterial;
     
     public override void _Ready()
     {
         AnimatedSprite.AnimationFinished += () => EmitSignal(SignalName.OnAnimationEnded, AnimatedSprite.Animation);
+
+        _shaderMaterial = ((ShaderMaterial)AnimatedSprite.MaterialOverride);
     }
     
     public void ShowSprite()
@@ -115,7 +119,7 @@ public partial class PlayerAnimationProvider3D : Node3D
         AnimatedSprite.SpeedScale = 1;
     }
     
-    public void Blink()
+    public void Blink(bool health = true)
     {
         if (AnimatedSprite.MaterialOverride is null)
         {
@@ -124,13 +128,22 @@ public partial class PlayerAnimationProvider3D : Node3D
         //if (BlinkMaterial == null) return;
         //AnimatedSprite.MaterialOverride = BlinkMaterial;
         
-        var material = ((ShaderMaterial)AnimatedSprite.MaterialOverride);
+        //var material = ((ShaderMaterial)AnimatedSprite.MaterialOverride);
+
+        if (health)
+        {
+            SetShaderBlinkColor(Colors.Red);
+        }
+        else
+        {
+            SetShaderBlinkColor(Colors.Blue);
+        }
         
         _blinkTween?.Kill();
 		      
         _blinkTween = GTweenSequenceBuilder.New()
-            .Append(material.TweenPropertyFloat(BlinkShaderPropertyName, 1f, 0f))
-            .Append(material.TweenPropertyFloat(BlinkShaderPropertyName, 0f, 0.5f))
+            .Append(_shaderMaterial.TweenPropertyFloat(BlinkShaderPropertyName, 1f, 0f))
+            .Append(_shaderMaterial.TweenPropertyFloat(BlinkShaderPropertyName, 0f, 0.5f))
             .Build();
         
         _blinkTween.Play();
@@ -142,15 +155,14 @@ public partial class PlayerAnimationProvider3D : Node3D
         {
             return;
         }
-        //if (BlinkMaterial == null) return;
-        //AnimatedSprite.MaterialOverride = BlinkMaterial;
-        var material = ((ShaderMaterial)AnimatedSprite.MaterialOverride);
+        
+        //var material = ((ShaderMaterial)AnimatedSprite.MaterialOverride);
         _blinkTween?.Kill();
         _blinkTween = GTweenSequenceBuilder.New()
-            .Append(material.TweenPropertyFloat(TeleportProgressPropertyName, 0f, 0f))
-            .Append(material.TweenPropertyFloat(ScanlineDensityPropertyName, 0f, 0f))
-            .Append(material.TweenPropertyFloat(ScanlineDensityPropertyName,50f,0.5f))
-            .Join(material.TweenPropertyFloat(TeleportProgressPropertyName, 1f,0.5f))
+            .Append(_shaderMaterial.TweenPropertyFloat(TeleportProgressPropertyName, 0f, 0f))
+            .Append(_shaderMaterial.TweenPropertyFloat(ScanlineDensityPropertyName, 0f, 0f))
+            .Append(_shaderMaterial.TweenPropertyFloat(ScanlineDensityPropertyName,50f,0.5f))
+            .Join(_shaderMaterial.TweenPropertyFloat(TeleportProgressPropertyName, 1f,0.5f))
             .Build();
 
         _blinkTween.Play();
@@ -162,37 +174,41 @@ public partial class PlayerAnimationProvider3D : Node3D
         {
             return;
         }
-        //if (BlinkMaterial == null) return;
-        //AnimatedSprite.MaterialOverride = BlinkMaterial;
-        var material = ((ShaderMaterial)AnimatedSprite.MaterialOverride);
+
+        //var material = ((ShaderMaterial)AnimatedSprite.MaterialOverride);
         _blinkTween?.Kill();
         _blinkTween = GTweenSequenceBuilder.New()
-            .Append(material.TweenPropertyFloat(TeleportProgressPropertyName, 1f, 0f))
-            .Append(material.TweenPropertyFloat(ScanlineDensityPropertyName, 50f, 0f))
-            .Append(material.TweenPropertyFloat(ScanlineDensityPropertyName,0f,0.5f))
-            .Join(material.TweenPropertyFloat(TeleportProgressPropertyName, 0f,0.5f))
+            .Append(_shaderMaterial.TweenPropertyFloat(TeleportProgressPropertyName, 1f, 0f))
+            .Append(_shaderMaterial.TweenPropertyFloat(ScanlineDensityPropertyName, 50f, 0f))
+            .Append(_shaderMaterial.TweenPropertyFloat(ScanlineDensityPropertyName,0f,0.5f))
+            .Join(_shaderMaterial.TweenPropertyFloat(TeleportProgressPropertyName, 0f,0.5f))
             .Build();
 
         _blinkTween.Play();
     }
-	
+    
+    private void SetShaderBlinkColor(Color value)
+    {
+        _shaderMaterial.SetShaderParameter("blink_color", value);
+    }
+    
     private void SetShaderTeleportProgress(float value)
     {
-        ((ShaderMaterial)AnimatedSprite.MaterialOverride).SetShaderParameter("teleport_progress", value);
+        _shaderMaterial.SetShaderParameter("teleport_progress", value);
     }
 
     private void SetShaderScanlineDensity(float value)
     {
-        ((ShaderMaterial)AnimatedSprite.MaterialOverride).SetShaderParameter("scanline_density", value);
+        _shaderMaterial.SetShaderParameter("scanline_density", value);
     }
 
     private void SetShaderBlinkIntensity(float newValue)
     {
-        ((ShaderMaterial)AnimatedSprite.MaterialOverride).SetShaderParameter("blink_intensity", newValue);
+        _shaderMaterial.SetShaderParameter("blink_intensity", newValue);
     }
 
     public void PlayShieldAnimation()
     {
-        
+        Blink(false);
     }
 }

Scripts/Components/FSM/3DPlayer/PlayerGrazingModule3D.cs

@@ -0,0 +1,75 @@
+using Cirno.Scripts.Components.Actors;
+using Cirno.Scripts.Weapons;
+using Godot;
+
+namespace Cirno.Scripts.Components.FSM._3DPlayer;
+
+public partial class PlayerGrazingModule3D : Area3D, IModule<PlayerState, CharacterBody3D>
+{
+    [Export] public BulletOwner Owner { get; private set; } = BulletOwner.Player;
+
+    [Export] public ActorResourceProvider Shield { get; private set; }
+
+    private bool _enabled = false;
+    
+    public IStateMachine<PlayerState, CharacterBody3D> StateMachine { get; private set; }
+    
+    public bool Enabled
+    {
+        get => _enabled;
+        set
+        {
+            if (_enabled == value) return;
+            _enabled = value;
+        }
+    }
+
+    public void EnterState(PlayerState state)
+    {
+        Enabled = true;
+        this.AreaEntered += OnAreaEntered;
+    }
+
+    private void OnAreaEntered(Area3D area)
+    {
+        if (!Enabled) return;
+        if (area is Bullet3D bullet)
+        {
+            if (!bullet.Enabled) return;
+            if (bullet.IsGrazed) return;
+            if (!bullet.BulletInfo.Grazeable) return;
+            if (bullet.BulletOwner is BulletOwner.Player) return;
+
+            bullet.Graze();
+            //bullet.IsGrazed = true;
+            var baseGrazeValue = bullet.BulletInfo.GrazeValue;
+
+            float grazeShield = baseGrazeValue * GlobalState.Instance.SessionSettings.DifficultyDamageMultiplier;
+            
+            Shield.CurrentResource += grazeShield;
+            
+            // check if it's grazed
+            // check if it's grazeable
+            // restore appropriate amount of shield
+        }
+    }
+    
+    public virtual void Init(IStateMachine<PlayerState, CharacterBody3D> machine)
+    {
+        StateMachine = machine;
+    }
+
+    public void ExitState(PlayerState state)
+    {
+        Enabled = false;
+        this.AreaEntered -= OnAreaEntered;
+    }
+
+    public void Process(double delta)
+    {
+    }
+
+    public void PhysicsProcess(double delta)
+    {
+    }
+}

Scripts/Components/FSM/3DPlayer/PlayerGrazingModule3D.cs.uid

@@ -0,0 +1 @@
+uid://pqsd8h60urrc

Scripts/Weapons/Bullet3D.cs

@@ -73,7 +73,7 @@ public partial class Bullet3D : Area3D, IBullet
     
     public override void _Ready()
     {
-        _grazeSound = GetNodeOrNull<AudioStreamPlayer3D>("AudioStreamPlayer");
+        _grazeSound = GetNodeOrNull<AudioStreamPlayer3D>("GrazeSound");
         _grazeParticles = GetNodeOrNull<GpuParticles3D>("GrazeParticles");
 
         _collisionShape = GetNode<CollisionShape3D>("CollisionShape");
@@ -101,6 +101,9 @@ public partial class Bullet3D : Area3D, IBullet
         {
             sphere.Radius = bulletInfo.OriginalBulletResource.BulletSize;            
         }
+
+        IsGrazed = false;
+        IsFrozen = false;
         
         // Need to clone them here
         // _modifiers = _bulletInfo.TimeModifiers.Select(x => x.MakeClone()).ToList();