Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
MOUZU committed Feb 2, 2016
1 parent 334cb51 commit 4667acd
Show file tree
Hide file tree
Showing 7 changed files with 61 additions and 19 deletions.
9 changes: 7 additions & 2 deletions Core.lua
Original file line number Diff line number Diff line change
Expand Up @@ -861,8 +861,13 @@ function BigWigs:BigWigs_RecvSync(sync, module, nick)
elseif sync == "Bosskill" and module then
for name, mod in BigWigs:IterateModules() do
if mod:IsBossModule() and BigWigs:IsModuleActive(mod) and mod.bossSync and mod.bossSync == module then
self:ToggleModuleActive(mod, false)
self:TriggerEvent("BigWigs_Message", mod:ToString() .. " has been defeated!", "Positive")
if module == "High Priest Thekal" and BigWigsThekal.phase < 2 then
-- thekal is an exception
self:ScheduleEvent("ThekalPhase2", BigWigsThekal.PhaseSwitch, 1)
else
self:ToggleModuleActive(mod, false)
self:TriggerEvent("BigWigs_Message", mod:ToString() .. " has been defeated!", "Positive")
end
end
end
self:TriggerEvent("BigWigs_RemoveRaidIcon")
Expand Down
1 change: 0 additions & 1 deletion Raids/BWL/Broodlord.lua
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,6 @@ function BigWigsBroodlord:Event(msg)
if GetTime() - self.lastbw > 5 then
self:TriggerEvent("BigWigs_StartBar", self, L["bw_bar"], 8, "Interface\\Icons\\Spell_Holy_Excorcism_02", true, "Red")
self:ScheduleEvent("BigWigs_Message", 24, L["bw_warn"], "Urgent", true, "Alert")
self:ScheduleEvent("BigWigs_StartBar", 8, self, "Possible Blast Wave", 18, "Interface\\Icons\\Spell_Holy_Excorcism_02")
end
self.lastbw = GetTime()
end
Expand Down
7 changes: 3 additions & 4 deletions Raids/BWL/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,22 @@

## Razorgore the Untamed
- <b>(100%)</b> First Wave, adjusted Bar and its Warning from 29s to 46s
- <b>(100%)</b> Control Orb
- <b>(99%)</b> Control Orb, it seems that it will not always trigger the control correctly
- <b>(DG)</b> Mindcontrol, is the timer correct?
- <b>(DG)</b> Polymorph, is the timer correct?
- <b>(DG)</b> Egg Counter, is it counting correctly?
- <b>(DG)</b> Conflagration, seems to be RNG
- <b>(DG)</b> Fireball Volley, seems to be RNG
- <b>(QA)</b> WarnIcon, Fireball Volley cast is announced via Fireball icon
- <b>(DG)</b> War Stomp, timer
- <b>(TODO)</b> Egg Counter, rework counting method and perhaps reworking&implementing CounterBars
- <b>(DG)</b> Egg Counter. The only way I see this getting 100% accurate would be if we could somehow capture on the client controlling razorgore when the cast is being used and I currently have no clue how to get that. At the moment the chance is pretty high that we miss the first 1-3 eggs being destroyed since the position where razorgore spawns and the position the raid is is too far away so that it would be visible in the combat log. maybe hook CastPetAction(id)

## Vaelastrasz the Corrupt
- <b>(100%)</b> Combat Trigger, adjusted timers from 36/26/10 to 38/28/12 AND adjusted enUS locales to trigger combat
- <b>(100%)</b> Burning Adrenaline, seems to be correct
- <b>(QA)</b> WarnIcon, Burning Adrenaline icon appears when it's on you

## Broodlord Lashlayer
- <b>(99%)</b> Blast Wave, increased the timer for the first one from 12 to 19.5s. Added timer for 'Possible Blast Wave' which runs for 18s after the 8s Blast Wave(Debuff) timer runs out, this is just estimated and can never be accurate but shall give an estimation. The delay between Blast waves ranges between 20 and 40s from my research.
- <b>(100%)</b> Blast Wave DURATION, increased the timer for the first one from 12 to 19.5s. The delay between Blast waves ranges between 20 and 40s from my research, the timer is for the Debuff duration.
- <b>(100%)</b> WarnIcon, Mortal Strike icon appears if your target has Mortal Strike active OR if it's up on you

## Firemaw
Expand Down
2 changes: 2 additions & 0 deletions Raids/BWL/Razorgore.lua
Original file line number Diff line number Diff line change
Expand Up @@ -423,3 +423,5 @@ function BigWigsRazorgore:DestroyEggCheck()
self:TriggerEvent("BigWigs_SendSync", "RazorgoreEgg "..tostring(self.eggs + 1))
end
end


18 changes: 16 additions & 2 deletions Raids/ZG/Jindo.lua
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ local L = AceLibrary("AceLocale-2.2"):new("BigWigs"..boss)
----------------------------

