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

Refactor collectable components to C# and update resource scripts for consistency

Browse Source
This commit is contained in:
Gabriel Kaszewski
2025-08-21 18:01:13 +02:00
parent d84f7d1740
commit 9d0f502cc2
16 changed files with 179 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/components/CollectableComponent.cs
View File

@@ -13,7 +13,7 @@ public partial class CollectableComponent : Node
[Export] public CollectableResource Data { get; set; }
[Export] public AudioStreamPlayer2D Sfx {get; set; }
[Signal] public delegate void CollectedEventHandler(Variant amount, CollectableType type, Node2D body);
[Signal] public delegate void CollectedEventHandler(float amount, CollectableType type, Node2D body);
public override void _Ready()
{

5
scripts/components/HealComponent.cs
View File

@@ -19,7 +19,7 @@ public partial class HealComponent : Node
Collectable.Collected += OnCollected;
}
private void OnCollected(Variant amount, CollectableType type, Node2D body)
private void OnCollected(float amount, CollectableType type, Node2D body)
{
if (type != CollectableType.Health) return;
@@ -28,8 +28,7 @@ public partial class HealComponent : Node
var healthComponent = body.GetNodeOrNull<HealthComponent>("HealthComponent");
if (healthComponent == null) return;
var value = amount.AsSingle();
healthComponent.IncreaseHealth(value);
healthComponent.IncreaseHealth(amount);
if (HealFx != null)
{
PlayHealFx();

4
scripts/components/RequirementComponent.cs
View File

@@ -28,9 +28,9 @@ public partial class RequirementComponent : Node
}
}
private void OnCollected(Variant amount, CollectableType type, Node2D body)
private void OnCollected(float amount, CollectableType type, Node2D body)
{
AddProgress(amount.As<int>());
AddProgress((int)amount);
}
private void AddProgress(int amount = 1)

4
scripts/components/ScoreComponent.cs
View File

@@ -31,11 +31,11 @@ public partial class ScoreComponent : Node
}
}
private void OnCollected(Variant amount, CollectableType type, Node2D body)
private void OnCollected(float amount, CollectableType type, Node2D body)
{
if (type != CollectableType.Coin) return;
var coinAmount = amount.As<int>();
var coinAmount = (int)amount;
var currentCoins = (int)_gameManager.CurrentSessionState["coins_collected"];
_gameManager.CurrentSessionState["coins_collected"] = currentCoins + coinAmount;
}

2
scripts/resources/collectable_resource.gd
View File

@@ -7,4 +7,4 @@ enum CollectableType {
HEALTH,
}
@export var amount: Variant = 0.0
@export var type: CollectableType = CollectableType.COIN
@export var type: CollectableType = CollectableType.COIN