Fix Prism of Belief not working with some Skill Gems (#1435)

Prism of Belief wasn't working with some skill gems as it was trying to match the GrantedEffect Id instead of the Gem Id in a few  cases
If has 2 manual name overrides for Spectres and Companions
Prism of Belief also was generating variants for skills that came from the tree or only from item.
Technically it should be using the gem list in SkillGemForUniqueStat.dat but after correctly tagging all the gems that come from items, we only need to manually excluded 2 gems

Co-authored-by: LocalIdentity <localidentity2@gmail.com>

Author: LocalIdentity

src/Data/Gems.lua

@@ -6447,35 +6447,6 @@ return {
 		Tier = 1,
 		naturalMaxLevel = 20,
 	},
-	["Metadata/Items/Gems/SkillGemElementalSiphon"] = {
-		name = "Elemental Siphon",
-		baseTypeName = "Elemental Siphon",
-		gameId = "Metadata/Items/Gem/SkillGemElementalSiphon",
-		variantId = "ElementalSiphon",
-		grantedEffectId = "ElementalSiphonPlayer",
-		additionalStatSet1 = "ElementalSiphonColdPlayer",
-		additionalStatSet2 = "ElementalSiphonFirePlayer",
-		additionalStatSet3 = "ElementalSiphonLightningPlayer",
-		tags = {
-			dexterity = true,
-			grants_active_skill = true,
-			attack = true,
-			melee = true,
-			strike = true,
-			lightning = true,
-			cold = true,
-			fire = true,
-			duration = true,
-		},
-		gemType = "Attack",
-		tagString = "Melee, Strike, Lightning, Cold, Fire, Duration",
-		weaponRequirements = "Spear",
-		reqStr = 0,
-		reqDex = 100,
-		reqInt = 0,
-		Tier = 0,
-		naturalMaxLevel = 20,
-	},
 	["Metadata/Items/Gems/SkillGemThunderousLeap"] = {
 		name = "Thunderous Leap",
 		baseTypeName = "Thunderous Leap",

src/Data/ModCache.lua

@@ -4077,6 +4077,7 @@ skills["ConvalescenceActivePlayer"] = {
 skills["CracklingPalmPlayer"] = {
 	name = "Crackling Palm",
 	baseTypeName = "Crackling Palm",
+	fromItem = true,
 	color = 3,
 	description = "When you Hit with Unarmed Melee Attacks, calls down lightning bolts which deal Unarmed Attack damage to all surrounding enemies.",
 	skillTypes = { [SkillType.Buff] = true, [SkillType.HasReservation] = true, [SkillType.Area] = true, [SkillType.Lightning] = true, [SkillType.Attack] = true, [SkillType.OngoingSkill] = true, [SkillType.Persistent] = true, [SkillType.NoAttackOrCastTime] = true, },
@@ -4256,6 +4257,7 @@ skills["CracklingPalmPlayer"] = {
 skills["MetaCastCurseOnBlockPlayer"] = {
 	name = "Curse on Block",
 	baseTypeName = "Curse on Block",
+	fromItem = true,
 	color = 3,
 	description = "While active, gains Energy when you Block and triggers socketed Curses on reaching maximum Energy.",
 	skillTypes = { [SkillType.HasReservation] = true, [SkillType.OngoingSkill] = true, [SkillType.Meta] = true, [SkillType.Persistent] = true, [SkillType.Buff] = true, [SkillType.CanHaveMultipleOngoingSkillInstances] = true, [SkillType.GeneratesEnergy] = true, [SkillType.Triggers] = true, },
@@ -4369,6 +4371,7 @@ skills["MetaCastCurseOnBlockPlayer"] = {
 skills["SupportMetaCastCurseOnBlockPlayer"] = {
 	name = "SupportMetaCastCurseOnBlockPlayer",
 	hidden = true,
+	fromItem = true,
 	support = true,
 	requireSkillTypes = { SkillType.AppliesCurse, SkillType.Triggerable, SkillType.AND, },
 	addSkillTypes = { SkillType.Triggered, SkillType.Cooldown, },
@@ -6906,6 +6909,7 @@ skills["FallingThunderPlayer"] = {
 skills["FeastOfFleshPlayer"] = {
 	name = "Feast of Flesh",
 	baseTypeName = "Feast of Flesh",
+	fromItem = true,
 	color = 3,
 	description = "Consume Corpses near you to recover Life and Mana over a short time per Corpse Consumed.",
 	skillTypes = { [SkillType.Spell] = true, [SkillType.Area] = true, [SkillType.Triggerable] = true, [SkillType.AreaSpell] = true, [SkillType.Nova] = true, [SkillType.NoAttackInPlace] = true, [SkillType.Unleashable] = true, [SkillType.Buff] = true, },
@@ -9956,6 +9960,7 @@ skills["FrozenLocusPlayer"] = {
 skills["FulminationPlayer"] = {
 	name = "Fulmination",
 	baseTypeName = "Fulmination",
+	fromItem = true,
 	color = 3,
 	description = "While active, the first time any Skill Hits a Shocked enemy in your Presence, that Skill also Hits other Shocked enemies in your Presence, up to a maximum.",
 	skillTypes = { [SkillType.Buff] = true, [SkillType.HasReservation] = true, [SkillType.Aura] = true, [SkillType.OngoingSkill] = true, [SkillType.Persistent] = true, [SkillType.AffectsPresence] = true, [SkillType.Damage] = true, [SkillType.NoAttackInPlace] = true, [SkillType.NoAttackOrCastTime] = true, [SkillType.Lightning] = true, },

src/Data/Skills/act_dex.lua

@@ -1264,6 +1264,7 @@ skills["BerserkPlayer"] = {
 skills["BlackPowderBlitzReservationPlayer"] = {
 	name = "Black Powder Blitz",
 	baseTypeName = "Black Powder Blitz",
+	fromItem = true,
 	color = 1,
 	description = "Replaces your dodge roll with an explosive-assisted leap, firing off a round from your prosthetic cannon leg that Blinds and Ignites enemies in the area you escape from. The explosion will cause any Grenades in its area of effect to also explode.",
 	skillTypes = { [SkillType.OngoingSkill] = true, [SkillType.HasReservation] = true, [SkillType.Buff] = true, [SkillType.Persistent] = true, [SkillType.DodgeReplacement] = true, [SkillType.Detonator] = true, },
@@ -1373,6 +1374,7 @@ skills["BlackPowderBlitzReservationPlayer"] = {
 skills["BlackPowderBlitzPlayer"] = {
 	name = "Black Powder Blitz",
 	hidden = true,
+	fromItem = true,
 	skillTypes = { [SkillType.UsableWhileMoving] = true, [SkillType.Cooldown] = true, [SkillType.Travel] = true, [SkillType.CanCancelActions] = true, [SkillType.Area] = true, [SkillType.Damage] = true, [SkillType.Physical] = true, [SkillType.Fire] = true, [SkillType.Jumping] = true, },
 	castTime = 0.7,
 	qualityStats = {
@@ -4683,6 +4685,7 @@ skills["ToxicGrenadePlayer"] = {
 skills["GeminiSurgePlayer"] = {
 	name = "Gemini Surge",
 	baseTypeName = "Gemini Surge",
+	fromItem = true,
 	color = 1,
 	description = "Grants your weapon Surges. Non-Melee Projectile Attacks with that weapon Consume Surges to cause the Projectiles fired to explode at the end of their flight.",
 	skillTypes = { [SkillType.Attack] = true, [SkillType.Area] = true, [SkillType.Fire] = true, [SkillType.Cold] = true, [SkillType.Triggered] = true, [SkillType.Triggerable] = true, [SkillType.NoAttackOrCastTime] = true, },
@@ -14260,6 +14263,7 @@ skills["SuperchargedSlamPlayer"] = {
 skills["MetaCastLightningSpellOnHitPlayer"] = {
 	name = "Thundergod's Wrath",
 	baseTypeName = "Thundergod's Wrath",
+	fromItem = true,
 	color = 1,
 	description = "While active, gains Energy when you Hit enemies with Melee Attacks and triggers socketed Lightning spells on reaching maximum Energy.",
 	skillTypes = { [SkillType.HasReservation] = true, [SkillType.OngoingSkill] = true, [SkillType.Meta] = true, [SkillType.Persistent] = true, [SkillType.Buff] = true, [SkillType.Lightning] = true, [SkillType.CanHaveMultipleOngoingSkillInstances] = true, [SkillType.GeneratesEnergy] = true, [SkillType.Triggers] = true, },
@@ -14374,6 +14378,7 @@ skills["MetaCastLightningSpellOnHitPlayer"] = {
 skills["SupportMetaCastLightningSpellOnHitPlayer"] = {
 	name = "SupportMetaCastLightningSpellOnHitPlayer",
 	hidden = true,
+	fromItem = true,
 	support = true,
 	requireSkillTypes = { SkillType.Spell, SkillType.Triggerable, SkillType.Lightning, SkillType.AND, SkillType.AND, },
 	addSkillTypes = { SkillType.Triggered, SkillType.Cooldown, },
@@ -14600,6 +14605,7 @@ skills["TimeOfNeedPlayer"] = {
 skills["ValakosChargePlayer"] = {
 	name = "Valako's Charge",
 	baseTypeName = "Valako's Charge",
+	fromItem = true,
 	color = 1,
 	description = "While active, taking Lightning damage builds up charge on you. Reaching full charge expends all charge to Trigger this skill, creating a Chaining lightning bolt that arcs to nearby enemies.",
 	skillTypes = { [SkillType.Spell] = true, [SkillType.Damage] = true, [SkillType.Chains] = true, [SkillType.Triggerable] = true, [SkillType.Lightning] = true, [SkillType.UsableWhileMoving] = true, [SkillType.Area] = true, [SkillType.AreaSpell] = true, [SkillType.NoAttackInPlace] = true, [SkillType.Cooldown] = true, [SkillType.InbuiltTrigger] = true, [SkillType.Triggered] = true, [SkillType.NoAttackOrCastTime] = true, },

src/Data/Skills/act_int.lua

@@ -75,10 +75,13 @@ end
 
 do
 	local excludedGems = {
+		"Detonate Minion",
+		"Rhoa Mount",
 	}
 	local gems = { }
 	for _, gemData in pairs(data.gems) do
-		if not gemData.tags.support and not isValueInArray(excludedGems, gemData.name) then
+		if not gemData.tags.support and not isValueInArray(excludedGems, gemData.name) and not gemData.grantedEffect.hidden and not gemData.grantedEffect.fromItem and not gemData.grantedEffect.fromTree then
+			gemData.name = gemData.name:gsub("Spectre: {0}", "Summon Spectre"):gsub("Companion: {0}", "Tamed Companion")
 			table.insert(gems, gemData.name)
 		end
 	end

src/Data/Skills/act_str.lua

@@ -147,21 +147,6 @@ statMap = {
 #mods
 #skillEnd
 
-#skill ElementalSiphonPlayer
-#set ElementalSiphonPlayer
-#flags attack area melee
-#mods
-#set ElementalSiphonColdPlayer
-#flags
-#mods
-#set ElementalSiphonFirePlayer
-#flags
-#mods
-#set ElementalSiphonLightningPlayer
-#flags
-#mods
-#skillEnd
-
 #skill ElementalSunderingPlayer
 #set ElementalSunderingPlayer
 #flags
@@ -344,6 +329,7 @@ statMap = {
 #mods
 #skillEnd
 
+#from item
 #skill PhantasmalArrowPlayer
 #set PhantasmalArrowPlayer
 #flags attack projectile duration

src/Data/Uniques/Special/Generated.lua

@@ -289,6 +289,7 @@ statMap = {
 #mods
 #skillEnd
 
+#from item
 #skill CracklingPalmPlayer
 #set CracklingPalmPlayer
 #flags
@@ -298,12 +299,14 @@ statMap = {
 #mods
 #skillEnd
 
+#from item
 #skill MetaCastCurseOnBlockPlayer
 #set MetaCastCurseOnBlockPlayer
 #flags
 #mods
 #skillEnd
 
+#from item
 #skill SupportMetaCastCurseOnBlockPlayer
 #set SupportMetaCastCurseOnBlockPlayer
 #mods
@@ -451,6 +454,7 @@ statMap = {
 #mods
 #skillEnd
 
+#from item
 #skill FeastOfFleshPlayer
 #set FeastOfFleshPlayer
 #flags
@@ -623,6 +627,7 @@ statMap = {
 #mods
 #skillEnd
 
+#from item
 #skill FulminationPlayer
 #set FulminationPlayer
 #flags

src/Export/Skills/act_dex.txt

@@ -100,12 +100,14 @@ statMap = {
 #mods
 #skillEnd
 
+#from item
 #skill BlackPowderBlitzReservationPlayer
 #set BlackPowderBlitzReservationPlayer
 #flags
 #mods
 #skillEnd
 
+#from item
 #skill BlackPowderBlitzPlayer
 #set BlackPowderBlitzPlayer
 #flags hit area
@@ -327,6 +329,7 @@ statMap = {
 #mods
 #skillEnd
 
+#from item
 #skill GeminiSurgePlayer
 #set GeminiSurgeColdPlayer
 #flags attack area
@@ -842,12 +845,14 @@ statMap = {
 #mods
 #skillEnd
 
+#from item
 #skill MetaCastLightningSpellOnHitPlayer
 #set MetaCastLightningSpellOnHitPlayer
 #flags
 #mods
 #skillEnd
 
+#from item
 #skill SupportMetaCastLightningSpellOnHitPlayer
 #set SupportMetaCastLightningSpellOnHitPlayer
 #flags
@@ -860,6 +865,7 @@ statMap = {
 #mods
 #skillEnd
 
+#from item
 #skill ValakosChargePlayer
 #set ValakosChargePlayer
 #flags area

src/Export/Skills/act_int.txt

@@ -2070,14 +2070,11 @@ local function flag(name, ...)
 	return mod(name, "FLAG", true, ...)
 end
 
-local gemIdLookup = {
-	["power charge on critical hit"] = "SupportPowerChargeOnCritical",
-}
-for name, grantedEffect in pairs(data.skills) do
-	if not grantedEffect.hidden or grantedEffect.fromItem or grantedEffect.fromTree then
-		local gemName = grantedEffect.baseTypeName and grantedEffect.baseTypeName:lower() or grantedEffect.name:lower()
-		gemIdLookup[gemName] = grantedEffect.id
-	end
+local gemIdLookup = { }
+for gemId, gemData in pairs(data.gems) do
+	local grantedEffect = gemData.grantedEffect
+	local gemName = (grantedEffect.fromItem or grantedEffect.fromTree) and grantedEffect.baseTypeName and grantedEffect.baseTypeName:lower() or gemData.name:lower()
+	gemIdLookup[gemName] = grantedEffect.id
 end
 local function grantedExtraSkill(name, level, noSupports)
 	name = name:gsub(" skill","")