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

Compat code for GetCriteriaInfo #40

Merged
merged 2 commits into from
Jun 12, 2024
Merged

Compat code for GetCriteriaInfo #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
449c3de
Compat code for GetCriteriaInfo
ntowle Jun 12, 2024
2596ebe
Update .luacheckrc
ntowle Jun 12, 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
1 change: 1 addition & 0 deletions .luacheckrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ read_globals = {
"C_GossipInfo",
"C_Map",
"C_Scenario",
"C_ScenarioInfo",
"C_Spell",
"C_UIWidgetManager",
"C_UnitAuras",
Expand Down
23 changes: 21 additions & 2 deletions Transcriptor.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1181,6 +1181,23 @@ do
end
end

local GetCriteriaInfo = C_ScenarioInfo and C_ScenarioInfo.GetCriteriaInfo or function(...)
local criteriaString, criteriaType, completed, quantity, totalQuantity, flags, assetID, _, criteriaID, duration, elapsed, criteriaFailed, isWeightedProgress = C_Scenario.GetCriteriaInfo(...)
return {
["description"] = criteriaString,
["criteriaType"] = criteriaType,
["completed"] = completed,
["quantity"] = quantity,
["totalQuantity"] = totalQuantity,
["flags"] = flags,
["assetID"] = assetID,
["criteriaID"] = criteriaID,
["duration"] = duration,
["elapsed"] = elapsed,
["failed"] = criteriaFailed,
["isWeightedProgress"] = isWeightedProgress,
}
end
function sh.SCENARIO_UPDATE(newStep)
--Proving Grounds
local ret = ""
Expand All @@ -1199,7 +1216,8 @@ function sh.SCENARIO_UPDATE(newStep)
local ret3 = ""
local _, _, numCriteria = C_Scenario.GetStepInfo()
for i = 1, numCriteria do
ret3 = ret3 .. "#CriteriaInfo" .. i .. "#" .. strjoin("#", tostringall(C_Scenario.GetCriteriaInfo(i)))
local info = GetCriteriaInfo(i)
ret3 = ret3 .. "#CriteriaInfo" .. i .. "#" .. strjoin("#", tostringall(info.description, info.criteriaType, info.completed, info.quantity, info.totalQuantity, info.flags, info.assetID, info.criteriaID, info.duration, info.elapsed, info.failed, info.isWeightedProgress))
end

local ret4 = ""
Expand All @@ -1224,7 +1242,8 @@ function sh.SCENARIO_CRITERIA_UPDATE(criteriaID)
local ret2 = ""
local _, _, numCriteria = C_Scenario.GetStepInfo()
for i = 1, numCriteria do
ret2 = ret2 .. "#CriteriaInfo" .. i .. "#" .. strjoin("#", tostringall(C_Scenario.GetCriteriaInfo(i)))
local info = GetCriteriaInfo(i)
ret2 = ret2 .. "#CriteriaInfo" .. i .. "#" .. strjoin("#", tostringall(info.description, info.criteriaType, info.completed, info.quantity, info.totalQuantity, info.flags, info.assetID, info.criteriaID, info.duration, info.elapsed, info.failed, info.isWeightedProgress))
end

local ret3 = ""
Expand Down