GKaszewski/broberry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor character attributes system; replace individual attributes with a dictionary-based approach for better scalability and maintainability

Browse Source
This commit is contained in:
Gabriel Kaszewski
2025-08-02 06:06:51 +02:00
parent 93cbc4a3e5
commit 3871cba753
21 changed files with 505 additions and 417 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Assets/Scripts/Systems/DeathHandler.cs
View File

@@ -13,12 +13,12 @@ namespace Systems
private void OnEnable()
{
character.attributes.OnHealthChanged += OnHealthChanged;
character.attributes.Subscribe(Attribute.Health, OnHealthChanged);
}
private void OnDisable()
{
character.attributes.OnHealthChanged -= OnHealthChanged;
character.attributes.Unsubscribe(Attribute.Health, OnHealthChanged);
}
private void OnHealthChanged(float newHealth)

3
Assets/Scripts/Systems/EnemyDeathBehavior.cs
View File

@@ -2,6 +2,7 @@ using System;
using Interfaces;
using Sirenix.Serialization;
using UnityEngine;
using Attribute = Data.Attribute;
namespace Systems
{
@@ -14,7 +15,7 @@ namespace Systems
public void Die(GameObject killer = null)
{
GameManager.Instance.Player.attributes.ModifyExperience(expReward);
GameManager.Instance.Player.attributes.Modify(Attribute.Experience, expReward);
GameManager.Instance.AddCoins(coinReward);
OnAnyEnemyKilled?.Invoke(killer ?? GameManager.Instance.Player.gameObject, gameObject);

7
Assets/Scripts/Systems/Health.cs
View File

@@ -2,6 +2,7 @@ using System;
using Data;
using KBCore.Refs;
using UnityEngine;
using Attribute = Data.Attribute;
namespace Systems
{
@@ -19,15 +20,15 @@ namespace Systems
private void Start()
{
character.attributes.SetHealth(initialHealth);
character.attributes.Set(Attribute.Health, initialHealth);
}
public void TakeDamage(float damage, GameObject attacker = null)
{
lastAttacker = attacker;
var effectiveDamage = Math.Max(damage - character.attributes.Armor, 1);
character.attributes.ModifyHealth(-effectiveDamage);
var effectiveDamage = Math.Max(damage - character.attributes.Get(Attribute.Armor), 1);
character.attributes.Modify(Attribute.Health, -effectiveDamage);
if (damageSound)
{

3
Assets/Scripts/Systems/Movement.cs
View File

@@ -3,6 +3,7 @@ using Data;
using KBCore.Refs;
using UnityEngine;
using UnityEngine.InputSystem;
using Attribute = Data.Attribute;
namespace Systems
{
@@ -43,7 +44,7 @@ namespace Systems
{
if (!rb) return;
var velocity = new Vector2(movementInput.x, movementInput.y).normalized * character.attributes.MoveSpeed;
var velocity = new Vector2(movementInput.x, movementInput.y).normalized * character.attributes.Get(Attribute.MoveSpeed);
rb.linearVelocity = velocity;
}
}