L:RegisterTranslations("enUS", function() return {
engage_trigger = "Welcome to da great show friends",
triggerbrainwash = "afflicted by Brain Wash.$", -- Jin'do the Hexxer casts Summon Brain Wash Totem. stupid workaround
triggerhealing = "Jin'do the Hexxer casts Powerful Healing Ward.", -- NOTHING to detect this totem spawn in combatlog. Not even mana usage from the boss.
curseself_trigger = "You are afflicted by Delusions of Jin'do.",
Expand Down Expand Up @@ -54,6 +55,7 @@ L:RegisterTranslations("enUS", function() return {
} end )

L:RegisterTranslations("deDE", function() return {
engage_trigger = "Welcome to da great show friends",
triggerbrainwash = "von Gehirnw\195\164sche betroffen", -- Jin'do the Hexxer casts Summon Brain Wash Totem. stupid workaround
triggerhealing = "Jin'do the Hexxer wirkt M\195\164chtiger Heilungszauberschutz.", -- NOTHING to detect this totem spawn in combatlog. Not even mana usage from the boss.
curseself_trigger = "Ihr seid von Irrbilder von Jin'do betroffen.",
Expand Down Expand Up @@ -113,6 +115,9 @@ BigWigsJindo.revision = tonumber(string.sub("$Revision: 11206 $", 12, -3))
------------------------------

function BigWigsJindo:OnEnable()
self.started = nil

self:RegisterEvent("CHAT_MSG_MONSTER_YELL")
self:RegisterEvent("CHAT_MSG_SPELL_CREATURE_VS_CREATURE_BUFF")
self:RegisterEvent("CHAT_MSG_SPELL_AURA_GONE_SELF")
self:RegisterEvent("CHAT_MSG_SPELL_AURA_GONE_PARTY", "FadeFrom")
Expand All @@ -133,6 +138,12 @@ end
-- Events --
------------------------------

function BigWigsJindo:CHAT_MSG_MONSTER_YELL(msg)
if string.find(msg, L["engage_trigger"]) then
self:SendEngageSync()
end
end

function BigWigsJindo:CHAT_MSG_SPELL_CREATURE_VS_CREATURE_BUFF(msg)
--[[if self.db.profile.brainwash and string.find(msg, L["triggerbrainwash"]) then -------------- seriously WTB fix for combat log events
self:TriggerEvent("BigWigs_Message", L["warnbrainwash"], "Urgent")
Expand All @@ -143,8 +154,10 @@ function BigWigsJindo:CHAT_MSG_SPELL_CREATURE_VS_CREATURE_BUFF(msg)
end

function BigWigsJindo:BigWigs_RecvSync(sync, rest, nick)
if sync == "BossEngaged" and rest == "Jin'do" then

if not self.started and sync == "BossEngaged" and rest == self.bossSync then
self.started = true
self:TriggerEvent("BigWigs_StartBar", self, "Next Hex", 8, "Interface\\Icons\\Spell_Nature_Polymorph")
self:TriggerEvent("BigWigs_StartBar", self, "Next Healing Ward", 12, "Interface\\Icons\\Spell_Holy_LayOnHands")
elseif sync == "JindoCurse" then
if self.db.profile.curse then
if rest == UnitName("player") then
Expand All @@ -158,6 +171,7 @@ function BigWigsJindo:BigWigs_RecvSync(sync, rest, nick)
self:TriggerEvent("BigWigs_SetRaidIcon", rest)
end
elseif sync == "JindoHexStart" and self.db.profile.hex then
self:TriggerEvent("BigWigs_StopBar", self, "Next Hex")
self:TriggerEvent("BigWigs_Message", string.format(L["hexwarn_warning"], rest), "Important")
self:TriggerEvent("BigWigs_StartBar", self, string.format(L["hex_bar"], rest), 5, "Interface\\Icons\\Spell_Nature_Polymorph", true, "White")
elseif sync == "JindoHexStop" and self.db.profile.hex then
Expand Down
9 changes: 9 additions & 0 deletions Raids/ZG/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,22 @@
- <b>(100%)</b> added missing locale for 'Incoming Gaze'

## High Priest Thekal
- <b>(QA)</b> added locale to trigger phase 2
- <b>(QA)</b> Knockback Phase 2, first one after 5s and the next one after 21s
- <b>(QA)</b> Bloodlust, Phase 1: first one after 15s. Phase 2: first one after 29s
- <b>(QA)</b> added a mechanism to the core to reactivate thekal mod after phase 1 ended, added a timer for the next phase

## High Priestess Arlokk
- <b>(QA)</b> added locale to trigger combat
- <b>(QA)</b> added 'Next Vanish' bar with 35s (should be accurate)
- <b>(99%)</b> fixed trigger for Vanish, so 'Vanish' bar should display but it can't be 100% accurate. Changed its title to 'Estimated Return'

## Jin'do the Hexxer
- <b>(100%)</b> Hex duration, from my research there is no way to predict the next hex accurately. added timer for first hex after 8s
- <b>(DG)</b> Brain Wash Totem, the trigger doesn't work when it's destroyed. should come every ~21s
- <b>(DG)</b> Healing Totem, the trigger on spawn doesn't work, idk about the one when it's destroyed. should come every 20s. added timer for the first one
- <b>(DG)</b> Teleport, I don't have any data on this one
- <b>(QA)</b> added locale to trigger combat

## Gahz'ranka

Expand Down
34 changes: 24 additions & 10 deletions Raids/ZG/Thekal.lua
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ local L = AceLibrary("AceLocale-2.2"):new("BigWigs"..boss)
L:RegisterTranslations("enUS", function() return {
cmd = "Thekal",

phase2_trigger = "fill me with your RAGE!",
roguename = "Zealot Zath",
shamanname = "Zealot Lor\'Khan",
phaseone_message = "Troll Phase",
Expand Down Expand Up @@ -97,6 +98,7 @@ L:RegisterTranslations("enUS", function() return {
L:RegisterTranslations("deDE", function() return {
cmd = "Thekal",

phase2_trigger = "fill me with your RAGE!",
roguename = "Zealot Zath",
shamanname = "Zealot Lor\'Khan",
phaseone_message = "Troll Phase",
Expand Down Expand Up @@ -196,10 +198,12 @@ BigWigsThekal.revision = tonumber(string.sub("$Revision: 11206 $", 12, -3))
------------------------------

function BigWigsThekal:OnEnable()
self.started = nil
self.started = nil
self.phase = 0
zathdead = nil
lorkhandead = nil
thekaldead = nil
self:RegisterEvent("CHAT_MSG_MONSTER_YELL")
self:RegisterEvent("CHAT_MSG_MONSTER_EMOTE")
self:RegisterEvent("CHAT_MSG_SPELL_PERIODIC_CREATURE_BUFFS")
self:RegisterEvent("CHAT_MSG_SPELL_AURA_GONE_SELF", "Fades")
Expand Down Expand Up @@ -232,6 +236,12 @@ end
-- Events --
------------------------------

function BigWigsThekal:CHAT_MSG_MONSTER_YELL(msg)
if string.find(msg, L["phase2_trigger"]) then
self:TriggerEvent("BigWigs_SendSync", "ThekalPhaseTwo")
end
end

function BigWigsThekal:Event(msg)
local _,_,silenceother_triggerword = string.find(msg, L["silenceother_trigger"])
local _,_,disarmother_triggerword = string.find(msg, L["disarmother_trigger"])
Expand Down Expand Up @@ -326,24 +336,22 @@ function BigWigsThekal:Fades(msg)
end

function BigWigsThekal:BigWigs_RecvSync(sync, rest, nick)
if not self.started and sync == "BossEngaged" and rest == self.bossSync then
if not self.started and ((sync == "BossEngaged" and rest == self.bossSync) or (sync == "ThekalPhaseOne")) then
self.started = true
self:TriggerEvent("BigWigs_SendSync", "ThekalPhaseOne")
elseif sync == "ThekalPhaseOne" then
started = true
if self.db.profile.phase then
self:TriggerEvent("BigWigs_Message", L["phaseone_message"], "Attention")
end
elseif sync == "ThekalPhaseTwo" then
self.phase = 1
elseif sync == "ThekalPhaseTwo" and self.phase < 2 then
self.phase = 2
if self.db.profile.heal then
self:TriggerEvent("BigWigs_StopBar", L["heal_bar"])
end
if self.db.profile.bloodlust then
self:TriggerEvent("BigWigs_StopBar", string.format(L["bloodlust_bar"], rest))
self:TriggerEvent("BigWigs_StartBar", self, "Next Bloodlust", 29, "Interface\\Icons\\Spell_Nature_BloodLust")
end
if self.db.profile.phase then
self:TriggerEvent("BigWigs_Message", L["phasetwo_message"], "Attention")
end
self:TriggerEvent("BigWigs_StartBar", self, "New Adds", 24, "Interface\\Icons\\Ability_Hunter_Pet_Cat")
self:TriggerEvent("BigWigs_StartBar", self, "Knockback", 5, "Interface\\Icons\\Ability_WarStomp")
elseif sync == "ThekalLorkhanHeal" and self.db.profile.heal then
self:TriggerEvent("BigWigs_Message", L["heal_message"], "Attention", "Alarm")
self:TriggerEvent("BigWigs_StartBar", self, L["heal_bar"], 4, "Interface\\Icons\\Spell_Holy_Heal", true, "Black")
Expand All @@ -370,3 +378,9 @@ function BigWigsThekal:BigWigs_RecvSync(sync, rest, nick)
self:TriggerEvent("BigWigs_Message", L["enrage_message"], "Urgent")
end
end

function BigWigsThekal:PhaseSwitch()
BigWigs:ToggleModuleActive(BigWigsThekal, true)
BigWigsThekal:TriggerEvent("BigWigs_StartBar", BigWigsThekal, "Next Phase", 9, "Interface\\Icons\\Spell_Holy_PrayerOfHealing")
BigWigsThekal.phase = 1.5;
end

0 comments on commit 4667acd

Please sign in to comment.