From bd886d54eab79bd4c74f13659c967206aded7e11 Mon Sep 17 00:00:00 2001
From: mauriliogenovese <125388969+mauriliogenovese@users.noreply.github.com>
Date: Sun, 16 Feb 2025 15:22:54 +0100
Subject: [PATCH 1/2] fix-721

---
 src/Modules/CalcSetup.lua | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Modules/CalcSetup.lua b/src/Modules/CalcSetup.lua
index 8cdc448583..834ed16d13 100644
--- a/src/Modules/CalcSetup.lua
+++ b/src/Modules/CalcSetup.lua
@@ -1274,7 +1274,6 @@ function calcs.initEnv(build, mode, override, specEnv)
 					enabled = true,
 				}
 				activeGemInstance.fromItem = grantedSkill.sourceItem ~= nil
-				activeGemInstance.gemId = nil
 				activeGemInstance.level = grantedSkill.level
 				activeGemInstance.enableGlobal1 = true
 				activeGemInstance.noSupports = grantedSkill.noSupports
@@ -1597,7 +1596,7 @@ function calcs.initEnv(build, mode, override, specEnv)
 								t_insert(env.player.activeSkillList, activeSkill)
 							end
 						end
-						if gemInstance.gemData and not accelerate.requirementsGems then
+						if gemInstance.gemData and not (accelerate.requirementsGems or group.gemList[gemIndex].fromNode or group.gemList[gemIndex].fromItem) then
 							t_insert(env.requirementsTableGems, {
 								source = "Gem",
 								sourceGem = gemInstance,

From 93f5a8fe68c65839e1625eec96845d1dcf4019ad Mon Sep 17 00:00:00 2001
From: mauriliogenovese <125388969+mauriliogenovese@users.noreply.github.com>
Date: Sun, 16 Feb 2025 16:17:36 +0100
Subject: [PATCH 2/2] missing gemId

---
 src/Modules/CalcSetup.lua | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Modules/CalcSetup.lua b/src/Modules/CalcSetup.lua
index 834ed16d13..38473ee0f6 100644
--- a/src/Modules/CalcSetup.lua
+++ b/src/Modules/CalcSetup.lua
@@ -1275,6 +1275,7 @@ function calcs.initEnv(build, mode, override, specEnv)
 				}
 				activeGemInstance.fromItem = grantedSkill.sourceItem ~= nil
 				activeGemInstance.level = grantedSkill.level
+				activeGemInstance.gemId = data.gemForSkill[data.skills[grantedSkill.skillId]]
 				activeGemInstance.enableGlobal1 = true
 				activeGemInstance.noSupports = grantedSkill.noSupports
 				group.noSupports = grantedSkill.noSupports