Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Addon: [1.7.55] - Add Cataclysm Classic support #586

Merged
merged 5 commits into from
May 11, 2024
Merged

Addon: [1.7.55] - Add Cataclysm Classic support #586

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
47adc9a
Addon: Add support for Cataclysm Classic client
Xian55 May 11, 2024
b2d1aca
Core: Wapi: Added cata support
Xian55 May 11, 2024
81a3f5a
SharedLib: Added cataclysm Classic support
Xian55 May 11, 2024
236a10f
Utilities: Added support for extracting the necessary json files for …
Xian55 May 11, 2024
3accce4
Json: Added Cataclysm Classic support. Note Creatures are not updated…
Xian55 May 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Addons/DataToColor/DataToColor.toc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
## Title: DataToColor
## Author: FreeHongKongMMO
## Notes: Displays data as colors
## Version: 1.7.54
## Version: 1.7.55
## RequiredDeps:
## OptionalDeps: Ace3, LibRangeCheck, LibClassicCasterino
## SavedVariables:
Expand Down
12 changes: 10 additions & 2 deletions Addons/DataToColor/Versions.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ local WOW_PROJECT_ID = WOW_PROJECT_ID
local WOW_PROJECT_CLASSIC = WOW_PROJECT_CLASSIC
local WOW_PROJECT_BURNING_CRUSADE_CLASSIC = WOW_PROJECT_BURNING_CRUSADE_CLASSIC
local WOW_PROJECT_WRATH_CLASSIC = WOW_PROJECT_WRATH_CLASSIC
local WOW_PROJECT_CATACLYSM_CLASSIC = WOW_PROJECT_CATACLYSM_CLASSIC
local WOW_PROJECT_MAINLINE = WOW_PROJECT_MAINLINE

local LE_EXPANSION_LEVEL_CURRENT = LE_EXPANSION_LEVEL_CURRENT
Expand All @@ -31,6 +32,10 @@ function DataToColor.IsClassic_Wrath()
return WOW_PROJECT_ID == WOW_PROJECT_WRATH_CLASSIC
end

function DataToColor.IsClassic_Cata()
return WOW_PROJECT_ID == WOW_PROJECT_CATACLYSM_CLASSIC
end

function DataToColor.IsRetail()
return WOW_PROJECT_ID == WOW_PROJECT_MAINLINE
end
Expand All @@ -44,9 +49,12 @@ local Som140 = DataToColor.IsClassic() and select(4, GetBuildInfo()) == 11400
local TBC253 = DataToColor.IsClassic_BCC() and select(4, GetBuildInfo()) >= 20503
local TBC252 = DataToColor.IsClassic_BCC() and select(4, GetBuildInfo()) >= 20502
local Wrath340 = DataToColor.IsClassic_BCC() and select(4, GetBuildInfo()) >= 30400
local Cata440 = DataToColor.IsClassic_Cata() and select(4, GetBuildInfo()) >= 40400

if WOW_PROJECT_ID == WOW_PROJECT_MAINLINE then
DataToColor.ClientVersion = 1
elseif WOW_PROJECT_ID == WOW_PROJECT_CATACLYSM_CLASSIC then
DataToColor.ClientVersion = 5
elseif WOW_PROJECT_ID == WOW_PROJECT_WRATH_CLASSIC then
DataToColor.ClientVersion = 4
elseif WOW_PROJECT_ID == WOW_PROJECT_BURNING_CRUSADE_CLASSIC then
Expand All @@ -60,7 +68,7 @@ elseif WOW_PROJECT_ID == WOW_PROJECT_CLASSIC then
DataToColor.ClientVersion = 2
end

if DataToColor.IsRetail() or TBC253 or DataToColor.IsClassic_Wrath() then
if DataToColor.IsRetail() or TBC253 or DataToColor.IsClassic_Wrath() or DataToColor.IsClassic_Cata() then
DataToColor.UnitCastingInfo = UnitCastingInfo
elseif Som140 or TBC252 then
DataToColor.UnitCastingInfo = function(unit)
Expand All @@ -82,7 +90,7 @@ else
end
end

