controller fix

Author: dargem

cpp-backend-new/src/combatants/Combatant.cpp

@@ -17,19 +17,14 @@ Combatant::Combatant(int troops, Stats stats)
  * 
  * @param status_effect value passed status effect
  */
-void Combatant::addStatusEffect(TimedEffect status_effect) 
+void Combatant::addStatusEffect(TimedEffect timed_effect, EffectType type)
 {
-    status_effects.push_back(status_effect);
+    status_manager.addStatusEffect(timed_effect, type);
 }
 
-/**
- * @brief adds a buff effect to the combatant
- * 
- * @param buff_effect value passed buff effect
- */
-void Combatant::addBuffEffect(TimedEffect buff_effect) 
+bool Combatant::checkEffectActive(EffectType effect_type)
 {
-    buff_effects.push_back(buff_effect);
+    return status_manager.checkEffectActive(effect_type);
 }
 
 void Combatant::addSkill(Skill& skill, CombatantEvent combat_event)

cpp-backend-new/src/combatants/Combatant.hpp

@@ -2,8 +2,10 @@
 #define COMBATANT_HPP
 
 #include "../effects/TimedEffect.hpp"
+#include "../effects/EffectType.hpp"
 #include "../orchestration/CombatPublisher.hpp"
 #include "../orchestration/CombatantEvents.hpp"
+#include "StatusController.hpp"
 #include "../skills/Skill.hpp"
 #include "Stats.hpp"
 #include <vector>
@@ -13,9 +15,9 @@ class Combatant
 public:
     Combatant(int troops, Stats stats);
 
+    bool checkEffectActive(EffectType effect_type);
     void addSkill(Skill& skill, CombatantEvent combat_event);
-    void addStatusEffect(TimedEffect status_effect);
-    void addBuffEffect(TimedEffect buff_effect);
+    void addStatusEffect(TimedEffect timed_effect, EffectType type);
 
     void setTroops(int troops);
     int getTroops();
@@ -28,10 +30,11 @@ class Combatant
     int troops;
     Stats stats;
     CombatPublisher combat_publisher;
-    
+    StatusController status_manager;
+
     std::vector<TimedEffect> status_effects;
     std::vector<TimedEffect> buff_effects;
     std::vector<const Skill*> skills;
-};
+};  
 
 #endif

cpp-backend-new/src/combatants/StatusController.cpp

@@ -0,0 +1,33 @@
+#include "StatusController.hpp"
+#include "effects/EffectType.hpp"
+
+StatusController::StatusController()
+{
+    for (int i = 0; i < static_cast<int>(EffectType::COUNT); ++i) 
+    {
+        debuff_collection[static_cast<EffectType>(i)] = std::vector<TimedEffect>();
+    }
+}
+
+void StatusController::addStatusEffect(const TimedEffect effect, EffectType type)
+{
+    // get the timed effects for a specific debuff type
+    std::vector<TimedEffect>& timed_effects = debuff_collection[type];
+    // needs to check its not already on there also, do later
+    timed_effects.push_back(effect);
+}
+
+void StatusController::removeRandomBuffEffect(int num_removals)
+{
+    // filler 4 now
+}
+void StatusController::removeAllDebuffEffects()
+{
+    // filler 4 now
+}
+
+bool StatusController::checkEffectActive(EffectType type) const
+{
+    const std::vector<TimedEffect>& timed_effects = debuff_collection.at(type);
+    return (timed_effects.size() > 0);
+}

cpp-backend-new/src/combatants/StatusController.hpp

@@ -0,0 +1,25 @@
+#ifndef STATUS_MANAGER_HPP
+#define STATUS_MANAGER_HPP
+
+#include "effects/TimedEffect.hpp"
+#include "effects/EffectType.hpp"
+
+#include <vector>
+#include <map>
+
+class StatusController
+{
+public:
+    StatusController();
+    void addStatusEffect(const TimedEffect effect, EffectType type);
+    void removeRandomBuffEffect(int num_removals);
+    void removeAllDebuffEffects();
+    bool checkEffectActive(EffectType type) const;
+private:
+    // Collection of active debuffs grouped by type
+    std::map<EffectType, std::vector<TimedEffect>> debuff_collection;
+    // List of general status effects
+    std::vector<TimedEffect> status_effects;
+};
+
+#endif

cpp-backend-new/src/combatants/StatusManager.hpp

@@ -1,15 +1,16 @@
-#ifndef EFFECT_TYPES_HPP
-#define EFFECT_TYPES_HPP
+#ifndef EFFECT_TYPE_HPP
+#define EFFECT_TYPE_HPP
 
 enum class EffectType 
 { 
+    START,
     BURN, 
     BLEED, 
     POISON, 
     ABSORPTION, 
     HEALING,
     RETRIBUTION,
-    DIRECT_DAMAGE
+    COUNT
 };
 
 #endif

cpp-backend-new/src/effects/EffectType.hpp

@@ -1,5 +1,5 @@
-#ifndef TIMER
-#define TIMER
+#ifndef TIMER_HPP
+#define TIMER_HPP
 
 class Timer
 {
@@ -10,4 +10,4 @@ class Timer
         short duration;
 };
 
-#endif
+#endif // TIMER_HPP

cpp-backend-new/src/effects/Timer.hpp

@@ -1,3 +1,4 @@
-int main() {
+int main() 
+{
     return 0;
 }

cpp-backend-new/src/main.cpp

@@ -0,0 +1,11 @@
+#ifndef CONDITION_TYPE_HPP
+#define CONDITION_TYPE_HPP
+
+enum class ConditionType
+{
+    HAS_EFFECT_SELF,
+    HAS_EFFECT_TARGET,
+    TROOP_COUNT_GREATER_THAN_TARGET
+};
+
+#endif

cpp-backend-new/src/skills/ConditionType.hpp

@@ -0,0 +1,15 @@
+#include "SkillCondition.hpp"
+
+bool SkillCondition::isMet(Combatant self, Combatant target)
+{
+    switch(condition_type)
+    {
+    case ConditionType::HAS_EFFECT_SELF:
+        break;
+    case ConditionType::HAS_EFFECT_TARGET:
+        break;
+    case ConditionType::TROOP_COUNT_GREATER_THAN_TARGET:
+        break;
+    }
+    return true;
+}