Skip to content

Commit

Permalink
99.2
Browse files Browse the repository at this point in the history
+ couple pointless npc casting spells to track
- skin bugs
- chat stamp formatting error
  • Loading branch information
obble committed Jul 31, 2017
1 parent d468683 commit 96cf79b
Show file tree
Hide file tree
Showing 9 changed files with 63 additions and 19 deletions.
3 changes: 2 additions & 1 deletion chat/chat.lua
Expand Up @@ -143,7 +143,8 @@
else
bu:Show()
bu:SetAlpha(1)
if fl:IsShown() then modSkinColor(bu, 0, .6, 1) else modSkinColor(bu, .2, .2, .2) end
if fl:IsShown() then modSkinColor(bu, 0, 1, 0) else modSkinColor(bu, .7, .7, .7) end
fl:SetAlpha(0)
end
end

Expand Down
10 changes: 5 additions & 5 deletions chat/event.lua
Expand Up @@ -177,11 +177,6 @@
if tonumber(GetCVar'modChatFormat') == 1 then
t = gsub(t, '%[(%d+)%. .+%].+(|Hplayer.+)', '%1 %2') -- WORLD CHANNELS '1'
t = gsub(t, 'Guild Message of the Day:', 'GMOTD —') -- MOTD
if ts == 1 then -- TIMESTAMP
local d = date'%I.%M'..string.lower(date'%p')
d = gsub(d, '0*(%d+)', '%1', 1)
t = string.format('|cff'..colour..'%s|r %s', d, t)
end
for i, v in pairs(chatevents) do -- CHAT EVENTS
for k, j in pairs(v) do
if string.find(t, k)then
Expand All @@ -190,6 +185,11 @@
end
end
end
if ts == 1 then -- TIMESTAMP
local d = date'%I.%M'..string.lower(date'%p')
d = gsub(d, '0*(%d+)', '%1', 1)
t = string.format('|cff'..colour..'%s|r %s', d, t)
end
end
for i = 1, tlength(URL_PATTERNS) do -- URL
if string.find(t, URL_PATTERNS[i]) then
Expand Down
2 changes: 2 additions & 0 deletions globals/table.lua
Expand Up @@ -58,6 +58,7 @@
['Ink Spray'] = {[[Interface\Icons\spell_nature_sleep]], 1},
['Healing Ward'] = {[[Interface\Icons\spell_holy_layonhands]], 2},
['Holy Smite'] = {[[Interface\Icons\Spell_holy_holysmite]], 2.5},
['Lightning Blast'] = {[[Interface\Icons\spell_nature_lightning]], 3.2},
['Lizard Bolt'] = {[[Interface\Icons\spell_nature_lightning]], 2},
['Plague Cloud'] = {[[Interface\Icons\spell_shadow_callofbone]], 2},
['Plague Mind'] = {[[Interface\Icons\spell_shadow_callofbone]], 4},
Expand All @@ -66,6 +67,7 @@
['Shrink'] = {[[Interface\Icons\spell_shadow_antishadow]], 3},
['Silithid Pox'] = {[[Interface\Icons\spell_nature_nullifydisease]], 2},
['Slowing Poison'] = {[[Interface\Icons\spell_nature_slowpoison]], 1},
['Torch Toss'] = {[[Interface\Icons\spell_fire_fireball02]], 3},
['Toxic Spit'] = {[[Interface\Icons\spell_nature_corrosivebreath]], 2.5},
['Trelane\'s Freezing Touch'] = {[[Interface\Icons\spell_shadow_unsummonbuilding]], 3},
['Wandering Plague'] = {[[Interface\Icons\spell_shadow_callofbone]], 2},
Expand Down
5 changes: 2 additions & 3 deletions map/pvp.lua
Expand Up @@ -10,9 +10,8 @@
bu:SetPoint('TOPLEFT', BattlefieldMinimap2, -2, 0)
bu:SetPoint('BOTTOMRIGHT', BattlefieldMinimap11, 0, 20)

modSkin(bu, 16)
modSkinPadding(bu, 2)
modSkinColor(bu, .2, .2, .2)
modSkin(bu)
modSkinColor(bu, .7, .7, .7)

