Skip to content

Commit

Permalink
wip: round two
Browse files Browse the repository at this point in the history
  • Loading branch information
ffainy committed Jun 25, 2022
1 parent 1cda602 commit 1fdb836
Show file tree
Hide file tree
Showing 101 changed files with 607 additions and 605 deletions.
2 changes: 1 addition & 1 deletion Bindings.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Bindings>

<Binding name='FREEUI_TOGGLE_GUI' category='BINDING_HEADER_FREEUI' header='FREEUI'>
<Binding name='ANDROMEDA_TOGGLE_GUI' category='BINDING_HEADER_ANDROMEDA' header='ANDROMEDA'>
ANDROMEDA[1].ToggleGUI()
</Binding>

Expand Down
4 changes: 2 additions & 2 deletions andromeda.toc
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
## Version: @project-version@
## Title: |cff6ea3faA|r|cff749ffcn|r|cff7b9afdd|r|cff8395fer|r|cff8c90fdo|r|cff968afcm|r|cffa083fae|r|cffaa7cf7d|r|cffb575f3a|r|cffc06ceeU|r|cffca63e8I|r
## Notes: A user interface replacement for World of Warcraft.
## SavedVariables: FREE_ADB, FREE_PDB
## SavedVariablesPerCharacter: FREE_DB
## SavedVariables: ANDROMEDA_ADB, ANDROMEDA_PDB
## SavedVariablesPerCharacter: ANDROMEDA_CDB

## X-oUF: oUFembed
## X-Website: https://github.com/neotpravlennoye/andromeda
Expand Down
2 changes: 1 addition & 1 deletion bindings.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Bindings>

<Binding name='FREEUI_TOGGLE_GUI' category='BINDING_HEADER_FREEUI' header='FREEUI'>
<Binding name='ANDROMEDA_TOGGLE_GUI' category='BINDING_HEADER_ANDROMEDA' header='ANDROMEDA'>
ANDROMEDA[1].ToggleGUI()
</Binding>

Expand Down
2 changes: 1 addition & 1 deletion core/constants.lua
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ end

C.ClassColors = {}
function F.UpdateCustomClassColors()
local colors = _G.FREE_ADB.UseCustomClassColor and _G.FREE_ADB.CustomClassColors or _G.RAID_CLASS_COLORS
local colors = _G.ANDROMEDA_ADB.UseCustomClassColor and _G.ANDROMEDA_ADB.CustomClassColors or _G.RAID_CLASS_COLORS
for class, value in pairs(colors) do
C.ClassColors[class] = {}
C.ClassColors[class].r = value.r
Expand Down
16 changes: 8 additions & 8 deletions core/core.lua
Original file line number Diff line number Diff line change
Expand Up @@ -71,25 +71,25 @@ loader:SetScript('OnEvent', function(self, _, addon)
return
end

InitialSettings(C.AccountSettings, _G.FREE_ADB)
if not next(_G.FREE_PDB) then
InitialSettings(C.AccountSettings, _G.ANDROMEDA_ADB)
if not next(_G.ANDROMEDA_PDB) then
for i = 1, 5 do
_G.FREE_PDB[i] = {}
_G.ANDROMEDA_PDB[i] = {}
end
end

if not _G.FREE_ADB['ProfileIndex'][C.MY_FULL_NAME] then
_G.FREE_ADB['ProfileIndex'][C.MY_FULL_NAME] = 1
if not _G.ANDROMEDA_ADB['ProfileIndex'][C.MY_FULL_NAME] then
_G.ANDROMEDA_ADB['ProfileIndex'][C.MY_FULL_NAME] = 1
end

if _G.FREE_ADB['ProfileIndex'][C.MY_FULL_NAME] == 1 then
C.DB = _G.FREE_DB
if _G.ANDROMEDA_ADB['ProfileIndex'][C.MY_FULL_NAME] == 1 then
C.DB = _G.ANDROMEDA_CDB
if not C.DB['ShadowLands'] then
table.wipe(C.DB)
C.DB['ShadowLands'] = true
end
else
C.DB = _G.FREE_PDB[_G.FREE_ADB['ProfileIndex'][C.MY_FULL_NAME] - 1]
C.DB = _G.ANDROMEDA_PDB[_G.ANDROMEDA_ADB['ProfileIndex'][C.MY_FULL_NAME] - 1]
end
InitialSettings(C.CharacterSettings, C.DB, true)

Expand Down
1 change: 0 additions & 1 deletion core/core.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
<Script file="core.lua"/>
<Script file="dev.lua"/>
<Script file="math.lua"/>
<Script file="itemlevel.lua"/>
<Script file="media.lua"/>
<Script file="functions.lua"/>
<Script file="animation.lua"/>
Expand Down
Loading

0 comments on commit 1fdb836

Please sign in to comment.