From a43bc028610af3860f7c2f6f54acc93ae306c0fb Mon Sep 17 00:00:00 2001
From: Dominic Masters <dominic@domsplace.com>
Date: Wed, 5 Apr 2023 22:44:24 -0700
Subject: [PATCH] Thinking of a new attack base

---
 .../components/entity/EntityAttackBase.hpp    | 43 +++++++++++++++++++
 .../entity/EntityProjectileAttack.hpp         | 12 ++++++
 .../components/entity/EntitySwordAttack.cpp   | 29 ++++---------
 .../components/entity/EntitySwordAttack.hpp   | 30 -------------
 4 files changed, 64 insertions(+), 50 deletions(-)
 create mode 100644 src/dawnrose/scene/components/entity/EntityAttackBase.hpp
 create mode 100644 src/dawnrose/scene/components/entity/EntityProjectileAttack.hpp
 delete mode 100644 src/dawnrose/scene/components/entity/EntitySwordAttack.hpp

diff --git a/src/dawnrose/scene/components/entity/EntityAttackBase.hpp b/src/dawnrose/scene/components/entity/EntityAttackBase.hpp
new file mode 100644
index 00000000..7e9c52f8
--- /dev/null
+++ b/src/dawnrose/scene/components/entity/EntityAttackBase.hpp
@@ -0,0 +1,43 @@
+// Copyright (c) 2023 Dominic Masters
+// 
+// This software is released under the MIT License.
+// https://opensource.org/licenses/MIT
+
+#pragma once
+#include "scene/SceneItemComponent.hpp"
+#include "scene/components/entity/EntityFaction.hpp"
+
+namespace Dawn {
+  class EntityAttackBase : public SceneItemComponent {
+    protected:
+      float_t attackTime = -1;
+
+    public:
+      StateProperty<bool_t> interrupted;
+      StateEvent<> onAttackRampUpStart;
+      StateEvent<> onAttackRampUpEnd;
+      StateEvent<> onAttackActiveStart;
+      StateEvent<> onAttackActiveEnd;
+      StateEvent<> onAttackRampDownStart;
+      StateEvent<> onAttackRampDownEnd;
+      StateEvent<> onAttackCooldownStart;
+      StateEvent<> onAttackCooldownEnd;
+      StateEvent<> onAttackInterrupted;
+
+      EntitySwordAttack(SceneItem* item);
+      
+      virtual float_t getAttackRampUpDuration() = 0;
+      virtual float_t getAttackActiveDuration() = 0;
+      virtual float_t getAttackRampDownDuration() = 0;
+      virtual float_t getAttackCooldownDuration() = 0;
+      virtual bool_t isInterruptable() = 0;
+
+      virtual void attack() = 0;
+      
+      void interrupt();
+
+      bool_t isAttacking();
+
+      void onStart() override;
+  };
+}
\ No newline at end of file
diff --git a/src/dawnrose/scene/components/entity/EntityProjectileAttack.hpp b/src/dawnrose/scene/components/entity/EntityProjectileAttack.hpp
new file mode 100644
index 00000000..3c3fe868
--- /dev/null
+++ b/src/dawnrose/scene/components/entity/EntityProjectileAttack.hpp
@@ -0,0 +1,12 @@
+// Copyright (c) 2023 Dominic Masters
+// 
+// This software is released under the MIT License.
+// https://opensource.org/licenses/MIT
+
+#pragma once
+#include "scene/SceneItemComponent.hpp"
+#include "scene/components/entity/EntityFaction.hpp"
+
+namespace Dawn {
+
+}
\ No newline at end of file
diff --git a/src/dawnrose/scene/components/entity/EntitySwordAttack.cpp b/src/dawnrose/scene/components/entity/EntitySwordAttack.cpp
index 24561661..31cac458 100644
--- a/src/dawnrose/scene/components/entity/EntitySwordAttack.cpp
+++ b/src/dawnrose/scene/components/entity/EntitySwordAttack.cpp
@@ -9,8 +9,7 @@
 using namespace Dawn;
 
 EntitySwordAttack::EntitySwordAttack(SceneItem* item) :
-  SceneItemComponent(item),
-  attackTime(0.0f)
+  SceneItemComponent(item)
 {
   
 }
@@ -21,29 +20,19 @@ void EntitySwordAttack::onStart() {
   attackHitbox->transform.setParent(this->transform);
 
   useEvent([&](float_t delta) {
-    if(this->attackTime > 0.0f) {
-      this->attackTime = this->attackTime - delta;
-    }
+    if(swingTime != -1) swingTime -= delta;
   }, getScene()->eventSceneUpdate);
-
-  useEffect([&]{
-    if(attackTime <= 0) {
-      attackHitbox->transform.setLocalPosition(glm::vec3(999999999, 0, 0));
-    } else {
-      attackHitbox->transform.setLocalPosition(this->attackOffset);
-    }
-  }, attackTime);
 }
 
 void EntitySwordAttack::attack() {
-  auto entityFaction = this->item->getComponent<EntityFaction>();
-  auto hazard = attackHitbox->getComponent<HurtHazard>();
-  this->attackTime = swingTime;
-  if(hazard != nullptr && entityFaction != nullptr) {
-    hazard->faction = entityFaction->faction;
-  }
+  // auto entityFaction = this->item->getComponent<EntityFaction>();
+  // auto hazard = attackHitbox->getComponent<HurtHazard>();
+  // this->attackTime = swingTime;
+  // if(hazard != nullptr && entityFaction != nullptr) {
+  //   hazard->faction = entityFaction->faction;
+  // }
 }
 
 bool_t EntitySwordAttack::isAttacking() {
-  return this->attackTime > 0.0f;
+  // return this->attackTime > 0.0f;
 }
\ No newline at end of file
diff --git a/src/dawnrose/scene/components/entity/EntitySwordAttack.hpp b/src/dawnrose/scene/components/entity/EntitySwordAttack.hpp
deleted file mode 100644
index 24882d2e..00000000
--- a/src/dawnrose/scene/components/entity/EntitySwordAttack.hpp
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright (c) 2023 Dominic Masters
-// 
-// This software is released under the MIT License.
-// https://opensource.org/licenses/MIT
-
-#pragma once
-#include "scene/SceneItemComponent.hpp"
-#include "scene/components/entity/EntityFaction.hpp"
-
-namespace Dawn {
-  class EntitySwordAttack : public SceneItemComponent {
-    protected:
-      SceneItem *attackHitbox = nullptr;
-
-    public:
-      // @optional
-      StateProperty<float_t> attackTime;
-
-      // @optional
-      glm::vec3 attackOffset = glm::vec3(0, 0, 1);
-
-      // @optional
-      float_t swingTime = 0.5f;
-
-      EntitySwordAttack(SceneItem* item);
-      void onStart() override;
-      void attack();
-      bool_t isAttacking();
-  };
-}
\ No newline at end of file