fix build issues

Author: dargem

cpp-backend-new/src/skills/SkillCondition.cpp

@@ -1,13 +1,19 @@
 #include "SkillCondition.hpp"
+#include "../combatants/Combatant.hpp"
 
-bool SkillCondition::isMet(const Combatant self, const Combatant target) const
+SkillCondition::SkillCondition(ConditionType condition_type, EffectType trigger_requirement)
+    : condition_type {condition_type},
+    trigger_requirement { trigger_requirement }
+{}
+
+bool SkillCondition::isMet(const Combatant& self, const Combatant& target) const
 {
     switch(condition_type)
     {
     case ConditionType::HAS_EFFECT_SELF:
-        return self.checkEffectActive(effect_type);
+        return self.checkEffectActive(trigger_requirement);
     case ConditionType::HAS_EFFECT_TARGET:
-        return target.checkEffectActive(effect_type);
+        return target.checkEffectActive(trigger_requirement);
     case ConditionType::TROOP_COUNT_GREATER_THAN_TARGET:
         return self.getTroops() > target.getTroops();
     }

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

@@ -4,15 +4,17 @@
 #include <optional>
 #include "ConditionType.hpp"
 #include "../effects/EffectType.hpp"
-#include "../combatants/Combatant.hpp"
+
+class Combatant; // Forward declaration
 
 struct SkillCondition
 {
 public:
-    bool isMet(const Combatant self, const Combatant target) const;
+    SkillCondition(ConditionType condition_type, EffectType trigger_requirement);
+    bool isMet(const Combatant& self, const Combatant& target) const;
 private:
-    const ConditionType condition_type;
-    const EffectType effect_type;
+    ConditionType condition_type;
+    EffectType trigger_requirement;
 };
 
 #endif

cpp-backend-new/src/skills/StatusSkill.cpp

@@ -1,7 +1,8 @@
 #include "StatusSkill.hpp"
 
-StatusSkill::StatusSkill(const TimedEffect status_effect, const SkillType skill_type, const EffectType effect_type)
-    : Skill(skill_type, effect_type), status_effect(status_effect)
+StatusSkill::StatusSkill(const TimedEffect status_effect, const SkillType skill_type, const EffectType effect_type, const SkillCondition skill_condition)
+    : Skill(skill_type, effect_type, skill_condition), 
+    status_effect(status_effect)
 {}
 
 void StatusSkill::onDependent(Combatant& combatant_friendly, Combatant& combatant_enemy) const

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

@@ -13,7 +13,7 @@ class Combatant;
 class StatusSkill: public Skill
 {
     public:
-        StatusSkill(const TimedEffect status_effect, const SkillType skill_type, const EffectType effect_type);
+        StatusSkill(const TimedEffect status_effect, const SkillType skill_type, const EffectType effect_type, const SkillCondition skill_condition);
         void onDependent(Combatant& friendly_combatant, Combatant& enemy_combatant) const override;
         bool operator==(const Skill& other) const override;
         std::vector<CombatantEvent> getTriggerEvents() const;