More global cleanup, removal of redundancies.

justinkb · Jul 27, 2019 · 2b8f97d · 2b8f97d
1 parent c615b6d
commit 2b8f97d
Show file tree

Hide file tree

Showing 9 changed files with 6 additions and 20 deletions.
diff --git a/Classes.lua b/Classes.lua
@@ -1174,7 +1174,6 @@ all:RegisterAuras( {
  duration = 15,
  alias = { "ferocity_of_the_frostwolf", "might_of_the_blackrock", "zeal_of_the_burning_blade", "rictus_of_the_laughing_skull" },
  aliasMode = "first",
- duration = 15,
  },
 
  arcane_pulse = {

diff --git a/Classes/DemonHunterVengeance.lua b/Classes/DemonHunterVengeance.lua
@@ -795,8 +795,6 @@ if UnitClassBase( 'player' ) == 'DEMONHUNTER' then
  cooldown = function () return ( pvptalent.sigil_mastery.enabled and 0.75 or 1 ) * 60 end,
  gcd = "spell",
 
- toggle = "cooldowns",
-
  startsCombat = true,
  texture = 1418288,
 

diff --git a/Classes/HunterBeastMastery.lua b/Classes/HunterBeastMastery.lua
@@ -408,12 +408,6 @@ if UnitClassBase( 'player' ) == 'HUNTER' then
 
 
  -- PvP Talents
- dire_beast_hawk = {
- id = 208684,
- duration = 3600,
- max_stack = 1,
- },
-
  hiexplosive_trap = {
  id = 236777,
  duration = 0.1,
@@ -982,8 +976,6 @@ if UnitClassBase( 'player' ) == 'HUNTER' then
  cooldown = 0,
  gcd = "spell",
 
- velocity = 50,
-
  spend = 40,
  spendType = "focus",
 

diff --git a/Classes/HunterSurvival.lua b/Classes/HunterSurvival.lua
@@ -1058,9 +1058,8 @@ if UnitClassBase( 'player' ) == 'HUNTER' then
  volatile_bomb = {
  -- id = 271045,
  known = 259495,
- charges = function () return talent.guerrilla_tactics.enabled and 2 or nil end,
  cast = 0,
- charges = 2,
+ charges = function () return talent.guerrilla_tactics.enabled and 2 or nil end,
  cooldown = 18,
  recharge = 18,
  hasteCD = true,

diff --git a/Classes/WarlockDemonology.lua b/Classes/WarlockDemonology.lua
@@ -305,7 +305,6 @@ if UnitClassBase( 'player' ) == 'WARLOCK' then
 
  spec:RegisterStateFunction( "summon_demon", function( name, duration, count )
  local db = other_demon_v
- delay = delay or 0
 
  if name == 'dreadstalkers' then db = dreadstalkers_v
  elseif name == 'vilefiend' then db = vilefiend_v

diff --git a/Classes/WarriorArms.lua b/Classes/WarriorArms.lua
@@ -536,8 +536,6 @@ if UnitClassBase( 'player' ) == 'WARRIOR' then
  cooldown = 180,
  gcd = "spell",
 
- toggle = "cooldowns",
-
  startsCombat = false,
  texture = 132336,
 

diff --git a/Classes/WarriorProtection.lua b/Classes/WarriorProtection.lua
@@ -518,7 +518,7 @@ if UnitClassBase( 'player' ) == 'WARRIOR' then
  last_stand = {
  id = 12975,
  cast = 0,
- cooldown = function () return talent.bolster.enabled and 120 and 180 end,
+ cooldown = function () return talent.bolster.enabled and 120 or 180 end,
  gcd = "spell",
 
  toggle = "defensives",

diff --git a/Options.lua b/Options.lua
@@ -7068,7 +7068,7 @@ do
  append( "spec:RegisterAbilities( {" )
  increaseIndent()
 
- count = 1
+ local count = 1
  for k, a in orderedPairs( abilities ) do
  if count > 1 then append( "\n" ) end
  count = count + 1

diff --git a/UI.lua b/UI.lua
@@ -21,8 +21,8 @@ local format = string.format
 
 local HasVehicleActionBar, HasOverrideActionBar, IsInPetBattle, UnitHasVehicleUI, UnitOnTaxi = HasVehicleActionBar, HasOverrideActionBar, C_PetBattles.IsInBattle, UnitHasVehicleUI, UnitOnTaxi
 
-
 local Masque, MasqueGroup
+local _
 
 
 function Hekili:GetScale()
@@ -162,7 +162,8 @@ function ns.StartConfiguration( external )
  ns.UI.Notification.Mover:SetBackdropBorderColor( ccolor.r, ccolor.g, ccolor.b, 1 )
  ns.UI.Notification.Mover:Show()
 
- f = ns.UI.Notification.Mover
+ local f = ns.UI.Notification.Mover
+
  if not f.Header then
  f.Header = f:CreateFontString( "HekiliNotificationHeader", "OVERLAY", "GameFontNormal" )
  local path, size = f.Header:GetFont()