Merge upstream/dev into feature/draganddrop

Author: marckaraujo

CONTRIBUTING.md

@@ -66,9 +66,10 @@ The easiest way to make and test changes is by setting up a development installa
 
        cd PathOfBuilding-PoE2
 
-3. Start Path of Building from the repository by running `./runtime/Path{space}of{space}Building-PoE2.exe`.
-
-   * <ins>Note for Linux users:</ins> The executable files should automatically have the correct permissions when cloned fresh. If you still encounter permission issues, run once: `chmod +x ./runtime/Path{space}of{space}Building-PoE2.exe`
+3. Start Path of Building from the repository.
+       * On Windows, run `./runtime/Path{space}of{space}Building-PoE2.exe`
+       * On Linux, run `wine ./runtime/Path{space}of{space}Building-PoE2.exe`
+       * <ins>Note for Linux users:</ins> `chmod +x` only fixes the execute bit. The file is still a Windows executable, so Wine is required to run it.
 
 You can now use the shortcut to run the program from the repository. Running the program in this manner automatically enables "Dev Mode", which has some handy debugging feature:
 * `F5` restarts the program in-place (this is what usually happens when an update is applied).
@@ -97,7 +98,7 @@ To do so [comment out Line 54 to line 58](./src/Launch.lua#L54-L58) of the [Laun
 	--end
 ```
 
-and create a valid manifest.xml file in the ./src directory. Then run the `./runtime/Path{space}of{space}Building.exe` as usual. You should get the typical update popup in the bottom left corner.
+and create a valid manifest.xml file in the ./src directory. Then run the `./runtime/Path{space}of{space}Building-PoE2.exe` as usual. You should get the typical update popup in the bottom left corner.
 
 The manifest.xml file deserves its own in depth document, but usually copying from release and editing accordingly works well enough.
 
@@ -205,7 +206,7 @@ Files in `/Data` `/Export` and `/TreeData` can be massive and cause the EmmyLua
 
 If you're on windows, consider downloading [git for windows](https://git-scm.com/downloads) and installing git bash. Git bash comes with a variety of typical linux tools such as grep that can make navigating the code base much easier.
 
-If you're using linux you can run the ./runtime/Path{space}of{space}Building.exe executable with wine. You will need to provide a valid wine path to the emmy lua debugger directory.
+If you're using linux you can run the `./runtime/Path{space}of{space}Building-PoE2.exe` executable with wine. You will need to provide a valid wine path to the emmy lua debugger directory.
 
 ```bash
 # winepath -w ~/.vscode/extensions/tangzx.emmylua-0.8.20-linux-x64/debugger/emmy/windows/x64/
@@ -266,9 +267,9 @@ as well as some familiarity with build tools such as [CMake](https://cmake.org).
 
 ### Set up the exporter
 1. Copy `bun_extract_file.exe`, `libbun.dll` and `libooz.dll` to `.\src\Export\ggpk\`.
-2. Create a shortcut to `.\runtime\Path{space}of{space}Building.exe` with the path to `.\src\Export\Launch.lua` as the first argument. You should end up with something like: 
+2. Create a shortcut to `.\runtime\Path{space}of{space}Building-PoE2.exe` with the path to `.\src\Export\Launch.lua` as the first argument. You should end up with something like: 
 
-       "<path to repo>\runtime\Path{space}of{space}Building.exe" "<path to repo>\src\Export\Launch.lua"
+       "<path to repo>\runtime\Path{space}of{space}Building-PoE2.exe" "<path to repo>\src\Export\Launch.lua"
 3. Run the shortcut.  "Dat View", the GGPK data viewer UI, should appear.  If you get an error, be sure you're using the latest release of Path of Building Community.
 4. Click `Edit Sources...` to display the "New DAT Source" popup.  Click `New` and enter a name.
 5. Paste the full path to `Content.ggpk` into the "Source from GGPK/Steam PoE path" box and hit `Enter`.  For the stand-alone client, the path must include the file-name.  (Do not put anything in the "Source from DAT files" box unless you have already manually unpacked the relevant files.)  

runtime/lua/socket.lua

@@ -17,53 +17,56 @@ local _M = socket
 -- Exported auxiliar functions
 -----------------------------------------------------------------------------
 function _M.connect4(address, port, laddress, lport)
-    return socket.connect(address, port, laddress, lport, "inet")
+	return socket.connect(address, port, laddress, lport, "inet")
 end
 
 function _M.connect6(address, port, laddress, lport)
-    return socket.connect(address, port, laddress, lport, "inet6")
+	return socket.connect(address, port, laddress, lport, "inet6")
 end
 
 function _M.bind(host, port, backlog)
-    if host == "*" then host = "0.0.0.0" end
-    local addrinfo, err = socket.dns.getaddrinfo(host);
-    if not addrinfo then return nil, err end
-    local sock, res
-    err = "no info on address"
-    for i, alt in base.ipairs(addrinfo) do
-        if alt.family == "inet" then
-            sock, err = socket.tcp4()
-        else
-            sock, err = socket.tcp6()
-        end
-        if not sock then return nil, err end
-        sock:setoption("reuseaddr", true)
-        res, err = sock:bind(alt.addr, port)
-        if not res then
-            sock:close()
-        else
-            res, err = sock:listen(backlog)
-            if not res then
-                sock:close()
-            else
-                return sock
-            end
-        end
-    end
-    return nil, err
+	if host == "*" then host = "0.0.0.0" end
+	local addrinfo, err = socket.dns.getaddrinfo(host);
+	if not addrinfo then return nil, err end
+	local sock, res
+	err = "no info on address"
+	for i, alt in base.ipairs(addrinfo) do
+		if alt.family == "inet" then
+			sock, err = socket.tcp4()
+		else
+			sock, err = socket.tcp6()
+		end
+		if not sock then return nil, err end
+		-- sock:setoption("reuseaddr", true)
+		res, err = sock:bind(alt.addr, port)
+		if not res then
+			sock:close()
+		else
+			res, err = sock:listen(backlog)
+			if not res then
+				sock:close()
+			else
+				return sock
+			end
+		end
+	end
+	return nil, err
 end
 
 _M.try = _M.newtry()
 
 function _M.choose(table)
-    return function(name, opt1, opt2)
-        if base.type(name) ~= "string" then
-            name, opt1, opt2 = "default", name, opt1
-        end
-        local f = table[name or "nil"]
-        if not f then base.error("unknown key (".. base.tostring(name) ..")", 3)
-        else return f(opt1, opt2) end
-    end
+	return function(name, opt1, opt2)
+		if base.type(name) ~= "string" then
+			name, opt1, opt2 = "default", name, opt1
+		end
+		local f = table[name or "nil"]
+		if not f then
+			base.error("unknown key (" .. base.tostring(name) .. ")", 3)
+		else
+			return f(opt1, opt2)
+		end
+	end
 end
 
 -----------------------------------------------------------------------------
@@ -77,68 +80,76 @@ _M.sinkt = sinkt
 _M.BLOCKSIZE = 2048
 
 sinkt["close-when-done"] = function(sock)
-    return base.setmetatable({
-        getfd = function() return sock:getfd() end,
-        dirty = function() return sock:dirty() end
-    }, {
-        __call = function(self, chunk, err)
-            if not chunk then
-                sock:close()
-                return 1
-            else return sock:send(chunk) end
-        end
-    })
+	return base.setmetatable({
+		getfd = function() return sock:getfd() end,
+		dirty = function() return sock:dirty() end
+	}, {
+		__call = function(self, chunk, err)
+			if not chunk then
+				sock:close()
+				return 1
+			else
+				return sock:send(chunk)
+			end
+		end
+	})
 end
 
 sinkt["keep-open"] = function(sock)
-    return base.setmetatable({
-        getfd = function() return sock:getfd() end,
-        dirty = function() return sock:dirty() end
-    }, {
-        __call = function(self, chunk, err)
-            if chunk then return sock:send(chunk)
-            else return 1 end
-        end
-    })
+	return base.setmetatable({
+		getfd = function() return sock:getfd() end,
+		dirty = function() return sock:dirty() end
+	}, {
+		__call = function(self, chunk, err)
+			if chunk then
+				return sock:send(chunk)
+			else
+				return 1
+			end
+		end
+	})
 end
 
 sinkt["default"] = sinkt["keep-open"]
 
 _M.sink = _M.choose(sinkt)
 
 sourcet["by-length"] = function(sock, length)
-    return base.setmetatable({
-        getfd = function() return sock:getfd() end,
-        dirty = function() return sock:dirty() end
-    }, {
-        __call = function()
-            if length <= 0 then return nil end
-            local size = math.min(socket.BLOCKSIZE, length)
-            local chunk, err = sock:receive(size)
-            if err then return nil, err end
-            length = length - string.len(chunk)
-            return chunk
-        end
-    })
+	return base.setmetatable({
+		getfd = function() return sock:getfd() end,
+		dirty = function() return sock:dirty() end
+	}, {
+		__call = function()
+			if length <= 0 then return nil end
+			local size = math.min(socket.BLOCKSIZE, length)
+			local chunk, err = sock:receive(size)
+			if err then return nil, err end
+			length = length - string.len(chunk)
+			return chunk
+		end
+	})
 end
 
 sourcet["until-closed"] = function(sock)
-    local done
-    return base.setmetatable({
-        getfd = function() return sock:getfd() end,
-        dirty = function() return sock:dirty() end
-    }, {
-        __call = function()
-            if done then return nil end
-            local chunk, err, partial = sock:receive(socket.BLOCKSIZE)
-            if not err then return chunk
-            elseif err == "closed" then
-                sock:close()
-                done = 1
-                return partial
-            else return nil, err end
-        end
-    })
+	local done
+	return base.setmetatable({
+		getfd = function() return sock:getfd() end,
+		dirty = function() return sock:dirty() end
+	}, {
+		__call = function()
+			if done then return nil end
+			local chunk, err, partial = sock:receive(socket.BLOCKSIZE)
+			if not err then
+				return chunk
+			elseif err == "closed" then
+				sock:close()
+				done = 1
+				return partial
+			else
+				return nil, err
+			end
+		end
+	})
 end
 
 

spec/System/TestAilments_spec.lua

@@ -14,4 +14,18 @@ describe("TestAilments", function()
 	--TODO: Shock not supported currently
 	--it("bleed is buffed by bleed chance", function()
 	--end)
-end)
+
+	it("does not double count chaos damage taken for chaos poison", function()
+		build.skillsTab:PasteSocketGroup("Chaos Bolt 1/0  1\nPoison I 1/0  1\n")
+		runCallback("OnFrame")
+
+		local baseEffMult = build.calcsTab.mainOutput.PoisonEffMult
+		assert.True(baseEffMult and baseEffMult > 0)
+
+		build.configTab.input.customMods = "Nearby enemies take 10% increased Chaos Damage"
+		build.configTab:BuildModList()
+		runCallback("OnFrame")
+
+		assert.are.equals(1.1, build.calcsTab.mainOutput.PoisonEffMult)
+	end)
+end)

spec/System/TestItemTools_spec.lua

@@ -53,4 +53,53 @@ describe("TestItemTools", function()
 		assert.are.equals(0.5, item.rangeLineList[1].range)
 		assert.are.equals(0, item.baseModList:Sum("BASE", nil, "PowerChargesMax"))
 	end)
-end)
+
+	it("uses the displayed item slot for anoint comparison tooltips", function()
+		if not common.classes.ItemsTab then
+			LoadModule("Classes/ItemsTab")
+		end
+
+		local function assertAnointUsesSlot(rawItem, expectedSlot)
+			local item = new("Item", rawItem)
+			local overrides = { }
+			local fakeItemsTab = setmetatable({
+				displayItem = item,
+				build = {
+					spec = { allocNodes = { } },
+					calcsTab = {
+						GetMiscCalculator = function()
+							return function(override)
+								table.insert(overrides, override)
+								return { }
+							end
+						end,
+					},
+					AddStatComparesToTooltip = function()
+						return 1
+					end,
+				},
+			}, common.classes.ItemsTab)
+			local tooltip = {
+				AddLine = function() end,
+			}
+
+			fakeItemsTab:AppendAnointTooltip(tooltip, { id = 1, dn = "Abasement" })
+
+			assert.are.equals(expectedSlot, overrides[1].repSlotName)
+			assert.are.equals(expectedSlot, overrides[2].repSlotName)
+		end
+
+		assertAnointUsesSlot([[
+			Rarity: Rare
+			Dire Thread
+			Plate Belt
+			Can be Anointed
+			]], "Belt")
+		assertAnointUsesSlot([[
+			Rarity: Rare
+			Spark Loop
+			Ruby Ring
+			Can be Anointed
+			]], "Ring 1")
+	end)
+end)