GKaszewski/brick-framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add event publishing for inventory and combat interactions

Browse Source
This commit is contained in:
Gabriel Kaszewski
2025-10-29 02:12:39 +01:00
parent bf15fad9ce
commit d6a31b12e3
14 changed files with 96 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
GameCore/Combat/DamageSystem.cs
View File

@@ -34,5 +34,8 @@ public class DamageSystem : ISystem
{
var targetAttributes = _world.GetComponent<AttributeComponent>(e.Target);
targetAttributes?.ModifyValue(Attribute.Health, -e.Amount);
var newHealth = targetAttributes?.GetValue(Attribute.Health) ?? 0f;
_world.PublishEvent(new EntityDamagedEvent(e.Target, newHealth, e.Amount));
}
}

8
GameCore/Combat/Effects/ConsumeAmmoCost.cs
View File

@@ -1,4 +1,5 @@
using GameCore.Combat.Interfaces;
using GameCore.Events;
using GameCore.Inventory;
namespace GameCore.Combat.Effects;
@@ -8,7 +9,12 @@ public class ConsumeAmmoCost(string ammoId, int amount) : ICostEffect
public void Execute(EffectContext context)
{
var inventory = context.World.GetComponent<InventoryComponent>(context.Owner);
inventory?.RemoveItem(ammoId, amount);
if (inventory == null) return;
inventory.RemoveItem(ammoId, amount);
var newQuantity = inventory.GetItemCount(ammoId);
context.World.PublishEvent(new InventoryItemChangedEvent(context.Owner, ammoId, newQuantity));
}
public bool CanAfford(EffectContext context)

8
GameCore/Combat/Effects/HitscanEffect.cs
View File

@@ -1,4 +1,5 @@
using GameCore.Combat.Interfaces;
using GameCore.Events;
using GameCore.Input;
namespace GameCore.Combat.Effects;
@@ -12,8 +13,11 @@ public class HitscanEffect(float range) : IEffect
if (input == null || weapon == null) return;
var targetPos = input.MuzzlePosition + input.MuzzleDirection * range;
var hit = context.World.WorldQuery.Raycast(input.MuzzlePosition, targetPos, context.Owner);
var fromPos = input.MuzzlePosition;
var targetPos = fromPos + input.MuzzleDirection * range;
var hit = context.World.WorldQuery.Raycast(fromPos, targetPos, context.Owner);
context.World.PublishEvent(new HitscanImpactEvent(context.Owner, fromPos, targetPos, hit));
if (hit.DidHit)
{

2
GameCore/Combat/ProjectileSystem.cs
View File

@@ -1,6 +1,7 @@
using GameCore.Combat.Effects;
using GameCore.ECS;
using GameCore.ECS.Interfaces;
using GameCore.Events;
using GameCore.Physics;
namespace GameCore.Combat;
@@ -24,6 +25,7 @@ public class ProjectileSystem : ISystem
var hit = world.WorldQuery.Raycast(position.Position, newPosition, projectileData.Owner);
if (hit.DidHit)
{
world.PublishEvent(new ProjectileImpactEvent(projectile, hit));
var hitContext = new EffectContext
{
World = world,

6
GameCore/ECS/HitResult.cs
View File

@@ -1,7 +1,11 @@
using GameCore.Math;
namespace GameCore.ECS;
public struct HitResult
{
public bool DidHit;
public Entity HitEntity;
public Entity? HitEntity;
public Vector3 Position;
public Vector3 Normal;
}

11
GameCore/Events/EntityDamagedEvent.cs Normal file
View File

@@ -0,0 +1,11 @@
using GameCore.ECS;
using GameCore.Events.Interfaces;
namespace GameCore.Events;
public readonly struct EntityDamagedEvent(Entity target, float newHealth, float damageTaken) : IEvent
{
public readonly Entity Target = target;
public readonly float NewHealth = newHealth;
public readonly float DamageTaken = damageTaken;
}

13
GameCore/Events/HitscanImpactEvent.cs Normal file
View File

@@ -0,0 +1,13 @@
using GameCore.ECS;
using GameCore.Events.Interfaces;
using GameCore.Math;
namespace GameCore.Events;
public readonly struct HitscanImpactEvent(Entity owner, Vector3 from, Vector3 to, HitResult hit) : IEvent
{
public readonly Entity Owner = owner;
public readonly Vector3 From = from;
public readonly Vector3 To = to;
public readonly HitResult Hit = hit;
}

10
GameCore/Events/InstantItemUsedEvent.cs Normal file
View File

@@ -0,0 +1,10 @@
using GameCore.ECS;
using GameCore.Events.Interfaces;
namespace GameCore.Events;
public readonly struct InstantItemUsedEvent(Entity picker, string itemId) : IEvent
{
public readonly Entity Picker = picker;
public readonly string ItemId = itemId;
}

11
GameCore/Events/InventoryItemChangedEvent.cs Normal file
View File

@@ -0,0 +1,11 @@
using GameCore.ECS;
using GameCore.Events.Interfaces;
namespace GameCore.Events;
public readonly struct InventoryItemChangedEvent(Entity owner, string itemId, int newQuantity) : IEvent
{
public readonly Entity Owner = owner;
public readonly string ItemId = itemId;
public readonly int NewQuantity = newQuantity;
}

10
GameCore/Events/ProjectileImpactEvent.cs Normal file
View File

@@ -0,0 +1,10 @@
using GameCore.ECS;
using GameCore.Events.Interfaces;
namespace GameCore.Events;
public readonly struct ProjectileImpactEvent(Entity projectile, HitResult hit) : IEvent
{
public readonly Entity ProjectileEntity = projectile;
public readonly HitResult Hit = hit;
}

10
GameCore/Events/WeaponEquippedEvent.cs Normal file
View File

@@ -0,0 +1,10 @@
using GameCore.ECS;
using GameCore.Events.Interfaces;
namespace GameCore.Events;
public readonly struct WeaponEquippedEvent(Entity owner, string newWeaponItemId) : IEvent
{
public readonly Entity Owner = owner;
public readonly string NewWeaponItemId = newWeaponItemId;
}

6
GameCore/Inventory/InventorySystem.cs
View File

@@ -21,6 +21,10 @@ public class InventorySystem : ISystem
private void OnAddItem(AddItemToInventoryEvent e)
{
var inventory = _world.GetComponent<InventoryComponent>(e.Target);
inventory?.AddItem(e.Item);
if (inventory == null) return;
inventory.AddItem(e.Item);
var newQuantity = inventory.GetItemCount(e.Item.ItemId);
_world.PublishEvent(new InventoryItemChangedEvent(e.Target, e.Item.ItemId, newQuantity));
}
}

1
GameCore/Inventory/ItemAcquisitionSystem.cs
View File

@@ -27,6 +27,7 @@ public class ItemAcquisitionSystem : ISystem
if (pickupComponent.IsInstantUse)
{
_world.PublishEvent(new InstantItemUsedEvent(e.Picker, e.ItemId));
var context = new EffectContext
{
World = _world,

2
GameCore/Player/EquipmentSystem.cs
View File

@@ -38,5 +38,7 @@ public class EquipmentSystem : ISystem
weaponComponent.OnFireEffects = newData.OnFireEffects;
weaponComponent.OnHitEffects = newData.OnHitEffects;
weaponComponent.CooldownTimer = 0f;
_world.PublishEvent(new WeaponEquippedEvent(e.Owner, e.NewWeaponItemId));
}
}