Mercurial > wow > cyborg-mmo7

comparison CyborgMMO7.lua @ 20:937be4664323

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Removed the CyborgMMO_ prefix to some local variables, and simplified a few associated ifs.
author madcatzinc@35b17cf1-18cd-47ff-9ca3-31d6b526ef09
date Thu, 25 Apr 2013 01:30:21 +0000
parents 33ffeb90b311
children c8b19bc87787
comparison
equal deleted inserted replaced
19:33ffeb90b311 20:937be4664323
21 function CyborgMMO_LoadStrings(self) 21 function CyborgMMO_LoadStrings(self)
22 -- CyborgMMO_DPrint("LoadStrings("..self:GetName()..") = "..CyborgMMO_StringTable[self:GetName()]) 22 -- CyborgMMO_DPrint("LoadStrings("..self:GetName()..") = "..CyborgMMO_StringTable[self:GetName()])
23 self:SetText(CyborgMMO_StringTable[self:GetName()]) 23 self:SetText(CyborgMMO_StringTable[self:GetName()])
24 end 24 end
25 25
26 local CyborgMMO_VarsLoaded = false 26 local VarsLoaded = false
27 local CyborgMMO_EnteredWorld = false 27 local EnteredWorld = false
28 local CyborgMMO_LoadBinding = false 28 local BindingsLoaded = false
29 local CyborgMMO_SaveName = GetRealmName().."_"..UnitName("player") 29 local SaveName = GetRealmName().."_"..UnitName("player")
30 local CyborgMMO_Settings = nil 30 local CyborgMMO_Settings = nil
31 31
32 32
33 function CyborgMMO_MiniMapButtonReposition(pos) 33 function CyborgMMO_MiniMapButtonReposition(pos)
34 CyborgMMO_MiniMapFrame:SetPoint("TOPLEFT", 34 CyborgMMO_MiniMapFrame:SetPoint("TOPLEFT",
85 end 85 end
86 CyborgMMO_WowCommands = CyborgMMO_ProfileKeyBindings 86 CyborgMMO_WowCommands = CyborgMMO_ProfileKeyBindings
87 end 87 end
88 88
89 function CyborgMMO_GetSaveData() 89 function CyborgMMO_GetSaveData()
90 if CyborgMMO_VarsLoaded then 90 if VarsLoaded then
91 if not CyborgMMO7SaveData then 91 if not CyborgMMO7SaveData then
92 CyborgMMO7SaveData = {} 92 CyborgMMO7SaveData = {}
93 CyborgMMO7SaveData[CyborgMMO_SaveName] = {} 93 CyborgMMO7SaveData[SaveName] = {}
94 end 94 end
95 CyborgMMO_LoadWowCommands() 95 CyborgMMO_LoadWowCommands()
96 return CyborgMMO7SaveData[CyborgMMO_SaveName] 96 return CyborgMMO7SaveData[SaveName]
97 end 97 end
98 return nil 98 return nil
99 end 99 end
100 100
101 function CyborgMMO_SetSaveData(data, index) 101 function CyborgMMO_SetSaveData(data, index)
102 if CyborgMMO_VarsLoaded then 102 if VarsLoaded then
103 CyborgMMO_GetSaveData()[index] = data 103 CyborgMMO_GetSaveData()[index] = data
104 CyborgMMO_ProfileKeyBindings = CyborgMMO_WowCommands 104 CyborgMMO_ProfileKeyBindings = CyborgMMO_WowCommands
105 end 105 end
106 end 106 end
107 107
108 function CyborgMMO_Event(self, event, ...) 108 function CyborgMMO_Event(self, event, ...)
109 if event == "VARIABLES_LOADED" then 109 if event == "VARIABLES_LOADED" then
110 CyborgMMO_VarsLoaded = true 110 VarsLoaded = true
111 elseif event == "PLAYER_ENTERING_WORLD" then 111 elseif event == "PLAYER_ENTERING_WORLD" then
112 CyborgMMO_EnteredWorld = true 112 EnteredWorld = true
113 elseif event == "PLAYER_REGEN_DISABLED" then 113 elseif event == "PLAYER_REGEN_DISABLED" then
114 CyborgMMO_Close() 114 CyborgMMO_Close()
115 else 115 else
116 CyborgMMO_DPrint("Event is "..tostring(event)) 116 CyborgMMO_DPrint("Event is "..tostring(event))
117 end 117 end
118 118
119 -- Fire Loading if and only if the player is in the world and vars are loaded 119 -- Fire Loading if and only if the player is in the world and vars are loaded
120 if not CyborgMMO_LoadBinding then 120 if not BindingsLoaded and VarsLoaded and EnteredWorld then
121 if CyborgMMO_VarsLoaded then 121 local data = CyborgMMO_GetSaveData()
122 if CyborgMMO_EnteredWorld then 122
123 local data = CyborgMMO_GetSaveData() 123 CyborgMMO_RatPageModel:LoadData()
124 124 BindingsLoaded = true
125 CyborgMMO_RatPageModel:LoadData() 125
126 CyborgMMO_LoadBinding = true 126 ShowMacroFrame()
127 127 HideUIPanel(MacroFrame)
128 ShowMacroFrame() 128
129 HideUIPanel(MacroFrame) 129
130 130 CyborgMMO_SetupModeCallbacks(1)
131 131 CyborgMMO_SetupModeCallbacks(2)
132 CyborgMMO_SetupModeCallbacks(1) 132 CyborgMMO_SetupModeCallbacks(3)
133 CyborgMMO_SetupModeCallbacks(2) 133
134 CyborgMMO_SetupModeCallbacks(3) 134
135 135 --Reload Slider values:
136 136 if not data["Settings"] then
137 --Reload Slider values: 137 data["Settings"] = {}
138 if not data["Settings"] then 138 data["Settings"]["Cyborg"] = 0.75
139 data["Settings"] = {} 139 data["Settings"]["Plugin"] = 0.75
140 data["Settings"]["Cyborg"] = 0.75 140 data["Settings"]["MiniMapButton"] = true
141 data["Settings"]["Plugin"] = 0.75 141 data["Settings"]["CyborgButton"] = true
142 data["Settings"]["MiniMapButton"] = true 142 end
143 data["Settings"]["CyborgButton"] = true 143
144 end 144 CyborgMMO_Settings = data["Settings"]
145 145
146 CyborgMMO_Settings = data["Settings"] 146 CyborgMMO_OptionPageCyborgSizeSlider:SetValue(CyborgMMO_Settings["Cyborg"])
147 147 CyborgMMO_SetOpenButtonSize(CyborgMMO_Settings["Cyborg"])
148 CyborgMMO_OptionPageCyborgSizeSlider:SetValue(CyborgMMO_Settings["Cyborg"]) 148 CyborgMMO_OptionPagePluginSizeSlider:SetValue(CyborgMMO_Settings["Plugin"])
149 CyborgMMO_SetOpenButtonSize(CyborgMMO_Settings["Cyborg"]) 149 CyborgMMO_SetMainPageSize(CyborgMMO_Settings["Plugin"])
150 CyborgMMO_OptionPagePluginSizeSlider:SetValue(CyborgMMO_Settings["Plugin"]) 150
151 CyborgMMO_SetMainPageSize(CyborgMMO_Settings["Plugin"]) 151 CyborgMMO_SetMiniMapButton(CyborgMMO_Settings["MiniMapButton"])
152 152 CyborgMMO_SetCyborgHeadButton(CyborgMMO_Settings["CyborgButton"])
153 CyborgMMO_SetMiniMapButton(CyborgMMO_Settings["MiniMapButton"]) 153
154 CyborgMMO_SetCyborgHeadButton(CyborgMMO_Settings["CyborgButton"]) 154 local xmin,ymin = Minimap:GetLeft(),Minimap:GetBottom()
155 155 CyborgMMO_MiniMapButtonReposition(math.deg(math.atan2(ymin, xmin)))
156 local xmin,ymin = Minimap:GetLeft(),Minimap:GetBottom() 156 -- Close the main window for now
157 CyborgMMO_MiniMapButtonReposition(math.deg(math.atan2(ymin, xmin))) 157 CyborgMMO_Close()
158 -- Close the main window for now
159 CyborgMMO_Close()
160 end
161 end
162 end 158 end
163 end 159 end
164 160
165 function CyborgMMO_SetDefaultSettings() 161 function CyborgMMO_SetDefaultSettings()
166 CyborgMMO_OpenButtonPageOpenMainForm:ClearAllPoints() 162 CyborgMMO_OpenButtonPageOpenMainForm:ClearAllPoints()
243 debugframe:AddMessage(table.concat(t, ' ')) 239 debugframe:AddMessage(table.concat(t, ' '))
244 end 240 end
245 end 241 end
246 242
247 function CyborgMMO_SetMainPageSize(percent) 243 function CyborgMMO_SetMainPageSize(percent)
248 if CyborgMMO_VarsLoaded then 244 if VarsLoaded and EnteredWorld then
249 if CyborgMMO_EnteredWorld then 245 CyborgMMO_MainPage:SetScale(percent)
250 CyborgMMO_MainPage:SetScale(percent) 246 CyborgMMO_Settings["Plugin"] = percent
251 CyborgMMO_Settings["Plugin"] = percent 247 local data = CyborgMMO_GetSaveData()
252 local data = CyborgMMO_GetSaveData() 248 data["Settings"] = CyborgMMO_Settings
253 data["Settings"] = CyborgMMO_Settings 249 CyborgMMO_OptionPagePluginSizeSlider:SetValue(percent)
254 CyborgMMO_OptionPagePluginSizeSlider:SetValue(percent)
255 end
256 end 250 end
257 end 251 end
258 252
259 function CyborgMMO_SetOpenButtonSize(percent) 253 function CyborgMMO_SetOpenButtonSize(percent)
260 if CyborgMMO_VarsLoaded then 254 if VarsLoaded and EnteredWorld then
261 if CyborgMMO_EnteredWorld then 255 CyborgMMO_OpenButtonPage:SetScale(percent)
262 CyborgMMO_OpenButtonPage:SetScale(percent) 256 CyborgMMO_Settings["Cyborg"] = percent
263 CyborgMMO_Settings["Cyborg"] = percent 257 local data = CyborgMMO_GetSaveData()
264 local data = CyborgMMO_GetSaveData() 258 data["Settings"] = CyborgMMO_Settings
265 data["Settings"] = CyborgMMO_Settings 259 CyborgMMO_OptionPageCyborgSizeSlider:SetValue(percent)
266 CyborgMMO_OptionPageCyborgSizeSlider:SetValue(percent)
267 end
268 end 260 end
269 end 261 end
270 262
271 function CyborgMMO_SetCyborgHeadButton(boolVal) 263 function CyborgMMO_SetCyborgHeadButton(boolVal)
272 CyborgMMO_Settings["CyborgButton"] = boolVal 264 CyborgMMO_Settings["CyborgButton"] = boolVal