You must login to post a comment. Don't have an account? Register to get one!

• 

  • Reply
  • #1

  Barfolomeu May 10, 2013 at 17:34 UTC - 0 likes

  I wrote a patch to make it work with 5.2. Plus I added a feature that allows the user to toggle tis off in BGs and arenas. I usually use this addon to alert me when the opposing faction is nearby in the world, so being able to have it off in bgs and arenas makes sense to me.

  diff -Naru WitchHunt.orig/locales/enUS.lua WitchHunt/locales/enUS.lua
  --- WitchHunt.orig/locales/enUS.lua     2009-04-30 11:35:58.000000000 -0700
  +++ WitchHunt/locales/enUS.lua  2013-04-03 16:15:21.784533200 -0700
  @@ -28,6 +28,9 @@
   L["Target Only"] = true
   L["Toggle target only mode."] = true
  
  +L["Enable BG"] = true
  +L["Toggle on/off in battlegrounds."] = true
  +
   L["Players Only"] = true
   L["Toggle players only mode. This will only alert for player controlled characters."] = true
  
  diff -Naru WitchHunt.orig/WitchHunt.lua WitchHunt/WitchHunt.lua
  --- WitchHunt.orig/WitchHunt.lua        2013-05-08 23:04:31.425633000 -0700
  +++ WitchHunt/WitchHunt.lua     2013-04-03 16:38:44.671773700 -0700
  @@ -40,6 +40,7 @@
                  icons = true,
                  combatonly = false,
                  targetonly = false,
  +               enablebg = true,
                  font = "normal",
                  lock = true,
                  insertmode = "TOP",
  @@ -256,6 +257,12 @@
                                  arg = "icons",
                                  order = 31,
                          },
  +                       enablebg = {
  +                               name = L["Enable BG"], type = "toggle",
  +                               desc = L["Toggle on/off in battlegrounds."],
  +                               arg = "enablebg",
  +                               order = 35,
  +                       },
                          descframe = {
                                  name = L["The options below affect the built in Witch Hunt message frame. To select messages sent to this frame select the Message Display option from the tree on the left."],
                                  type = "description",
  @@ -712,11 +719,18 @@
   end
  
   function WitchHunt:ZONE_CHANGED()
  -       local zonePVPType = GetZonePVPInfo()
  +       local zonePVPType, isFFA = GetZonePVPInfo()
          InSanctuary = zonePVPType == "sanctuary" and true or false
  +       -- Check for pvp zone if not enabled for battlegrounds and not
  +       -- already in a sanctuary
  +       if not InSanctuary and not db.enablebg then
  +               local isin = select(2,IsInInstance())
  +               local pvp = isin == "pvp" or isin == "arena" or zonePVPType == "arena" or zonePVPType == "combat" or isFFA
  +               InSanctuary = pvp
  +       end
   end
  
  -function WitchHunt:COMBAT_LOG_EVENT_UNFILTERED(event, timestamp, eventType, srcGUID, srcName, srcFlags, dstGUID, dstName, dstFlags, spellID, spellName, spellSchool, eID, eName)
  +function WitchHunt:COMBAT_LOG_EVENT_UNFILTERED(event, timestamp, eventType, hideCaster, srcGUID, srcName, srcFlags, srcRaidFlags, dstGUID, dstName, dstFlags, dstRaidFlags, spellID, spellName, spellSchool, eID, eName)
          if InSanctuary then return end
          if db.combatonly and not UnitAffectingCombat("player") then return end