if DataToColor.IsRetail() or TBC253 or DataToColor.IsClassic_Wrath() then
if DataToColor.IsRetail() or TBC253 or DataToColor.IsClassic_Wrath() or DataToColor.IsClassic_Cata() then
DataToColor.UnitChannelInfo = UnitChannelInfo
elseif Som140 or TBC252 then
DataToColor.UnitChannelInfo = function(unit)
Expand Down
2 changes: 2 additions & 0 deletions Core/WowheadAPI/WApi.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ public WApi(StartupClientVersion scv)
ClientVersion.SoM => "https://classic.wowhead.com",
ClientVersion.TBC => "https://tbc.wowhead.com",
ClientVersion.Wrath => "https://www.wowhead.com/wotlk",
ClientVersion.Cata => "https://www.wowhead.com/cata",
_ => "https://www.wowhead.com",
};

Expand All @@ -27,6 +28,7 @@ public WApi(StartupClientVersion scv)
ClientVersion.SoM => "https://wow.zamimg.com/images/wow/classic/maps/enus/original/",
ClientVersion.TBC => "https://wow.zamimg.com/images/wow/tbc/maps/enus/original/",
ClientVersion.Wrath => "https://wow.zamimg.com/images/wow/wrath/maps/enus/original/",
ClientVersion.Cata => "https://wow.zamimg.com/images/wow/cata/maps/enus/original/",
_ => "https://wow.zamimg.com/images/wow/maps/enus/original/",
};

