new: damage can now be dealt to units using DamageSources

This commit is contained in:
Chris
2025-10-03 20:44:48 -04:00
parent 06cfd582c8
commit 7068d39b5b
11 changed files with 188 additions and 16 deletions

View File

@@ -0,0 +1,7 @@
namespace Reset.Core{
public struct DamageSource{
public object source;
public float damageDealt;
}
}

View File

@@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: ef4bf859ed4a4432a67812d87101fe5e
timeCreated: 1759536327

View File

@@ -0,0 +1,49 @@
using NodeCanvas.Framework;
using ParadoxNotion.Design;
using UnityEngine;
namespace Reset.Core {
[Category("Reset")]
[Description("Create a damage source and return it as a BBParameter")]
public class CreateDamageSource : ActionTask{
public BBParameter<float> damage;
public BBParameter<GameObject> source;
[Space(5)]
public BBParameter<DamageSource> outputDamageSource;
//Use for initialization. This is called only once in the lifetime of the task.
//Return null if init was successfull. Return an error string otherwise
protected override string OnInit() {
return null;
}
//This is called once each time the task is enabled.
//Call EndAction() to mark the action as finished, either in success or failure.
//EndAction can be called from anywhere.
protected override void OnExecute(){
outputDamageSource.value = new DamageSource(){
damageDealt = damage.value,
source = source.value,
};
EndAction(true);
}
//Called once per frame while the action is active.
protected override void OnUpdate() {
}
//Called when the task is disabled.
protected override void OnStop() {
}
//Called when the task is paused.
protected override void OnPause() {
}
}
}

View File

@@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: 1cacb344bd58efa489200a89d8bd84c1

View File

@@ -0,0 +1,56 @@
using System.Collections.Generic;
using NodeCanvas.Framework;
using ParadoxNotion.Design;
using UnityEngine;
namespace Reset.Core {
[Category("Reset")]
[Description("Deal damage using a damage source to a target")]
public class DealDamage : ActionTask{
public BBParameter<List<Collider>> targets;
public BBParameter<DamageSource> damageSource;
//Use for initialization. This is called only once in the lifetime of the task.
//Return null if init was successfull. Return an error string otherwise
protected override string OnInit() {
return null;
}
//This is called once each time the task is enabled.
//Call EndAction() to mark the action as finished, either in success or failure.
//EndAction can be called from anywhere.
protected override void OnExecute() {
foreach (Collider target in targets.value) {
if (target.GetComponent<IDamageable>() == null) {
if (damageSource.value.source != null) {
Debug.LogError($"Target {target.name} cannot be dealt damage as it does not implement the IDamageable interface. It was attempted an attack by {damageSource.value.source}");
} else {
Debug.LogError($"Target {target.name} cannot be dealt damage as it does not implement the IDamageable interface. This attack has no source.");
}
continue;
}
target.GetComponent<IDamageable>().TakeDamage(damageSource.value);
}
EndAction(true);
}
//Called once per frame while the action is active.
protected override void OnUpdate() {
}
//Called when the task is disabled.
protected override void OnStop() {
}
//Called when the task is paused.
protected override void OnPause() {
}
}
}

View File

@@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: 853d0d23d94a38a4590fcf7ba3a8a7aa

View File

@@ -1,5 +1,9 @@
using UnityEngine;
public interface IDamageable{
public void TakeDamage();
}
namespace Reset.Core{
public interface IDamageable{
public void TakeDamage(DamageSource source);
public void TakeDamage(DamageSource[] sources);
}
}

View File

@@ -0,0 +1,10 @@
using Reset.Core;
namespace Reset.Units{
public interface IKillable : IDamageable{
public void Kill();
public float maxHealth{ get; set; }
public float currentHealth{ get; set; }
}
}

View File

@@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: a819219f1a77429aacb1aace2e346eab
timeCreated: 1759535007

View File

@@ -1,22 +1,36 @@
using System;
using System.Collections;
using Drawing;
using Reset;
using Reset.Core;
using Reset.Core.Tools;
using Reset.Units;
using UnityEngine;
using Sirenix.OdinInspector;
using Sirenix.Serialization;
using Unity.Netcode;
public class Player : NetworkBehaviour{
public class Player : NetworkBehaviour, IKillable{
[HideInInspector] public PlayerControls controls;
[HideInInspector] public new PlayerCamera camera;
float IKillable.maxHealth{ get; set; }
float IKillable.currentHealth{ get; set; }
void Awake(){
GameManager.Player = gameObject;
controls = GetComponent<PlayerControls>();
}
void Start()
{
void Start(){
if (((IKillable)this).maxHealth == 0f) {
Debug.LogError($"Max health is not set for type of <b>{name}</b>. Setting to 100.");
((IKillable)this).currentHealth = 100f;
} else {
((IKillable)this).currentHealth = ((IKillable)this).maxHealth;
}
if (!NetworkManager.Singleton.IsConnectedClient && !NetworkManager.Singleton.IsHost) {
Attach();
} else {
@@ -50,8 +64,29 @@ public class Player : NetworkBehaviour{
// Update is called once per frame
void Update()
{
void Update(){
using (Draw.WithColor(Color.blue)) {
Draw.ingame.Label2D(transform.position + Vector3.up * 2.2f, ((IKillable)this).currentHealth.ToString(),
Color.blue);
}
}
public void TakeDamage(DamageSource[] sources){
foreach (DamageSource source in sources) {
TakeDamage(source);
}
}
public void TakeDamage(DamageSource source){
((IKillable)this).currentHealth -= source.damageDealt;
if (((IKillable)this).currentHealth <= 0) {
Kill();
}
}
public void Kill(){
throw new NotImplementedException();
}
}