Release 1.3.4

- Added support for Offerings and Mistress of Sacrifice
2017-02-19 23:58:04 +10:00
parent fae06652d6
commit 57c3c4a0fe
7 changed files with 185 additions and 16 deletions
--- a/Data/Gems/act_int.lua
+++ b/Data/Gems/act_int.lua
@@ -390,7 +390,60 @@ gems["Bone Offering"] = {
 	active_skill = true,
 	spell = true,
 	duration = true,
-	unsupported = true,
+	color = 3,
+	baseFlags = {
+		spell = true,
+		duration = true,
+	},
+	skillTypes = { [2] = true, [5] = true, [12] = true, [36] = true, [9] = true, [49] = true, [17] = true, [19] = true, [18] = true, },
+	baseMods = {
+		skill("castTime", 1), 
+		skill("duration", 3), --"base_skill_effect_duration" = 3000
+		--"offering_skill_effect_duration_per_corpse" = 500
+		--"base_deal_no_damage" = ?
+		skill("offering", true), 
+	},
+	qualityMods = {
+		mod("Duration", "INC", 0.5), --"skill_effect_duration_+%" = 0.5
+	},
+	levelMods = {
+		[1] = skill("manaCost", nil), 
+		[2] = mod("BlockChance", "BASE", nil, 0, 0, { type = "GlobalEffect", effectType = "Buff" }), --"monster_base_block_%"
+		[3] = mod("SpellBlockChance", "BASE", nil, 0, 0, { type = "GlobalEffect", effectType = "Buff" }), --"base_spell_block_%"
+		--[4] = "minion_recover_X_life_on_block"
+	},
+	levels = {
+		[1] = { 16, 25, 25, 11, },
+		[2] = { 17, 26, 25, 14, },
+		[3] = { 18, 26, 26, 20, },
+		[4] = { 19, 27, 26, 27, },
+		[5] = { 20, 27, 27, 38, },
+		[6] = { 21, 28, 27, 50, },
+		[7] = { 22, 28, 28, 66, },
+		[8] = { 23, 29, 28, 81, },
+		[9] = { 24, 29, 29, 99, },
+		[10] = { 25, 30, 29, 120, },
+		[11] = { 26, 30, 30, 146, },
+		[12] = { 27, 31, 30, 176, },
+		[13] = { 28, 31, 31, 212, },
+		[14] = { 29, 32, 31, 255, },
+		[15] = { 29, 32, 32, 306, },
+		[16] = { 30, 33, 32, 366, },
+		[17] = { 30, 33, 33, 414, },
+		[18] = { 31, 34, 33, 468, },
+		[19] = { 32, 34, 34, 528, },
+		[20] = { 33, 35, 34, 594, },
+		[21] = { 34, 35, 35, 644, },
+		[22] = { 34, 36, 35, 693, },
+		[23] = { 35, 36, 36, 743, },
+		[24] = { 36, 37, 36, 792, },
+		[25] = { 37, 37, 37, 842, },
+		[26] = { 38, 38, 37, 891, },
+		[27] = { 38, 38, 38, 941, },
+		[28] = { 39, 39, 38, 990, },
+		[29] = { 40, 39, 39, 1040, },
+		[30] = { 41, 40, 39, 1089, },
+	},
 }
 gems["Clarity"] = {
 	aura = true,
@@ -1779,7 +1832,60 @@ gems["Flesh Offering"] = {
 	active_skill = true,
 	spell = true,
 	duration = true,
-	unsupported = true,
+	color = 3,
+	baseFlags = {
+		spell = true,
+		duration = true,
+	},
+	skillTypes = { [2] = true, [5] = true, [12] = true, [36] = true, [9] = true, [49] = true, [17] = true, [19] = true, [18] = true, },
+	baseMods = {
+		skill("castTime", 1), 
+		skill("duration", 3), --"base_skill_effect_duration" = 3000
+		--"offering_skill_effect_duration_per_corpse" = 500
+		--"base_deal_no_damage" = ?
+		skill("offering", true), 
+	},
+	qualityMods = {
+		mod("Duration", "INC", 0.5), --"skill_effect_duration_+%" = 0.5
+	},
+	levelMods = {
+		[1] = skill("manaCost", nil), 
+		[2] = mod("Speed", "INC", nil, ModFlag.Attack, 0, { type = "GlobalEffect", effectType = "Buff" }), --"attack_speed_+%"
+		[3] = mod("MovementSpeed", "INC", nil, 0, 0, { type = "GlobalEffect", effectType = "Buff" }), --"base_movement_velocity_+%"
+		[4] = mod("Speed", "INC", nil, ModFlag.Cast, 0, { type = "GlobalEffect", effectType = "Buff" }), --"cast_speed_+%_from_haste_aura"
+	},
+	levels = {
+		[1] = { 16, 20, 20, 20, },
+		[2] = { 17, 21, 20, 21, },
+		[3] = { 18, 21, 21, 21, },
+		[4] = { 19, 22, 21, 22, },
+		[5] = { 20, 22, 22, 22, },
+		[6] = { 21, 23, 22, 23, },
+		[7] = { 22, 23, 23, 23, },
+		[8] = { 23, 24, 23, 24, },
+		[9] = { 24, 24, 24, 24, },
+		[10] = { 25, 25, 24, 25, },
+		[11] = { 26, 25, 25, 25, },
+		[12] = { 27, 26, 25, 26, },
+		[13] = { 28, 26, 26, 26, },
+		[14] = { 29, 27, 26, 27, },
+		[15] = { 29, 27, 27, 27, },
+		[16] = { 30, 28, 27, 28, },
+		[17] = { 30, 28, 28, 28, },
+		[18] = { 31, 29, 28, 29, },
+		[19] = { 32, 29, 29, 29, },
+		[20] = { 33, 30, 29, 30, },
+		[21] = { 34, 30, 30, 30, },
+		[22] = { 34, 31, 30, 31, },
+		[23] = { 35, 31, 31, 31, },
+		[24] = { 36, 32, 31, 32, },
+		[25] = { 37, 32, 32, 32, },
+		[26] = { 38, 33, 32, 33, },
+		[27] = { 38, 33, 33, 33, },
+		[28] = { 39, 34, 33, 34, },
+		[29] = { 40, 34, 34, 34, },
+		[30] = { 41, 35, 34, 35, },
+	},
 }
 gems["Freezing Pulse"] = {
 	projectile = true,
@@ -3714,7 +3820,60 @@ gems["Spirit Offering"] = {
 	active_skill = true,
 	spell = true,
 	duration = true,
-	unsupported = true,
+	color = 3,
+	baseFlags = {
+		spell = true,
+		duration = true,
+	},
+	skillTypes = { [2] = true, [5] = true, [12] = true, [36] = true, [9] = true, [49] = true, [17] = true, [19] = true, [18] = true, },
+	baseMods = {
+		skill("castTime", 1), 
+		skill("duration", 3), --"base_skill_effect_duration" = 3000
+		--"offering_skill_effect_duration_per_corpse" = 500
+		--"spirit_offering_life_%_added_as_base_maximum_energy_shield_per_corpse_consumed" = 2
+		--"base_deal_no_damage" = ?
+		skill("offering", true), 
+	},
+	qualityMods = {
+		mod("Duration", "INC", 0.5), --"skill_effect_duration_+%" = 0.5
+	},
+	levelMods = {
+		[1] = skill("manaCost", nil), 
+		[2] = mod("PhysicalDamageGainAsChaos", "BASE", nil, 0, 0, { type = "GlobalEffect", effectType = "Buff" }), --"physical_damage_%_to_add_as_chaos"
+		[3] = mod("ElementalResist", "BASE", nil, 0, 0, { type = "GlobalEffect", effectType = "Buff" }), --"base_resist_all_elements_%"
+	},
+	levels = {
+		[1] = { 16, 20, 20, },
+		[2] = { 17, 20, 21, },
+		[3] = { 18, 21, 21, },
+		[4] = { 19, 21, 22, },
+		[5] = { 20, 22, 22, },
+		[6] = { 21, 22, 23, },
+		[7] = { 22, 23, 23, },
+		[8] = { 23, 23, 24, },
+		[9] = { 24, 24, 24, },
+		[10] = { 25, 24, 25, },
+		[11] = { 26, 25, 25, },
+		[12] = { 27, 25, 26, },
+		[13] = { 28, 26, 26, },
+		[14] = { 29, 26, 27, },
+		[15] = { 29, 27, 27, },
+		[16] = { 30, 27, 28, },
+		[17] = { 30, 28, 28, },
+		[18] = { 31, 28, 29, },
+		[19] = { 32, 29, 29, },
+		[20] = { 33, 29, 30, },
+		[21] = { 34, 30, 30, },
+		[22] = { 34, 30, 31, },
+		[23] = { 35, 31, 31, },
+		[24] = { 36, 31, 32, },
+		[25] = { 37, 32, 32, },
+		[26] = { 38, 32, 33, },
+		[27] = { 38, 33, 33, },
+		[28] = { 39, 33, 34, },
+		[29] = { 40, 34, 34, },
+		[30] = { 41, 34, 35, },
+	},
 }
 gems["Storm Call"] = {
 	intelligence = true,
--- a/Modules/Calcs.lua
+++ b/Modules/Calcs.lua
@@ -3,7 +3,7 @@
 -- Module: Calcs
 -- Performs all the offense and defense calculations.
 -- Here be dragons!
-- This file is 3000 lines long, over half of which is in one function...
+-- This file is 3100 lines long, over half of which is in one function...
 --

 local pairs = pairs
@@ -1155,7 +1155,8 @@ local function performCalcs(env)

 		-- Merge auxillary modifiers
 		if env.mode_buffs then
-			if activeSkill.buffModList and (not activeSkill.skillFlags.totem or activeSkill.skillData.allowTotemBuff) then
+			if activeSkill.buffModList and (not activeSkill.skillFlags.totem or activeSkill.skillData.allowTotemBuff) and (not activeSkill.skillData.offering or modDB:Sum("FLAG", nil, "OfferingsAffectPlayer")) then
+				activeSkill.buffSkill = true
 				local inc = modDB:Sum("INC", skillCfg, "BuffEffect")
 				if activeSkill.activeGem.data.golem and modDB:Sum("FLAG", skillCfg, "LiegeOfThePrimordial") and (activeSkill.activeGem.data.fire or activeSkill.activeGem.data.cold or activeSkill.activeGem.data.lightning) then
 					inc = inc + 100
@@ -1163,6 +1164,7 @@ local function performCalcs(env)
 				modDB:ScaleAddList(activeSkill.buffModList, 1 + inc / 100)
 			end
 			if activeSkill.auraModList then
+				activeSkill.buffSkill = true
 				local inc = modDB:Sum("INC", skillCfg, "AuraEffect") + skillModList:Sum("INC", skillCfg, "AuraEffect") + modDB:Sum("INC", skillCfg, "BuffEffect")
 				local more = modDB:Sum("MORE", skillCfg, "AuraEffect") * skillModList:Sum("MORE", skillCfg, "AuraEffect")
 				modDB:ScaleAddList(activeSkill.auraModList, (1 + inc / 100) * more)
@@ -1172,9 +1174,11 @@ local function performCalcs(env)
 		end
 		if env.mode_effective then
 			if activeSkill.debuffModList then
+				activeSkill.debuffSkill = true
 				enemyDB:ScaleAddList(activeSkill.debuffModList, activeSkill.skillData.stackCount or 1)
 			end
 			if activeSkill.curseModList then
+				activeSkill.debuffSkill = true
 				condList["EnemyCursed"] = true
 				local inc = modDB:Sum("INC", skillCfg, "CurseEffect") + enemyDB:Sum("INC", nil, "CurseEffect") + skillModList:Sum("INC", skillCfg, "CurseEffect")
 				local more = modDB:Sum("MORE", skillCfg, "CurseEffect") * enemyDB:Sum("MORE", nil, "CurseEffect") * skillModList:Sum("MORE", skillCfg, "CurseEffect")
@@ -1554,7 +1558,7 @@ local function performCalcs(env)
 				slotBreakdown("Conversion", "Mana to Energy Shield", nil, energyShieldBase, nil, "EnergyShield", "Defences", "Mana")
 			end
 		end
-		local convLifeToES = modDB:Sum("BASE", nil, "LifeConvertToEnergyShield")
+		local convLifeToES = modDB:Sum("BASE", nil, "LifeConvertToEnergyShield", "LifeGainAsEnergyShield")
 		if convLifeToES > 0 then
 			energyShieldBase = modDB:Sum("BASE", nil, "Life") * convLifeToES / 100
 			local total
@@ -3096,14 +3100,14 @@ function calcs.buildOutput(build, mode)
 			t_insert(combatList, "Unholy Might")
 		end
 		for _, activeSkill in ipairs(env.activeSkillList) do
-			if activeSkill.buffModList or activeSkill.auraModList then
+			if activeSkill.buffSkill then
 				if activeSkill.skillFlags.multiPart then
 					t_insert(buffList, activeSkill.activeGem.name .. " (" .. activeSkill.skillPartName .. ")")
 				else
 					t_insert(buffList, activeSkill.activeGem.name)
 				end
 			end
-			if activeSkill.debuffModList or activeSkill.curseModList then
+			if activeSkill.debuffSkill then
 				if activeSkill.skillFlags.multiPart then
 					t_insert(curseList, activeSkill.activeGem.name .. " (" .. activeSkill.skillPartName .. ")")
 				else
--- a/Modules/ModParser.lua
+++ b/Modules/ModParser.lua
@@ -513,6 +513,7 @@ local specialModList = {
 	["critical strikes ignore enemy monster elemental resistances"] = { flag("IgnoreElementalResistances", { type = "Condition", var = "CriticalStrike" }) },
 	["non%-critical strikes penetrate (%d+)%% of enemy elemental resistances"] = function(num) return { mod("ElementalPenetration", "BASE", num, { type = "Condition", var = "CriticalStrike", neg = true }) } end,
 	["movement speed cannot be modified to below base value"] = { flag("MovementSpeedCannotBeBelowBase") },
+	["your offering skills also affect you"] = { flag("OfferingsAffectPlayer") },
 	-- Special node types
 	["(%d+)%% of block chance applied to spells"] = function(num) return { mod("BlockChanceConv", "BASE", num) } end,
 	["(%d+)%% additional block chance with staves"] = function(num) return { mod("BlockChance", "BASE", num, { type = "Condition", var = "UsingStaff" }) } end,
--- a/README.md
+++ b/README.md
@@ -47,6 +47,9 @@ Head over to the [Releases](https://github.com/Openarl/PathOfBuilding/releases)
 ![ss3](https://cloud.githubusercontent.com/assets/19189971/18089780/f0ff234a-6f04-11e6-8c88-6193fe59a5c4.png)

 ## Changelog
+### 1.3.4 - 2017/02/20
+ * Added support for the Offering skills and Mistress of Sacrifice
+
 ### 1.3.3 - 2017/02/19
 * Added support for Intuitive Leap
 * Added support for the Decay effect granted by Essence of Delirium
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,5 @@
+VERSION[1.3.4][2017/02/20]
+ * Added support for the Offering skills and Mistress of Sacrifice
 VERSION[1.3.3][2017/02/19]
 * Added support for Intuitive Leap
 * Added support for the Decay effect granted by Essence of Delirium
--- a/manifest.xml
+++ b/manifest.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <PoBVersion>
-	<Version number="1.3.3"/>
+	<Version number="1.3.4"/>
 	<Source part="program" url="https://raw.githubusercontent.com/Openarl/PathOfBuilding/{branch}/"/>
 	<Source part="tree" url="https://raw.githubusercontent.com/Openarl/PathOfBuilding/{branch}/tree.zip"/>
 	<Source url="https://raw.githubusercontent.com/Openarl/PathOfBuilding/{branch}/runtime-win32.zip" part="runtime" platform="win32"/>
 	<File sha1="8a7163c306feb866be7f8d66c71b282c9f99be94" name="Launch.lua" part="program"/>
 	<File sha1="d8e42beeb38baabcc197d658e4c0af33419eeff3" name="UpdateCheck.lua" part="program"/>
 	<File sha1="4f17937f2b37784e169a3792b235f2a0a3961e61" name="UpdateApply.lua" part="program"/>
-	<File sha1="a59c51c53747dda1f29bd86dc00c52976f700a9e" name="changelog.txt" part="program"/>
+	<File sha1="eb2ab2d5663283daa1d89265f35353dc2f822dcc" name="changelog.txt" part="program"/>
 	<File sha1="231a4fe264d84294427edacbf3e29ec4b301712e" name="Classes/BuildListControl.lua" part="program"/>
 	<File sha1="deffd663ba726d938fcbe2870aab8a4e982587fa" name="Classes/ButtonControl.lua" part="program"/>
 	<File sha1="412639a254d0e275d9cc2286c5d76d3b0a9a0e8e" name="Classes/CalcBreakdownControl.lua" part="program"/>
@@ -44,13 +44,13 @@
 	<File sha1="4b7675c8b4fe71cade7dd3d70793df1ed8022d01" name="Classes/UndoHandler.lua" part="program"/>
 	<File sha1="06cef31ee7a133da6a9c4b8b4b9e859901c4a4a4" name="Modules/Build.lua" part="program"/>
 	<File sha1="8a07fe01c53b785ebb6256236e781fbaabd36c0e" name="Modules/BuildList.lua" part="program"/>
-	<File sha1="a99839763bab36cba2fed0c77b1d8a14bc329648" name="Modules/Calcs.lua" part="program"/>
+	<File sha1="2538e96f9fdd53aaf2915ca4c1d2c06aba9dbd72" name="Modules/Calcs.lua" part="program"/>
 	<File sha1="4063501d4bf32511b5eddcb08ad8037866846179" name="Modules/CalcSections.lua" part="program"/>
 	<File sha1="761af85f3e1c5601fdb790356a09aefe2f5a64e3" name="Modules/Common.lua" part="program"/>
 	<File sha1="cc9721ab97b5cfb9c707f4523168b9df618db083" name="Modules/Data.lua" part="program"/>
 	<File sha1="4426369a8320676d96df73dea35e1a6cafdd3d19" name="Modules/ItemTools.lua" part="program"/>
 	<File sha1="e66e6bd244bb5d6112dbade17f7d4640a58f6b3a" name="Modules/Main.lua" part="program"/>
-	<File sha1="33e4d6a9d804b9ffb4a140ff4af201c626873830" name="Modules/ModParser.lua" part="program"/>
+	<File sha1="4fa1af18fb1b338c737b4157dd12a284739427ea" name="Modules/ModParser.lua" part="program"/>
 	<File sha1="5f93a9d8f58e0d5990a1f84e1ab1d53fbd35fb56" name="Modules/ModTools.lua" part="program"/>
 	<File sha1="e7ee7e5b6388facb7bf568517ecc401590757df7" name="Assets/ring.png" part="program"/>
 	<File sha1="9a320bfe629b1cf3f14fc77fbbf2508d0a5b2841" name="Assets/small_ring.png" part="program"/>
@@ -59,7 +59,7 @@
 	<File sha1="24596d013ecc9170990670c4e02f1b38c326db9e" name="Data/New.lua" part="program"/>
 	<File sha1="1e6951cb616701529d9cca9d320fc24b441c1d5c" name="Data/Rares.lua" part="program"/>
 	<File sha1="bfbb2f85884ae85a34efba541b712db9f7beca87" name="Data/Gems/act_dex.lua" part="program"/>
-	<File sha1="793e7c6d5ecd04d9f38660e3b784b1ab627fd1fe" name="Data/Gems/act_int.lua" part="program"/>
+	<File sha1="0d3a56eb1f71c292926fefa1029397dcbeb8078f" name="Data/Gems/act_int.lua" part="program"/>
 	<File sha1="647f42dd7f410c28d5d7f50c331b66d6a514aaee" name="Data/Gems/act_str.lua" part="program"/>
 	<File sha1="9fc931dae9bd0e8a4bd442b59f287225165a2fce" name="Data/Gems/other.lua" part="program"/>
 	<File sha1="f9a472c52c60975b8f1f98ed67a105e72c2134a0" name="Data/Gems/sup_dex.lua" part="program"/>
@@ -103,12 +103,12 @@
 	<File sha1="5fa6696ce2be10a120bbfdcc290d0821a3b80176" name="Data/Uniques/staff.lua" part="program"/>
 	<File sha1="299479094ef80df2fcc1e3232ef56685349b26bf" name="Data/Uniques/sword.lua" part="program"/>
 	<File sha1="3054ba5a1cdc0720a39e4f69496564b9ad9b9dc8" name="Data/Uniques/wand.lua" part="program"/>
-	<File platform="win32" sha1="c8e2641564927748a142af7b79f31264eb7d768e" name="Path of Building.exe" part="runtime"/>
+	<File platform="win32" sha1="7e5a3242c9a4296dc8377feb4c9d824f3f0a3cc1" name="Path of Building.exe" part="runtime"/>
 	<File platform="win32" sha1="7a973d3c0b5121e6aad0dcb9323be5b432fc63e7" name="lua51.dll" part="runtime"/>
-	<File platform="win32" sha1="7c8adb0bc837d785f80b115f4a01f10f80a3fc0a" name="SimpleGraphic.dll" part="runtime"/>
+	<File platform="win32" sha1="75f480418fa0abc24d799ea9f773be5b168b6ccd" name="SimpleGraphic.dll" part="runtime"/>
 	<File platform="win32" sha1="54affb3a261404479b5cc932753c0a36446992d9" name="libcurl.dll" part="runtime"/>
 	<File platform="win32" sha1="5b9c38e7a05a615e45a6b00ad1ff1a92832bcc84" name="lcurl.dll" part="runtime"/>
-	<File platform="win32" sha1="65ab53933ec7fd3cbc272452fdf4092b8c6182fa" name="lzip.dll" part="runtime"/>
+	<File platform="win32" sha1="294f5209c0abdf173435bce8234f1f94887ab1a9" name="lzip.dll" part="runtime"/>
 	<File sha1="74cc6c47e7cda18211e57b9e062368eab3c26bab" name="SimpleGraphic/Fonts/Bitstream Vera Sans Mono.10.tga" part="runtime"/>
 	<File sha1="1977206f0efc5035834ecbf93ca7d046010d8aab" name="SimpleGraphic/Fonts/Bitstream Vera Sans Mono.12.tga" part="runtime"/>
 	<File sha1="93a4309dc814914be7d2dee708e3821494f145a2" name="SimpleGraphic/Fonts/Bitstream Vera Sans Mono.14.tga" part="runtime"/>
--- a/runtime-win32.zip
+++ b/runtime-win32.zip