Expand Down
Empty file added Json/History/cata/.keep
View file
Open in desktop
Empty file.
Empty file added Json/area/cata/.keep
View file
Open in desktop
Empty file.
1 change: 1 addition & 0 deletions Json/area/cata/1.json
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions Json/area/cata/10.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"flightmaster":[{"coords":[[77.4,44.4]],"level":0,"name":"Felicia Maline","type":1,"id":2409,"reacthorde":-1,"reactalliance":1,"description":"Gryphon Master"}],"innkeeper":[{"coords":[[73.8,44.4]],"level":0,"name":"Innkeeper Trelayne","type":1,"id":6790,"reacthorde":0,"reactalliance":1,"description":"Innkeeper"}],"repair":[{"coords":[[73.6,48.8]],"level":0,"name":"Gavin Gnarltree","type":1,"id":225,"reacthorde":-1,"reactalliance":1,"description":"Weaponsmith"},{"coords":[[73.8,48.6]],"level":0,"name":"Morg Gnarltree","type":1,"id":226,"reacthorde":0,"reactalliance":1,"description":"Armorer"},{"coords":[[73.2,44.8]],"level":0,"name":"Avette Fellwood","type":1,"id":228,"reacthorde":0,"reactalliance":1,"description":"Bowyer"}],"vendor":[{"coords":[[73.6,48.8]],"level":0,"name":"Gavin Gnarltree","type":1,"id":225,"reacthorde":-1,"reactalliance":1,"description":"Weaponsmith"},{"coords":[[73.8,48.6]],"level":0,"name":"Morg Gnarltree","type":1,"id":226,"reacthorde":0,"reactalliance":1,"description":"Armorer"},{"coords":[[74.0,44.8]],"level":0,"name":"Mabel Solaj","type":1,"id":227,"reacthorde":0,"reactalliance":1,"description":"General Goods"},{"coords":[[73.2,44.8]],"level":0,"name":"Avette Fellwood","type":1,"id":228,"reacthorde":0,"reactalliance":1,"description":"Bowyer"},{"coords":[[73.8,44.2]],"level":0,"name":"Barkeep Hann","type":1,"id":274,"reacthorde":0,"reactalliance":1,"description":"Bartender"},{"coords":[[75.0,46.4]],"level":0,"name":"Antonio Perelli","type":1,"id":844,"reacthorde":-1,"reactalliance":1,"description":"Traveling Salesman"},{"coords":[[73.8,45.0]],"level":0,"name":"Gunder Thornbush","type":1,"id":960,"reacthorde":0,"reactalliance":1,"description":"Tradesman"},{"coords":[[75.6,44.6]],"level":0,"name":"Lohgan Eva","type":1,"id":1672,"reacthorde":0,"reactalliance":1,"description":"Tailoring Supplies"},{"coords":[[76.0,45.2]],"level":0,"name":"Alyssa Eva","type":1,"id":1673,"reacthorde":0,"reactalliance":1,"description":"Reagents"},{"coords":[[18.0,54.4]],"level":0,"name":"Bliztik","type":1,"id":2481,"reacthorde":1,"reactalliance":1,"description":"Alchemy Supplies"},{"coords":[[75.8,45.4]],"level":0,"name":"Danielle Zipstitch","type":1,"id":2668,"reacthorde":0,"reactalliance":1,"description":"Tailoring Supplies"},{"coords":[[75.6,45.4]],"level":0,"name":"Sheri Zipstitch","type":1,"id":2669,"reacthorde":0,"reactalliance":1,"description":"Tailoring Supplies"},{"coords":[[77.8,48.2]],"level":0,"name":"Herble Baubbletump","type":1,"id":3133,"reacthorde":-1,"reactalliance":1,"description":"Engineering & Mining Supplies"},{"coords":[[81.8,19.8]],"level":0,"name":"Kzixx","type":1,"id":3134,"reacthorde":1,"reactalliance":1,"description":"Rare Goods"},{"coords":[[79.4,44.4]],"level":0,"name":"Malissa","type":1,"id":3135,"reacthorde":-1,"reactalliance":1,"description":"Poison Supplies"},{"coords":[[75.6,48.6]],"level":0,"name":"Scott Carevin","type":1,"id":3138,"reacthorde":0,"reactalliance":1,"description":"Mushroom Seller"},{"coords":[[73.8,44.4]],"level":0,"name":"Innkeeper Trelayne","type":1,"id":6790,"reacthorde":0,"reactalliance":1,"description":"Innkeeper"}],"trainer":[{"coords":[[77.4,48.6]],"level":0,"name":"Finbus Geargrind","type":1,"id":1676,"reacthorde":0,"reactalliance":1,"description":"Engineering Trainer"},{"coords":[[74.0,48.4]],"level":0,"name":"Clarise Gnarltree","type":1,"id":3136,"reacthorde":0,"reactalliance":1,"description":"Blacksmithing Trainer"},{"coords":[[74.0,49.6]],"level":0,"name":"Matt Johnson","type":1,"id":3137,"reacthorde":-1,"reactalliance":1,"description":"Mining Trainer"}],"herb":{"Tear of Tilloa":[{"coords":[[78.4,36.0],[78.5,36.0]],"level":0,"name":"Tear of Tilloa","type":2,"id":321}],"Mageroyal":[{"coords":[[9.2,45.3],[9.2,45.5],[13.0,70.6],[20.7,24.6],[20.8,24.4],[21.4,68.8],[21.5,68.7],[26.4,35.4],[26.4,35.5],[26.6,35.4],[26.6,35.5],[27.6,26.4],[27.6,26.6],[33.1,24.1],[33.8,72.4],[33.8,72.5],[36.3,72.7],[40.1,73.4],[40.1,73.5],[47.7,76.1],[49.4,73.1],[49.5,72.9],[50.1,70.4],[50.1,70.5],[52.2,75.8],[54.2,60.7],[59.4,59.0],[59.6,59.1],[63.6,16.9],[64.9,36.8],[65.0,76.2],[65.1,76.5],[72.3,73.9],[75.0,17.2],[80.6,73.4],[80.6,73.5],[80.8,66.8],[82.0,60.7]],"level":0,"name":"Mageroyal","type":2,"id":1620}],"Briarthorn":[{"coords":[[12.4,48.9],[12.5,48.9],[14.4,27.4],[14.4,27.6],[14.5,27.4],[14.6,27.5],[14.9,55.9],[17.9,67.7],[18.2,43.3],[18.7,75.9],[20.9,30.6],[21.0,30.4],[23.6,65.2],[24.4,29.7],[24.6,29.6],[25.3,68.6],[25.3,78.8],[27.9,72.2],[27.9,72.5],[29.3,40.0],[29.6,50.3],[29.6,50.6],[29.7,34.9],[29.9,32.0],[31.1,55.6],[31.2,55.4],[31.4,74.8],[31.5,74.8],[32.4,66.6],[32.5,66.4],[32.5,66.5],[33.6,27.3],[33.7,27.6],[33.7,42.0],[34.1,36.0],[35.1,56.3],[35.1,56.5],[36.0,51.5],[36.0,74.3],[36.1,51.4],[36.1,74.5],[36.4,29.3],[36.4,29.5],[36.5,29.4],[36.5,29.5],[37.8,68.4],[37.8,68.5],[38.1,59.2],[46.9,72.3],[47.0,72.5],[54.9,57.1],[58.1,77.2],[58.9,30.9],[60.3,68.6],[60.4,37.1],[60.4,43.9],[60.5,37.1],[60.5,43.9],[60.5,68.6],[60.7,47.0],[61.3,57.0],[62.7,52.1],[64.7,49.9],[64.9,25.5],[65.8,54.8],[65.9,31.3],[66.0,31.5],[67.4,53.7],[67.5,53.6],[67.9,46.0],[68.0,27.9],[68.9,65.3],[69.0,65.5],[71.7,64.4],[71.7,64.6],[73.2,69.4],[73.2,69.5],[75.0,37.4],[75.0,37.5],[75.4,64.2],[75.5,64.2],[76.4,29.7],[76.4,72.4],[76.4,72.5],[76.5,29.7],[76.5,72.5],[76.6,72.3],[79.2,65.4],[79.2,65.5],[79.6,31.9],[79.8,36.3],[79.8,36.5],[81.3,40.8],[83.1,55.2],[83.8,33.1]],"level":0,"name":"Briarthorn","type":2,"id":1621}],"Bruiseweed":[{"coords":[[14.3,67.2],[14.3,67.5],[16.3,38.9],[17.4,34.6],[17.6,34.5],[17.7,34.4],[20.0,44.4],[20.0,44.5],[21.1,72.4],[23.2,73.9],[23.4,35.4],[23.4,35.5],[23.5,35.3],[23.5,35.5],[23.7,71.9],[27.3,79.6],[28.2,31.8],[32.3,69.4],[32.3,69.6],[32.5,69.5],[32.7,69.0],[33.7,78.4],[33.8,78.5],[34.7,76.1],[35.2,44.6],[35.3,37.2],[35.4,67.5],[35.5,37.3],[35.5,67.6],[36.9,51.9],[38.5,30.2],[38.9,26.2],[39.4,75.4],[39.4,75.5],[39.5,75.2],[39.6,75.5],[41.3,71.0],[41.5,71.0],[51.7,62.1],[55.0,80.4],[55.1,80.5],[56.9,29.6],[57.4,53.6],[57.5,53.6],[58.6,35.5],[58.7,35.4],[59.4,42.2],[59.5,42.3],[63.3,80.3],[63.3,80.5],[65.7,76.6],[65.8,70.0],[66.0,67.3],[66.0,67.5],[66.4,75.5],[66.5,75.6],[68.6,38.7],[71.6,56.4],[71.7,56.5],[77.3,58.3],[77.3,58.5],[81.1,72.4],[81.1,72.6],[81.7,71.4],[81.7,71.5],[82.0,59.8],[82.1,58.7],[82.1,61.0],[87.6,49.4],[87.6,49.5]],"level":0,"name":"Bruiseweed","type":2,"id":1622}],"Wild Steelbloom":[{"coords":[[29.8,77.9],[35.7,39.4],[35.8,39.5],[36.8,79.4],[36.8,79.5],[36.9,46.7],[37.2,33.6],[40.8,57.8],[43.1,80.4],[43.1,80.5],[44.0,58.0],[45.1,21.1],[52.8,25.4],[53.0,54.4],[54.9,25.9],[56.5,30.3],[56.6,30.5],[56.9,48.6],[57.6,42.4],[57.6,42.5],[76.5,78.2],[78.8,77.6],[84.7,51.3],[86.1,34.7],[87.7,45.6],[87.8,51.1]],"level":0,"name":"Wild Steelbloom","type":2,"id":1623}],"Kingsblood":[{"coords":[[13.2,29.7],[14.4,55.2],[14.6,55.2],[16.6,29.4],[16.6,29.5],[21.9,68.1],[21.9,79.0],[25.2,52.3],[25.3,52.5],[26.4,68.3],[26.4,68.5],[26.5,68.4],[26.5,68.5],[28.3,48.0],[31.8,34.7],[31.9,34.4],[31.9,44.8],[32.0,28.6],[32.2,28.4],[32.4,39.2],[32.6,39.2],[32.7,50.5],[33.4,31.9],[33.4,50.1],[33.5,32.0],[33.5,50.2],[34.4,73.1],[34.7,73.2],[49.3,74.1],[55.5,60.1],[56.5,59.9],[56.7,74.1],[60.4,30.1],[60.5,30.0],[61.4,45.9],[61.4,74.1],[62.7,71.4],[62.7,71.8],[62.9,69.3],[62.9,69.6],[62.9,76.6],[63.0,40.2],[63.0,76.3],[63.7,29.4],[63.7,29.5],[64.7,33.5],[64.7,44.8],[64.8,33.4],[66.1,48.8],[66.1,71.8],[66.8,42.4],[66.8,42.5]],"level":0,"name":"Kingsblood","type":2,"id":1624}],"Grave Moss":[{"coords":[[14.4,45.9],[14.5,45.8],[15.0,43.2],[16.0,45.7],[16.1,45.4],[16.4,37.1],[16.4,48.4],[16.4,48.5],[16.5,37.0],[16.5,48.5],[16.6,48.2],[16.9,40.0],[20.8,46.0],[22.4,35.1],[22.4,47.0],[22.5,35.0],[22.5,47.0],[22.6,40.4],[22.7,40.5],[23.0,43.4],[23.1,43.5],[24.4,37.4],[24.4,37.8],[24.5,37.8],[78.3,70.6],[78.8,68.7],[78.8,71.6],[79.7,73.3],[79.7,73.5],[79.9,69.7],[80.2,71.4],[80.2,71.6]],"level":0,"name":"Grave Moss","type":2,"id":1628}]},"vein":{"Copper Vein":[{"coords":[[5.8,44.4],[5.9,44.6],[20.2,80.1],[27.6,34.8],[28.2,69.9],[29.2,42.4],[29.3,42.5],[33.5,44.4],[33.6,44.5],[37.7,54.7],[37.7,69.3],[37.7,69.5],[38.0,76.9],[40.2,78.2],[42.1,73.9],[43.5,22.4],[43.5,22.5],[46.3,73.4],[46.3,73.5],[47.4,20.6],[47.5,20.4],[47.5,20.5],[52.4,78.0],[56.9,25.4],[56.9,25.5],[57.9,74.9],[59.1,46.8],[59.4,78.3],[59.5,78.3],[60.1,35.9],[64.3,78.8],[65.2,80.0],[66.1,41.7],[66.6,55.9],[68.4,40.0],[68.4,77.9],[68.5,39.8],[68.5,77.6],[69.1,74.0],[70.8,72.0],[74.5,72.3],[78.4,63.4],[78.4,63.5],[78.5,63.4],[78.5,63.5],[82.2,75.2],[82.3,51.1],[82.5,51.3],[84.2,55.4],[84.2,55.5]],"level":0,"name":"Copper Vein","type":2,"id":1731}],"Tin Vein":[{"coords":[[23.8,80.4],[23.8,80.6],[25.1,80.4],[25.1,80.5],[26.5,79.9],[28.4,77.4],[28.5,77.2],[30.4,71.3],[30.4,71.5],[30.4,76.0],[30.5,71.3],[30.5,71.5],[32.0,76.4],[32.0,76.5],[33.6,76.7],[34.7,77.7],[34.8,81.4],[34.9,81.5],[35.2,41.6],[35.7,67.8],[35.7,80.3],[35.9,31.8],[35.9,76.6],[36.3,49.1],[36.6,81.1],[36.7,77.0],[36.9,78.8],[37.3,84.8],[37.7,80.3],[38.0,84.1],[40.4,76.5],[40.5,76.4],[40.5,76.5],[41.5,24.5],[46.4,60.3],[46.5,60.3],[49.9,79.4],[49.9,79.5],[50.6,63.1],[50.9,71.1],[51.1,22.3],[51.3,22.5],[52.6,55.4],[52.6,55.6],[56.7,76.9],[57.9,61.4],[57.9,61.5],[58.9,81.4],[58.9,81.5],[60.0,56.2],[61.6,82.3],[62.2,79.0],[62.3,79.8],[63.4,82.0],[63.4,84.3],[63.4,84.5],[67.3,51.3],[67.3,51.6],[67.5,51.6],[68.0,42.6],[68.1,47.7],[68.6,40.7],[71.1,77.2],[72.4,75.3],[73.7,78.5],[73.7,79.6],[73.8,76.2],[74.1,77.2],[77.9,72.9],[80.0,76.2],[81.7,62.8],[82.6,70.7],[82.7,52.9],[84.1,58.2],[84.9,50.9],[85.5,54.0],[85.9,49.2],[86.6,47.3],[86.6,47.5]],"level":0,"name":"Tin Vein","type":2,"id":1732}],"Silver Vein":[{"coords":[[26.7,37.6],[30.5,71.2],[30.5,71.5],[32.0,76.5],[34.7,77.7],[34.8,81.5],[35.2,41.6],[35.6,67.7],[35.7,80.3],[35.9,31.8],[35.9,76.6],[36.3,49.0],[37.3,84.8],[40.3,76.5],[41.5,24.5],[46.5,60.3],[49.9,79.4],[50.6,63.0],[50.9,71.1],[51.2,22.3],[52.6,55.6],[56.7,76.9],[57.9,61.4],[60.0,56.3],[62.2,78.9],[63.3,84.5],[64.6,53.5],[67.4,51.6],[67.5,71.7],[67.8,42.7],[68.1,47.7],[68.6,40.7],[71.1,77.1],[73.7,78.5],[77.9,72.9],[80.0,76.2],[81.7,62.8],[82.6,70.7],[82.7,52.9],[84.1,58.2],[85.6,54.1],[85.9,49.2]],"level":0,"name":"Silver Vein","type":2,"id":1733}],"Gold Vein":[{"coords":[[63.9,52.5],[64.6,53.5],[67.6,71.8],[74.1,80.1]],"level":0,"name":"Gold Vein","type":2,"id":1734}],"Iron Deposit":[{"coords":[[25.9,34.1],[26.7,37.6],[32.8,73.6],[35.9,81.3],[36.0,77.3],[36.4,79.9],[36.4,83.6],[36.5,79.9],[37.2,83.0],[38.3,80.2],[57.2,31.4],[57.2,31.6],[57.7,46.9],[58.7,37.8],[59.3,42.6],[59.5,42.8],[59.7,39.9],[62.2,83.0],[63.0,79.0],[63.7,83.7],[63.9,52.5],[64.0,52.4],[64.6,53.5],[65.6,77.6],[67.4,71.8],[67.6,71.8],[72.0,75.7],[73.5,76.8],[74.1,78.2],[74.1,80.1],[74.3,78.8],[77.4,38.9],[78.7,29.1],[79.4,40.4],[79.4,40.5],[79.5,40.7],[81.2,28.8],[82.9,35.8],[85.1,32.6],[85.2,32.4],[85.9,47.1],[87.2,49.2],[88.1,51.7]],"level":0,"name":"Iron Deposit","type":2,"id":1735}]},"skinnable":[205,206,213,507,521,533,534,565,628,898,920,923,1258,6170,14887,14888,14889,14890],"gatherable":[],"minable":[],"salvegable":[]}
Loading
Loading