for _, v in pairs ({
BattlefieldMinimap1, BattlefieldMinimap5, BattlefieldMinimap9,
Expand Down
11 changes: 7 additions & 4 deletions raid/unit.lua
Expand Up @@ -17,11 +17,14 @@
}

local decurse = {
['MAGE'] = 'Remove Curse',
['MAGE'] = 'Remove Lesser Curse',
['DRUID'] = 'Abolish Poison',
['DRUID'] = 'Remove Curse',
['DRUID'] = 'Remove Poison',
['PRIEST'] = 'Dispel',
['SHAMAN'] = 'Cleanse',
['PALADIN'] = 'Cleanse',
['PRIEST'] = 'Abolish Disease',
['PRIEST'] = 'Dispel Magic',
['SHAMAN'] = 'Cleanse Toxins',
['SHAMAN'] = 'Cleane Spirit',
}

local showdebuffs = false -- TOGGLE DEBUFF ICONS
Expand Down
4 changes: 2 additions & 2 deletions skin/button/party.lua
Expand Up @@ -7,7 +7,7 @@
for j = 1, 4 do
local bu = _G[n..'Debuff'..j]
if bu then
modSkin(bu, 6)
modSkin(bu)
modSkinColor(bu, .7, .7, .7)
end
end
Expand Down Expand Up @@ -35,7 +35,7 @@
local d = _G[f..'Border']
if d then
local r, g, b = d:GetVertexColor()
modSkinColor(_G[f], r*.7, g*.7, b*.7)
modSkinColor(_G[f], r*1.5, g*1.5, b*1.5)
d:SetAlpha(0)
end
end
Expand Down
6 changes: 6 additions & 0 deletions skin/button/target.lua
Expand Up @@ -12,4 +12,10 @@
modSkinColor(bu, 1, 0, 0)
end

for i = 1, 4 do
local bu = _G['TargetofTargetFrameDebuff'..i]
modSkin(bu, -1)
modSkinColor(bu, 1, 0, 0)
end

--
5 changes: 3 additions & 2 deletions tracker/click.lua
Expand Up @@ -21,7 +21,7 @@
function QuestWatch_Update()
orig.QuestWatch_Update()
q = {}
local wi = 1
local wi = 1
if tonumber(GetCVar'modQuestWatch') == 1 then
for i = 1, GetNumQuestWatches() do
local qi = GetQuestIndexForWatch(i)
Expand All @@ -30,8 +30,9 @@
local num = GetNumQuestLeaderBoards(qi)
if num > 0 then
local title = _G['QuestWatchLine'..wi]
wi = wi + 1
if q[t] then
print(t)
wi = wi + 1
-- title is already in our objective tracker and is being duplicated!!
title:Hide()
for j = 1, num do
Expand Down
36 changes: 34 additions & 2 deletions unitframe/aura.lua
Expand Up @@ -42,7 +42,7 @@
else
count:Hide()
end
modSkinColor(bu, colour.r*.7, colour.g*.7, colour.b*.7)
modSkinColor(bu, colour.r*1.5, colour.g*1.5, colour.b*1.5)
border:Hide()
bu:Show()
numDebuff = numDebuff + 1
Expand Down Expand Up @@ -139,7 +139,8 @@
end
end

orig.TargetDebuffButton_Update = TargetDebuffButton_Update
orig.TargetDebuffButton_Update = TargetDebuffButton_Update
orig.TargetofTarget_Update = TargetofTarget_Update

local AddAllTargetBuffs = function()
local cv = _G['modui_vars'].db['modAuraOrientation']
Expand Down Expand Up @@ -215,6 +216,37 @@
end
end

function TargetofTarget_Update()
orig.TargetofTarget_Update()
--if event == 'UNIT_AURA' then
for i = 1, 4 do
local n = 'TargetofTargetFrame'..i
for j = 1, 4 do
local f = n..'Debuff'..j
local d = _G[f..'Border']
if d then
local r, g, b = d:GetVertexColor()
modSkinColor(_G[f], r*1.5, g*1.5, b*1.5)
d:SetAlpha(0)
end
end
end
--end
end

for i = 2, 4 do
local bu = _G['TargetofTargetFrameDebuff'..i]
local bu1 = _G['TargetofTargetFrameDebuff1']
bu:ClearAllPoints()
if i == 2 then
bu:SetPoint('LEFT', bu1, 'RIGHT', 4, 0)
elseif i == 3 then
bu:SetPoint('TOPLEFT', bu1, 'BOTTOMLEFT', 0, -4)
else
bu:SetPoint('LEFT', _G['TargetofTargetFrameDebuff3'], 'RIGHT', 4, 0)
end
end

TargetFrame:SetScript('OnEnter', function()
UnitFrame_OnEnter()
function TargetDebuffButton_Update() AddAllTargetBuffs() end
Expand Down

0 comments on commit 96cf79b

Please sign in to comment.