From 328743f1e156ad05d058586b2d8e59f05f7970ac Mon Sep 17 00:00:00 2001
From: wincent <wincent.holm@gmail.com>
Date: Sun, 8 Sep 2024 17:40:32 +0200
Subject: [PATCH] Local work

---
 dGame/NejlikaHooks.cpp | 4 ++--
 dGame/UpgradeEffect.h  | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/dGame/NejlikaHooks.cpp b/dGame/NejlikaHooks.cpp
index 77677d22..7268c011 100644
--- a/dGame/NejlikaHooks.cpp
+++ b/dGame/NejlikaHooks.cpp
@@ -723,10 +723,10 @@ void nejlika::NejlikaHooks::InstallHooks() {
 		}
 
 		// Get the offenders Offensive modifier
-		auto offenderModifiers = offenderEntity.CalculateModifier(ModifierType::Offensive, level);
+		auto offenderModifiers = offenderEntity.CalculateFinalModifier(ModifierType::Offensive, modifiers, level);
 
 		// Get the defenders Defensive modifier
-		auto defensiveModifiers = damagedEntity.CalculateModifier(ModifierType::Defensive, level);
+		auto defensiveModifiers = damagedEntity.CalculateFinalModifier(ModifierType::Defensive, level);
 
 		if (offenderModifiers == 0) offenderModifiers = 1;
 		if (defensiveModifiers == 0) defensiveModifiers = 1;
diff --git a/dGame/UpgradeEffect.h b/dGame/UpgradeEffect.h
index b681ff79..13c96b3f 100644
--- a/dGame/UpgradeEffect.h
+++ b/dGame/UpgradeEffect.h
@@ -62,6 +62,8 @@ private:
 	std::vector<ModifierTemplate> modifiers;
 	int32_t effectID = 0;
 	std::string effectType = "";
+	std::vector<ModifierTemplate> debuffs;
+	std::vector<UpgradeScale> debuffDuration;
 };
 
 }