Merge branch 'dev'

PathOfBuildingCommunity · Dec 18, 2023 · 5afd747 · 5afd747
2 parents 9021489 + eaeb37c
commit 5afd747
Show file tree

Hide file tree

Showing 6 changed files with 104 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,18 @@
 # Changelog
 
+## [v2.38.2](https://github.com/PathOfBuildingCommunity/PathOfBuilding/tree/v2.38.2) (2023/12/19)
+
+[Full Changelog](https://github.com/PathOfBuildingCommunity/PathOfBuilding/compare/v2.38.1...v2.38.2)
+
+<!-- Release notes generated using configuration in .github/release.yml at dev -->
+
+## What's Changed
+
+### Fixed Bugs
+- Fix Bodyswap of Sacrifice explosion not scaling correctly [\#7104](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/7104) ([LocalIdentity](https://github.com/LocalIdentity))
+
+
+
 ## [v2.38.1](https://github.com/PathOfBuildingCommunity/PathOfBuilding/tree/v2.38.1) (2023/12/18)
 
 [Full Changelog](https://github.com/PathOfBuildingCommunity/PathOfBuilding/compare/v2.38.0...v2.38.1)
@@ -18,7 +31,7 @@
 
 ### Fixed Bugs
 - Fix Flicker Strike DPS being limited by cooldown [\#7078](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/7078) ([sida-wang](https://github.com/sida-wang))
-- Fix Replica Dragonsfang's Flight not affecting Transfigured gems [\#7101](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/7101) ([Paliak](https://github.com/Paliak))
+- Fix Replica Dragonfang's Flight not affecting Transfigured gems [\#7101](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/7101) ([Paliak](https://github.com/Paliak))
 - Fix Lacerate of Haemorrhage "more damage with Bleeding" using increased [\#7072](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/7072) ([sida-wang](https://github.com/sida-wang))
 - Fix The Adorned not applying to jewels in outer tree sockets [\#7086](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/7086) ([LocalIdentity](https://github.com/LocalIdentity))
 - Fix The Adorned applying to abyss jewels in gear [\#7086](https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/7086) ([LocalIdentity](https://github.com/LocalIdentity))

diff --git a/changelog.txt b/changelog.txt
@@ -1,3 +1,9 @@
+VERSION[2.38.2][2023/12/19]
+
+--- User Interface ---
+* Fix Bodyswap of Sacrifice explosion not scaling correctly (LocalIdentity)
+
+
 VERSION[2.38.1][2023/12/18]
 
 --- User Interface ---
@@ -10,7 +16,7 @@ VERSION[2.38.1][2023/12/18]
 
 --- Fixed Bugs ---
 * Fix Flicker Strike DPS being limited by cooldown (sida-wang)
-* Fix Replica Dragonsfang's Flight not affecting Transfigured gems (Paliak)
+* Fix Replica Dragonfang's Flight not affecting Transfigured gems (Paliak)
 * Fix Lacerate of Haemorrhage "more damage with Bleeding" using increased (sida-wang)
 * Fix The Adorned not applying to jewels in outer tree sockets (LocalIdentity)
 * Fix The Adorned applying to abyss jewels in gear (LocalIdentity)

diff --git a/src/Data/Skills/act_int.lua b/src/Data/Skills/act_int.lua
@@ -2344,6 +2344,14 @@ skills["CorpseWarpAltX"] = {
 		["spell_maximum_base_fire_damage"] = {
 			skill("FireMax", nil, { type = "SkillPart", skillPart = 1 }),
 		},
+		["spell_base_fire_damage_%_maximum_life"] = {
+			skill("selfFireExplosionLifeMultiplier", nil, { type = "SkillPart", skillPart = 1 }),
+			div = 100,
+		},
+		["skill_minion_explosion_life_%"] = {
+			skill("selfFireExplosionLifeMultiplier", nil, { type = "SkillPart", skillPart = 2 }),
+			div = 100,
+		},
 		["corpse_warp_area_of_effect_+%_final_when_consuming_minion"] = {
 			mod("AreaOfEffect", "MORE", nil, 0, 0, { type = "SkillPart", skillPart = 2 }),
 		},

diff --git a/src/Export/Classes/GGPKData.lua b/src/Export/Classes/GGPKData.lua
@@ -218,6 +218,8 @@ function GGPKClass:GetNeededFiles()
 		"Data/azmerifeaturerooms.dat",
 		"Data/corpsetypetags.dat",
 		"Data/itemisedcorpse.dat",
+		"Data/indexableskillgems.dat",
+		"Data/indexablesupportgems.dat",
 	}
 	local txtFiles = {
 		"Metadata/StatDescriptions/passive_skill_aura_stat_descriptions.txt",

diff --git a/src/Export/Skills/act_int.txt b/src/Export/Skills/act_int.txt
@@ -581,6 +581,14 @@ local skills, mod, flag, skill = ...
 		["spell_maximum_base_fire_damage"] = {
 			skill("FireMax", nil, { type = "SkillPart", skillPart = 1 }),
 		},
+		["spell_base_fire_damage_%_maximum_life"] = {
+			skill("selfFireExplosionLifeMultiplier", nil, { type = "SkillPart", skillPart = 1 }),
+			div = 100,
+		},
+		["skill_minion_explosion_life_%"] = {
+			skill("selfFireExplosionLifeMultiplier", nil, { type = "SkillPart", skillPart = 2 }),
+			div = 100,
+		},
 		["corpse_warp_area_of_effect_+%_final_when_consuming_minion"] = {
 			mod("AreaOfEffect", "MORE", nil, 0, 0, { type = "SkillPart", skillPart = 2 }),
 		},

diff --git a/src/Export/spec.lua b/src/Export/spec.lua
@@ -5286,7 +5286,72 @@ return {
 	},
 	incursionuniqueupgrades={
 	},
+	indexableskillgems={
+		[1]={
+			list=false,
+			name="Id",
+			refTo="",
+			type="Int",
+			width=80
+		},
+		[2]={
+			list=true,
+			name="BaseItemType",
+			refTo="SkillGems",
+			type="Key",
+			width=300
+		},
+		[3]={
+			list=false,
+			name="Skill",
+			refTo="",
+			type="String",
+			width=150
+		},
+		[4]={
+			list=true,
+			name="BaseItemTypeRuthless",
+			refTo="SkillGems",
+			type="Key",
+			width=300
+		},
+		[5]={
+			list=false,
+			name="SkillRuthless",
+			refTo="",
+			type="String",
+			width=150
+		},
+		[6]={
+			list=false,
+			name="IdRuthless",
+			refTo="indexableskillgems",
+			type="Key",
+			width=80
+		}
+	},
 	indexablesupportgems={
+		[1]={
+			list=false,
+			name="Id",
+			refTo="",
+			type="Int",
+			width=80
+		},
+		[2]={
+			list=false,
+			name="BaseItemType",
+			refTo="SkillGems",
+			type="Key",
+			width=300
+		},
+		[3]={
+			list=false,
+			name="Skill",
+			refTo="",
+			type="String",
+			width=200
+		}
 	},
 	influenceexalts={
 	},