From 7a23309abafbd8c91ad8358e4d125ba7f892c883 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9D=D0=B8=D0=BA=D0=B8=D1=82=D0=B0=20=D0=A2=D1=80=D0=BE?= =?UTF-8?q?=D1=8F=D0=BD=D0=BE=D0=B2?= <36129181+n1tr0xs@users.noreply.github.com> Date: Wed, 3 Jul 2024 12:22:03 +0300 Subject: [PATCH 1/5] Fix Curtain Call PoB description does not match with in-game (#7660) --- src/Data/Uniques/helmet.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Data/Uniques/helmet.lua b/src/Data/Uniques/helmet.lua index e1763ca5c2..3ab0c7619e 100644 --- a/src/Data/Uniques/helmet.lua +++ b/src/Data/Uniques/helmet.lua @@ -1253,8 +1253,8 @@ Requires Level 20 +23 to maximum Life (15-10)% reduced Mine Throwing Speed Mines have (40-50)% increased Detonation Speed -Skills which Place Mines place up to 1 additional Mine if you have at least 800 Dexterity -Skills which Place Mines place up to 1 additional Mine if you have at least 800 Intelligence +Skills which throw Mines throw up to 1 additional Mine if you have at least 800 Dexterity +Skills which throw Mines throw up to 1 additional Mine if you have at least 800 Intelligence ]],[[ Eye of Malice Callous Mask From 4f8e7fae15d0950090931039d1f97e823a71c59f Mon Sep 17 00:00:00 2001 From: Sida Wang <42928828+sida-wang@users.noreply.github.com> Date: Sun, 7 Jul 2024 05:27:14 +0000 Subject: [PATCH 2/5] Add platform dropdown option to issue templates (#7666) * add platform to accuracy template * change default index * add platform to all templates * updating options * splitting linux into two options --- .github/ISSUE_TEMPLATE/accuracy_bug_report.yaml | 12 ++++++++++++ .github/ISSUE_TEMPLATE/application_bug_report.yaml | 12 ++++++++++++ .github/ISSUE_TEMPLATE/behaviour_bug_report.yaml | 12 ++++++++++++ .github/ISSUE_TEMPLATE/calculation_bug_report.yaml | 12 ++++++++++++ .github/ISSUE_TEMPLATE/crash_report.yaml | 12 ++++++++++++ .github/ISSUE_TEMPLATE/feature_request.yaml | 12 ++++++++++++ 6 files changed, 72 insertions(+) diff --git a/.github/ISSUE_TEMPLATE/accuracy_bug_report.yaml b/.github/ISSUE_TEMPLATE/accuracy_bug_report.yaml index 0a12aac657..8e131c3ca0 100644 --- a/.github/ISSUE_TEMPLATE/accuracy_bug_report.yaml +++ b/.github/ISSUE_TEMPLATE/accuracy_bug_report.yaml @@ -21,6 +21,18 @@ body: options: - label: I've checked for duplicate open **and closed** issues by using the search function of the [issue tracker](https://github.com/PathOfBuildingCommunity/PathOfBuilding/issues?q=is%3Aissue) required: true + - type: dropdown + id: platform + attributes: + label: What platform are you running Path of Building on? + options: + - Windows + - Linux - Wine + - Linux - PoB Frontend + - MacOS + default: 0 + validations: + required: true - type: textarea id: expected attributes: diff --git a/.github/ISSUE_TEMPLATE/application_bug_report.yaml b/.github/ISSUE_TEMPLATE/application_bug_report.yaml index 29f891b375..f5fa6412c6 100644 --- a/.github/ISSUE_TEMPLATE/application_bug_report.yaml +++ b/.github/ISSUE_TEMPLATE/application_bug_report.yaml @@ -21,6 +21,18 @@ body: options: - label: I've checked for duplicate open **and closed** issues by using the search function of the [issue tracker](https://github.com/PathOfBuildingCommunity/PathOfBuilding/issues?q=is%3Aissue) required: true + - type: dropdown + id: platform + attributes: + label: What platform are you running Path of Building on? + options: + - Windows + - Linux - Wine + - Linux - PoB Frontend + - MacOS + default: 0 + validations: + required: true - type: textarea id: expected attributes: diff --git a/.github/ISSUE_TEMPLATE/behaviour_bug_report.yaml b/.github/ISSUE_TEMPLATE/behaviour_bug_report.yaml index cc1ce7cad2..9d857da69b 100644 --- a/.github/ISSUE_TEMPLATE/behaviour_bug_report.yaml +++ b/.github/ISSUE_TEMPLATE/behaviour_bug_report.yaml @@ -28,6 +28,18 @@ body: options: - label: I've checked that the behaviour is supposed to be supported. If it isn't please open a feature request instead (Red text is a feature request). required: true + - type: dropdown + id: platform + attributes: + label: What platform are you running Path of Building on? + options: + - Windows + - Linux - Wine + - Linux - PoB Frontend + - MacOS + default: 0 + validations: + required: true - type: textarea id: expected attributes: diff --git a/.github/ISSUE_TEMPLATE/calculation_bug_report.yaml b/.github/ISSUE_TEMPLATE/calculation_bug_report.yaml index 9ddf5ea32b..57ff891d94 100644 --- a/.github/ISSUE_TEMPLATE/calculation_bug_report.yaml +++ b/.github/ISSUE_TEMPLATE/calculation_bug_report.yaml @@ -28,6 +28,18 @@ body: options: - label: I've checked that the calculation is supposed to be supported. If it isn't please open a feature request instead (Red text is a feature request). required: true + - type: dropdown + id: platform + attributes: + label: What platform are you running Path of Building on? + options: + - Windows + - Linux - Wine + - Linux - PoB Frontend + - MacOS + default: 0 + validations: + required: true - type: textarea id: expected attributes: diff --git a/.github/ISSUE_TEMPLATE/crash_report.yaml b/.github/ISSUE_TEMPLATE/crash_report.yaml index a8277828a2..4b16d96994 100644 --- a/.github/ISSUE_TEMPLATE/crash_report.yaml +++ b/.github/ISSUE_TEMPLATE/crash_report.yaml @@ -21,6 +21,18 @@ body: options: - label: I've checked for duplicate open **and closed** issues by using the search function of the [issue tracker](https://github.com/PathOfBuildingCommunity/PathOfBuilding/issues?q=is%3Aissue) required: true + - type: dropdown + id: platform + attributes: + label: What platform are you running Path of Building on? + options: + - Windows + - Linux - Wine + - Linux - PoB Frontend + - MacOS + default: 0 + validations: + required: true - type: textarea id: context attributes: diff --git a/.github/ISSUE_TEMPLATE/feature_request.yaml b/.github/ISSUE_TEMPLATE/feature_request.yaml index 831a532a95..71ffa2ffb1 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.yaml +++ b/.github/ISSUE_TEMPLATE/feature_request.yaml @@ -14,6 +14,18 @@ body: options: - label: I've checked for duplicate open **and closed** issues by using the search function of the [issue tracker](https://github.com/PathOfBuildingCommunity/PathOfBuilding/issues?q=is%3Aissue) required: true + - type: dropdown + id: platform + attributes: + label: What platform are you running Path of Building on? + options: + - Windows + - Linux - Wine + - Linux - PoB Frontend + - MacOS + default: 0 + validations: + required: true - type: textarea id: problem attributes: From 3d9704970e4f77712d941052673dfbe48150c902 Mon Sep 17 00:00:00 2001 From: Nostrademous Date: Sun, 7 Jul 2024 01:27:38 -0400 Subject: [PATCH 3/5] Fixes the GGPK export of ChainHook Enchantment description (#7664) * Fixes the GGPK export of ChainHook Enchantment description * added comments to the one gsub() pattern --- src/Export/statdesc.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Export/statdesc.lua b/src/Export/statdesc.lua index 3f2ea32d70..1b2754af34 100644 --- a/src/Export/statdesc.lua +++ b/src/Export/statdesc.lua @@ -273,7 +273,9 @@ function describeStats(stats) else return string.format("(%"..v.fmt.."-%"..v.fmt..")", v.min, v.max) end - end):gsub("{(%d?):(%+?)d}", function(n, fmt) + end):gsub("{(%d?):(%+?)d?}", function(n, fmt) + -- Most forms are {0:1}, however Chain Hook enchantment is {0:} + -- the above pattern supports both cases. n = n ~= "" and n or "0" local v = val[tonumber(n)+1] if v.min == v.max then From 8c3208f2c977daaaf4b99055953587424c5d5f9b Mon Sep 17 00:00:00 2001 From: trimbe <19672127+trimbe@users.noreply.github.com> Date: Sat, 6 Jul 2024 22:28:28 -0700 Subject: [PATCH 4/5] correct subsection layouting for calcs tab (#7661) --- src/Classes/CalcSectionControl.lua | 48 +++++++++++++++++------------- 1 file changed, 27 insertions(+), 21 deletions(-) diff --git a/src/Classes/CalcSectionControl.lua b/src/Classes/CalcSectionControl.lua index 6d41a61ae3..0f84686153 100644 --- a/src/Classes/CalcSectionControl.lua +++ b/src/Classes/CalcSectionControl.lua @@ -258,10 +258,12 @@ function CalcSectionClass:Draw(viewPort, noTooltip) primary = false end else - lineY = lineY + 22 + lineY = lineY + 20 primary = false + local rows = 0; for _, rowData in ipairs(subSec.data) do if rowData.enabled then + rows = rows + 1 local textColor = "^7" if rowData.color then textColor = rowData.color @@ -269,35 +271,39 @@ function CalcSectionClass:Draw(viewPort, noTooltip) if rowData.label then -- Draw row label with background SetDrawColor(rowData.bgCol or "^0") - DrawImage(nil, x + 2, lineY, 130, 18) - DrawString(x + 132, lineY + 1, "RIGHT_X", 16, "VAR", textColor..rowData.label.."^7:") + DrawImage(nil, x + 2, lineY + 2, 130, 18) + DrawString(x + 132, lineY + 2, "RIGHT_X", 16, "VAR", textColor..rowData.label.."^7:") end for colour, colData in ipairs(rowData) do -- Draw column separator at the left end of the cell SetDrawColor(self.colour) - DrawImage(nil, colData.x, lineY, 2, colData.height) + DrawImage(nil, colData.x, lineY + 2, 2, colData.height) if colData.format and self.calcsTab:CheckFlag(colData) then if cursorY >= viewPort.y and cursorY < viewPort.y + viewPort.height and cursorX >= colData.x and cursorY >= colData.y and cursorX < colData.x + colData.width and cursorY < colData.y + colData.height then - self.calcsTab:SetDisplayStat(colData) - end - if self.calcsTab.displayData == colData then - -- This is the display stat, draw a green border around this cell - SetDrawColor(0.25, 1, 0.25) - DrawImage(nil, colData.x + 2, colData.y, colData.width - 2, colData.height) - SetDrawColor(rowData.bgCol or "^0") - DrawImage(nil, colData.x + 3, colData.y + 1, colData.width - 4, colData.height - 2) - else - SetDrawColor(rowData.bgCol or "^0") - DrawImage(nil, colData.x + 2, colData.y, colData.width - 2, colData.height) + self.calcsTab:SetDisplayStat(colData) + end + if self.calcsTab.displayData == colData then + -- This is the display stat, draw a green border around this cell + SetDrawColor(0.25, 1, 0.25) + DrawImage(nil, colData.x + 2, colData.y, colData.width - 2, colData.height) + SetDrawColor(rowData.bgCol or "^0") + DrawImage(nil, colData.x + 3, colData.y + 1, colData.width - 4, colData.height - 2) + else + SetDrawColor(rowData.bgCol or "^0") + DrawImage(nil, colData.x + 2, colData.y, colData.width - 2, colData.height) + end + local textSize = rowData.textSize or 14 + SetViewport(colData.x + 3, colData.y, colData.width - 4, colData.height) + DrawString(1, 9 - textSize/2, "LEFT", textSize, "VAR", "^7"..self:FormatStr(colData.format, actor, colData)) + SetViewport() + end end - local textSize = rowData.textSize or 14 - SetViewport(colData.x + 3, colData.y, colData.width - 4, colData.height) - DrawString(1, 9 - textSize/2, "LEFT", textSize, "VAR", "^7"..self:FormatStr(colData.format, actor, colData)) - SetViewport() + lineY = lineY + 18 end end - lineY = lineY + 18 - end + -- If there's at least one enabled row in this subsection, offset by the border for the subsection label + if rows > 0 then + lineY = lineY + 2 end end end From 5c2dd5a963159d6ea13b226ce5809316d2b0f347 Mon Sep 17 00:00:00 2001 From: trimbe <19672127+trimbe@users.noreply.github.com> Date: Sat, 6 Jul 2024 22:29:04 -0700 Subject: [PATCH 5/5] allow children of PopupDialogs to process input events first (#7655) --- src/Classes/PopupDialog.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Classes/PopupDialog.lua b/src/Classes/PopupDialog.lua index 5366c140dc..9e5d97edec 100644 --- a/src/Classes/PopupDialog.lua +++ b/src/Classes/PopupDialog.lua @@ -60,6 +60,7 @@ function PopupDialogClass:Draw(viewPort) end function PopupDialogClass:ProcessInput(inputEvents, viewPort) + self:ProcessControlsInput(inputEvents, viewPort) for id, event in ipairs(inputEvents) do if event.type == "KeyDown" then if event.key == "ESCAPE" then @@ -83,5 +84,4 @@ function PopupDialogClass:ProcessInput(inputEvents, viewPort) end end end - self:ProcessControlsInput(inputEvents, viewPort) end \ No newline at end of file