Merge branch 'PathOfBuildingCommunity:dev' into spectres

Author: Blitz54

src/Classes/ImportTab.lua

@@ -751,10 +751,12 @@ function ImportTabClass:ImportItemsAndSkills(charData)
 			local group = { label = "", enabled = true, gemList = { } }
 			t_insert(group.gemList, gemInstance )
 
-			for _, anotherSkillData in pairs(skillData.socketedItems) do
-				local anotherGemInstance = funcGetGemInstance(anotherSkillData)
-				if anotherGemInstance then
-					t_insert(group.gemList, anotherGemInstance )
+			if skillData.socketedItems then
+				for _, anotherSkillData in pairs(skillData.socketedItems) do
+					local anotherGemInstance = funcGetGemInstance(anotherSkillData)
+					if anotherGemInstance then
+						t_insert(group.gemList, anotherGemInstance )
+					end
 				end
 			end
 

src/Classes/ItemsTab.lua

@@ -1816,7 +1816,7 @@ function ItemsTabClass:IsItemValidForSlot(item, slotName, itemSet)
 		if not node or item.type ~= "Jewel" then
 			return false
 		elseif node.containJewelSocket  then
-			if item.rarity == "UNIQUE" or (item.base and item.base.subType ~= nil) then
+			if item.rarity == "UNIQUE" or item.rarity == "RELIC" or (item.base and item.base.subType ~= nil) then
 				-- Lich socket can only accept basic non-unique jewels
 				-- Need to change this to use ModParser if GGG add different conditional ascendancy jewel sockets
 				return false

src/Classes/ModStore.lua

@@ -453,6 +453,9 @@ function ModStoreClass:EvalMod(mod, cfg)
 			end
 			local percent = tag.percent or self:GetMultiplier(tag.percentVar, cfg)
 			local mult = base * (percent and percent / 100 or 1)
+			if tag.floor then
+				mult = m_floor(mult)
+			end
 			local limitTotal
 			if tag.limit or tag.limitVar then
 				local limit = tag.limit or self:GetMultiplier(tag.limitVar, cfg)

src/Data/Misc.lua

@@ -100,6 +100,13 @@ data.gameConstants = {
 	["CullingStrikeRareThreshold"] = 10,
 	["CullingStrikeUniqueThreshold"] = 5,
 }
+-- From PlayerMinionIntrinsicStats.dat
+data.playerMinionIntrinsicStats = {
+	["stun_base_duration_override_ms"] = 500,
+	["accuracy_rating_+%_final_at_max_distance_scaled"] = -90,
+	["accuracy_rating_per_level"] = 10,
+	["base_critical_hit_damage_bonus"] = 70,
+}
 -- From MonsterVarieties.dat combined with SkillTotemVariations.dat
 data.totemLifeMult = { [1] = 1, [2] = 1, [3] = 1, [5] = 1, [12] = 1, [18] = 1, [19] = 1, [22] = 1, [15] = 1.2, [23] = 1, [24] = 1, }
 data.monsterVarietyLifeMult = {

src/Data/ModCache.lua

@@ -4687,7 +4687,7 @@ c["Your Dexterity is added to your Minions"]={{[1]={flags=0,keywordFlags=0,name=
 c["Your Heavy Stun buildup empties 50% faster"]={nil,"Your Heavy Stun buildup empties 50% faster "}
 c["Your Heavy Stun buildup empties 50% faster if you've successfully Parried Recently"]={nil,"Your Heavy Stun buildup empties 50% faster if you've successfully Parried Recently "}
 c["Your Hits are Crushing Blows"]={nil,"Your Hits are Crushing Blows "}
-c["Your Hits can Penetrate Elemental Resistances down to a minimum of -50%"]={nil,"Your Hits can Penetrate Elemental Resistances down to a minimum of -50% "}
+c["Your Hits can Penetrate Elemental Resistances down to a minimum of -50%"]={{[1]={flags=0,keywordFlags=262144,name="ElementalPenetrationMinimum",type="BASE",value=-50}},nil}
 c["Your Hits can't be Evaded"]={{[1]={flags=0,keywordFlags=0,name="CannotBeEvaded",type="FLAG",value=true}},nil}
 c["Your Life cannot change while you have Energy Shield"]={{[1]={flags=0,keywordFlags=0,name="EternalLife",type="FLAG",value=true}},nil}
 c["Your base Energy Shield Recharge Delay is 10 seconds"]={{[1]={flags=0,keywordFlags=0,name="EnergyShieldRechargeBase",type="OVERRIDE",value=10}},nil}