diff --git a/spec/System/TestSkills_spec.lua b/spec/System/TestSkills_spec.lua index 751680db1d..5d1cab3827 100644 --- a/spec/System/TestSkills_spec.lua +++ b/spec/System/TestSkills_spec.lua @@ -67,7 +67,7 @@ describe("TestSkills", function() newBuild() - build.skillsTab:PasteSocketGroup("Blasphemy 20/0 1\nDespair 20/0 1\nFlammability 20/0 1\n") + build.skillsTab:PasteSocketGroup("Blasphemy 20/0 1\nDespair 20/0 1\nTemporal Chains 20/0 1\n") runCallback("OnFrame") assert.True(build.calcsTab.mainOutput.SpiritReservedPercent > oneCurseReservation) @@ -384,11 +384,11 @@ describe("TestSkills", function() it("Test Atziri's Allure - ignore curse limit", function() build.skillsTab:PasteSocketGroup("Elemental Weakness 20/0 1\nAtziri's Allure 1/0 1") - build.skillsTab:PasteSocketGroup("Flammability 20/0 1\n") + build.skillsTab:PasteSocketGroup("Despair 20/0 1\n") runCallback("OnFrame") local curseList = build.calcsTab.calcsOutput.CurseList - assert.True(curseList:match("Flammability") ~= nil and curseList:match("Elemental Weakness") ~= nil) + assert.True(curseList:match("Despair") ~= nil and curseList:match("Elemental Weakness") ~= nil) end) -- skills that don't have a base CD and have more than one use need to use the added cooldown by whatever support allows the +1 limit to be supportable diff --git a/src/Classes/GemSelectControl.lua b/src/Classes/GemSelectControl.lua index fa4bc5aee0..e45f9a04c2 100644 --- a/src/Classes/GemSelectControl.lua +++ b/src/Classes/GemSelectControl.lua @@ -102,7 +102,9 @@ function GemSelectClass:PopulateGemList() if (self.sortGemsBy and gemData.tags[self.sortGemsBy] == true or not self.sortGemsBy) then local levelRequirement = (gemData.grantedEffect.levels and gemData.grantedEffect.levels[1] and gemData.grantedEffect.levels[1].levelRequirement) or 1 if characterLevel >= levelRequirement or not matchLevel then - self.gems["Default:" .. gemId] = gemData + if self.skillsTab.showLegacyGems or not (self.skillsTab.showLegacyGems and gemData.grantedEffect.legacy) then + self.gems["Default:" .. gemId] = gemData + end end end end @@ -110,6 +112,9 @@ end function GemSelectClass:FilterSupport(gemId, gemData) local showSupportTypes = self.skillsTab.showSupportGemTypes + if gemData.grantedEffect.legacy and not self.skillsTab.showLegacyGems then + return false + end return (not gemData.grantedEffect.support or showSupportTypes == "ALL" or (showSupportTypes == "NORMAL" and not gemData.grantedEffect.isLineage) @@ -225,11 +230,12 @@ function GemSelectClass:UpdateSortCache() and sortCache.outputRevision == self.skillsTab.build.outputRevision and sortCache.defaultLevel == self.skillsTab.defaultGemLevel and (sortCache.characterLevel == self.skillsTab.build.characterLevel or self.skillsTab.defaultGemLevel ~= "characterLevel") and sortCache.defaultQuality == self.skillsTab.defaultGemQuality and sortCache.sortType == self.skillsTab.sortGemsByDPSField - and sortCache.considerGemType == self.skillsTab.showSupportGemTypes then + and sortCache.considerGemType == self.skillsTab.showSupportGemTypes and sortCache.showLegacyGems == self.skillsTab.showLegacyGems then return end if not sameSortBy or not sortCache or (sortCache.considerGemType ~= self.skillsTab.showSupportGemTypes + or sortCache.showLegacyGems ~= self.skillsTab.showLegacyGems or sortCache.defaultQuality ~= self.skillsTab.defaultGemQuality or sortCache.defaultLevel ~= self.skillsTab.defaultGemLevel or (sortCache.characterLevel ~= self.skillsTab.build.characterLevel and self.skillsTab.defaultGemLevel == "characterLevel")) then @@ -240,6 +246,7 @@ function GemSelectClass:UpdateSortCache() -- Initialize a new sort cache sortCache = { considerGemType = self.skillsTab.showSupportGemTypes, + showLegacyGems = self.skillsTab.showLegacyGems, socketGroup = self.skillsTab.displayGroup, gemInstance = self.skillsTab.displayGroup.gemList[self.index], outputRevision = self.skillsTab.build.outputRevision, diff --git a/src/Classes/GemTooltip.lua b/src/Classes/GemTooltip.lua index cdffcddbd0..249b585668 100644 --- a/src/Classes/GemTooltip.lua +++ b/src/Classes/GemTooltip.lua @@ -299,6 +299,12 @@ function GemTooltip.AddGemTooltip(tooltip, build, gemInstance, options) tooltip:AddLine(fontSizeTitle, colorCodes.GEM .. (gemInstance.displayEffect and gemInstance.displayEffect.nameSpec or gemInstance.gemData.name), "FONTIN SC") else tooltip:AddLine(fontSizeTitle, colorCodes.GEM .. gemInstance.gemData.name, "FONTIN SC") + tooltip:AddSeparator(10) + if grantedEffect.legacy then + tooltip:AddLine(fontSizeTitle, colorCodes.WARNING .. "Legacy Gem", "FONTIN SC") + tooltip:AddLine(fontSizeBig, colorCodes.WARNING .. "Gem only exists in Standard League", "FONTIN SC") + tooltip:AddSeparator(10) + end end tooltip:AddSeparator(10) tooltip:AddLine(fontSizeBig, colorCodes.NORMAL .. gemInstance.gemData.gemType, "FONTIN SC") diff --git a/src/Classes/SkillsTab.lua b/src/Classes/SkillsTab.lua index 21dc2e912f..833b60116b 100644 --- a/src/Classes/SkillsTab.lua +++ b/src/Classes/SkillsTab.lua @@ -89,6 +89,7 @@ local SkillsTabClass = newClass("SkillsTab", "UndoHandler", "ControlHost", "Cont self.sortGemsByDPS = true self.sortGemsByDPSField = "CombinedDPS" self.showSupportGemTypes = "ALL" + self.showLegacyGems = false self.defaultGemLevel = "normalMaximum" self.defaultGemQuality = main.defaultGemQuality self.defaultCorruptionLevel = 0 @@ -123,7 +124,7 @@ local SkillsTabClass = newClass("SkillsTab", "UndoHandler", "ControlHost", "Cont -- Gem options local optionInputsX = 170 local optionInputsY = 45 - self.controls.optionSection = new("SectionControl", { "TOPLEFT", self.controls.groupList, "BOTTOMLEFT" }, { 0, optionInputsY + 50, 360, 130 }, "Gem Options") + self.controls.optionSection = new("SectionControl", { "TOPLEFT", self.controls.groupList, "BOTTOMLEFT" }, { 0, optionInputsY + 50, 360, 150 }, "Gem Options") self.controls.sortGemsByDPS = new("CheckBoxControl", { "TOPLEFT", self.controls.groupList, "BOTTOMLEFT" }, { optionInputsX, optionInputsY + 70, 20 }, "Sort gems by DPS:", function(state) self.sortGemsByDPS = state end, nil, true) @@ -148,6 +149,9 @@ local SkillsTabClass = newClass("SkillsTab", "UndoHandler", "ControlHost", "Cont self.showSupportGemTypes = value.show end) self.controls.showSupportGemTypesLabel = new("LabelControl", { "RIGHT", self.controls.showSupportGemTypes, "LEFT" }, { -4, 0, 0, 16 }, "^7Show support gems:") + self.controls.showLegacyGems = new("CheckBoxControl", { "TOPLEFT", self.controls.groupList, "BOTTOMLEFT" }, { optionInputsX, optionInputsY + 166, 20 }, "^7Show legacy gems:", function(state) + self.showLegacyGems = state + end) -- Socket group details if main.portraitMode then @@ -413,6 +417,10 @@ function SkillsTabClass:Load(xml, fileName) self.sortGemsByDPS = xml.attrib.sortGemsByDPS == "true" end self.controls.sortGemsByDPS.state = self.sortGemsByDPS + if xml.attrib.showLegacyGems then + self.showLegacyGems = xml.attrib.showLegacyGems == "true" + end + self.controls.showLegacyGems.state = self.showLegacyGems self.controls.showSupportGemTypes:SelByValue(xml.attrib.showSupportGemTypes or "ALL", "show") self.controls.sortGemsByDPSFieldControl:SelByValue(xml.attrib.sortGemsByDPSField or "CombinedDPS", "type") self.showSupportGemTypes = self.controls.showSupportGemTypes:GetSelValueByKey("show") @@ -448,6 +456,7 @@ function SkillsTabClass:Save(xml) sortGemsByDPS = tostring(self.sortGemsByDPS), showSupportGemTypes = self.showSupportGemTypes, sortGemsByDPSField = self.sortGemsByDPSField, + showLegacyGems = tostring(self.showLegacyGems), } for _, skillSetId in ipairs(self.skillSetOrderList) do local skillSet = self.skillSets[skillSetId] diff --git a/src/Data/Gems.lua b/src/Data/Gems.lua index b626790b58..e688908da6 100644 --- a/src/Data/Gems.lua +++ b/src/Data/Gems.lua @@ -1480,75 +1480,6 @@ return { Tier = 3, naturalMaxLevel = 1, }, - ["Metadata/Items/Gems/SkillGemFlammability"] = { - name = "Flammability", - baseTypeName = "Flammability", - gameId = "Metadata/Items/Gems/SkillGemFlammability", - variantId = "Flammability", - grantedEffectId = "FlammabilityPlayer", - tags = { - intelligence = true, - grants_active_skill = true, - spell = true, - area = true, - fire = true, - duration = true, - curse = true, - }, - gemType = "Spell", - tagString = "AoE, Fire, Duration, Curse", - reqStr = 0, - reqDex = 0, - reqInt = 100, - Tier = 0, - naturalMaxLevel = 20, - }, - ["Metadata/Items/Gems/SkillGemHypothermia"] = { - name = "Hypothermia", - baseTypeName = "Hypothermia", - gameId = "Metadata/Items/Gems/SkillGemHypothermia", - variantId = "Hypothermia", - grantedEffectId = "HypothermiaPlayer", - tags = { - intelligence = true, - grants_active_skill = true, - spell = true, - area = true, - cold = true, - duration = true, - curse = true, - }, - gemType = "Spell", - tagString = "AoE, Cold, Duration, Curse", - reqStr = 0, - reqDex = 0, - reqInt = 100, - Tier = 0, - naturalMaxLevel = 20, - }, - ["Metadata/Items/Gems/SkillGemConductivity"] = { - name = "Conductivity", - baseTypeName = "Conductivity", - gameId = "Metadata/Items/Gems/SkillGemConductivity", - variantId = "Conductivity", - grantedEffectId = "ConductivityPlayer", - tags = { - intelligence = true, - grants_active_skill = true, - spell = true, - area = true, - lightning = true, - duration = true, - curse = true, - }, - gemType = "Spell", - tagString = "AoE, Lightning, Duration, Curse", - reqStr = 0, - reqDex = 0, - reqInt = 100, - Tier = 0, - naturalMaxLevel = 20, - }, ["Metadata/Items/Gems/SkillGemElementalWeakness"] = { name = "Elemental Weakness", baseTypeName = "Elemental Weakness", @@ -4365,23 +4296,6 @@ return { Tier = 5, naturalMaxLevel = 1, }, - ["Metadata/Items/Gems/SkillGemUnbreakableSupport"] = { - name = "Unbreakable", - gameId = "Metadata/Items/Gems/SupportGemUnbreakable", - variantId = "UnbreakableSupport", - grantedEffectId = "UnbreakableSupportPlayer", - tags = { - support = true, - }, - gemType = "Support", - gemFamily = "Unbreakable", - tagString = "", - reqStr = 100, - reqDex = 0, - reqInt = 0, - Tier = 0, - naturalMaxLevel = 1, - }, ["Metadata/Items/Gems/SkillGemProlongedDurationSupport"] = { name = "Prolonged Duration I", gameId = "Metadata/Items/Gems/SupportGemPersistence", @@ -5309,23 +5223,6 @@ return { Tier = 2, naturalMaxLevel = 1, }, - ["Metadata/Items/Gems/SkillGemDevastateSupport"] = { - name = "Devastate", - gameId = "Metadata/Items/Gems/SupportGemDevastate", - variantId = "DevastateSupport", - grantedEffectId = "SupportDevastatePlayer", - tags = { - support = true, - }, - gemType = "Support", - gemFamily = "Devastate", - tagString = "", - reqStr = 100, - reqDex = 0, - reqInt = 0, - Tier = 0, - naturalMaxLevel = 1, - }, ["Metadata/Items/Gems/SkillGemBarrierInvocation"] = { name = "Barrier Invocation", baseTypeName = "Barrier Invocation", @@ -6758,23 +6655,6 @@ return { Tier = 4, naturalMaxLevel = 20, }, - ["Metadata/Items/Gems/SkillGemEnergyBarrierSupport"] = { - name = "Energy Barrier", - gameId = "Metadata/Items/Gems/SupportGemEnergyBarrier", - variantId = "EnergyBarrierSupport", - grantedEffectId = "SupportEnergyBarrierPlayer", - tags = { - support = true, - }, - gemType = "Support", - gemFamily = "Energy Barrier", - tagString = "", - reqStr = 0, - reqDex = 0, - reqInt = 100, - Tier = 0, - naturalMaxLevel = 1, - }, ["Metadata/Items/Gems/SkillGemKnockbackWaveSupport"] = { name = "Wind Wave", gameId = "Metadata/Items/Gems/SupportGemWindWave", @@ -7400,23 +7280,6 @@ return { Tier = 2, naturalMaxLevel = 1, }, - ["Metadata/Items/Gems/SkillGemEnduranceChargeOnArmourBreakSupport"] = { - name = "Break Endurance", - gameId = "Metadata/Items/Gem/SupportGemBreakEndurance", - variantId = "EnduranceChargeOnArmourBreakSupport", - grantedEffectId = "SupportEnduranceChargeOnArmourBreak", - tags = { - support = true, - }, - gemType = "Support", - gemFamily = "Break Endurance", - tagString = "", - reqStr = 100, - reqDex = 0, - reqInt = 0, - Tier = 0, - naturalMaxLevel = 1, - }, ["Metadata/Items/Gems/SkillGemCurseEffectSupport"] = { name = "Heightened Curse", gameId = "Metadata/Items/Gems/SupportGemHeightenedCurse", @@ -7739,23 +7602,6 @@ return { Tier = 5, naturalMaxLevel = 1, }, - ["Metadata/Items/Gems/SkillGemEmpoweredDamageSupport"] = { - name = "Premeditation", - gameId = "Metadata/Items/Gems/SupportGemPremeditation", - variantId = "EmpoweredDamageSupport", - grantedEffectId = "SupportEmpoweredDamagePlayer", - tags = { - support = true, - }, - gemType = "Support", - gemFamily = "Premeditation", - tagString = "", - reqStr = 100, - reqDex = 0, - reqInt = 0, - Tier = 0, - naturalMaxLevel = 1, - }, ["Metadata/Items/Gems/SkillGemEmpoweredCullSupport"] = { name = "Murderous Intent", gameId = "Metadata/Items/Gems/SupportGemMurderousIntent", @@ -10221,25 +10067,6 @@ return { Tier = 3, naturalMaxLevel = 1, }, - ["Metadata/Items/Gems/SkillGemHinderSupport"] = { - name = "Hinder", - gameId = "Metadata/Items/Gem/SupportGemHinder", - variantId = "HinderSupport", - grantedEffectId = "SupportHinderPlayer", - tags = { - support = true, - spell = true, - chaos = true, - }, - gemType = "Support", - gemFamily = "Hinder", - tagString = "Spell, Chaos", - reqStr = 0, - reqDex = 0, - reqInt = 100, - Tier = 0, - naturalMaxLevel = 1, - }, ["Metadata/Items/Gems/SkillGemComboFinisherSupport"] = { name = "Combo Finisher I", gameId = "Metadata/Items/Gems/SupportGemComboFinisher", @@ -10689,42 +10516,6 @@ return { Tier = 0, naturalMaxLevel = 1, }, - ["Metadata/Items/Gems/SkillGemDazedBreakSupport"] = { - name = "Break Posture", - gameId = "Metadata/Items/Gems/SupportGemBreakPosture", - variantId = "DazedBreakSupport", - grantedEffectId = "SupportDazedBreakPlayer", - tags = { - support = true, - attack = true, - }, - gemType = "Support", - gemFamily = "Break Posture", - tagString = "Attack", - reqStr = 0, - reqDex = 100, - reqInt = 0, - Tier = 0, - naturalMaxLevel = 1, - }, - ["Metadata/Items/Gems/SkillGemDazingCrySupport"] = { - name = "Dazing Cry", - gameId = "Metadata/Items/Gem/SupportGemDazingCry", - variantId = "DazingCrySupport", - grantedEffectId = "SupportDazingCryPlayer", - tags = { - support = true, - warcry = true, - }, - gemType = "Support", - gemFamily = "Dazing Cry", - tagString = "Warcry", - reqStr = 100, - reqDex = 0, - reqInt = 0, - Tier = 0, - naturalMaxLevel = 1, - }, ["Metadata/Items/Gems/SkillGemCursedGroundSupport"] = { name = "Cursed Ground", gameId = "Metadata/Items/Gem/SupportGemCursedGround", @@ -12632,23 +12423,6 @@ return { Tier = 3, naturalMaxLevel = 1, }, - ["Metadata/Items/Gems/SkillGemLeverageSupport"] = { - name = "Leverage", - gameId = "Metadata/Items/Gem/SupportGemLeverage", - variantId = "LeverageSupport", - grantedEffectId = "SupportLeveragePlayer", - tags = { - support = true, - }, - gemType = "Support", - gemFamily = "Leverage", - tagString = "", - reqStr = 0, - reqDex = 100, - reqInt = 0, - Tier = 0, - naturalMaxLevel = 1, - }, ["Metadata/Items/Gems/SkillGemCulminationSupport"] = { name = "Culmination I", gameId = "Metadata/Items/Gem/SupportGemCulmination", @@ -12689,23 +12463,6 @@ return { Tier = 5, naturalMaxLevel = 1, }, - ["Metadata/Items/Gems/SkillGemPotentialSupport"] = { - name = "Potential", - gameId = "Metadata/Items/Gem/SupportGemPotential", - variantId = "PotentialSupport", - grantedEffectId = "SupportPotentialPlayer", - tags = { - support = true, - }, - gemType = "Support", - gemFamily = "Potential", - tagString = "", - reqStr = 0, - reqDex = 0, - reqInt = 100, - Tier = 0, - naturalMaxLevel = 1, - }, ["Metadata/Items/Gems/SkillGemExpanseSupport"] = { name = "Expanse", gameId = "Metadata/Items/Gem/SupportGemExpanse", @@ -13081,23 +12838,6 @@ return { Tier = 0, naturalMaxLevel = 1, }, - ["Metadata/Items/Gems/SkillGemFlowSupport"] = { - name = "Flow", - gameId = "Metadata/Items/Gem/SupportGemFlow", - variantId = "FlowSupport", - grantedEffectId = "SupportFlowPlayer", - tags = { - support = true, - }, - gemType = "Support", - gemFamily = "Flow", - tagString = "", - reqStr = 0, - reqDex = 100, - reqInt = 0, - Tier = 0, - naturalMaxLevel = 1, - }, ["Metadata/Items/Gems/SkillGemAdhesiveGrenadesSupport"] = { name = "Adhesive Grenades I", gameId = "Metadata/Items/Gem/SupportGemAdhere", @@ -13172,26 +12912,6 @@ return { Tier = 4, naturalMaxLevel = 1, }, - ["Metadata/Items/Gems/SkillGemTremorsSupport"] = { - name = "Tremors", - gameId = "Metadata/Items/Gem/SupportGemTremors", - variantId = "TremorsSupport", - grantedEffectId = "SupportTremorsPlayer", - tags = { - support = true, - attack = true, - melee = true, - slam = true, - }, - gemType = "Support", - gemFamily = "Tremors", - tagString = "Attack, Melee, Slam", - reqStr = 100, - reqDex = 0, - reqInt = 0, - Tier = 0, - naturalMaxLevel = 1, - }, ["Metadata/Items/Gems/SkillGemSalvoSupport"] = { name = "Salvo", gameId = "Metadata/Items/Gem/SupportGemSalvo", @@ -13702,25 +13422,6 @@ return { Tier = 4, naturalMaxLevel = 1, }, - ["Metadata/Items/Gems/SkillGemRallySupport"] = { - name = "Rally", - gameId = "Metadata/Items/Gem/SupportGemRally", - variantId = "RallySupport", - grantedEffectId = "SupportRallyPlayer", - tags = { - support = true, - attack = true, - melee = true, - }, - gemType = "Support", - gemFamily = "Rally", - tagString = "Attack, Melee", - reqStr = 100, - reqDex = 0, - reqInt = 0, - Tier = 0, - naturalMaxLevel = 1, - }, ["Metadata/Items/Gems/SkillGemDeathmarchSupport"] = { name = "Deathmarch", gameId = "Metadata/Items/Gem/SupportGemDeathmarch", @@ -14004,24 +13705,6 @@ return { Tier = 0, naturalMaxLevel = 1, }, - ["Metadata/Items/Gems/SkillGemDazzleSupport"] = { - name = "Dazzle", - gameId = "Metadata/Items/Gem/SupportGemDazzle", - variantId = "DazzleSupport", - grantedEffectId = "SupportDazzlePlayer", - tags = { - support = true, - attack = true, - }, - gemType = "Support", - gemFamily = "Dazzle", - tagString = "Attack", - reqStr = 0, - reqDex = 100, - reqInt = 0, - Tier = 0, - naturalMaxLevel = 1, - }, ["Metadata/Items/Gems/SkillGemSyzygySupport"] = { name = "Syzygy", gameId = "Metadata/Items/Gem/SupportGemSyzygy", @@ -14043,44 +13726,6 @@ return { Tier = 4, naturalMaxLevel = 1, }, - ["Metadata/Items/Gems/SkillGemUnyieldingSupport"] = { - name = "Unyielding", - gameId = "Metadata/Items/Gem/SupportGemUnyielding", - variantId = "UnyieldingSupport", - grantedEffectId = "SupportUnyieldingPlayer", - tags = { - support = true, - attack = true, - melee = true, - }, - gemType = "Support", - gemFamily = "Unyielding", - tagString = "Attack, Melee", - reqStr = 100, - reqDex = 0, - reqInt = 0, - Tier = 0, - naturalMaxLevel = 1, - }, - ["Metadata/Items/Gems/SkillGemDesperationSupport"] = { - name = "Desperation", - gameId = "Metadata/Items/Gem/SupportGemDesperation", - variantId = "DesperationSupport", - grantedEffectId = "SupportDesperationPlayer", - tags = { - support = true, - attack = true, - melee = true, - }, - gemType = "Support", - gemFamily = "Desperation", - tagString = "Attack, Melee", - reqStr = 100, - reqDex = 0, - reqInt = 0, - Tier = 0, - naturalMaxLevel = 1, - }, ["Metadata/Items/Gems/SkillGemOverextendSupport"] = { name = "Overextend", gameId = "Metadata/Items/Gem/SupportGemOverextend", @@ -14099,43 +13744,6 @@ return { Tier = 2, naturalMaxLevel = 1, }, - ["Metadata/Items/Gems/SkillGemExcoriateSupport"] = { - name = "Excoriate", - gameId = "Metadata/Items/Gem/SupportGemExcoriate", - variantId = "ExcoriateSupport", - grantedEffectId = "SupportExcoriatePlayer", - tags = { - support = true, - attack = true, - melee = true, - }, - gemType = "Support", - gemFamily = "Excoriate", - tagString = "Attack, Melee", - reqStr = 0, - reqDex = 100, - reqInt = 0, - Tier = 0, - naturalMaxLevel = 1, - }, - ["Metadata/Items/Gems/SkillGemUnbendingSupport"] = { - name = "Unbending", - gameId = "Metadata/Items/Gem/SupportGemUnbending", - variantId = "UnbendingSupport", - grantedEffectId = "SupportUnbendingPlayer", - tags = { - support = true, - spell = true, - }, - gemType = "Support", - gemFamily = "Unbending", - tagString = "Spell", - reqStr = 0, - reqDex = 0, - reqInt = 100, - Tier = 0, - naturalMaxLevel = 1, - }, ["Metadata/Items/Gems/SkillGemRetreatSupport"] = { name = "Retreat I", gameId = "Metadata/Items/Gem/SupportGemRetreat", @@ -14596,25 +14204,6 @@ return { Tier = 3, naturalMaxLevel = 1, }, - ["Metadata/Items/Gems/SkillGemUnsteadyTempoSupport"] = { - name = "Unsteady Tempo", - gameId = "Metadata/Items/Gem/SupportGemUnsteadyTempo", - variantId = "UnsteadyTempoSupport", - grantedEffectId = "SupportUnsteadyTempoPlayer", - tags = { - support = true, - attack = true, - melee = true, - }, - gemType = "Support", - gemFamily = "Unsteady Tempo", - tagString = "Attack, Melee", - reqStr = 100, - reqDex = 0, - reqInt = 0, - Tier = 0, - naturalMaxLevel = 1, - }, ["Metadata/Items/Gems/SkillGemAncestralAidSupport"] = { name = "Ancestral Aid", gameId = "Metadata/Items/Gem/SupportGemAncestralAid", @@ -14715,24 +14304,6 @@ return { Tier = 5, naturalMaxLevel = 1, }, - ["Metadata/Items/Gems/SkillGemRimeSupport"] = { - name = "Rime", - gameId = "Metadata/Items/Gem/SupportGemRime", - variantId = "RimeSupport", - grantedEffectId = "SupportRimePlayer", - tags = { - support = true, - cold = true, - }, - gemType = "Support", - gemFamily = "Rime", - tagString = "Cold", - reqStr = 0, - reqDex = 0, - reqInt = 100, - Tier = 0, - naturalMaxLevel = 1, - }, ["Metadata/Items/Gems/SkillGemArmsLengthSupport"] = { name = "Arms Length", gameId = "Metadata/Items/Gem/SupportGemArmsLength", @@ -15106,24 +14677,6 @@ return { Tier = 5, naturalMaxLevel = 1, }, - ["Metadata/Items/Gems/SkillGemUnabatingSupport"] = { - name = "Unabating", - gameId = "Metadata/Items/Gem/SupportGemUnabating", - variantId = "UnabatingSupport", - grantedEffectId = "SupportUnabatingPlayer", - tags = { - support = true, - attack = true, - }, - gemType = "Support", - gemFamily = "Unabating", - tagString = "Attack", - reqStr = 100, - reqDex = 0, - reqInt = 0, - Tier = 0, - naturalMaxLevel = 1, - }, ["Metadata/Items/Gems/SkillGemPunchThroughSupport"] = { name = "Punch Through", gameId = "Metadata/Items/Gem/SupportGemPunchThrough", @@ -15267,25 +14820,6 @@ return { Tier = 2, naturalMaxLevel = 1, }, - ["Metadata/Items/Gems/SkillGemFirstBloodSupport"] = { - name = "First Blood", - gameId = "Metadata/Items/Gem/SupportGemFirstBlood", - variantId = "FirstBloodSupport", - grantedEffectId = "SupportFirstBloodPlayer", - tags = { - support = true, - attack = true, - physical = true, - }, - gemType = "Support", - gemFamily = "First Blood", - tagString = "Attack, Physical", - reqStr = 100, - reqDex = 0, - reqInt = 0, - Tier = 0, - naturalMaxLevel = 1, - }, ["Metadata/Items/Gems/SkillGemFrenziedRiposteSupport"] = { name = "Frenzied Riposte", gameId = "Metadata/Items/Gem/SupportGemRetort", @@ -15304,24 +14838,6 @@ return { Tier = 2, naturalMaxLevel = 1, }, - ["Metadata/Items/Gems/SkillGemHobbleSupport"] = { - name = "Hobble", - gameId = "Metadata/Items/Gem/SupportGemBloodintheEyes", - variantId = "HobbleSupport", - grantedEffectId = "SupportHobblePlayer", - tags = { - support = true, - physical = true, - }, - gemType = "Support", - gemFamily = "Hobble", - tagString = "Physical", - reqStr = 0, - reqDex = 100, - reqInt = 0, - Tier = 0, - naturalMaxLevel = 1, - }, ["Metadata/Items/Gems/SkillGemHeightenedChargesSupport"] = { name = "Heightened Charges", gameId = "Metadata/Items/Gem/SupportGemTwofold", @@ -15467,25 +14983,6 @@ return { Tier = 4, naturalMaxLevel = 1, }, - ["Metadata/Items/Gems/SkillGemVolatilePowerSupport"] = { - name = "Volatile Power", - gameId = "Metadata/Items/Gem/SupportGemVolatilePower", - variantId = "VolatilePowerSupport", - grantedEffectId = "SupportVolatilePowerPlayer", - tags = { - support = true, - physical = true, - chaos = true, - }, - gemType = "Support", - gemFamily = "Volatile Power", - tagString = "Physical, Chaos", - reqStr = 0, - reqDex = 0, - reqInt = 100, - Tier = 0, - naturalMaxLevel = 1, - }, ["Metadata/Items/Gems/SkillGemGambleshotSupport"] = { name = "Gambleshot", gameId = "Metadata/Items/Gem/SupportGemGambleshot", @@ -15575,25 +15072,6 @@ return { Tier = 3, naturalMaxLevel = 1, }, - ["Metadata/Items/Gems/SkillGemSeeRedSupport"] = { - name = "See Red", - gameId = "Metadata/Items/Gem/SupportGemSeeRed", - variantId = "SeeRedSupport", - grantedEffectId = "SupportSeeRedPlayer", - tags = { - support = true, - attack = true, - physical = true, - }, - gemType = "Support", - gemFamily = "See Red", - tagString = "Attack, Physical", - reqStr = 100, - reqDex = 0, - reqInt = 0, - Tier = 0, - naturalMaxLevel = 1, - }, ["Metadata/Items/Gems/SkillGemShortFuseSupport"] = { name = "Short Fuse I", gameId = "Metadata/Items/Gem/SupportGemExpedite", @@ -15646,24 +15124,6 @@ return { Tier = 0, naturalMaxLevel = 1, }, - ["Metadata/Items/Gems/SkillGemOutmaneuverSupport"] = { - name = "Outmaneuver", - gameId = "Metadata/Items/Gem/SupportGemOutmaneuver", - variantId = "OutmaneuverSupport", - grantedEffectId = "SupportOutmaneuverPlayer", - tags = { - support = true, - physical = true, - }, - gemType = "Support", - gemFamily = "Outmaneuver", - tagString = "Physical", - reqStr = 0, - reqDex = 100, - reqInt = 0, - Tier = 0, - naturalMaxLevel = 1, - }, ["Metadata/Items/Gems/SkillGemMarkForDeathSupport"] = { name = "Mark for Death", gameId = "Metadata/Items/Gem/SupportGemSingleOut", @@ -15702,24 +15162,6 @@ return { Tier = 4, naturalMaxLevel = 1, }, - ["Metadata/Items/Gems/SkillGemTumultSupport"] = { - name = "Tumult", - gameId = "Metadata/Items/Gem/SupportGemTumult", - variantId = "TumultSupport", - grantedEffectId = "SupportTumultPlayer", - tags = { - support = true, - physical = true, - }, - gemType = "Support", - gemFamily = "Tumult", - tagString = "Physical", - reqStr = 0, - reqDex = 100, - reqInt = 0, - Tier = 0, - naturalMaxLevel = 1, - }, ["Metadata/Items/Gems/SkillGemAdmixtureSupport"] = { name = "Admixture", gameId = "Metadata/Items/Gem/SupportGemAdmixture", diff --git a/src/Data/ModCache.lua b/src/Data/ModCache.lua index b3aac6ec74..93454662a4 100644 --- a/src/Data/ModCache.lua +++ b/src/Data/ModCache.lua @@ -421,7 +421,6 @@ c["+3 to Level of all Cluster Grenade Skills"]={{[1]={flags=0,keywordFlags=0,nam c["+3 to Level of all Cold Skills"]={{[1]={flags=0,keywordFlags=0,name="GemProperty",type="LIST",value={key="level",keyOfScaledMod="value",keyword="cold",value=3}}},nil} c["+3 to Level of all Combat Frenzy Skills"]={{[1]={flags=0,keywordFlags=0,name="GemProperty",type="LIST",value={key="level",keyOfScaledMod="value",keyword="combat frenzy",value=3}}},nil} c["+3 to Level of all Comet Skills"]={{[1]={flags=0,keywordFlags=0,name="GemProperty",type="LIST",value={key="level",keyOfScaledMod="value",keyword="comet",value=3}}},nil} -c["+3 to Level of all Conductivity Skills"]={{[1]={flags=0,keywordFlags=0,name="GemProperty",type="LIST",value={key="level",keyOfScaledMod="value",keyword="conductivity",value=3}}},nil} c["+3 to Level of all Contagion Skills"]={{[1]={flags=0,keywordFlags=0,name="GemProperty",type="LIST",value={key="level",keyOfScaledMod="value",keyword="contagion",value=3}}},nil} c["+3 to Level of all Convalescence Skills"]={{[1]={flags=0,keywordFlags=0,name="GemProperty",type="LIST",value={key="level",keyOfScaledMod="value",keyword="convalescence",value=3}}},nil} c["+3 to Level of all Cross Slash Skills"]={{[1]={flags=0,keywordFlags=0,name="GemProperty",type="LIST",value={key="level",keyOfScaledMod="value",keyword="cross slash",value=3}}},nil} @@ -463,7 +462,6 @@ c["+3 to Level of all Firestorm Skills"]={{[1]={flags=0,keywordFlags=0,name="Gem c["+3 to Level of all Flame Breath Skills"]={{[1]={flags=0,keywordFlags=0,name="GemProperty",type="LIST",value={key="level",keyOfScaledMod="value",keyword="flame breath",value=3}}},nil} c["+3 to Level of all Flame Wall Skills"]={{[1]={flags=0,keywordFlags=0,name="GemProperty",type="LIST",value={key="level",keyOfScaledMod="value",keyword="flame wall",value=3}}},nil} c["+3 to Level of all Flameblast Skills"]={{[1]={flags=0,keywordFlags=0,name="GemProperty",type="LIST",value={key="level",keyOfScaledMod="value",keyword="flameblast",value=3}}},nil} -c["+3 to Level of all Flammability Skills"]={{[1]={flags=0,keywordFlags=0,name="GemProperty",type="LIST",value={key="level",keyOfScaledMod="value",keyword="flammability",value=3}}},nil} c["+3 to Level of all Flash Grenade Skills"]={{[1]={flags=0,keywordFlags=0,name="GemProperty",type="LIST",value={key="level",keyOfScaledMod="value",keyword="flash grenade",value=3}}},nil} c["+3 to Level of all Flicker Strike Skills"]={{[1]={flags=0,keywordFlags=0,name="GemProperty",type="LIST",value={key="level",keyOfScaledMod="value",keyword="flicker strike",value=3}}},nil} c["+3 to Level of all Forge Hammer Skills"]={{[1]={flags=0,keywordFlags=0,name="GemProperty",type="LIST",value={key="level",keyOfScaledMod="value",keyword="forge hammer",value=3}}},nil} @@ -497,7 +495,6 @@ c["+3 to Level of all Herald of Plague Skills"]={{[1]={flags=0,keywordFlags=0,na c["+3 to Level of all Herald of Thunder Skills"]={{[1]={flags=0,keywordFlags=0,name="GemProperty",type="LIST",value={key="level",keyOfScaledMod="value",keyword="herald of thunder",value=3}}},nil} c["+3 to Level of all Hexblast Skills"]={{[1]={flags=0,keywordFlags=0,name="GemProperty",type="LIST",value={key="level",keyOfScaledMod="value",keyword="hexblast",value=3}}},nil} c["+3 to Level of all High Velocity Rounds Skills"]={{[1]={flags=0,keywordFlags=0,name="GemProperty",type="LIST",value={key="level",keyOfScaledMod="value",keyword="high velocity rounds",value=3}}},nil} -c["+3 to Level of all Hypothermia Skills"]={{[1]={flags=0,keywordFlags=0,name="GemProperty",type="LIST",value={key="level",keyOfScaledMod="value",keyword="hypothermia",value=3}}},nil} c["+3 to Level of all Ice Nova Skills"]={{[1]={flags=0,keywordFlags=0,name="GemProperty",type="LIST",value={key="level",keyOfScaledMod="value",keyword="ice nova",value=3}}},nil} c["+3 to Level of all Ice Shards Skills"]={{[1]={flags=0,keywordFlags=0,name="GemProperty",type="LIST",value={key="level",keyOfScaledMod="value",keyword="ice shards",value=3}}},nil} c["+3 to Level of all Ice Shot Skills"]={{[1]={flags=0,keywordFlags=0,name="GemProperty",type="LIST",value={key="level",keyOfScaledMod="value",keyword="ice shot",value=3}}},nil} diff --git a/src/Data/Skills/act_int.lua b/src/Data/Skills/act_int.lua index 76b8b459a9..457b2e921a 100644 --- a/src/Data/Skills/act_int.lua +++ b/src/Data/Skills/act_int.lua @@ -3602,135 +3602,6 @@ skills["CometPlayer"] = { }, } } -skills["ConductivityPlayer"] = { - name = "Conductivity", - baseTypeName = "Conductivity", - color = 3, - description = "Curse all targets in an area after a short delay, lowering their Lightning Resistance.", - skillTypes = { [SkillType.Spell] = true, [SkillType.Area] = true, [SkillType.Duration] = true, [SkillType.Trappable] = true, [SkillType.Totemable] = true, [SkillType.Mineable] = true, [SkillType.Multicastable] = true, [SkillType.Triggerable] = true, [SkillType.Lightning] = true, [SkillType.Cascadable] = true, [SkillType.AppliesCurse] = true, [SkillType.Unleashable] = true, [SkillType.AreaSpell] = true, [SkillType.UsableWhileMoving] = true, }, - castTime = 0.7, - qualityStats = { - { "curse_effect_+%", 0.5 }, - }, - levels = { - [1] = { levelRequirement = 0, cost = { Mana = 41, }, }, - [2] = { levelRequirement = 3, cost = { Mana = 46, }, }, - [3] = { levelRequirement = 6, cost = { Mana = 52, }, }, - [4] = { levelRequirement = 10, cost = { Mana = 57, }, }, - [5] = { levelRequirement = 14, cost = { Mana = 63, }, }, - [6] = { levelRequirement = 18, cost = { Mana = 69, }, }, - [7] = { levelRequirement = 22, cost = { Mana = 76, }, }, - [8] = { levelRequirement = 26, cost = { Mana = 82, }, }, - [9] = { levelRequirement = 31, cost = { Mana = 89, }, }, - [10] = { levelRequirement = 36, cost = { Mana = 96, }, }, - [11] = { levelRequirement = 41, cost = { Mana = 103, }, }, - [12] = { levelRequirement = 46, cost = { Mana = 110, }, }, - [13] = { levelRequirement = 52, cost = { Mana = 118, }, }, - [14] = { levelRequirement = 58, cost = { Mana = 126, }, }, - [15] = { levelRequirement = 64, cost = { Mana = 134, }, }, - [16] = { levelRequirement = 66, cost = { Mana = 142, }, }, - [17] = { levelRequirement = 72, cost = { Mana = 151, }, }, - [18] = { levelRequirement = 78, cost = { Mana = 160, }, }, - [19] = { levelRequirement = 84, cost = { Mana = 169, }, }, - [20] = { levelRequirement = 90, cost = { Mana = 178, }, }, - [21] = { levelRequirement = 90, cost = { Mana = 188, }, }, - [22] = { levelRequirement = 90, cost = { Mana = 198, }, }, - [23] = { levelRequirement = 90, cost = { Mana = 208, }, }, - [24] = { levelRequirement = 90, cost = { Mana = 219, }, }, - [25] = { levelRequirement = 90, cost = { Mana = 230, }, }, - [26] = { levelRequirement = 90, cost = { Mana = 241, }, }, - [27] = { levelRequirement = 90, cost = { Mana = 253, }, }, - [28] = { levelRequirement = 90, cost = { Mana = 265, }, }, - [29] = { levelRequirement = 90, cost = { Mana = 277, }, }, - [30] = { levelRequirement = 90, cost = { Mana = 289, }, }, - [31] = { levelRequirement = 90, cost = { Mana = 302, }, }, - [32] = { levelRequirement = 90, cost = { Mana = 316, }, }, - [33] = { levelRequirement = 90, cost = { Mana = 329, }, }, - [34] = { levelRequirement = 90, cost = { Mana = 344, }, }, - [35] = { levelRequirement = 90, cost = { Mana = 358, }, }, - [36] = { levelRequirement = 90, cost = { Mana = 373, }, }, - [37] = { levelRequirement = 90, cost = { Mana = 388, }, }, - [38] = { levelRequirement = 90, cost = { Mana = 404, }, }, - [39] = { levelRequirement = 90, cost = { Mana = 420, }, }, - [40] = { levelRequirement = 90, cost = { Mana = 437, }, }, - }, - statSets = { - [1] = { - label = "Conductivity", - incrementalEffectiveness = 0.092720001935959, - statDescriptionScope = "conductivity", - statMap = { - ["base_skill_buff_lightning_damage_resistance_%_to_apply"] = { - mod("LightningResist", "BASE", nil, 0, 0, { type = "GlobalEffect", effectType = "Curse" }), - }, - }, - baseFlags = { - spell = true, - curse = true, - area = true, - duration = true, - }, - constantStats = { - { "curse_delay_duration_ms", 1500 }, - { "movement_speed_+%_final_while_performing_action", -70 }, - { "movement_speed_acceleration_+%_per_second_while_performing_action", 160 }, - { "movement_speed_while_performing_action_locked_duration_%", 50 }, - }, - stats = { - "base_skill_effect_duration", - "active_skill_base_area_of_effect_radius", - "base_skill_buff_lightning_damage_resistance_%_to_apply", - "base_deal_no_damage", - "can_perform_skill_while_moving", - }, - notMinionStat = { - "base_skill_effect_duration", - }, - levels = { - [1] = { 6000, 15, -23, statInterpolation = { 1, 1, 1, }, actorLevel = 1, }, - [2] = { 6200, 16, -23, statInterpolation = { 1, 1, 1, }, actorLevel = 3.4519999027252, }, - [3] = { 6200, 17, -23, statInterpolation = { 1, 1, 1, }, actorLevel = 6.7670001983643, }, - [4] = { 6200, 18, -24, statInterpolation = { 1, 1, 1, }, actorLevel = 10.307999610901, }, - [5] = { 6400, 18, -24, statInterpolation = { 1, 1, 1, }, actorLevel = 14.074999809265, }, - [6] = { 6400, 19, -24, statInterpolation = { 1, 1, 1, }, actorLevel = 18.068000793457, }, - [7] = { 6400, 20, -25, statInterpolation = { 1, 1, 1, }, actorLevel = 22.287000656128, }, - [8] = { 6600, 21, -25, statInterpolation = { 1, 1, 1, }, actorLevel = 26.732000350952, }, - [9] = { 6600, 22, -25, statInterpolation = { 1, 1, 1, }, actorLevel = 31.40299987793, }, - [10] = { 6600, 23, -26, statInterpolation = { 1, 1, 1, }, actorLevel = 36.299999237061, }, - [11] = { 6800, 23, -26, statInterpolation = { 1, 1, 1, }, actorLevel = 41.423000335693, }, - [12] = { 6800, 24, -26, statInterpolation = { 1, 1, 1, }, actorLevel = 46.771999359131, }, - [13] = { 6800, 25, -27, statInterpolation = { 1, 1, 1, }, actorLevel = 52.34700012207, }, - [14] = { 7000, 26, -27, statInterpolation = { 1, 1, 1, }, actorLevel = 58.147998809814, }, - [15] = { 7000, 27, -27, statInterpolation = { 1, 1, 1, }, actorLevel = 64.175003051758, }, - [16] = { 7000, 28, -28, statInterpolation = { 1, 1, 1, }, actorLevel = 70.428001403809, }, - [17] = { 7200, 28, -28, statInterpolation = { 1, 1, 1, }, actorLevel = 76.906997680664, }, - [18] = { 7200, 29, -28, statInterpolation = { 1, 1, 1, }, actorLevel = 83.611999511719, }, - [19] = { 7200, 30, -29, statInterpolation = { 1, 1, 1, }, actorLevel = 90.542999267578, }, - [20] = { 7400, 31, -29, statInterpolation = { 1, 1, 1, }, actorLevel = 97.699996948242, }, - [21] = { 7400, 32, -29, statInterpolation = { 1, 1, 1, }, actorLevel = 105.08300018311, }, - [22] = { 7400, 33, -30, statInterpolation = { 1, 1, 1, }, actorLevel = 112.69200134277, }, - [23] = { 7600, 34, -30, statInterpolation = { 1, 1, 1, }, actorLevel = 120.52700042725, }, - [24] = { 7600, 34, -30, statInterpolation = { 1, 1, 1, }, actorLevel = 128.58799743652, }, - [25] = { 7600, 35, -31, statInterpolation = { 1, 1, 1, }, actorLevel = 136.875, }, - [26] = { 7800, 36, -31, statInterpolation = { 1, 1, 1, }, actorLevel = 145.38800048828, }, - [27] = { 7800, 37, -31, statInterpolation = { 1, 1, 1, }, actorLevel = 154.12699890137, }, - [28] = { 7800, 38, -32, statInterpolation = { 1, 1, 1, }, actorLevel = 163.09199523926, }, - [29] = { 8000, 39, -32, statInterpolation = { 1, 1, 1, }, actorLevel = 172.28300476074, }, - [30] = { 8000, 39, -32, statInterpolation = { 1, 1, 1, }, actorLevel = 181.69999694824, }, - [31] = { 8000, 40, -33, statInterpolation = { 1, 1, 1, }, actorLevel = 191.34300231934, }, - [32] = { 8200, 40, -33, statInterpolation = { 1, 1, 1, }, actorLevel = 201.21200561523, }, - [33] = { 8200, 41, -33, statInterpolation = { 1, 1, 1, }, actorLevel = 211.30700683594, }, - [34] = { 8200, 41, -34, statInterpolation = { 1, 1, 1, }, actorLevel = 221.62800598145, }, - [35] = { 8400, 42, -34, statInterpolation = { 1, 1, 1, }, actorLevel = 232.17500305176, }, - [36] = { 8400, 42, -34, statInterpolation = { 1, 1, 1, }, actorLevel = 242.94799804688, }, - [37] = { 8400, 42, -35, statInterpolation = { 1, 1, 1, }, actorLevel = 253.94700622559, }, - [38] = { 8600, 43, -35, statInterpolation = { 1, 1, 1, }, actorLevel = 265.17199707031, }, - [39] = { 8600, 43, -35, statInterpolation = { 1, 1, 1, }, actorLevel = 276.62298583984, }, - [40] = { 8600, 44, -36, statInterpolation = { 1, 1, 1, }, actorLevel = 288.29998779297, }, - }, - }, - } -} skills["ContagionPlayer"] = { name = "Contagion", baseTypeName = "Contagion", @@ -8293,135 +8164,6 @@ skills["FlameblastPlayer"] = { }, } } -skills["FlammabilityPlayer"] = { - name = "Flammability", - baseTypeName = "Flammability", - color = 3, - description = "Curse all targets in an area after a short delay, lowering their Fire Resistance.", - skillTypes = { [SkillType.Spell] = true, [SkillType.Area] = true, [SkillType.Duration] = true, [SkillType.Trappable] = true, [SkillType.Totemable] = true, [SkillType.Mineable] = true, [SkillType.Multicastable] = true, [SkillType.Triggerable] = true, [SkillType.Fire] = true, [SkillType.Cascadable] = true, [SkillType.AppliesCurse] = true, [SkillType.Unleashable] = true, [SkillType.AreaSpell] = true, [SkillType.UsableWhileMoving] = true, }, - castTime = 0.7, - qualityStats = { - { "curse_effect_+%", 0.5 }, - }, - levels = { - [1] = { levelRequirement = 0, cost = { Mana = 41, }, }, - [2] = { levelRequirement = 3, cost = { Mana = 46, }, }, - [3] = { levelRequirement = 6, cost = { Mana = 52, }, }, - [4] = { levelRequirement = 10, cost = { Mana = 57, }, }, - [5] = { levelRequirement = 14, cost = { Mana = 63, }, }, - [6] = { levelRequirement = 18, cost = { Mana = 69, }, }, - [7] = { levelRequirement = 22, cost = { Mana = 76, }, }, - [8] = { levelRequirement = 26, cost = { Mana = 82, }, }, - [9] = { levelRequirement = 31, cost = { Mana = 89, }, }, - [10] = { levelRequirement = 36, cost = { Mana = 96, }, }, - [11] = { levelRequirement = 41, cost = { Mana = 103, }, }, - [12] = { levelRequirement = 46, cost = { Mana = 110, }, }, - [13] = { levelRequirement = 52, cost = { Mana = 118, }, }, - [14] = { levelRequirement = 58, cost = { Mana = 126, }, }, - [15] = { levelRequirement = 64, cost = { Mana = 134, }, }, - [16] = { levelRequirement = 66, cost = { Mana = 142, }, }, - [17] = { levelRequirement = 72, cost = { Mana = 151, }, }, - [18] = { levelRequirement = 78, cost = { Mana = 160, }, }, - [19] = { levelRequirement = 84, cost = { Mana = 169, }, }, - [20] = { levelRequirement = 90, cost = { Mana = 178, }, }, - [21] = { levelRequirement = 90, cost = { Mana = 188, }, }, - [22] = { levelRequirement = 90, cost = { Mana = 198, }, }, - [23] = { levelRequirement = 90, cost = { Mana = 208, }, }, - [24] = { levelRequirement = 90, cost = { Mana = 219, }, }, - [25] = { levelRequirement = 90, cost = { Mana = 230, }, }, - [26] = { levelRequirement = 90, cost = { Mana = 241, }, }, - [27] = { levelRequirement = 90, cost = { Mana = 253, }, }, - [28] = { levelRequirement = 90, cost = { Mana = 265, }, }, - [29] = { levelRequirement = 90, cost = { Mana = 277, }, }, - [30] = { levelRequirement = 90, cost = { Mana = 289, }, }, - [31] = { levelRequirement = 90, cost = { Mana = 302, }, }, - [32] = { levelRequirement = 90, cost = { Mana = 316, }, }, - [33] = { levelRequirement = 90, cost = { Mana = 329, }, }, - [34] = { levelRequirement = 90, cost = { Mana = 344, }, }, - [35] = { levelRequirement = 90, cost = { Mana = 358, }, }, - [36] = { levelRequirement = 90, cost = { Mana = 373, }, }, - [37] = { levelRequirement = 90, cost = { Mana = 388, }, }, - [38] = { levelRequirement = 90, cost = { Mana = 404, }, }, - [39] = { levelRequirement = 90, cost = { Mana = 420, }, }, - [40] = { levelRequirement = 90, cost = { Mana = 437, }, }, - }, - statSets = { - [1] = { - label = "Flammability", - incrementalEffectiveness = 0.092720001935959, - statDescriptionScope = "flammability", - statMap = { - ["base_skill_buff_fire_damage_resistance_%_to_apply"] = { - mod("FireResist", "BASE", nil, 0, 0, { type = "GlobalEffect", effectType = "Curse" }), - }, - }, - baseFlags = { - spell = true, - curse = true, - area = true, - duration = true, - }, - constantStats = { - { "curse_delay_duration_ms", 1500 }, - { "movement_speed_+%_final_while_performing_action", -70 }, - { "movement_speed_acceleration_+%_per_second_while_performing_action", 160 }, - { "movement_speed_while_performing_action_locked_duration_%", 50 }, - }, - stats = { - "base_skill_effect_duration", - "active_skill_base_area_of_effect_radius", - "base_skill_buff_fire_damage_resistance_%_to_apply", - "base_deal_no_damage", - "can_perform_skill_while_moving", - }, - notMinionStat = { - "base_skill_effect_duration", - }, - levels = { - [1] = { 6000, 15, -23, statInterpolation = { 1, 1, 1, }, actorLevel = 1, }, - [2] = { 6200, 16, -23, statInterpolation = { 1, 1, 1, }, actorLevel = 3.4519999027252, }, - [3] = { 6200, 17, -23, statInterpolation = { 1, 1, 1, }, actorLevel = 6.7670001983643, }, - [4] = { 6200, 18, -24, statInterpolation = { 1, 1, 1, }, actorLevel = 10.307999610901, }, - [5] = { 6400, 18, -24, statInterpolation = { 1, 1, 1, }, actorLevel = 14.074999809265, }, - [6] = { 6400, 19, -24, statInterpolation = { 1, 1, 1, }, actorLevel = 18.068000793457, }, - [7] = { 6400, 20, -25, statInterpolation = { 1, 1, 1, }, actorLevel = 22.287000656128, }, - [8] = { 6600, 21, -25, statInterpolation = { 1, 1, 1, }, actorLevel = 26.732000350952, }, - [9] = { 6600, 22, -25, statInterpolation = { 1, 1, 1, }, actorLevel = 31.40299987793, }, - [10] = { 6600, 23, -26, statInterpolation = { 1, 1, 1, }, actorLevel = 36.299999237061, }, - [11] = { 6800, 23, -26, statInterpolation = { 1, 1, 1, }, actorLevel = 41.423000335693, }, - [12] = { 6800, 24, -26, statInterpolation = { 1, 1, 1, }, actorLevel = 46.771999359131, }, - [13] = { 6800, 25, -27, statInterpolation = { 1, 1, 1, }, actorLevel = 52.34700012207, }, - [14] = { 7000, 26, -27, statInterpolation = { 1, 1, 1, }, actorLevel = 58.147998809814, }, - [15] = { 7000, 27, -27, statInterpolation = { 1, 1, 1, }, actorLevel = 64.175003051758, }, - [16] = { 7000, 28, -28, statInterpolation = { 1, 1, 1, }, actorLevel = 70.428001403809, }, - [17] = { 7200, 28, -28, statInterpolation = { 1, 1, 1, }, actorLevel = 76.906997680664, }, - [18] = { 7200, 29, -28, statInterpolation = { 1, 1, 1, }, actorLevel = 83.611999511719, }, - [19] = { 7200, 30, -29, statInterpolation = { 1, 1, 1, }, actorLevel = 90.542999267578, }, - [20] = { 7400, 31, -29, statInterpolation = { 1, 1, 1, }, actorLevel = 97.699996948242, }, - [21] = { 7400, 32, -29, statInterpolation = { 1, 1, 1, }, actorLevel = 105.08300018311, }, - [22] = { 7400, 33, -30, statInterpolation = { 1, 1, 1, }, actorLevel = 112.69200134277, }, - [23] = { 7600, 34, -30, statInterpolation = { 1, 1, 1, }, actorLevel = 120.52700042725, }, - [24] = { 7600, 34, -30, statInterpolation = { 1, 1, 1, }, actorLevel = 128.58799743652, }, - [25] = { 7600, 35, -31, statInterpolation = { 1, 1, 1, }, actorLevel = 136.875, }, - [26] = { 7800, 36, -31, statInterpolation = { 1, 1, 1, }, actorLevel = 145.38800048828, }, - [27] = { 7800, 37, -31, statInterpolation = { 1, 1, 1, }, actorLevel = 154.12699890137, }, - [28] = { 7800, 38, -32, statInterpolation = { 1, 1, 1, }, actorLevel = 163.09199523926, }, - [29] = { 8000, 39, -32, statInterpolation = { 1, 1, 1, }, actorLevel = 172.28300476074, }, - [30] = { 8000, 39, -32, statInterpolation = { 1, 1, 1, }, actorLevel = 181.69999694824, }, - [31] = { 8000, 40, -33, statInterpolation = { 1, 1, 1, }, actorLevel = 191.34300231934, }, - [32] = { 8200, 40, -33, statInterpolation = { 1, 1, 1, }, actorLevel = 201.21200561523, }, - [33] = { 8200, 41, -33, statInterpolation = { 1, 1, 1, }, actorLevel = 211.30700683594, }, - [34] = { 8200, 41, -34, statInterpolation = { 1, 1, 1, }, actorLevel = 221.62800598145, }, - [35] = { 8400, 42, -34, statInterpolation = { 1, 1, 1, }, actorLevel = 232.17500305176, }, - [36] = { 8400, 42, -34, statInterpolation = { 1, 1, 1, }, actorLevel = 242.94799804688, }, - [37] = { 8400, 42, -35, statInterpolation = { 1, 1, 1, }, actorLevel = 253.94700622559, }, - [38] = { 8600, 43, -35, statInterpolation = { 1, 1, 1, }, actorLevel = 265.17199707031, }, - [39] = { 8600, 43, -35, statInterpolation = { 1, 1, 1, }, actorLevel = 276.62298583984, }, - [40] = { 8600, 44, -36, statInterpolation = { 1, 1, 1, }, actorLevel = 288.29998779297, }, - }, - }, - } -} skills["FlickerStrikePlayer"] = { name = "Flicker Strike", baseTypeName = "Flicker Strike", @@ -12449,135 +12191,6 @@ skills["TriggeredHisWinnowingFlamePillarPlayer"] = { }, } } -skills["HypothermiaPlayer"] = { - name = "Hypothermia", - baseTypeName = "Hypothermia", - color = 3, - description = "Curse all targets in an area after a short delay, lowering their Cold Resistance.", - skillTypes = { [SkillType.Spell] = true, [SkillType.Area] = true, [SkillType.Duration] = true, [SkillType.Trappable] = true, [SkillType.Totemable] = true, [SkillType.Mineable] = true, [SkillType.Multicastable] = true, [SkillType.Triggerable] = true, [SkillType.Cold] = true, [SkillType.Cascadable] = true, [SkillType.AppliesCurse] = true, [SkillType.Unleashable] = true, [SkillType.AreaSpell] = true, [SkillType.UsableWhileMoving] = true, }, - castTime = 0.7, - qualityStats = { - { "curse_effect_+%", 0.5 }, - }, - levels = { - [1] = { levelRequirement = 0, cost = { Mana = 41, }, }, - [2] = { levelRequirement = 3, cost = { Mana = 46, }, }, - [3] = { levelRequirement = 6, cost = { Mana = 52, }, }, - [4] = { levelRequirement = 10, cost = { Mana = 57, }, }, - [5] = { levelRequirement = 14, cost = { Mana = 63, }, }, - [6] = { levelRequirement = 18, cost = { Mana = 69, }, }, - [7] = { levelRequirement = 22, cost = { Mana = 76, }, }, - [8] = { levelRequirement = 26, cost = { Mana = 82, }, }, - [9] = { levelRequirement = 31, cost = { Mana = 89, }, }, - [10] = { levelRequirement = 36, cost = { Mana = 96, }, }, - [11] = { levelRequirement = 41, cost = { Mana = 103, }, }, - [12] = { levelRequirement = 46, cost = { Mana = 110, }, }, - [13] = { levelRequirement = 52, cost = { Mana = 118, }, }, - [14] = { levelRequirement = 58, cost = { Mana = 126, }, }, - [15] = { levelRequirement = 64, cost = { Mana = 134, }, }, - [16] = { levelRequirement = 66, cost = { Mana = 142, }, }, - [17] = { levelRequirement = 72, cost = { Mana = 151, }, }, - [18] = { levelRequirement = 78, cost = { Mana = 160, }, }, - [19] = { levelRequirement = 84, cost = { Mana = 169, }, }, - [20] = { levelRequirement = 90, cost = { Mana = 178, }, }, - [21] = { levelRequirement = 90, cost = { Mana = 188, }, }, - [22] = { levelRequirement = 90, cost = { Mana = 198, }, }, - [23] = { levelRequirement = 90, cost = { Mana = 208, }, }, - [24] = { levelRequirement = 90, cost = { Mana = 219, }, }, - [25] = { levelRequirement = 90, cost = { Mana = 230, }, }, - [26] = { levelRequirement = 90, cost = { Mana = 241, }, }, - [27] = { levelRequirement = 90, cost = { Mana = 253, }, }, - [28] = { levelRequirement = 90, cost = { Mana = 265, }, }, - [29] = { levelRequirement = 90, cost = { Mana = 277, }, }, - [30] = { levelRequirement = 90, cost = { Mana = 289, }, }, - [31] = { levelRequirement = 90, cost = { Mana = 302, }, }, - [32] = { levelRequirement = 90, cost = { Mana = 316, }, }, - [33] = { levelRequirement = 90, cost = { Mana = 329, }, }, - [34] = { levelRequirement = 90, cost = { Mana = 344, }, }, - [35] = { levelRequirement = 90, cost = { Mana = 358, }, }, - [36] = { levelRequirement = 90, cost = { Mana = 373, }, }, - [37] = { levelRequirement = 90, cost = { Mana = 388, }, }, - [38] = { levelRequirement = 90, cost = { Mana = 404, }, }, - [39] = { levelRequirement = 90, cost = { Mana = 420, }, }, - [40] = { levelRequirement = 90, cost = { Mana = 437, }, }, - }, - statSets = { - [1] = { - label = "Hypothermia", - incrementalEffectiveness = 0.092720001935959, - statDescriptionScope = "hypothermia", - statMap = { - ["base_skill_buff_cold_damage_resistance_%_to_apply"] = { - mod("ColdResist", "BASE", nil, 0, 0, { type = "GlobalEffect", effectType = "Curse" }), - }, - }, - baseFlags = { - spell = true, - curse = true, - area = true, - duration = true, - }, - constantStats = { - { "curse_delay_duration_ms", 1500 }, - { "movement_speed_+%_final_while_performing_action", -70 }, - { "movement_speed_acceleration_+%_per_second_while_performing_action", 160 }, - { "movement_speed_while_performing_action_locked_duration_%", 50 }, - }, - stats = { - "base_skill_effect_duration", - "active_skill_base_area_of_effect_radius", - "base_skill_buff_cold_damage_resistance_%_to_apply", - "base_deal_no_damage", - "can_perform_skill_while_moving", - }, - notMinionStat = { - "base_skill_effect_duration", - }, - levels = { - [1] = { 6000, 15, -23, statInterpolation = { 1, 1, 1, }, actorLevel = 1, }, - [2] = { 6200, 16, -23, statInterpolation = { 1, 1, 1, }, actorLevel = 3.4519999027252, }, - [3] = { 6200, 17, -23, statInterpolation = { 1, 1, 1, }, actorLevel = 6.7670001983643, }, - [4] = { 6200, 18, -24, statInterpolation = { 1, 1, 1, }, actorLevel = 10.307999610901, }, - [5] = { 6400, 18, -24, statInterpolation = { 1, 1, 1, }, actorLevel = 14.074999809265, }, - [6] = { 6400, 19, -24, statInterpolation = { 1, 1, 1, }, actorLevel = 18.068000793457, }, - [7] = { 6400, 20, -25, statInterpolation = { 1, 1, 1, }, actorLevel = 22.287000656128, }, - [8] = { 6600, 21, -25, statInterpolation = { 1, 1, 1, }, actorLevel = 26.732000350952, }, - [9] = { 6600, 22, -25, statInterpolation = { 1, 1, 1, }, actorLevel = 31.40299987793, }, - [10] = { 6600, 23, -26, statInterpolation = { 1, 1, 1, }, actorLevel = 36.299999237061, }, - [11] = { 6800, 23, -26, statInterpolation = { 1, 1, 1, }, actorLevel = 41.423000335693, }, - [12] = { 6800, 24, -26, statInterpolation = { 1, 1, 1, }, actorLevel = 46.771999359131, }, - [13] = { 6800, 25, -27, statInterpolation = { 1, 1, 1, }, actorLevel = 52.34700012207, }, - [14] = { 7000, 26, -27, statInterpolation = { 1, 1, 1, }, actorLevel = 58.147998809814, }, - [15] = { 7000, 27, -27, statInterpolation = { 1, 1, 1, }, actorLevel = 64.175003051758, }, - [16] = { 7000, 28, -28, statInterpolation = { 1, 1, 1, }, actorLevel = 70.428001403809, }, - [17] = { 7200, 28, -28, statInterpolation = { 1, 1, 1, }, actorLevel = 76.906997680664, }, - [18] = { 7200, 29, -28, statInterpolation = { 1, 1, 1, }, actorLevel = 83.611999511719, }, - [19] = { 7200, 30, -29, statInterpolation = { 1, 1, 1, }, actorLevel = 90.542999267578, }, - [20] = { 7400, 31, -29, statInterpolation = { 1, 1, 1, }, actorLevel = 97.699996948242, }, - [21] = { 7400, 32, -29, statInterpolation = { 1, 1, 1, }, actorLevel = 105.08300018311, }, - [22] = { 7400, 33, -30, statInterpolation = { 1, 1, 1, }, actorLevel = 112.69200134277, }, - [23] = { 7600, 34, -30, statInterpolation = { 1, 1, 1, }, actorLevel = 120.52700042725, }, - [24] = { 7600, 34, -30, statInterpolation = { 1, 1, 1, }, actorLevel = 128.58799743652, }, - [25] = { 7600, 35, -31, statInterpolation = { 1, 1, 1, }, actorLevel = 136.875, }, - [26] = { 7800, 36, -31, statInterpolation = { 1, 1, 1, }, actorLevel = 145.38800048828, }, - [27] = { 7800, 37, -31, statInterpolation = { 1, 1, 1, }, actorLevel = 154.12699890137, }, - [28] = { 7800, 38, -32, statInterpolation = { 1, 1, 1, }, actorLevel = 163.09199523926, }, - [29] = { 8000, 39, -32, statInterpolation = { 1, 1, 1, }, actorLevel = 172.28300476074, }, - [30] = { 8000, 39, -32, statInterpolation = { 1, 1, 1, }, actorLevel = 181.69999694824, }, - [31] = { 8000, 40, -33, statInterpolation = { 1, 1, 1, }, actorLevel = 191.34300231934, }, - [32] = { 8200, 40, -33, statInterpolation = { 1, 1, 1, }, actorLevel = 201.21200561523, }, - [33] = { 8200, 41, -33, statInterpolation = { 1, 1, 1, }, actorLevel = 211.30700683594, }, - [34] = { 8200, 41, -34, statInterpolation = { 1, 1, 1, }, actorLevel = 221.62800598145, }, - [35] = { 8400, 42, -34, statInterpolation = { 1, 1, 1, }, actorLevel = 232.17500305176, }, - [36] = { 8400, 42, -34, statInterpolation = { 1, 1, 1, }, actorLevel = 242.94799804688, }, - [37] = { 8400, 42, -35, statInterpolation = { 1, 1, 1, }, actorLevel = 253.94700622559, }, - [38] = { 8600, 43, -35, statInterpolation = { 1, 1, 1, }, actorLevel = 265.17199707031, }, - [39] = { 8600, 43, -35, statInterpolation = { 1, 1, 1, }, actorLevel = 276.62298583984, }, - [40] = { 8600, 44, -36, statInterpolation = { 1, 1, 1, }, actorLevel = 288.29998779297, }, - }, - }, - } -} skills["IceNovaPlayer"] = { name = "Ice Nova", baseTypeName = "Ice Nova", diff --git a/src/Data/Skills/sup_dex.lua b/src/Data/Skills/sup_dex.lua index 6d08183a0c..0fb510be22 100644 --- a/src/Data/Skills/sup_dex.lua +++ b/src/Data/Skills/sup_dex.lua @@ -626,37 +626,6 @@ skills["SupportBountyPlayerTwo"] = { }, } } -skills["SupportDazedBreakPlayer"] = { - name = "Break Posture", - description = "Supports Attacks, causing them to Daze Enemies when they fully Break Armour.", - color = 2, - support = true, - requireSkillTypes = { SkillType.Attack, SkillType.CrossbowAmmoSkill, }, - addSkillTypes = { }, - excludeSkillTypes = { }, - gemFamily = { "BreakPosture",}, - levels = { - [1] = { levelRequirement = 0, }, - }, - statSets = { - [1] = { - label = "Break Posture", - incrementalEffectiveness = 0.054999999701977, - statDescriptionScope = "gem_stat_descriptions", - baseFlags = { - }, - constantStats = { - { "support_daze_break_duration_ms", 8000 }, - }, - stats = { - "support_apply_daze_on_armour_break", - }, - levels = { - [1] = { actorLevel = 1, }, - }, - }, - } -} skills["SupportBurstingPlaguePlayer"] = { name = "Bursting Plague", description = "Supports skills that can Poison enemies, causing Poisoned enemies to gain Plague over time and explode in a Plague Burst on death. Cannot support the skills of Minions.", @@ -1717,35 +1686,6 @@ skills["SupportDazePlayer"] = { }, } } -skills["SupportDazzlePlayer"] = { - name = "Dazzle", - description = "Supports Attack Skills. Supported Skills always hit Dazed Enemies, but Consume Daze on Hit, and cannot themselves inflict Daze.", - color = 2, - support = true, - requireSkillTypes = { SkillType.Attack, SkillType.CrossbowSkill, SkillType.CrossbowAmmoSkill, }, - addSkillTypes = { }, - excludeSkillTypes = { }, - gemFamily = { "Dazzle",}, - levels = { - [1] = { levelRequirement = 0, }, - }, - statSets = { - [1] = { - label = "Dazzle", - incrementalEffectiveness = 0.054999999701977, - statDescriptionScope = "gem_stat_descriptions", - baseFlags = { - }, - stats = { - "consume_enemy_daze_to_always_hit", - "cannot_daze", - }, - levels = { - [1] = { actorLevel = 1, }, - }, - }, - } -} skills["SupportDeadlyHeraldsPlayer"] = { name = "Deadly Herald", description = "Supports Herald Skills, making their triggered effects deal more damage at the expense of higher Spirit cost.", @@ -2099,46 +2039,6 @@ skills["SupportEscalatingPoisonPlayer"] = { }, } } -skills["SupportExcoriatePlayer"] = { - name = "Excoriate", - description = "Supports Melee Attack Skills. Supported Skills deal more Melee Damage for each Elemental Ailment on Enemies they hit, but cannot themselves inflict Elemental Ailments.", - color = 2, - support = true, - requireSkillTypes = { SkillType.Attack, SkillType.Melee, SkillType.AND, }, - addSkillTypes = { }, - excludeSkillTypes = { }, - gemFamily = { "Excoriate",}, - levels = { - [1] = { levelRequirement = 0, manaMultiplier = 15, }, - }, - statSets = { - [1] = { - label = "Excoriate", - incrementalEffectiveness = 0.054999999701977, - statDescriptionScope = "gem_stat_descriptions", - statMap = { - ["support_elemental_assault_melee_damage_+%_final_per_elemental_ailment_on_target"] = { - mod("Damage", "MORE", nil, ModFlag.Melee, 0, { type = "ActorCondition", actor = "enemy", var = "Ignited" }), - mod("Damage", "MORE", nil, ModFlag.Melee, 0, { type = "ActorCondition", actor = "enemy", var = "Chilled" }), - mod("Damage", "MORE", nil, ModFlag.Melee, 0, { type = "ActorCondition", actor = "enemy", var = "Frozen" }), - mod("Damage", "MORE", nil, ModFlag.Melee, 0, { type = "ActorCondition", actor = "enemy", var = "Shocked" }), - mod("Damage", "MORE", nil, ModFlag.Melee, 0, { type = "ActorCondition", actor = "enemy", var = "Electrocuted" }), - }, - }, - baseFlags = { - }, - constantStats = { - { "support_elemental_assault_melee_damage_+%_final_per_elemental_ailment_on_target", 10 }, - }, - stats = { - "cannot_inflict_elemental_ailments", - }, - levels = { - [1] = { actorLevel = 1, }, - }, - }, - } -} skills["SupportFerocityPlayer"] = { name = "Ferocity", description = "Supports Skills that you use yourself. Supported Skills will consume a Frenzy Charge on use if possible, and will gain significant Skill Speed if they do. Supported Skills cannot generate Frenzy Charges.", @@ -2177,36 +2077,6 @@ skills["SupportFerocityPlayer"] = { }, } } -skills["SupportFlowPlayer"] = { - name = "Flow", - description = "Supports Skills which require Combo to use. Supported Skills lose their Combo stacks after a longer delay spent not gaining any Combo.", - color = 2, - support = true, - requireSkillTypes = { SkillType.ComboStacking, }, - addSkillTypes = { }, - excludeSkillTypes = { }, - gemFamily = { "Flow",}, - levels = { - [1] = { levelRequirement = 0, }, - }, - statSets = { - [1] = { - label = "Flow", - incrementalEffectiveness = 0.054999999701977, - statDescriptionScope = "gem_stat_descriptions", - baseFlags = { - }, - constantStats = { - { "combo_falloff_speed_+%", -60 }, - }, - stats = { - }, - levels = { - [1] = { actorLevel = 1, }, - }, - }, - } -} skills["SupportForkPlayer"] = { name = "Fork", description = "Supports Projectile skills, making their Projectiles Fork.", @@ -2530,33 +2400,6 @@ skills["SupportHitAndRunPlayer"] = { }, } } -skills["SupportHobblePlayer"] = { - name = "Hobble", - description = "Supports Skills that Hit Enemies, causing those Hits to Hobble Bleeding Enemies based on a portion of Physical Damage dealt.", - color = 2, - support = true, - requireSkillTypes = { SkillType.Damage, SkillType.Attack, SkillType.CrossbowAmmoSkill, }, - addSkillTypes = { }, - excludeSkillTypes = { }, - gemFamily = { "Hobble",}, - levels = { - [1] = { levelRequirement = 0, }, - }, - statSets = { - [1] = { - label = "Hobble", - incrementalEffectiveness = 0.054999999701977, - statDescriptionScope = "gem_stat_descriptions", - baseFlags = { - }, - stats = { - }, - levels = { - [1] = { actorLevel = 1, }, - }, - }, - } -} skills["SupportImpalePlayer"] = { name = "Impale", description = "Supports Attacks, causing them to Impale on Hit but making them unable to Extract Impale themselves.", @@ -2704,36 +2547,6 @@ skills["SupportLastingShockPlayer"] = { }, } } -skills["SupportLeveragePlayer"] = { - name = "Leverage", - description = "Supports Skills which Hit Enemies. Supported Skills gain increased chance to Critically Hit against Immobilised Enemies.", - color = 2, - support = true, - requireSkillTypes = { SkillType.Damage, SkillType.CrossbowAmmoSkill, SkillType.Attack, }, - addSkillTypes = { }, - excludeSkillTypes = { }, - gemFamily = { "Leverage",}, - levels = { - [1] = { levelRequirement = 0, }, - }, - statSets = { - [1] = { - label = "Leverage", - incrementalEffectiveness = 0.054999999701977, - statDescriptionScope = "gem_stat_descriptions", - baseFlags = { - }, - constantStats = { - { "critical_strike_chance_+%_vs_immobilised_enemies", 50 }, - }, - stats = { - }, - levels = { - [1] = { actorLevel = 1, }, - }, - }, - } -} skills["SupportLifeFlaskPlayer"] = { name = "Life Bounty", description = "Supports any skill that Hits enemies, causing enemies it kills to grant more Life Flask charges.", @@ -3395,37 +3208,6 @@ skills["SupportNovaProjectilesTwoPlayer"] = { }, } } -skills["SupportOutmaneuverPlayer"] = { - name = "Outmaneuver", - description = "Supports Skills you use yourself which can cause Damaging Hits. Supported Skills Break Armour against Parried Enemies.", - color = 2, - support = true, - requireSkillTypes = { SkillType.Damage, SkillType.Attack, SkillType.CrossbowSkill, SkillType.CrossbowAmmoSkill, }, - addSkillTypes = { }, - excludeSkillTypes = { SkillType.Persistent, SkillType.UsedByTotem, SkillType.SummonsTotem, SkillType.Minion, SkillType.Trapped, SkillType.RemoteMined, SkillType.Triggered, }, - gemFamily = { "Outmaneuver",}, - ignoreMinionTypes = true, - levels = { - [1] = { levelRequirement = 0, manaMultiplier = 15, }, - }, - statSets = { - [1] = { - label = "Outmaneuver", - incrementalEffectiveness = 0.054999999701977, - statDescriptionScope = "gem_stat_descriptions", - baseFlags = { - }, - constantStats = { - { "armour_break_physical_damage_%_dealt_as_armour_break_vs_parried_enemies", 25 }, - }, - stats = { - }, - levels = { - [1] = { actorLevel = 1, }, - }, - }, - } -} skills["SupportIncreaseLimitPlayer"] = { name = "Overabundance I", description = "Supports skills which can have a Limited number of effects active at once, increasing that Limit at the cost of their duration. Only applies to restrictions that use the word \"Limit\".", @@ -3541,6 +3323,7 @@ skills["SupportOverextendPlayer"] = { levels = { [1] = { levelRequirement = 0, manaMultiplier = 15, }, }, + legacy = true, statSets = { [1] = { label = "Overextend", @@ -5655,37 +5438,6 @@ skills["SupportTulsStillnessPlayer"] = { }, } } -skills["SupportTumultPlayer"] = { - name = "Tumult", - description = "Supports Skills you use yourself which can cause Damaging Hits. Supported Skills consume a Frenzy Charge on use to powerfully Break Armour.", - color = 2, - support = true, - requireSkillTypes = { SkillType.Attack, SkillType.Damage, SkillType.CrossbowSkill, }, - addSkillTypes = { SkillType.SupportedByTumult, }, - excludeSkillTypes = { SkillType.Persistent, SkillType.Triggered, SkillType.UsedByTotem, SkillType.SummonsTotem, SkillType.Minion, SkillType.Trapped, SkillType.RemoteMined, SkillType.SkillConsumesFrenzyChargesOnUse, SkillType.SupportedByTumult, SkillType.NOT, SkillType.AND, }, - gemFamily = { "Tumult",}, - ignoreMinionTypes = true, - levels = { - [1] = { levelRequirement = 0, }, - }, - statSets = { - [1] = { - label = "Tumult", - incrementalEffectiveness = 0.054999999701977, - statDescriptionScope = "gem_stat_descriptions", - baseFlags = { - }, - constantStats = { - { "skill_consume_frenzy_charge_to_armour_break_for_%_of_physical_damage", 50 }, - }, - stats = { - }, - levels = { - [1] = { actorLevel = 1, }, - }, - }, - } -} skills["SupportUnerringPowerPlayer"] = { name = "Unerring Power", description = "Supports Attack Skills you use yourself. When Supported Attacks are Empowered, they have significantly lowered cost and raised Accuracy.", diff --git a/src/Data/Skills/sup_int.lua b/src/Data/Skills/sup_int.lua index 6fcf4cdc35..97ce2b6f93 100644 --- a/src/Data/Skills/sup_int.lua +++ b/src/Data/Skills/sup_int.lua @@ -3542,36 +3542,6 @@ skills["SupportEncroachingGroundPlayer"] = { }, } } -skills["SupportEnergyBarrierPlayer"] = { - name = "Energy Barrier", - description = "Supports any skill that you can use, causing Energy Shield recharge to begin immediately if you are Stunned while using it.", - color = 3, - support = true, - requireSkillTypes = { }, - addSkillTypes = { }, - excludeSkillTypes = { SkillType.Instant, SkillType.Persistent, }, - gemFamily = { "EnergyBarrier",}, - levels = { - [1] = { levelRequirement = 0, }, - }, - statSets = { - [1] = { - label = "Energy Barrier", - incrementalEffectiveness = 0.054999999701977, - statDescriptionScope = "gem_stat_descriptions", - baseFlags = { - }, - constantStats = { - { "support_no_energy_shield_recharge_delay_for_duration_ms_on_stunned", 2000 }, - }, - stats = { - }, - levels = { - [1] = { actorLevel = 1, }, - }, - }, - } -} skills["SupportEnergyCapacitorPlayer"] = { name = "Energy Capacitor", description = "Supports Invocation Skills which Trigger other Skills. Supported Skills have significantly higher Maximum Energy.", @@ -4779,35 +4749,6 @@ skills["SupportHexBloomPlayer"] = { }, } } -skills["SupportHinderPlayer"] = { - name = "Hinder", - description = "Supports Spells that deal non-Ailment Chaos damage over time, causing damage over time they inflict to also Hinder enemies. Does not Support Skills used by Minions.", - color = 3, - support = true, - requireSkillTypes = { SkillType.Spell, SkillType.DamageOverTime, SkillType.Chaos, SkillType.AND, SkillType.AND, }, - addSkillTypes = { }, - excludeSkillTypes = { }, - gemFamily = { "Hinder",}, - ignoreMinionTypes = true, - levels = { - [1] = { levelRequirement = 0, }, - }, - statSets = { - [1] = { - label = "Hinder", - incrementalEffectiveness = 0.054999999701977, - statDescriptionScope = "gem_stat_descriptions", - baseFlags = { - }, - stats = { - "support_hinder_dots_also_apply_hinder", - }, - levels = { - [1] = { actorLevel = 1, }, - }, - }, - } -} skills["SupportHourglassPlayer"] = { name = "Hourglass", description = "Supports any damaging skill that you use yourself, causing it to deal significantly more damage but gain a long cooldown. Cannot support Skills which already have a cooldown.", @@ -6523,42 +6464,6 @@ skills["SupportPotentExposurePlayer"] = { }, } } -skills["SupportPotentialPlayer"] = { - name = "Potential", - description = "Supports Skills that you use yourself. Supported Skills will consume a Power Charge on use if possible, and will be much more likely to Critically Hit if they do. Supported Skills cannot generate Power Charges.", - color = 3, - support = true, - requireSkillTypes = { SkillType.Damage, SkillType.CrossbowAmmoSkill, SkillType.Attack, }, - addSkillTypes = { SkillType.SupportedByPotential, }, - excludeSkillTypes = { SkillType.Triggered, SkillType.Minion, SkillType.SummonsTotem, SkillType.UsedByTotem, SkillType.Persistent, SkillType.SkillConsumesPowerChargesOnUse, SkillType.SupportedByPotential, SkillType.NOT, SkillType.AND, }, - gemFamily = { "Potential",}, - levels = { - [1] = { levelRequirement = 0, }, - }, - statSets = { - [1] = { - label = "Potential", - incrementalEffectiveness = 0.054999999701977, - statDescriptionScope = "gem_stat_descriptions", - statMap = { - ["skill_consume_power_charge_to_gain_critical_strike_chance_+%_final"] = { - mod("CritChance", "MORE", nil, 0, 0, { type = "Multiplier", var = "RemovablePowerCharge", limit = 1 }), - }, - }, - baseFlags = { - }, - constantStats = { - { "skill_consume_power_charge_to_gain_critical_strike_chance_+%_final", 40 }, - }, - stats = { - "skill_cannot_generate_power_charges", - }, - levels = { - [1] = { actorLevel = 1, }, - }, - }, - } -} skills["SupportPracticalMagicPlayer"] = { name = "Practical Magic I", description = "Supports Skills which Hit enemies. Heavy Stunning an enemy with Supported Skills increases your Spell damage for a duration.", @@ -6780,45 +6685,6 @@ skills["SupportRapidCastingPlayerThree"] = { }, } } -skills["SupportRimePlayer"] = { - name = "Rime", - description = "Supports Skills which create Ground Surfaces, causing Enemies Chilled by those Surfaces to be more easily Frozen, but at the cost of some Chill magnitude.", - color = 3, - support = true, - requireSkillTypes = { SkillType.CreatesGroundEffect, }, - addSkillTypes = { }, - excludeSkillTypes = { }, - gemFamily = { "Rime",}, - levels = { - [1] = { levelRequirement = 0, }, - }, - statSets = { - [1] = { - label = "Rime", - incrementalEffectiveness = 0.054999999701977, - statDescriptionScope = "gem_stat_descriptions", - statMap = { - ["chilled_ground_applies_%_freeze_multiplier_taken"] = { - mod("EnemyFreezeBuildup", "MORE", nil, 0, 0, { type = "GlobalEffect", effectType = "Buff", effectName = "Rime" }, { type = "ActorCondition", actor = "enemy", var = "OnChilledGround" }), - }, - ["support_winterblast_chill_effect_+%_final"] = { - mod("EnemyChillMagnitude", "MORE", nil), - }, - }, - baseFlags = { - }, - constantStats = { - { "chilled_ground_applies_%_freeze_multiplier_taken", -20 }, - { "support_winterblast_chill_effect_+%_final", -30 }, - }, - stats = { - }, - levels = { - [1] = { actorLevel = 1, }, - }, - }, - } -} skills["SupportTempestuousTempoPlayer"] = { name = "Rising Tempest", description = "Supports Skills which deal Damage, raising Elemental Damage dealt for each Skill used Recently of a different Elemental type. Cannot support Minion Skills.", @@ -7033,6 +6899,7 @@ skills["SupportShockConductionPlayerTwo"] = { levels = { [1] = { levelRequirement = 0, manaMultiplier = 20, }, }, + legacy = true, statSets = { [1] = { label = "Shock Conduction II", @@ -7557,36 +7424,6 @@ skills["SupportThrillOfTheKillPlayerTwo"] = { }, } } -skills["SupportUnbendingPlayer"] = { - name = "Unbending", - description = "Supports Spell Skills you use yourself. While using Supported Skills, a percentage of Damage taken is Recouped as Mana, with the percentage scaling higher the longer the Cast time of the Supported Skill. Cannot Support Channelling Skills.", - color = 3, - support = true, - requireSkillTypes = { SkillType.Spell, }, - addSkillTypes = { }, - excludeSkillTypes = { SkillType.Persistent, SkillType.Minion, SkillType.UsedByTotem, SkillType.SummonsTotem, SkillType.Channel, SkillType.Triggered, }, - gemFamily = { "Unbending",}, - levels = { - [1] = { levelRequirement = 0, manaMultiplier = 20, }, - }, - statSets = { - [1] = { - label = "Unbending", - incrementalEffectiveness = 0.054999999701977, - statDescriptionScope = "gem_stat_descriptions", - baseFlags = { - }, - constantStats = { - { "damage_taken_%_recouped_as_mana_while_performing_spell_per_250_ms_cast_time", 8 }, - }, - stats = { - }, - levels = { - [1] = { actorLevel = 1, }, - }, - }, - } -} skills["SupportUnleashPlayer"] = { name = "Unleash", description = "Supports Spells you cast yourself, making their effect reoccur when cast. Cannot support Channelling Skills or Skills with a Cooldown.", @@ -7778,37 +7615,6 @@ skills["SupportVilentasPropulsionPlayer"] = { }, } } -skills["SupportVolatilePowerPlayer"] = { - name = "Volatile Power", - description = "Supports Skills which you use yourself. On using Supported Skills while they are Empowered, you gain Volatility.", - color = 3, - support = true, - requireSkillTypes = { }, - addSkillTypes = { }, - excludeSkillTypes = { SkillType.UsedByTotem, SkillType.Triggered, SkillType.Meta, SkillType.Persistent, SkillType.Triggered, }, - gemFamily = { "VolatilePower",}, - ignoreMinionTypes = true, - levels = { - [1] = { levelRequirement = 0, }, - }, - statSets = { - [1] = { - label = "Volatile Power", - incrementalEffectiveness = 0.054999999701977, - statDescriptionScope = "gem_stat_descriptions", - baseFlags = { - }, - constantStats = { - { "gain_X_volatility_on_empowered_skill_use", 5 }, - }, - stats = { - }, - levels = { - [1] = { actorLevel = 1, }, - }, - }, - } -} skills["SupportVolatilityPlayer"] = { name = "Volatility", description = "Supports Skills you use yourself which can cause Damaging Hits. Supported Skills grant Volatility on Critical Hit.", diff --git a/src/Data/Skills/sup_str.lua b/src/Data/Skills/sup_str.lua index c3d33482a9..e9a467b57f 100644 --- a/src/Data/Skills/sup_str.lua +++ b/src/Data/Skills/sup_str.lua @@ -1038,36 +1038,6 @@ skills["SupportBranchingFissuresPlayerTwo"] = { }, } } -skills["SupportEnduranceChargeOnArmourBreak"] = { - name = "Break Endurance", - description = "Supports any skill that Hits enemies, giving it a chance to gain an Endurance Charge when it Fully Breaks an enemy's Armour.", - color = 1, - support = true, - requireSkillTypes = { SkillType.Attack, SkillType.Damage, SkillType.CrossbowAmmoSkill, }, - addSkillTypes = { }, - excludeSkillTypes = { }, - gemFamily = { "BreakEndurance",}, - levels = { - [1] = { levelRequirement = 0, }, - }, - statSets = { - [1] = { - label = "Break Endurance", - incrementalEffectiveness = 0.054999999701977, - statDescriptionScope = "gem_stat_descriptions", - baseFlags = { - }, - constantStats = { - { "chance_to_gain_endurance_charge_on_armour_break_%", 40 }, - }, - stats = { - }, - levels = { - [1] = { actorLevel = 1, }, - }, - }, - } -} skills["SupportBrinkPlayer"] = { name = "Brink I", description = "Supports Melee Attack Skills. Supported Skills build up Heavy Stun more quickly, but cannot themselves Heavy Stun.", @@ -1877,37 +1847,6 @@ skills["SupportDauntlessPlayer"] = { }, } } -skills["SupportDazingCryPlayer"] = { - name = "Dazing Cry", - description = "Supports Warcries, causing them to Daze Enemies on use.", - color = 1, - support = true, - requireSkillTypes = { SkillType.Warcry, }, - addSkillTypes = { }, - excludeSkillTypes = { }, - gemFamily = { "DazingCry",}, - levels = { - [1] = { levelRequirement = 0, manaMultiplier = 10, }, - }, - statSets = { - [1] = { - label = "Dazing Cry", - incrementalEffectiveness = 0.054999999701977, - statDescriptionScope = "gem_stat_descriptions", - baseFlags = { - }, - constantStats = { - { "support_dazed_cry_duration_ms", 4000 }, - }, - stats = { - "support_apply_daze_on_warcry", - }, - levels = { - [1] = { actorLevel = 1, }, - }, - }, - } -} skills["SupportDeepCutsPlayer"] = { name = "Deep Cuts I", description = "Supports any skill that Hits enemies, causing it to deal less damage but inflict more potent Bleeding.", @@ -2043,68 +1982,6 @@ skills["SupportDefyPlayerTwo"] = { }, } } -skills["SupportDesperationPlayer"] = { - name = "Desperation", - description = "Supports Melee Attack Skills you use yourself. Insufficient Mana doesn't prevent Supported Skills from being used while Surrounded.", - color = 1, - support = true, - requireSkillTypes = { SkillType.Attack, SkillType.Melee, SkillType.AND, }, - addSkillTypes = { }, - excludeSkillTypes = { SkillType.Persistent, SkillType.SummonsTotem, SkillType.UsedByTotem, SkillType.Minion, SkillType.Triggered, }, - gemFamily = { "Desperation",}, - ignoreMinionTypes = true, - levels = { - [1] = { levelRequirement = 0, }, - }, - statSets = { - [1] = { - label = "Desperation", - incrementalEffectiveness = 0.054999999701977, - statDescriptionScope = "gem_stat_descriptions", - baseFlags = { - }, - stats = { - "skills_are_usable_without_mana_cost_while_surrounded", - }, - levels = { - [1] = { actorLevel = 1, }, - }, - }, - } -} -skills["SupportDevastatePlayer"] = { - name = "Devastate", - description = "Supports any skill that Hits enemies, causing them to apply Broken Armour to enemies when causing a Heavy Stun to enemies.", - color = 1, - support = true, - requireSkillTypes = { SkillType.Damage, SkillType.Attack, SkillType.CrossbowAmmoSkill, }, - addSkillTypes = { }, - excludeSkillTypes = { }, - gemFamily = { "Devastate",}, - levels = { - [1] = { levelRequirement = 0, manaMultiplier = 20, }, - }, - statSets = { - [1] = { - label = "Devastate", - incrementalEffectiveness = 0.054999999701977, - statDescriptionScope = "gem_stat_descriptions", - statMap = { - ["fully_break_enemies_armour_on_heavy_stun"] = { - flag("Condition:CanArmourBreak", { type = "GlobalEffect", effectType = "Buff", effectName = "ArmourBreak" } ), - }, - }, - baseFlags = { - }, - stats = { - "fully_break_enemies_armour_on_heavy_stun", - }, - levels = { - [1] = { actorLevel = 1, }, - }, - }, - } -} skills["SupportDirestrikePlayer"] = { name = "Direstrike I", description = "Supports Persistent Buff Skills, causing you to deal increased Attack Damage while on Low Life while the Supported Skill is active.", @@ -3351,36 +3228,6 @@ skills["SupportFirePenetrationPlayerTwo"] = { }, } } -skills["SupportFirstBloodPlayer"] = { - name = "First Blood", - description = "Supports Attacks. Supported Skills are far more likely to inflict Bleeding on Hitting full Life Enemies.", - color = 1, - support = true, - requireSkillTypes = { SkillType.Attack, }, - addSkillTypes = { }, - excludeSkillTypes = { }, - gemFamily = { "FirstBlood",}, - levels = { - [1] = { levelRequirement = 0, manaMultiplier = 10, }, - }, - statSets = { - [1] = { - label = "First Blood", - incrementalEffectiveness = 0.054999999701977, - statDescriptionScope = "gem_stat_descriptions", - baseFlags = { - }, - constantStats = { - { "bleed_chance_+%_vs_full_life_enemy", 100 }, - }, - stats = { - }, - levels = { - [1] = { actorLevel = 1, }, - }, - }, - } -} skills["FistOfWarSupportPlayer"] = { name = "Fist of War I", description = "Supports Slams you use yourself, providing a powerful Ancestral Boost every few seconds.", @@ -4311,6 +4158,7 @@ skills["SupportInfernalLegionPlayerThree"] = { levels = { [1] = { levelRequirement = 0, }, }, + legacy = true, statSets = { [1] = { label = "Infernal Legion III", @@ -5032,41 +4880,6 @@ skills["SupportPersistentGroundPlayerThree"] = { }, } } -skills["SupportEmpoweredDamagePlayer"] = { - name = "Premeditation", - description = "Supports skills that can Empower skills other than themselves, causing skills they Empower to deal more damage.", - color = 1, - support = true, - requireSkillTypes = { SkillType.EmpowersOtherSkill, }, - addSkillTypes = { }, - excludeSkillTypes = { }, - gemFamily = { "Premeditation",}, - levels = { - [1] = { levelRequirement = 0, manaMultiplier = 30, }, - }, - statSets = { - [1] = { - label = "Premeditation", - incrementalEffectiveness = 0.054999999701977, - statDescriptionScope = "gem_stat_descriptions", - statMap = { - ["support_empowered_damage_+%_final"] = { - mod("ExtraEmpowerMod", "LIST", { mod = mod("Damage", "MORE", nil) }), - } - }, - baseFlags = { - }, - constantStats = { - { "support_empowered_damage_+%_final", 15 }, - }, - stats = { - }, - levels = { - [1] = { actorLevel = 1, }, - }, - }, - } -} skills["ProlongedDurationSupportPlayer"] = { name = "Prolonged Duration I", description = "Supports any skill that has a duration, making that duration longer.", @@ -5410,37 +5223,6 @@ skills["SupportRagingCryPlayer"] = { }, } } -skills["SupportRallyPlayer"] = { - name = "Rally", - description = "Supports Melee Attacks you use yourself. Supported Skills Consume all Endurance Charge on use, causing you to restore a percentage of your maximum Life for each Charge Consumed.", - color = 1, - support = true, - requireSkillTypes = { SkillType.Melee, }, - addSkillTypes = { SkillType.ConsumesCharges, SkillType.SupportedByRally, }, - excludeSkillTypes = { SkillType.Triggered, SkillType.Minion, SkillType.SummonsTotem, SkillType.UsedByTotem, SkillType.Persistent, SkillType.SkillConsumesEnduranceChargesOnUse, SkillType.SupportedByRally, SkillType.NOT, SkillType.AND, }, - gemFamily = { "Rally",}, - levels = { - [1] = { levelRequirement = 0, }, - }, - statSets = { - [1] = { - label = "Rally", - incrementalEffectiveness = 0.054999999701977, - statDescriptionScope = "gem_stat_descriptions", - baseFlags = { - }, - constantStats = { - { "consume_endurance_charges_on_use_to_recover_%_maximum_life_per_charge", 10 }, - }, - stats = { - "skill_cannot_generate_endurance_charges", - }, - levels = { - [1] = { actorLevel = 1, }, - }, - }, - } -} skills["SupportRefractionPlayer"] = { name = "Refraction I", description = "Supports Banner Skills, causing those affected by Auras they create to gain Refractive Plating, a Buff which causes Armour to partially apply to Elemental Hit Damage.", @@ -6071,38 +5853,6 @@ skills["SupportDeadlyIgnitesPlayerTwo"] = { }, } } -skills["SupportSeeRedPlayer"] = { - name = "See Red", - description = "Supports Attack Skills. Bleeding inflicted with Supported Skills lasts significantly longer, but enemies you inflict Bleeding onto with Supported Skills will move and Attack faster.", - color = 1, - support = true, - requireSkillTypes = { SkillType.Attack, SkillType.CrossbowSkill, SkillType.CrossbowAmmoSkill, }, - addSkillTypes = { }, - excludeSkillTypes = { }, - gemFamily = { "SeeRed",}, - levels = { - [1] = { levelRequirement = 0, }, - }, - statSets = { - [1] = { - label = "See Red", - incrementalEffectiveness = 0.054999999701977, - statDescriptionScope = "gem_stat_descriptions", - baseFlags = { - }, - constantStats = { - { "bleeding_monsters_movement_velocity_+%", 15 }, - { "base_bleed_duration_+%", 50 }, - { "bleeding_monsters_attack_speed_+%", 15 }, - }, - stats = { - }, - levels = { - [1] = { actorLevel = 1, }, - }, - }, - } -} skills["SupportSelflessRemnantsPlayer"] = { name = "Selfless Remnants", description = "Supports Skills that generate Remnants, causing those Remnants to affect Allies in your Presence when collected instead of you.", @@ -7033,44 +6783,6 @@ skills["SupportTirelessPlayer"] = { }, } } -skills["SupportTremorsPlayer"] = { - name = "Tremors", - description = "Supports Slam Skills you use yourself. Supported Skills gain multiple independent chances to cause Aftershocks, but deal less Damage.", - color = 1, - support = true, - requireSkillTypes = { SkillType.Slam, }, - addSkillTypes = { }, - excludeSkillTypes = { SkillType.Persistent, SkillType.Minion, SkillType.UsedByTotem, SkillType.Triggered, }, - gemFamily = { "Tremors",}, - levels = { - [1] = { levelRequirement = 0, }, - }, - statSets = { - [1] = { - label = "Tremors", - incrementalEffectiveness = 0.054999999701977, - statDescriptionScope = "gem_stat_descriptions", - statMap = { - ["support_unstable_earth_damage_+%_final"] = { - mod("Damage", "MORE", nil), - }, - }, - baseFlags = { - }, - constantStats = { - { "support_slam_chance_for_one_additional_aftershock_%", 30 }, - { "support_slam_chance_for_two_additional_aftershocks_%", 15 }, - { "support_slam_chance_for_three_additional_aftershocks_%", 10 }, - { "support_unstable_earth_damage_+%_final", -35 }, - }, - stats = { - }, - levels = { - [1] = { actorLevel = 1, }, - }, - }, - } -} skills["SupportUhtredAuguryPlayer"] = { name = "Uhtred's Augury", description = "Supports Skills which can gain levels, granting them many additional levels provided exactly two other supports are used with the supported Skill. Does not support skills which do not have levels.", @@ -7182,73 +6894,6 @@ skills["SupportUhtredOmenPlayer"] = { }, } } -skills["SupportUnabatingPlayer"] = { - name = "Unabating", - description = "Supports Attack Skills you use yourself. While using Supported Skills, you gain increased Armour, with the increase scaling higher the longer the Attack time of the supported Skill. Cannot Support Channelling Skills.", - color = 1, - support = true, - requireSkillTypes = { SkillType.Attack, }, - addSkillTypes = { }, - excludeSkillTypes = { SkillType.Persistent, SkillType.Minion, SkillType.UsedByTotem, SkillType.SummonsTotem, SkillType.Channel, SkillType.Triggered, }, - gemFamily = { "Unabating",}, - ignoreMinionTypes = true, - levels = { - [1] = { levelRequirement = 0, manaMultiplier = 20, }, - }, - statSets = { - [1] = { - label = "Unabating", - incrementalEffectiveness = 0.054999999701977, - statDescriptionScope = "gem_stat_descriptions", - baseFlags = { - }, - constantStats = { - { "armour_+%_while_performing_action_per_250_ms_attack_time", 25 }, - }, - stats = { - }, - levels = { - [1] = { actorLevel = 1, }, - }, - }, - } -} -skills["UnbreakableSupportPlayer"] = { - name = "Unbreakable", - description = "Supports any skill that you can use, making you harder to Stun while using it.", - color = 1, - support = true, - requireSkillTypes = { }, - addSkillTypes = { }, - excludeSkillTypes = { SkillType.Instant, SkillType.Persistent, }, - gemFamily = { "Unbreakable",}, - levels = { - [1] = { levelRequirement = 0, manaMultiplier = 10, }, - }, - statSets = { - [1] = { - label = "Unbreakable", - incrementalEffectiveness = 0.092720001935959, - statDescriptionScope = "gem_stat_descriptions", - statMap = { - ["support_unbreakable_stun_threshold_+%_final_while_performing_action"] = { - mod("StunThreshold", "MORE", nil, 0, 0, { type = "GlobalEffect", effectType = "Buff", unscalable = true }), - }, - }, - baseFlags = { - }, - constantStats = { - { "support_unbreakable_light_stun_threshold_+%_final_while_performing_action", 200 }, - { "support_stability_heavy_stun_threshold_+%_final_while_performing_action", 30 }, - }, - stats = { - }, - levels = { - [1] = { actorLevel = 1, }, - }, - }, - } -} skills["SupportUnderminePlayer"] = { name = "Undermine", description = "Supports Attack Skills. Supported Skills Consume Maim on hit, Breaking a percentage of the Maimed target's Armour in doing so. Supported Skills cannot themselves inflict Maim.", @@ -7280,64 +6925,6 @@ skills["SupportUnderminePlayer"] = { }, } } -skills["SupportUnsteadyTempoPlayer"] = { - name = "Unsteady Tempo", - description = "Supports Melee Attack Skills you use yourself. Attacking with Supported Skills will cycle through various effects, with the first Attack in sequence inflicting Hobble on you. The second and third Attacks in sequence will powerfully scale chance to Critically Hit and overall damage, respectively, at which point the cycle will reset. Cannot Support Channelling Skills.", - color = 1, - support = true, - requireSkillTypes = { SkillType.Melee, SkillType.Attack, SkillType.AND, }, - addSkillTypes = { }, - excludeSkillTypes = { SkillType.Persistent, SkillType.UsedByTotem, SkillType.SummonsTotem, SkillType.Triggered, SkillType.Channel, }, - gemFamily = { "UnsteadyTempo",}, - ignoreMinionTypes = true, - levels = { - [1] = { levelRequirement = 0, manaMultiplier = 10, }, - }, - statSets = { - [1] = { - label = "Unsteady Tempo", - incrementalEffectiveness = 0.054999999701977, - statDescriptionScope = "gem_stat_descriptions", - baseFlags = { - }, - stats = { - }, - levels = { - [1] = { actorLevel = 1, }, - }, - }, - } -} -skills["SupportUnyieldingPlayer"] = { - name = "Unyielding", - description = "Supports Melee Attack Skills you use yourself. While using Supported Skills, a percentage of Damage taken is Recouped as Life, with the percentage scaling higher the longer the Attack time of the Supported Skill. Cannot Support Channelling Skills.", - color = 1, - support = true, - requireSkillTypes = { SkillType.Attack, SkillType.Melee, SkillType.AND, }, - addSkillTypes = { }, - excludeSkillTypes = { SkillType.Persistent, SkillType.Minion, SkillType.UsedByTotem, SkillType.SummonsTotem, SkillType.Channel, SkillType.Triggered, }, - gemFamily = { "Unyielding",}, - levels = { - [1] = { levelRequirement = 0, manaMultiplier = 20, }, - }, - statSets = { - [1] = { - label = "Unyielding", - incrementalEffectiveness = 0.054999999701977, - statDescriptionScope = "gem_stat_descriptions", - baseFlags = { - }, - constantStats = { - { "damage_taken_%_recouped_as_life_while_performing_attack_per_250_ms_attack_time", 8 }, - }, - stats = { - }, - levels = { - [1] = { actorLevel = 1, }, - }, - }, - } -} skills["SupportUpheavalPlayer"] = { name = "Upheaval I", description = "Supports Skills which create fissures in the ground, causing them to create an additional fissure at the cost of damage and speed.", diff --git a/src/Export/Main.lua b/src/Export/Main.lua index 98360a6968..f6ef44f74a 100644 --- a/src/Export/Main.lua +++ b/src/Export/Main.lua @@ -124,6 +124,8 @@ function main:Init() else if line:match("^%-%-") or line:match("^local") or line == "" then out:write(line, "\n") + elseif line:match("^legacy") then + out:write("\t"..line, ",\n") else out:write("\t\t\t"..line, "\n") end diff --git a/src/Export/Skills/act_int.txt b/src/Export/Skills/act_int.txt index d67f52948a..a04f33ab68 100644 --- a/src/Export/Skills/act_int.txt +++ b/src/Export/Skills/act_int.txt @@ -262,17 +262,6 @@ statMap = { #mods #skillEnd -#skill ConductivityPlayer -#set ConductivityPlayer -#flags spell curse area duration -statMap = { - ["base_skill_buff_lightning_damage_resistance_%_to_apply"] = { - mod("LightningResist", "BASE", nil, 0, 0, { type = "GlobalEffect", effectType = "Curse" }), - }, -}, -#mods -#skillEnd - #skill ContagionPlayer #set ContagionPlayer #flags area duration spell @@ -603,17 +592,6 @@ statMap = { #mods #skillEnd -#skill FlammabilityPlayer -#set FlammabilityPlayer -#flags spell curse area duration -statMap = { - ["base_skill_buff_fire_damage_resistance_%_to_apply"] = { - mod("FireResist", "BASE", nil, 0, 0, { type = "GlobalEffect", effectType = "Curse" }), - }, -}, -#mods -#skillEnd - #skill FlickerStrikePlayer preDamageFunc = function(activeSkill, output, breakdown) local strikesPerCharge = activeSkill.skillModList:Sum("BASE", activeSkill.skillCfg, "AdditionalFlickersPerPowerCharge") @@ -872,17 +850,6 @@ statMap = { #mods #skillEnd -#skill HypothermiaPlayer -#set HypothermiaPlayer -#flags spell curse area duration -statMap = { - ["base_skill_buff_cold_damage_resistance_%_to_apply"] = { - mod("ColdResist", "BASE", nil, 0, 0, { type = "GlobalEffect", effectType = "Curse" }), - }, -}, -#mods -#skillEnd - #skill IceNovaPlayer #set IceNovaPlayer #flags spell area diff --git a/src/Export/Skills/sup_dex.txt b/src/Export/Skills/sup_dex.txt index 0863aaf812..684c197421 100644 --- a/src/Export/Skills/sup_dex.txt +++ b/src/Export/Skills/sup_dex.txt @@ -146,11 +146,6 @@ statMap = { #mods #skillEnd -#skill SupportDazedBreakPlayer -#set SupportDazedBreakPlayer -#mods -#skillEnd - #skill SupportBurstingPlaguePlayer #set SupportBurstingPlaguePlayer #mods @@ -367,11 +362,6 @@ statMap = { #mods #skillEnd -#skill SupportDazzlePlayer -#set SupportDazzlePlayer -#mods -#skillEnd - #skill SupportDeadlyHeraldsPlayer #set SupportDeadlyHeraldsPlayer statMap = { @@ -465,20 +455,6 @@ statMap = { #mods #skillEnd -#skill SupportExcoriatePlayer -#set SupportExcoriatePlayer -statMap = { - ["support_elemental_assault_melee_damage_+%_final_per_elemental_ailment_on_target"] = { - mod("Damage", "MORE", nil, ModFlag.Melee, 0, { type = "ActorCondition", actor = "enemy", var = "Ignited" }), - mod("Damage", "MORE", nil, ModFlag.Melee, 0, { type = "ActorCondition", actor = "enemy", var = "Chilled" }), - mod("Damage", "MORE", nil, ModFlag.Melee, 0, { type = "ActorCondition", actor = "enemy", var = "Frozen" }), - mod("Damage", "MORE", nil, ModFlag.Melee, 0, { type = "ActorCondition", actor = "enemy", var = "Shocked" }), - mod("Damage", "MORE", nil, ModFlag.Melee, 0, { type = "ActorCondition", actor = "enemy", var = "Electrocuted" }), - }, -}, -#mods -#skillEnd - #skill SupportFerocityPlayer #set SupportFerocityPlayer statMap = { @@ -491,11 +467,6 @@ statMap = { #mods #skillEnd -#skill SupportFlowPlayer -#set SupportFlowPlayer -#mods -#skillEnd - #skill SupportForkPlayer #set SupportForkPlayer statMap = { @@ -567,11 +538,6 @@ statMap = { #mods #skillEnd -#skill SupportHobblePlayer -#set SupportHobblePlayer -#mods -#skillEnd - #skill SupportImpalePlayer #set SupportImpalePlayer #mods @@ -613,11 +579,6 @@ statMap = { #mods #skillEnd -#skill SupportLeveragePlayer -#set SupportLeveragePlayer -#mods -#skillEnd - #skill SupportLifeFlaskPlayer #set SupportLifeFlaskPlayer #mods @@ -769,11 +730,6 @@ statMap = { #mods #skillEnd -#skill SupportOutmaneuverPlayer -#set SupportOutmaneuverPlayer -#mods -#skillEnd - #skill SupportIncreaseLimitPlayer #set SupportIncreaseLimitPlayer statMap = { @@ -800,6 +756,7 @@ statMap = { #skillEnd #skill SupportOverextendPlayer +legacy = true #set SupportOverextendPlayer statMap = { ["support_overextend_critical_strike_multiplier_+%_final"] = { @@ -1254,11 +1211,6 @@ statMap = { #mods #skillEnd -#skill SupportTumultPlayer -#set SupportTumultPlayer -#mods -#skillEnd - #skill SupportUnerringPowerPlayer #set SupportUnerringPowerPlayer statMap = { diff --git a/src/Export/Skills/sup_int.txt b/src/Export/Skills/sup_int.txt index 65b0c0c5c1..e703524e9e 100644 --- a/src/Export/Skills/sup_int.txt +++ b/src/Export/Skills/sup_int.txt @@ -614,11 +614,6 @@ statMap = { #mods #skillEnd -#skill SupportEnergyBarrierPlayer -#set SupportEnergyBarrierPlayer -#mods -#skillEnd - #skill SupportEnergyCapacitorPlayer #set SupportEnergyCapacitorPlayer #mods @@ -873,11 +868,6 @@ statMap = { #mods #skillEnd -#skill SupportHinderPlayer -#set SupportHinderPlayer -#mods -#skillEnd - #skill SupportHourglassPlayer #set SupportHourglassPlayer statMap = { @@ -1257,16 +1247,6 @@ statMap = { #mods #skillEnd -#skill SupportPotentialPlayer -#set SupportPotentialPlayer -statMap = { - ["skill_consume_power_charge_to_gain_critical_strike_chance_+%_final"] = { - mod("CritChance", "MORE", nil, 0, 0, { type = "Multiplier", var = "RemovablePowerCharge", limit = 1 }), - }, -}, -#mods -#skillEnd - #skill SupportPracticalMagicPlayer #set SupportPracticalMagicPlayer #mods @@ -1302,19 +1282,6 @@ statMap = { #mods #skillEnd -#skill SupportRimePlayer -#set SupportRimePlayer -statMap = { - ["chilled_ground_applies_%_freeze_multiplier_taken"] = { - mod("EnemyFreezeBuildup", "MORE", nil, 0, 0, { type = "GlobalEffect", effectType = "Buff", effectName = "Rime" }, { type = "ActorCondition", actor = "enemy", var = "OnChilledGround" }), - }, - ["support_winterblast_chill_effect_+%_final"] = { - mod("EnemyChillMagnitude", "MORE", nil), - }, -}, -#mods -#skillEnd - #skill SupportTempestuousTempoPlayer #set SupportTempestuousTempoPlayer statMap = { @@ -1361,6 +1328,7 @@ statMap = { #skillEnd #skill SupportShockConductionPlayerTwo +legacy = true #set SupportShockConductionPlayerTwo #mods #skillEnd @@ -1454,11 +1422,6 @@ statMap = { #mods #skillEnd -#skill SupportUnbendingPlayer -#set SupportUnbendingPlayer -#mods -#skillEnd - #skill SupportUnleashPlayer #set SupportUnleashPlayer #baseMod flag("HasSeals") @@ -1491,11 +1454,6 @@ statMap = { #mods #skillEnd -#skill SupportVolatilePowerPlayer -#set SupportVolatilePowerPlayer -#mods -#skillEnd - #skill SupportVolatilityPlayer #set SupportVolatilityPlayer #mods diff --git a/src/Export/Skills/sup_str.txt b/src/Export/Skills/sup_str.txt index 3094573d5b..d7d4a3a9fb 100644 --- a/src/Export/Skills/sup_str.txt +++ b/src/Export/Skills/sup_str.txt @@ -196,11 +196,6 @@ statMap = { #mods #skillEnd -#skill SupportEnduranceChargeOnArmourBreak -#set SupportEnduranceChargeOnArmourBreak -#mods -#skillEnd - #skill SupportBrinkPlayer #set SupportBrinkPlayer #mods @@ -427,11 +422,6 @@ statMap = { #mods #skillEnd -#skill SupportDazingCryPlayer -#set SupportDazingCryPlayer -#mods -#skillEnd - #skill SupportDeepCutsPlayer #set SupportDeepCutsPlayer statMap = { @@ -468,21 +458,6 @@ statMap = { #mods #skillEnd -#skill SupportDesperationPlayer -#set SupportDesperationPlayer -#mods -#skillEnd - -#skill SupportDevastatePlayer -#set SupportDevastatePlayer -statMap = { - ["fully_break_enemies_armour_on_heavy_stun"] = { - flag("Condition:CanArmourBreak", { type = "GlobalEffect", effectType = "Buff", effectName = "ArmourBreak" } ), - }, -}, -#mods -#skillEnd - #skill SupportDirestrikePlayer #set SupportDirestrikePlayer statMap = { @@ -736,11 +711,6 @@ statMap = { #mods #skillEnd -#skill SupportFirstBloodPlayer -#set SupportFirstBloodPlayer -#mods -#skillEnd - #skill FistOfWarSupportPlayer #set FistOfWarSupportPlayer #mods @@ -975,6 +945,7 @@ statMap = { #skillEnd #skill SupportInfernalLegionPlayerThree +legacy = true #set SupportInfernalLegionPlayerThree statMap = { ["minion_fire_damage_%_of_maximum_life_taken_per_minute"] = { @@ -1147,16 +1118,6 @@ statMap = { #mods #skillEnd -#skill SupportEmpoweredDamagePlayer -#set SupportEmpoweredDamagePlayer -statMap = { - ["support_empowered_damage_+%_final"] = { - mod("ExtraEmpowerMod", "LIST", { mod = mod("Damage", "MORE", nil) }), - } -}, -#mods -#skillEnd - #skill ProlongedDurationSupportPlayer #set ProlongedDurationSupportPlayer statMap = { @@ -1232,11 +1193,6 @@ statMap = { #mods #skillEnd -#skill SupportRallyPlayer -#set SupportRallyPlayer -#mods -#skillEnd - #skill SupportRefractionPlayer #set SupportRefractionPlayer statMap = { @@ -1377,11 +1333,6 @@ statMap = { #mods #skillEnd -#skill SupportSeeRedPlayer -#set SupportSeeRedPlayer -#mods -#skillEnd - #skill SupportSelflessRemnantsPlayer #set SupportSelflessRemnantsPlayer #mods @@ -1586,16 +1537,6 @@ statMap = { #mods #skillEnd -#skill SupportTremorsPlayer -#set SupportTremorsPlayer -statMap = { - ["support_unstable_earth_damage_+%_final"] = { - mod("Damage", "MORE", nil), - }, -}, -#mods -#skillEnd - #skill SupportUhtredAuguryPlayer #set SupportUhtredAuguryPlayer statMap = { @@ -1626,36 +1567,11 @@ statMap = { #mods #skillEnd -#skill SupportUnabatingPlayer -#set SupportUnabatingPlayer -#mods -#skillEnd - -#skill UnbreakableSupportPlayer -#set UnbreakableSupportPlayer -statMap = { - ["support_unbreakable_stun_threshold_+%_final_while_performing_action"] = { - mod("StunThreshold", "MORE", nil, 0, 0, { type = "GlobalEffect", effectType = "Buff", unscalable = true }), - }, -}, -#mods -#skillEnd - #skill SupportUnderminePlayer #set SupportUnderminePlayer #mods #skillEnd -#skill SupportUnsteadyTempoPlayer -#set SupportUnsteadyTempoPlayer -#mods -#skillEnd - -#skill SupportUnyieldingPlayer -#set SupportUnyieldingPlayer -#mods -#skillEnd - #skill SupportUpheavalPlayer #set SupportUpheavalPlayer statMap = {