Fix "Shapeshifted" condition being toggled on every build. (#2346)

* Fix Shapeshifted condition being toggled on every build.

* Revert "Fix Shapeshifted condition being toggled on every build."

This reverts commit 31b01e7.

* Simpler fix

Move the shapeshifted condition to the demon form gem

---------

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

Author: briansonnenberg

src/Data/Skills/other.lua

@@ -4458,6 +4458,9 @@ skills["DemonFormPlayer"] = {
 			},
 			baseFlags = {
 			},
+			baseMods = {
+				flag("Condition:Shapeshifted", { type = "GlobalEffect", effectType = "Buff" }, { type = "Condition", var = "DemonForm" }),
+			},
 			constantStats = {
 				{ "demon_form_spell_damage_+%_final_per_stack", 3 },
 			},

src/Export/Skills/other.txt

@@ -304,6 +304,7 @@ statMap = {
 		mod("LifeDegen", "BASE", nil, 0, 0, { type = "Condition", var = "DemonForm" }, { type = "GlobalEffect", effectType = "Buff", effectName = "Demon Form" }, { type = "Multiplier", var = "DemonFlameStacks", limitVar = "DemonFlameMaximum" } ),
 		div = 60,
 	},
+#baseMod flag("Condition:Shapeshifted", { type = "GlobalEffect", effectType = "Buff" }, { type = "Condition", var = "DemonForm" })
 },
 #mods
 #skillEnd

src/Modules/ConfigOptions.lua

@@ -342,7 +342,6 @@ local configSettings = {
 	end },
 	{ label = "Demon Form:", ifSkill = "Demon Form" },
 	{ var = "inDemonForm", type = "check", label = "Are you in Demon Form?", ifSkill = "Demon Form", defaultState = true, tooltip = "Players need a minimum of 2 ^xE05030Life ^7to enter Demon Form, so you cannot use it with Chaos Inoculation", apply = function(val, modList, enemyModList)
-		modList:NewMod("Condition:Shapeshifted", "FLAG", true, "Config")
 		modList:NewMod("Condition:DemonForm", "FLAG", true, "Config", { type = "StatThreshold", stat = "Life", threshold = 2 })
 	end },
 	{ var = "demonFormStacks", type = "count", label = "Demonflame Stacks", ifSkill = "Demon Form", defaultPlaceholderState = 10, apply = function(val, modList, enemyModList)