Merge branch 'dev' into choir-of-the-storm

Author: etojuice

CONTRIBUTING.md

@@ -23,7 +23,7 @@
 * Please provide detailed instructions on how to reproduce the bug, if possible.
 * Provide a build share code for a build that is affected by the bug, if possible.
   In the "Import/Export Build" tab, click "Generate", then "Share" and add the link to your post. 
-  
+
 Build share codes allow us to reproduce bugs much more quickly. 
 
 ## Requesting features
@@ -236,6 +236,8 @@ Docker alternative:
 * [How skills work in Path of Building](docs/addingSkills.md)
 
 ## Exporting GGPK data from Path of Exile
+> [!WARNING]   
+> This will not work on files from the torrent that is released before league launches, as it contains no `Data` section.
 
 Note: This tutorial assumes that you are already familiar with the GGPK and its structure. [poe-tool-dev/ggpk.discussion](https://github.com/poe-tool-dev/ggpk.discussion/wiki)
 is a good starting point.
@@ -244,6 +246,9 @@ The `./src/Data` folder contains generated files which are created using the scr
 If you change any logic/configuration in `./src/Export`, you will need to regenerate the appropriate `./src/Data` files. You can do so by running the `./src/Export` scripts using the `.dat` viewer at `./src/Export/Launch.lua`:
 
 ### Obtain an Oodle extractor
+> [!TIP]   
+> Binaries are usually available at https://github.com/zao/ooz/releases.
+
 Note: For this tutorial, you will need a working installation of [Visual Studio Community](https://visualstudio.microsoft.com/vs/community/)
 as well as some familiarity with build tools such as [CMake](https://cmake.org).
 1. In Visual Studio, clone the following repository using this command:
@@ -252,13 +257,24 @@ as well as some familiarity with build tools such as [CMake](https://cmake.org).
 2. Configure CMake.
 3. Build `bun_extract_file.exe`, `libbun.dll` and `libooz.dll`.
 
-### 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 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"`.
-3. Run the shortcut, and the GGPK data viewer UI will appear. If you get an error, be sure you're using the latest release of Path of Building Community.
-4. Paste the path to `Content.ggpk` (or, for Steam users, `C:\Program Files (x86)\Steam\steamapps\common\Path of Exile`) into the text box in the top left, and hit `Enter` to read the GGPK. If successful, you will see a list of the data tables in the GGPK file. Note: This will not work on the GGPK from the torrent file released before league launches, as it contains no `Data` section.
-5. Click `Scripts >>` to show the list of available export scripts. Double-clicking a script will run it, and the box to the right will show any output from the script.
-6. If you run into any errors, update the code in `./src/Export` as necessary and try again.
+### 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: 
+
+       "<path to repo>\runtime\Path{space}of{space}Building.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.)  
+
+   Example input for the stand-alone client:
+
+       C:\Path of Exile 2\Content.ggpk
+   Example input for Steam:
+
+       C:\Program Files (x86)\Steam\steamapps\common\Path of Exile 2  
+   If successful, you should see some cmd windows pop up as the files are unpacked, and then a list of the data tables in the GGPK file should appear.  
+6. Click `Scripts >>` to show the list of available export scripts. Double-clicking a script will run it, and the box to the right will show any output from the script.
+7. If you run into any errors, update the code in `./src/Export` as necessary and try again.
 
 ## Using the inbuilt profiler
 The profiler is found at https://github.com/charlesmallah/lua-profiler and is written entirely in lua under a MIT license.

manifest.xml

@@ -138,7 +138,7 @@
 	<File name="Data/ModCorrupted.lua" part="program" sha1="37602fae17e519b99b547dc4b7c377b2e39c928e" />
 	<File name="Data/ModFlask.lua" part="program" sha1="d577f560c0abe0776a2b37eff17203a452308cdd" />
 	<File name="Data/ModItem.lua" part="program" sha1="b0c5501478746932c4f5a1a8393f7890afe8f700" />
-	<File name="Data/ModItemExlusive.lua" part="program" sha1="15bfcca27655f2deb997d5f0f432b0a0ba92cf01" />
+	<File name="Data/ModItemExclusive.lua" part="program" sha1="15bfcca27655f2deb997d5f0f432b0a0ba92cf01" />
 	<File name="Data/ModJewel.lua" part="program" sha1="4b3562c18a8242215498e3ac449925db1733e598" />
 	<File name="Data/ModMap.lua" part="program" sha1="29edb01606d86bf46267fbe91ad1dd51eef52dae" />
 	<File name="Data/ModRunes.lua" part="program" sha1="a14dfdea09c48f29fd830b00fb37141e66f86359" />

src/Classes/ItemsTab.lua

@@ -1059,12 +1059,12 @@ function ItemsTabClass:Draw(viewPort, inputEvents)
 		if event.type == "KeyDown" then	
 			if event.key == "v" and IsKeyDown("CTRL") then
 				local newItem = Paste()
-				if newItem:find("{ ", 0, true) then
-					main:OpenConfirmPopup("Warning", "\"Advanced Item Descriptions\" (Ctrl+Alt+c) are unsupported.\n\nAbort paste?", "OK", function()
-						self:SetDisplayItem()
-					end)
-				end
 				if newItem then
+					if newItem:find("{ ", 0, true) then
+						main:OpenConfirmPopup("Warning", "\"Advanced Item Descriptions\" (Ctrl+Alt+c) are unsupported.\n\nAbort paste?", "OK", function()
+							self:SetDisplayItem()
+						end)
+					end
 					self:CreateDisplayItemFromRaw(newItem, true)
 				end
 			elseif event.key == "e" then

src/Data/ModCache.lua

@@ -2253,8 +2253,7 @@ c["Cannot be Poisoned"]={{[1]={flags=0,keywordFlags=0,name="PoisonImmune",type="
 c["Cannot be Shocked"]={{[1]={flags=0,keywordFlags=0,name="ShockImmune",type="FLAG",value=true}},nil}
 c["Cannot gain Spirit from Equipment"]={{[1]={flags=0,keywordFlags=0,name="CannotGainSpiritFromEquipment",type="FLAG",value=true}},nil}
 c["Cannot have Energy Shield"]={{[1]={flags=0,keywordFlags=0,name="CannotHaveES",type="FLAG",value=true}},nil}
-c["Cannot use Charms"]={nil,"Cannot use Charms "}
-c["Cannot use Charms 30% more Recovery from Flasks"]={nil,"Cannot use Charms 30% more Recovery from Flasks "}
+c["Cannot use Charms"]={{[1]={flags=0,keywordFlags=0,name="CharmLimit",type="OVERRIDE",value=0}},nil}
 c["Cannot use Life Flasks"]={nil,"Cannot use Life Flasks "}
 c["Cannot use Shield Skills"]={nil,"Cannot use Shield Skills "}
 c["Carry a Chest which adds 20 Inventory Slots"]={nil,"Carry a Chest which adds 20 Inventory Slots "}

src/Data/ModItemExlusive.lua renamed to src/Data/ModItemExclusive.lua

@@ -3377,6 +3377,17 @@ skills["ChargeInfusionPlayer"] = {
 			label = "Charge Infusion",
 			incrementalEffectiveness = 0.054999999701977,
 			statDescriptionScope = "charge_mastery",
+			statMap = {
+				["skill_charge_matery_skill_speed_+%_final_with_frenzy_charges"] = {
+					mod("Speed", "MORE", nil, 0, 0, { type = "StatThreshold", stat = "FrenzyCharges", threshold = 1 }, { type = "GlobalEffect", effectType = "Buff", effectName = "Charge Infusion", effectCond = "UseFrenzyCharges" }),
+				},
+				["skill_charge_mastery_crit_chance_+%_final_with_power_charges"] = {
+					mod("CritChance", "MORE", nil, 0, 0, { type = "StatThreshold", stat = "PowerCharges", threshold = 1 }, { type = "GlobalEffect", effectType = "Buff", effectName = "Charge Infusion", effectCond = "UsePowerCharges" }),
+				},
+				["skill_charge_mastery_defences_+%_final_with_endurance_charges"] = {
+					mod("Defences", "MORE", nil, 0, 0, { type = "StatThreshold", stat = "EnduranceCharges", threshold = 1 }, { type = "GlobalEffect", effectType = "Buff", effectName = "Charge Infusion", effectCond = "UseEnduranceCharges" }),
+				},
+			},
 			baseFlags = {
 			},
 			stats = {
@@ -7689,6 +7700,12 @@ skills["FrostBombPlayer"] = {
 			incrementalEffectiveness = 0.14000000059605,
 			damageIncrementalEffectiveness = 0.0065000001341105,
 			statDescriptionScope = "frost_bomb",
+			statMap = {
+				['skill_cold_exposure_magnitude'] = {
+					mod("ColdExposure", "BASE", nil, 0, 0, { type = "GlobalEffect", effectType = "Debuff" }),
+					mult = -1
+				},
+			},
 			baseFlags = {
 				spell = true,
 				area = true,

src/Data/Skills/act_int.lua

@@ -9,7 +9,7 @@ data.uniques.generated = { }
 local excludedItemKeystones = {
 }
 
-local uniqueMods = LoadModule("Data/ModItemExlusive")
+local uniqueMods = LoadModule("Data/ModItemExclusive")
 
 do
 	local againstMods = { }

src/Data/Uniques/Special/Generated.lua

@@ -198,6 +198,16 @@ function main:Init()
 			return not self.curDatFile
 		end
 	}
+	self.controls.clearOutput = new("ButtonControl", nil, {1190, 10, 100, 18}, "Clear", function()
+		wipeTable(self.scriptOutput)
+	end) {
+		shown = function()
+			return not self.curDatFile 
+		end,
+		enabled = function()
+			return #self.scriptOutput > 0
+		end
+	}
 
 	self.controls.scriptList = new("ScriptListControl", nil, {270, 35, 100, 300}) {
 		shown = function()

src/Export/Main.lua

@@ -242,7 +242,7 @@ end)
 writeMods("../Data/ModJewel.lua", function(mod)
 	return (mod.Domain == 11 and (mod.GenerationType == 1 or mod.GenerationType == 2)) or (mod.Domain == 21 and mod.GenerationType == 3)
 end)
-writeMods("../Data/ModItemExlusive.lua", function(mod) -- contains primarily uniques and items implicits but also other mods only available on a single base or unique.
+writeMods("../Data/ModItemExclusive.lua", function(mod) -- contains primarily uniques and items implicits but also other mods only available on a single base or unique.
 	return (mod.Domain == 1 or mod.Domain == 2 or mod.Domain == 11 or mod.Domain == 22) and mod.GenerationType == 3
 	and (mod.Family[1] and mod.Family[1].Id ~= "AuraBonus" or not mod.Family[1])
 	and not mod.Id:match("^Synthesis") and not mod.Id:match("Royale") and not mod.Id:match("Cowards") and not mod.Id:match("Map") and not mod.Id:match("Ultimatum") and not mod.Id:match("SpecialCorruption")

src/Export/Scripts/mods.lua

@@ -57,7 +57,7 @@ local function writeMods(out, statOrder)
 	end
 end
 
-local uniqueMods = LoadModule("../Data/ModItemExlusive.lua")
+local uniqueMods = LoadModule("../Data/ModItemExclusive.lua")
 for _, name in ipairs(itemTypes) do
 	local out = io.open("../Data/Uniques/"..name..".lua", "w")
 	local statOrder = {}