Quantcast

Cleanup/Rearrange Code

Repooc [04-17-14 - 03:11]
Cleanup/Rearrange Code
Filename
ElvUI_SLE/modules/chat/chat.lua
ElvUI_SLE/modules/datatexts/add_panels.lua
ElvUI_SLE/modules/datatexts/options.lua
diff --git a/ElvUI_SLE/modules/chat/chat.lua b/ElvUI_SLE/modules/chat/chat.lua
index cc8fcab..c62f231 100755
--- a/ElvUI_SLE/modules/chat/chat.lua
+++ b/ElvUI_SLE/modules/chat/chat.lua
@@ -42,7 +42,7 @@ local test = "|TInterface\\AddOns\\ElvUI_SLE\\media\\textures\\Chat_Test:13:13|t
 local rpg = "|TInterface\\AddOns\\ElvUI_SLE\\media\\textures\\Chat_RPG:13:35|t"
 local tyrone = "|TInterface\\AddOns\\ElvUI\\media\\textures\\tyrone_biggums_chat_logo:16:18|t"
 local hulkhead = "|TInterface\\AddOns\\ElvUI\\media\\textures\\hulk_head:18:22|t"
-local helloitty = "|TInterface\\AddOns\\ElvUI\\media\\textures\\helloKittyChatLogo:18:20|t"
+local hellokitty = "|TInterface\\AddOns\\ElvUI\\media\\textures\\helloKittyChatLogo:18:20|t"
 local shortbus = "|TInterface\\AddOns\\ElvUI\\media\\textures\\short_bus:16:16|t"
 local kitalie = "|TInterface\\Icons\\%s:12:12:0:0:64:64:4:60:4:60|t"

@@ -52,13 +52,14 @@ local specialChatIcons = {
 		["Tirain"] = tyrone
 	},
 	["Spirestone"] = {
+		["Aeriane"] = true,
+		["Sinth"] = tyrone,
 		["Elvz"] = elvui,
-		["Sara"] = helloitty,
-		["Sarah"] = helloitty,
+		["Sarah"] = hellokitty,
+		["Sara"] = hellokitty,
+		["Sarâh"] = hellokitty,
 		["Itzjonny"] = hulkhead,
 		["Elv"] = elvui,
-		["Aeriane"] = true,
-		["Sinth"] = tyrone,
 		["Incision"] = shortbus,
 		--SLE stuff
 		["Sifupooc"] = repooc,
diff --git a/ElvUI_SLE/modules/datatexts/add_panels.lua b/ElvUI_SLE/modules/datatexts/add_panels.lua
index 9093d10..cf28837 100755
--- a/ElvUI_SLE/modules/datatexts/add_panels.lua
+++ b/ElvUI_SLE/modules/datatexts/add_panels.lua
@@ -4,23 +4,23 @@ local DT = E:GetModule('DataTexts');
 local LO = E:GetModule('Layout');
 local dp1 = CreateFrame('Frame', "DP_1", E.UIParent)
 local dp2 = CreateFrame('Frame', "DP_2", E.UIParent)
-local top = CreateFrame('Frame', "Top_Center", E.UIParent)
 local dp3 = CreateFrame('Frame', "DP_3", E.UIParent)
 local dp4 = CreateFrame('Frame', "DP_4", E.UIParent)
 local dp5 = CreateFrame('Frame', "DP_5", E.UIParent)
-local bottom = CreateFrame('Frame', "Bottom_Panel", E.UIParent)
 local dp6 = CreateFrame('Frame', "DP_6", E.UIParent)
+local top = CreateFrame('Frame', "Top_Center", E.UIParent)
+local bottom = CreateFrame('Frame', "Bottom_Panel", E.UIParent)

 local panels = {
 	--Panel = short, name, point, x, panel, slot
 	DP_1 = {"dp1", "DP_1", "TOPLEFT", 0, DP_1, 3},
 	DP_2 = {"dp2", "DP_2", "TOP", -(E.screenwidth/5), DP_2, 3},
-	Top_Center = {"top", "Top_Center", "TOP", 0, Top_Center, 1},
 	DP_3 = {"dp3", "DP_3", "TOP", (E.screenwidth/5), DP_3, 3},
 	DP_4 = {"dp4", "DP_4", "TOPRIGHT", 0, DP_4, 3},
 	DP_5 = {"dp5", "DP_5", "BOTTOM", -(E.screenwidth/6 - 15), DP_5, 3},
-	Bottom_Panel = {"bottom", "Bottom_Panel", "BOTTOM", 0, Bottom_Panel, 1},
 	DP_6 = {"dp6", "DP_6", "BOTTOM", (E.screenwidth/6 - 15), DP_6, 3},
+	Top_Center = {"top", "Top_Center", "TOP", 0, Top_Center, 1},
+	Bottom_Panel = {"bottom", "Bottom_Panel", "BOTTOM", 0, Bottom_Panel, 1},
 }

 --Added function to create new panels
@@ -95,9 +95,9 @@ end

 --Renew panels after loading screens
 function DTP:PLAYER_ENTERING_WORLD(...)
-DTP:ExtraDataBarSetup()
-DTP:RegisterHide()
-self:UnregisterEvent("PLAYER_ENTERING_WORLD");
+	DTP:ExtraDataBarSetup()
+	DTP:RegisterHide()
+	self:UnregisterEvent("PLAYER_ENTERING_WORLD");
 end
 DTP:RegisterEvent('PLAYER_ENTERING_WORLD')

diff --git a/ElvUI_SLE/modules/datatexts/options.lua b/ElvUI_SLE/modules/datatexts/options.lua
index 7166c15..e289aa3 100755
--- a/ElvUI_SLE/modules/datatexts/options.lua
+++ b/ElvUI_SLE/modules/datatexts/options.lua
@@ -8,12 +8,12 @@ local drop = {
 	--Group name = {short name, order, slot}
 	["DP_1"] = {"dp1", 1, 3},
 	["DP_2"] = {"dp2", 2, 3},
-	["Top_Center"] = {"top", 3, 1},
-	["DP_3"] = {"dp3", 4, 3},
-	["DP_4"] = {"dp4", 5, 3},
-	["DP_5"] = {"dp5", 6, 3},
-	["Bottom_Panel"] = {"bottom", 7, 1},
-	["DP_6"] = {"dp6", 8, 3},
+	["DP_3"] = {"dp3", 3, 3},
+	["DP_4"] = {"dp4", 4, 3},
+	["DP_5"] = {"dp5", 5, 3},
+	["DP_6"] = {"dp6", 6, 3},
+	["Top_Center"] = {"top", 7, 1},
+	["Bottom_Panel"] = {"bottom", 8, 1},
 }
 local chatT = {
 	--Group name = {short name, order, elv's varible, chat panel(used to call functions)}