Skip to content

Commit

Permalink
add factions
Browse files Browse the repository at this point in the history
  • Loading branch information
Hoizame committed Apr 10, 2021
1 parent 5f471b9 commit 8b09c3f
Show file tree
Hide file tree
Showing 9 changed files with 1,416 additions and 31 deletions.
2 changes: 2 additions & 0 deletions .luacheckrc
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,8 @@ globals = {
"ATLASLOOT_COLLECTIONS_COLOR",
"ATLASLOOT_CLASSPROFESSION_COLOR",
"AtlasLootScanTooltip",
"ATLASLOOT_HORDE_COLOR",
"ATLASLOOT_ALLIANCE_COLOR",

-- Atlas
"Atlas",
Expand Down
5 changes: 5 additions & 0 deletions AtlasLootClassic/Button/Extra_Price_type.lua
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,16 @@ local STRING_RED = "|cffff0000"
local STRING_GREEN = "|cff1eff00"

local PRICE_INFO = {
--- Classic
-- items
["burningblossom"] = { itemID = 23247 }, -- Burning Blossom
["ancestrycoin"] = { itemID = 21100 }, -- Coin of Ancestry
-- others
["money"] = { func = GetCoinTextureString },

--- BC
["holydust"] = { itemID = 29735 }, -- Holy Dust (Aldor)
["arcanerune"] = { itemID = 29736 }, -- Holy Dust (Scryers)
}

local Cache = {}
Expand Down
56 changes: 44 additions & 12 deletions AtlasLootClassic/Button/Faction_type.lua
Original file line number Diff line number Diff line change
Expand Up @@ -46,25 +46,49 @@ local FACTION_IMAGES = {
[890] = "Interface\\Icons\\INV_BannerPVP_02", -- Silverwing Sentinels

-- Classic
[47] = "Interface\\Icons\\inv_misc_tournaments_symbol_dwarf", --Ironforge
[54] = "Interface\\Icons\\inv_misc_tournaments_symbol_gnome", --Gnomeregan
[59] = "Interface\\Icons\\INV_Ingot_Mithril", --Thorium Brotherhood
[68] = "Interface\\Icons\\inv_misc_tournaments_symbol_scourge", --Undercity
[69] = "Interface\\Icons\\inv_misc_tournaments_banner_nightelf", --Darnassus
[72] = "Interface\\Icons\\inv_misc_tournaments_symbol_human", --Stormwind
[47] = "Interface\\Icons\\inv_misc_tournaments_symbol_dwarf", --Ironforge
[54] = "Interface\\Icons\\inv_misc_tournaments_symbol_gnome", --Gnomeregan
[59] = "Interface\\Icons\\INV_Ingot_Mithril", --Thorium Brotherhood
[68] = "Interface\\Icons\\inv_misc_tournaments_symbol_scourge", --Undercity
[69] = "Interface\\Icons\\inv_misc_tournaments_banner_nightelf", --Darnassus
[72] = "Interface\\Icons\\inv_misc_tournaments_symbol_human", --Stormwind
[76] = "Interface\\Icons\\inv_misc_tournaments_symbol_orc", --Orgrimmar
[81] = "Interface\\Icons\\inv_misc_tournaments_symbol_tauren", --Thunder Bluff
[87] = "Interface\\Icons\\INV_Helmet_66", --Bloodsail Buccaneers
[81] = "Interface\\Icons\\inv_misc_tournaments_symbol_tauren", --Thunder Bluff
[87] = "Interface\\Icons\\INV_Helmet_66", --Bloodsail Buccaneers
[270] = "Interface\\Icons\\inv_jewelry_ring_46", --Bloodsail Buccaneers
[529] = "Interface\\Icons\\inv_jewelry_talisman_07", --Argent Dawn
[530] = "Interface\\Icons\\inv_misc_tournaments_symbol_troll", --Darkspear Trolls
[576] = "Interface\\Icons\\inv_misc_horn_01", --Timbermaw Hold
[589] = "Interface\\Icons\\ability_mount_pinktiger", --Wintersaber Trainers
[530] = "Interface\\Icons\\inv_misc_tournaments_symbol_troll", --Darkspear Trolls
[576] = "Interface\\Icons\\inv_misc_horn_01", --Timbermaw Hold
[589] = "Interface\\Icons\\ability_mount_pinktiger", --Wintersaber Trainers
[609] = "Interface\\Icons\\ability_racial_ultravision", --Cenarion Circle
[749] = "Interface\\Icons\\spell_shadow_demonbreath", --Hydraxian Waterlords
[910] = "Interface\\Icons\\inv_misc_head_dragon_bronze", --Brood of Nozdormu
--@version-bc@
-- BC
[922] = "Interface\\Icons\\INV_Misc_Bandana_03", -- Tranquillien
[932] = "Interface\\Icons\\Spell_Holy_SealOfSalvation", -- The Aldor
[933] = "Interface\\Icons\\INV_Weapon_Shortblade_31", -- TheConsortium
[934] = "Interface\\Icons\\Spell_Holy_ChampionsBond", -- The Scryers
[935] = "Interface\\Icons\\Spell_Nature_LightningOverload", -- The Sha'tar
[941] = "Interface\\Icons\\INV_Misc_Foot_Centaur", -- The Mag'har
[942] = "Interface\\Icons\\INV_Misc_Ammo_Arrow_02", -- Cenarion Expedition
[946] = "Interface\\Icons\\INV_BannerPVP_02", -- Honor Hold
[947] = "Interface\\Icons\\INV_BannerPVP_01", -- Thrallmar
[967] = "Interface\\Icons\\INV_Jewelry_Ring_62", -- The Violet Eye
[970] = "Interface\\Icons\\INV_Mushroom_10", -- Sporeggar
[978] = "Interface\\Icons\\INV_Misc_Foot_Centaur", -- Kurenai
[989] = "Interface\\Icons\\Ability_Warrior_VictoryRush", -- Keepers of Time
[990] = "Interface\\Icons\\INV_Misc_MonsterScales_13", -- The Scale of the Sands
[1011] = "Interface\\Icons\\Ability_Rogue_MasterOfSubtlety", -- Lower City
[1012] = "Interface\\Icons\\INV_Misc_Gem_Pearl_05", -- Ashtongue Deathsworn
[1015] = "Interface\\Icons\\Ability_Mount_Netherdrakepurple", -- Netherwing
[1031] = "Interface\\Icons\\INV_Misc_Ribbon_01", -- Sha'tari Skyguard
[1038] = "Interface\\Icons\\INV_DataCrystal01", -- Ogri'la
[1077] = "Interface\\Icons\\INV_Misc_Statue_04", -- Shattered Sun Offensive
--@end-version-bc@
}

-- Name fallbacks
local FACTION_KEY = {
-- Classic
[47] = "Ironforge",
Expand All @@ -82,8 +106,16 @@ local FACTION_KEY = {
[576] = "Timbermaw Hold",
[589] = AL["Wintersaber Trainers"], -- Alliance only, Horde gets no info :/
[609] = "Cenarion Circle",
[719] = "Hydraxian Waterlords",
[749] = "Hydraxian Waterlords",
[910] = "Brood of Nozdormu",
-- BC
--@version-bc@
[922] = AL["Tranquillien"], -- Horde only
[941] = AL["The Mag'har"], -- Horde only
[946] = AL["Honor Hold"], -- Alli only
[947] = AL["Thrallmar"], -- Horde only
[978] = AL["Kurenai"], -- Alli only
--@end-version-bc@
}

ClickHandler:Add(
Expand Down
2 changes: 2 additions & 0 deletions AtlasLootClassic/Constants.lua
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ ATLASLOOT_WORLD_BOSS_COLOR = {0.74, 0.0, 0.28, 1}
ATLASLOOT_COLLECTIONS_COLOR = {0.64, 0.21, 0.93, 1}
ATLASLOOT_CLASSPROFESSION_COLOR = ATLASLOOT_FACTION_COLOR
ATLASLOOT_UNKNOWN_COLOR = {0, 0, 0, 1}
ATLASLOOT_HORDE_COLOR = {1, 0, 0, 0.8}
ATLASLOOT_ALLIANCE_COLOR = {0, 0, 1, 0.8}

ATLASLOOT_ITEM_BACKGROUND_ALPHA = 0.9

Expand Down
29 changes: 29 additions & 0 deletions AtlasLootClassic/Data/Mount.lua
Original file line number Diff line number Diff line change
Expand Up @@ -126,9 +126,38 @@ local MOUNT_LIST = {
[32458] = 17890, -- Ashes of Al'ar
[30480] = 19250, -- Fiery Warhorse's Reins
[33809] = 22464, -- Amani War Bear
[32319] = 21156, -- Blue Riding Nether Ray
[32314] = 21152, -- Green Riding Nether Ray
[32317] = 21158, -- Red Riding Nether Ray
[32316] = 21155, -- Purple Riding Nether Ray
[32318] = 21157, -- Silver Riding Nether Ray
[33999] = 22473, -- Cenarion War Hippogryph
[29102] = 19375, -- Reins of the Cobalt War Talbuk / The Maghar
[29104] = 19378, -- Reins of the Silver War Talbuk / The Maghar
[29105] = 19376, -- Reins of the Tan War Talbuk / The Maghar
[29103] = 19377, -- Reins of the White War Talbuk / The Maghar
[31829] = 21073, -- Reins of the Cobalt Riding Talbuk / The Maghar
[31831] = 21075, -- Reins of the Silver Riding Talbuk / The Maghar
[31833] = 21077, -- Reins of the Tan Riding Talbuk / The Maghar
[31835] = 21076, -- Reins of the White Riding Talbuk / The Maghar
[32858] = 21521, -- Reins of the Azure Netherwing Drake
[32859] = 21525, -- Reins of the Cobalt Netherwing Drake
[32857] = 21520, -- Reins of the Onyx Netherwing Drake
[32860] = 21523, -- Reins of the Purple Netherwing Drake
[32861] = 21522, -- Reins of the Veridian Netherwing Drake
[32862] = 21524, -- Reins of the Violet Netherwing Drake
[29227] = 19375, -- Reins of the Cobalt War Talbuk / Kurenai
[29229] = 19378, -- Reins of the Silver War Talbuk / Kurenai
[29230] = 19376, -- Reins of the Tan War Talbuk / Kurenai
[29231] = 19377, -- Reins of the White War Talbuk / Kurenai
[31830] = 21073, -- Reins of the Cobalt Riding Talbuk / Kurenai
[31832] = 21075, -- Reins of the Silver Riding Talbuk / Kurenai
[31834] = 21077, -- Reins of the Tan Riding Talbuk / Kurenai
[31836] = 21076, -- Reins of the White Riding Talbuk / Kurenai
--@end-version-bc@
}


function Mount.IsMount(itemID)
return MOUNT_LIST[itemID] and true or false
end
Expand Down
3 changes: 3 additions & 0 deletions AtlasLootClassic_Factions/AtlasLootClassic_Factions.toc
Original file line number Diff line number Diff line change
Expand Up @@ -43,3 +43,6 @@
Locales\Locales.xml

data.lua
#@version-bc@
data-tbc.lua
#@end-version-bc@
Loading

0 comments on commit 8b09c3f

Please sign in to comment.