GKaszewski/przygody-pana-cegly
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor FlipComponent to use PlayerController and remove ProgressiveDamageComponent from scene

Browse Source
This commit is contained in:
Gabriel Kaszewski
2025-08-31 02:11:05 +02:00
parent 604520cad5
commit 51aecf7da5
4 changed files with 6 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
objects/entities/brick_player.tscn
View File

@@ -1,4 +1,4 @@
[gd_scene load_steps=60 format=3 uid="uid://bqi5s710xb1ju"]
[gd_scene load_steps=59 format=3 uid="uid://bqi5s710xb1ju"]
[ext_resource type="Script" uid="uid://csel4s0e4g5uf" path="res://scripts/components/PlayerController.cs" id="1_yysbb"]
[ext_resource type="Shader" uid="uid://bs4xvm4qkurpr" path="res://shaders/hit_flash.tres" id="2_lgb3u"]
@@ -45,7 +45,6 @@
[ext_resource type="AudioStream" uid="uid://dyev46uqusimi" path="res://sfx/shoot.wav" id="32_x2b7c"]
[ext_resource type="PackedScene" uid="uid://dtem8jgcyoqar" path="res://objects/entities/green_laser.tscn" id="36_oxudy"]
[ext_resource type="Script" uid="uid://diw6opv6yutgi" path="res://scripts/components/KillPlayerOutOfScreenComponent.cs" id="37_qec3q"]
[ext_resource type="Script" uid="uid://3qy7rm28q66a" path="res://scripts/components/ProgressiveDamageComponent.cs" id="38_dhjci"]
[ext_resource type="Script" uid="uid://dssa2taiwktis" path="res://scripts/components/Movement/PlayerInputHandler.cs" id="42_e5pae"]
[ext_resource type="Script" uid="uid://ceoxet1nqws8w" path="res://scripts/components/SpriteTilterComponent.cs" id="43_xuhvf"]
[ext_resource type="Script" uid="uid://b1h8r5irryxcx" path="res://scripts/components/PlayerSfxComponent.cs" id="49_qec3q"]
@@ -158,10 +157,11 @@ visible = false
position = Vector2(0, 0.5)
shape = SubResource("RectangleShape2D_hdsg1")
[node name="FlipPlayerComponent" type="Node2D" parent="." node_paths=PackedStringArray("LeftEye", "RightEye")]
[node name="FlipPlayerComponent" type="Node2D" parent="." node_paths=PackedStringArray("LeftEye", "RightEye", "PlayerController")]
script = ExtResource("9_yysbb")
LeftEye = NodePath("../Graphics/Root/Left Eye")
RightEye = NodePath("../Graphics/Root/Right Eye")
PlayerController = NodePath("..")
[node name="StompDamageArea" type="Area2D" parent="."]
collision_layer = 0
@@ -294,12 +294,6 @@ script = ExtResource("37_qec3q")
ScreenNotifier = NodePath("../VisibleOnScreenNotifier2D")
HealthComponent = NodePath("../HealthComponent")
[node name="ProgressiveDamageComponent" type="Node" parent="." node_paths=PackedStringArray("HealthComponent", "Sprite")]
process_mode = 4
script = ExtResource("38_dhjci")
HealthComponent = NodePath("../HealthComponent")
Sprite = NodePath("../Graphics/Root/Base")
[node name="PlayerInputHandler" type="Node" parent="."]
script = ExtResource("42_e5pae")
metadata/_custom_type_script = "uid://dssa2taiwktis"

6
scripts/components/FlipComponent.cs
View File

@@ -6,13 +6,13 @@ public partial class FlipComponent : Node2D
{
[Export] public Sprite2D LeftEye { get; set; }
[Export] public Sprite2D RightEye { get; set; }
[Export] public PlatformMovementComponent PlatformMovement { get; set; }
[Export] public PlayerController PlayerController { get; set; }
public override void _Process(double delta)
{
if (PlatformMovement == null) return;
if (PlayerController == null) return;
var velocity = PlatformMovement.LastDirection;
var velocity = PlayerController.LastDirection;
switch (velocity.X)
{
case < 0f:

65
scripts/components/ProgressiveDamageComponent.cs
View File

@@ -1,65 +0,0 @@
using Godot;
namespace Mr.BrickAdventures.scripts.components;
public partial class ProgressiveDamageComponent : Node
{
[Export] public HealthComponent HealthComponent { get; set; }
[Export] public Sprite2D Sprite { get; set; }
[Export] public PlatformMovementComponent PlatformMovement { get; set; }
[Export] public float MinJumpHeight { get; set; } = 60f;
[Export] public float JumpReductionPercentage { get; set; } = 0.1f; // this is a percentage of the jump height per hit
private float _maxHealth;
private float _ogJumpHeight;
public override void _Ready()
{
_maxHealth = HealthComponent.MaxHealth;
HealthComponent.HealthChanged += OnHealthChanged;
if (PlatformMovement != null)
{
_ogJumpHeight = PlatformMovement.JumpHeight;
}
}
private void OnHealthChanged(float delta, float totalHealth)
{
var frame = GetDamageFrame();
if (frame < 0 || frame >= Sprite.GetHframes()) return;
Sprite.Frame = frame;
if (PlatformMovement != null)
{
PlatformMovement.JumpHeight = GetJumpHeight();
}
}
private int GetDamageFrame()
{
if (Sprite == null || HealthComponent == null) return 0;
var framesCount = Sprite.GetHframes();
if (framesCount == 0) return 0;
var currentHealth = HealthComponent.Health;
var healthRatio = currentHealth / _maxHealth;
return (int)(framesCount * (1f - healthRatio));
}
private float GetJumpHeight()
{
if (PlatformMovement == null) return 0f;
var jumpHeight = _ogJumpHeight;
if (jumpHeight <= 0f) return 0f;
var damageFrame = GetDamageFrame();
if (damageFrame < 0 || damageFrame >= Sprite.GetHframes()) return jumpHeight;
var reduction = JumpReductionPercentage * jumpHeight;
var calculatedJumpHeight = jumpHeight - (damageFrame * reduction);
return Mathf.Max(calculatedJumpHeight, MinJumpHeight);
}
}

1
scripts/components/ProgressiveDamageComponent.cs.uid
View File

@@ -1 +0,0 @@
uid://3qy7rm28q66a