Permalink
Browse files

Adding Insert Direction option to all the frames

  • Loading branch information...
1 parent 0a303d6 commit 85a9a916ff484ab2b3e4104bc741ade73f5ff547 @Cimplex Cimplex committed May 22, 2012
Showing with 89 additions and 35 deletions.
  1. +42 −18 config.lua
  2. +21 −14 profile.lua
  3. +25 −2 xCT.lua
  4. +1 −1 xCT.toc
View
@@ -19,6 +19,9 @@ Table of Contents:
> Blizzard Damage Options
> xCT+ Frames
+ + Healing/Damage Incoming Frame ("xCTheal" and "xCTdmg")
+ * Enable/Disable Frames
+
+ Healing/Damage Outing Frame ("xCTdone")
* Filter Units/Periodic Spells
* Damage/Healing Icon Sizes and Appearence
@@ -82,6 +85,14 @@ ns.config = {
["maxlines"] = 64, -- Max lines to keep in scrollable mode. More lines = more Memory Nom nom nom
+ -- ==================================================================================
+ -- Healing/Damage Incoming Frames (frames are called "xCTheal" and "xCTdmg")
+ -- ==================================================================================
+ ["showincomingheals"] = true, -- Allows You to Show/Hide Incoming Healing
+ ["showincomingdmg"] = true, -- Allows You to Show/Hide Incoming Damage
+ -- __________________________________________________________________________________
+
+
-- ==================================================================================
-- Healing/Damage Outing Frame (frame is called "xCTdone")
-- ==================================================================================
@@ -197,13 +208,13 @@ ns.config = {
-- xCT+ Frames' Justification
-- --------------------------------------------------------------------------------------
--[[Justification Options: "RIGHT", "LEFT", "CENTER" ]]
- ["justify_1"] = "LEFT", -- Damage Incoming Frame (frame is called "xCTdmg")
+ ["justify_1"] = "RIGHT", -- Damage Incoming Frame (frame is called "xCTdmg")
["justify_2"] = "RIGHT", -- Healing Incoming Frame (frame is called "xCTheal")
["justify_3"] = "CENTER", -- General Buffs Gains/Drops Frame (frame is called "xCTgen")
["justify_4"] = "RIGHT", -- Healing/Damage Outgoing Frame (frame is called "xCTdone")
["justify_5"] = "CENTER", -- Loot/Money Gains Frame (frame is called "xCTloot")
["justify_6"] = "RIGHT", -- Criticals Outgoing Frame (frame is called "xCTcrit")
- ["justify_7"] = "LEFT", -- Power Gains Frame (frame is called "xCTpwr")
+ ["justify_7"] = "CENTER", -- Power Gains Frame (frame is called "xCTpwr")
["justify_8"] = "CENTER", -- Procs Frame (frame is called "xCTproc")
["justify_9"] = "CENTER", -- Class Combo Points Frame (frame is called "xCTclass")
@@ -219,21 +230,22 @@ ns.config = {
-- Misc.
-- Spell Spam Spam Spam Spam Spam Spam Spam Spam
- ["mergeaoespam"] = true, -- Merges multiple AoE spam into single message, can be useful for dots too.
- ["mergeitems"] = true, -- Merges spammy items (mainly items from Dragon Soul)
- ["mergeaoespamtime"] = 3, -- Time in seconds AoE spell will be merged into single message. Minimum is 1.
+ ["mergeaoespam"] = true, -- Merges multiple AoE spam into single message, can be useful for dots too.
+ ["mergeitems"] = true, -- Merges spammy items (mainly items from Dragon Soul)
+ ["mergeaoespamtime"] = 3, -- Time in seconds AoE spell will be merged into single message. Minimum is 1.
-- Helpful Alerts (Shown in the Gerenal Gains/Drops Frame)
- ["killingblow"] = true, -- Alerts with the name of the PC/NPC that you had a killing blow on (Req. ["damageout"] = true)
- ["dispel"] = true, -- Alerts with the name of the (De)Buff Dispelled (Req. ["damageout"] = true)
- ["interrupt"] = true, -- Alerts with the name of the Spell Interupted (Req. ["damageout"] = true)
+ ["killingblow"] = true, -- Alerts with the name of the PC/NPC that you had a killing blow on (Req. ["damageout"] = true)
+ ["dispel"] = true, -- Alerts with the name of the (De)Buff Dispelled (Req. ["damageout"] = true)
+ ["interrupt"] = true, -- Alerts with the name of the Spell Interupted (Req. ["damageout"] = true)
+ ["colorkillingblows"] = true, -- Colors the alerts of a killing blow with the class color of the unit killed (Req. ["damageout"] = true)
-- Filter Auras Gains or Fades
["showharmfulaura"] = true, -- Show Harmful Auras (Gains and Fades)
["showhelpfulaura"] = true, -- Show Helpful Auras (Gains and Fades)
- ["showgains"] = true, -- Show Gains in the Aura frame
- ["showfades"] = true, -- Show Fades in the Aura frame
- ["filteraura"] = true, -- Allows You to Filter out Unwanted Aura Gains/Fades
+ ["showgains"] = true, -- Show Gains in the Aura frame (overrides above)
+ ["showfades"] = true, -- Show Fades in the Aura frame (overrides above)
+ ["filteraura"] = false, -- Allows You to Filter out Unwanted Aura Gains/Fades
["aura_blacklist"] = true, -- Aura List is a Blacklist (Opposed to a Whitelist)
-- Filter Aura Helpers
@@ -254,14 +266,8 @@ ns.config = {
--[[ ]]
--[[ In other words: USE AT YOUR OWN RISK ]]
- ["colorkillingblows"] = true, -- Colors the alerts of a killing blow with the class color of the unit killed (Req. ["damageout"] = true)
-
- ["showincomingheals"] = true, -- Allows You to Show/Hide Incoming Healing
- ["showincomingdmg"] = true, -- Allows You to Show/Hide Incoming Damage
-
["DisableProfileManager"] = false,
-
-
+
-- (DISABLED: Currently does not work)
["loottimevisible"] = 6,
["crittimevisible"] = 3,
@@ -271,6 +277,24 @@ ns.config = {
-- Change Default Damage/Healing Font Above Mobs/Player Heads. (This has no effect if ["blizzheadnumbers"] = false)
-- ["damagestyle"] = true, -- (You need to restart WoW to see changes!)
-- DO NOT USE - BUGGY
+
+
+
+ -- --------------------------------------------------------------------------------------
+ -- xCT+ Frames' Scrolling Direction - Note: "top" goes DOWN, "bottom" goes UP (default)
+ -- --------------------------------------------------------------------------------------
+ --[[Scrolling Direction Options: "top", "bottom" ]]
+ ["direction_1"] = "top", -- Damage Incoming Frame (frame is called "xCTdmg")
+ ["direction_2"] = "bottom", -- Healing Incoming Frame (frame is called "xCTheal")
+ ["direction_3"] = "bottom", -- General Buffs Gains/Drops Frame (frame is called "xCTgen")
+ ["direction_4"] = "bottom", -- Healing/Damage Outgoing Frame (frame is called "xCTdone")
+ ["direction_5"] = "top", -- Loot/Money Gains Frame (frame is called "xCTloot")
+ ["direction_6"] = "bottom", -- Criticals Outgoing Frame (frame is called "xCTcrit")
+ ["direction_7"] = "top", -- Power Gains Frame (frame is called "xCTpwr")
+ ["direction_8"] = "bottom", -- Procs Frame (frame is called "xCTproc")
+
+ -- This effectively does... nothing :)
+ ["direction_9"] = "bottom", -- Class Combo Points Frame (frame is called "xCTclass")
}
View
@@ -8,18 +8,25 @@ if (ct["DisableProfileManager"]) then return end
engine.default_profile = {
Name = "Default",
Frames = {
+ --[[
+ X - Horizontal Axis
+ Y - Vertical Axis
+ Width - Width of the frame
+ Height - Height of the frame
+ Justify - Frame Anchor to Parent (this is NOT text justify)
+ ]]
-- <Critical>
["crit"] = {
- X = 128,
+ X = 256,
Y = 0,
Width = 256,
Height = 128,
Justify = "CENTER",
}, -- </Critical>
-- <Damage>
["dmg"] = {
- X = -320,
- Y = 0,
+ X = -448,
+ Y = -80,
Width = 128,
Height = 128,
Justify = "CENTER",
@@ -35,38 +42,38 @@ engine.default_profile = {
-- <Healing>
["heal"] = {
X = -448,
- Y = 0,
+ Y = 80,
Width = 128,
Height = 128,
Justify = "CENTER",
}, -- </Healing>
-- <Loot>
["loot"] = {
X = 0,
- Y = -192,
+ Y = 0,
Width = 256,
Height = 128,
Justify = "CENTER",
}, -- </Loot>
-- <Outgoing>
["done"] = {
- X = 320,
+ X = 448,
Y = 0,
Width = 128,
- Height = 128,
+ Height = 320,
Justify = "CENTER",
}, -- </Outgoing>
-- <PowerGains>
["pwr"] = {
- X = 448,
- Y = 0,
- Width = 128,
+ X = 0,
+ Y = -192,
+ Width = 256,
Height = 128,
Justify = "CENTER",
}, -- </PowerGains>
-- <SpellProcs>
["proc"] = {
- X = -128,
+ X = -256,
Y = 0,
Width = 256,
Height = 128,
@@ -75,9 +82,9 @@ engine.default_profile = {
-- <ComboPoints>
["class"] = {
X = 0,
- Y = -512,
- Width = 256,
- Height = 128,
+ Y = 96,
+ Width = 64,
+ Height = 64,
Justify = "CENTER",
}, -- </ComboPoints>
},
View
27 xCT.lua
@@ -1201,17 +1201,21 @@ for i = 1, numf do
f:SetClampRectInsets(0, 0, ct.fontsize, 0)
if framenames[i] == "dmg" then
f:SetJustifyH(ct.justify_1)
+ f:SetInsertMode(ct.direction_1 or "bottom")
f:SetPoint("CENTER", -256, 0)
elseif framenames[i] == "heal" then
f:SetJustifyH(ct.justify_2)
+ f:SetInsertMode(ct.direction_2 or "bottom")
f:SetPoint("CENTER", -480, 0)
f:SetWidth(320)
elseif framenames[i] == "gen" then
f:SetJustifyH(ct.justify_3)
+ f:SetInsertMode(ct.direction_3 or "bottom")
f:SetWidth(512)
f:SetPoint("CENTER", 0, 320)
elseif framenames[i] == "done" then
f:SetJustifyH(ct.justify_4)
+ f:SetInsertMode(ct.direction_4 or "bottom")
f:SetHeight(384)
f:SetPoint("CENTER", 576, 0)
local a, _, c = f:GetFont()
@@ -1228,10 +1232,12 @@ for i = 1, numf do
end
elseif framenames[i] == "loot" then
f:SetJustifyH(ct.justify_5)
+ f:SetInsertMode(ct.direction_5 or "bottom")
f:SetWidth(512)
f:SetPoint("CENTER", 0, 192)
elseif framenames[i] == "crit" then
f:SetJustifyH(ct.justify_6)
+ f:SetInsertMode(ct.direction_6 or "bottom")
f:SetWidth(192)
f:SetPoint("CENTER", 416, 0)
if type(ct.critfontsize) == "number" then
@@ -1247,15 +1253,18 @@ for i = 1, numf do
end
elseif framenames[i] == "pwr" then
f:SetJustifyH(ct.justify_7)
+ f:SetInsertMode(ct.direction_7 or "bottom")
f:SetPoint("CENTER", 0, -64)
f:SetWidth(384)
elseif framenames[i] == "proc" then
f:SetJustifyH(ct.justify_8)
+ f:SetInsertMode(ct.direction_8 or "bottom")
f:SetWidth(512)
f:SetPoint("CENTER", 0, -192)
f:SetFont(ct.procfont, ct.procfontsize, ct.procfontstyle)
elseif framenames[i] == "class" then
f:SetJustifyH(ct.justify_9)
+ f:SetInsertMode(ct.direction_9 or "bottom")
f:SetMaxLines(1)
f:SetWidth(64)
f:SetHeight(64)
@@ -1265,11 +1274,13 @@ for i = 1, numf do
-- Add a starting location to your frame
--elseif framenames[i] == "custom" then
-- f:SetTimeVisible(ct.loottimevisible)
- -- f:SetJustifyH(ct.justify_3)
+ -- f:SetJustifyH(ct.justify_10)
+ -- f:SetInsertMode(ct.direction_10 or "bottom")
-- f:SetWidth(256)
-- f:SetPoint("CENTER", 320, 192)
end
+
ct.frames[i] = f
end
@@ -2232,4 +2243,16 @@ function ct:UpdateComboPoints()
ct.classcomboupdated = false
xCTclass:AddMessage(" ", 1, .82, 0)
end
-end
+end
+
+--[==[
+xCTgen:SetInsertMode("top") -- General Messages Frame
+xCTdmg:SetInsertMode("top") -- Incoming Damage Frame
+xCTheal:SetInsertMode("top") -- Incoming Healing Frame
+xCTdone:SetInsertMode("top") -- Outgoing Damage/Healing Frame
+xCTloot:SetInsertMode("top") -- Loot / Money Text
+xCTcrit:SetInsertMode("top") -- Outgoing Damage/Healing Criticals Frame
+xCTpwr:SetInsertMode("top") -- Incoming Power Gains (Mana, Rage, etc.)
+xCTproc:SetInsertMode("top") -- Class Procs Tiggered (Spells that light up) Frame
+xCTclass:SetInsertMode("top") -- Class and Rogue Combo Point Frame
+]==]
View
@@ -2,7 +2,7 @@
## Title: |cffFF0000x|rCT|cffDDFF55+|r
## Notes: X Combat Text Plus
## Author: Dandruff @ US-Whisperwind
-## Version: 2.4.3 Release
+## Version: 2.4.3a Release
## RequiredDeps: Blizzard_CombatText
## SavedVariables: xCTPlus_SavedVars

0 comments on commit 85a9a91

Please sign in to comment.