Merge branch 'dev' into update-0.2.1-uniques

Author: Blitz54

src/Data/Gems.lua

@@ -37,7 +37,7 @@ data.gameConstants = {
 	["PartyQuantityBonusPerAdditionalPlayerHardMode"] = 0.2,
 	["PartyRarityBonusPerAdditionalPlayer"] = 0,
 	["PartyRarityBonusPerAdditionalPlayerHardMode"] = 0,
-	["PartyUniqueBonusPerAdditionalPlayer"] = 1,
+	["PartyUniqueBonusPerAdditionalPlayer"] = 0.3,
 	["LightStunMinimumChance"] = 20,
 	["LightStunRatioScale"] = 92,
 	["LightStunMinimumChancePlayer"] = 12,

src/Data/Misc.lua

@@ -12390,74 +12390,6 @@ return {
 				["type"] = "explicit", 
 			}, 
 		}, 
-		["885_AlliesInPresenceAddedPhysicalDamage"] = {
-			["1HWeapon"] = {
-				["max"] = 25.5, 
-				["min"] = 2, 
-			}, 
-			["Sceptre"] = {
-				["max"] = 25.5, 
-				["min"] = 2, 
-			}, 
-			["specialCaseData"] = {
-			}, 
-			["tradeMod"] = {
-				["id"] = "explicit.stat_1574590649", 
-				["text"] = "Allies in your Presence deal # to # additional Attack Physical Damage", 
-				["type"] = "explicit", 
-			}, 
-		}, 
-		["886_AlliesInPresenceAddedFireDamage"] = {
-			["1HWeapon"] = {
-				["max"] = 37, 
-				["min"] = 2, 
-			}, 
-			["Sceptre"] = {
-				["max"] = 37, 
-				["min"] = 2, 
-			}, 
-			["specialCaseData"] = {
-			}, 
-			["tradeMod"] = {
-				["id"] = "explicit.stat_849987426", 
-				["text"] = "Allies in your Presence deal # to # additional Attack Fire Damage", 
-				["type"] = "explicit", 
-			}, 
-		}, 
-		["887_AlliesInPresenceAddedColdDamage"] = {
-			["1HWeapon"] = {
-				["max"] = 30.5, 
-				["min"] = 2, 
-			}, 
-			["Sceptre"] = {
-				["max"] = 30.5, 
-				["min"] = 2, 
-			}, 
-			["specialCaseData"] = {
-			}, 
-			["tradeMod"] = {
-				["id"] = "explicit.stat_2347036682", 
-				["text"] = "Allies in your Presence deal # to # additional Attack Cold Damage", 
-				["type"] = "explicit", 
-			}, 
-		}, 
-		["888_AlliesInPresenceAddedLightningDamage"] = {
-			["1HWeapon"] = {
-				["max"] = 37.5, 
-				["min"] = 3, 
-			}, 
-			["Sceptre"] = {
-				["max"] = 37.5, 
-				["min"] = 3, 
-			}, 
-			["specialCaseData"] = {
-			}, 
-			["tradeMod"] = {
-				["id"] = "explicit.stat_2854751904", 
-				["text"] = "Allies in your Presence deal # to # additional Attack Lightning Damage", 
-				["type"] = "explicit", 
-			}, 
-		}, 
 		["889_AlliesInPresenceIncreasedAccuracy"] = {
 			["1HWeapon"] = {
 				["max"] = 450, 
@@ -15379,14 +15311,6 @@ return {
 				["max"] = 80, 
 				["min"] = 36, 
 			}, 
-			["AnyJewel"] = {
-				["max"] = 25, 
-				["min"] = 15, 
-			}, 
-			["BaseJewel"] = {
-				["max"] = 25, 
-				["min"] = 15, 
-			}, 
 			["Sceptre"] = {
 				["max"] = 80, 
 				["min"] = 36, 
@@ -15713,6 +15637,23 @@ return {
 				["type"] = "implicit", 
 			}, 
 		}, 
+		["implicit.stat_1451444093"] = {
+			["1HWeapon"] = {
+				["max"] = 1, 
+				["min"] = 1, 
+			}, 
+			["Flail"] = {
+				["max"] = 1, 
+				["min"] = 1, 
+			}, 
+			["specialCaseData"] = {
+			}, 
+			["tradeMod"] = {
+				["id"] = "implicit.stat_1451444093", 
+				["text"] = "Forks Critical Hits", 
+				["type"] = "implicit", 
+			}, 
+		}, 
 		["implicit.stat_1541903247"] = {
 			["2HMace"] = {
 				["max"] = 10, 

src/Data/ModCache.lua

@@ -135,7 +135,7 @@ skills["BarragePlayer"] = {
 	name = "Barrage",
 	baseTypeName = "Barrage",
 	color = 2,
-	description = "Ready a volley of arrows or spears, Empowering your next Bow or Projectile Spear Attack to repeat multiple times. Consumes your Frenzy Charges on use to add additional repeats.",
+	description = "Ready a volley of arrows or spears, Empowering your next Barrageable Bow or Projectile Spear Attack to Repeat multiple times. Consumes your Frenzy Charges on use to add additional repeats.",
 	skillTypes = { [SkillType.Spell] = true, [SkillType.Duration] = true, [SkillType.ModifiesNextSkill] = true, [SkillType.Cooldown] = true, [SkillType.ConsumesCharges] = true, [SkillType.UsableWhileMoving] = true, [SkillType.Buff] = true, [SkillType.EmpowersOtherSkill] = true, [SkillType.SkillConsumesFrenzyChargesOnUse] = true, [SkillType.UsableWhileMounted] = true, },
 	weaponTypes = {
 		["Spear"] = true,
@@ -9966,6 +9966,7 @@ skills["TriggeredWindDancerPlayer"] = {
 				"global_knockback",
 				"triggerable_in_any_set",
 				"quality_display_active_skill_base_area_of_effect_radius_is_gem",
+				"visual_hit_effect_physical_is_wind",
 			},
 			levels = {
 				[1] = { actorLevel = 1, },

src/Data/QueryMods.lua

@@ -1216,6 +1216,7 @@ skills["BlinkPlayer"] = {
 				"base_deal_no_damage",
 				"usable_while_shapeshifted",
 				"skill_is_not_considered_a_skill",
+				"base_skill_enabled_while_mounted",
 			},
 			levels = {
 				[1] = { 40, statInterpolation = { 1, }, actorLevel = 1, },
@@ -1850,110 +1851,6 @@ skills["BonestormPlayer"] = {
 		},
 	}
 }
-skills["SupportInvisibleMetaGemSupport"] = {
-	name = "SupportInvisibleMetaGemSupport",
-	hidden = true,
-	support = true,
-	requireSkillTypes = { SkillType.Triggered, },
-	addSkillTypes = { },
-	excludeSkillTypes = { },
-	levels = {
-		[1] = { levelRequirement = 0, },
-		[2] = { levelRequirement = 0, },
-		[3] = { levelRequirement = 0, },
-		[4] = { levelRequirement = 0, },
-		[5] = { levelRequirement = 0, },
-		[6] = { levelRequirement = 0, },
-		[7] = { levelRequirement = 0, },
-		[8] = { levelRequirement = 0, },
-		[9] = { levelRequirement = 0, },
-		[10] = { levelRequirement = 0, },
-		[11] = { levelRequirement = 0, },
-		[12] = { levelRequirement = 0, },
-		[13] = { levelRequirement = 0, },
-		[14] = { levelRequirement = 0, },
-		[15] = { levelRequirement = 0, },
-		[16] = { levelRequirement = 0, },
-		[17] = { levelRequirement = 0, },
-		[18] = { levelRequirement = 0, },
-		[19] = { levelRequirement = 0, },
-		[20] = { levelRequirement = 0, },
-		[21] = { levelRequirement = 0, },
-		[22] = { levelRequirement = 0, },
-		[23] = { levelRequirement = 0, },
-		[24] = { levelRequirement = 0, },
-		[25] = { levelRequirement = 0, },
-		[26] = { levelRequirement = 0, },
-		[27] = { levelRequirement = 0, },
-		[28] = { levelRequirement = 0, },
-		[29] = { levelRequirement = 0, },
-		[30] = { levelRequirement = 0, },
-		[31] = { levelRequirement = 0, },
-		[32] = { levelRequirement = 0, },
-		[33] = { levelRequirement = 0, },
-		[34] = { levelRequirement = 0, },
-		[35] = { levelRequirement = 0, },
-		[36] = { levelRequirement = 0, },
-		[37] = { levelRequirement = 0, },
-		[38] = { levelRequirement = 0, },
-		[39] = { levelRequirement = 0, },
-		[40] = { levelRequirement = 0, },
-	},
-	statSets = {
-		[1] = {
-			label = "SupportInvisibleMetaGemSupport",
-			incrementalEffectiveness = 0.054999999701977,
-			statDescriptionScope = "gem_stat_descriptions",
-			baseFlags = {
-			},
-			stats = {
-				"skill_cannot_generate_energy",
-			},
-			levels = {
-				[1] = { actorLevel = 1, },
-				[2] = { actorLevel = 3.4519999027252, },
-				[3] = { actorLevel = 6.7670001983643, },
-				[4] = { actorLevel = 10.307999610901, },
-				[5] = { actorLevel = 14.074999809265, },
-				[6] = { actorLevel = 18.068000793457, },
-				[7] = { actorLevel = 22.287000656128, },
-				[8] = { actorLevel = 26.732000350952, },
-				[9] = { actorLevel = 31.40299987793, },
-				[10] = { actorLevel = 36.299999237061, },
-				[11] = { actorLevel = 41.423000335693, },
-				[12] = { actorLevel = 46.771999359131, },
-				[13] = { actorLevel = 52.34700012207, },
-				[14] = { actorLevel = 58.147998809814, },
-				[15] = { actorLevel = 64.175003051758, },
-				[16] = { actorLevel = 70.428001403809, },
-				[17] = { actorLevel = 76.906997680664, },
-				[18] = { actorLevel = 83.611999511719, },
-				[19] = { actorLevel = 90.542999267578, },
-				[20] = { actorLevel = 97.699996948242, },
-				[21] = { actorLevel = 105.08300018311, },
-				[22] = { actorLevel = 112.69200134277, },
-				[23] = { actorLevel = 120.52700042725, },
-				[24] = { actorLevel = 128.58799743652, },
-				[25] = { actorLevel = 136.875, },
-				[26] = { actorLevel = 145.38800048828, },
-				[27] = { actorLevel = 154.12699890137, },
-				[28] = { actorLevel = 163.09199523926, },
-				[29] = { actorLevel = 172.28300476074, },
-				[30] = { actorLevel = 181.69999694824, },
-				[31] = { actorLevel = 191.34300231934, },
-				[32] = { actorLevel = 201.21200561523, },
-				[33] = { actorLevel = 211.30700683594, },
-				[34] = { actorLevel = 221.62800598145, },
-				[35] = { actorLevel = 232.17500305176, },
-				[36] = { actorLevel = 242.94799804688, },
-				[37] = { actorLevel = 253.94700622559, },
-				[38] = { actorLevel = 265.17199707031, },
-				[39] = { actorLevel = 276.62298583984, },
-				[40] = { actorLevel = 288.29998779297, },
-			},
-		},
-	}
-}
 skills["MetaCastOnCritPlayer"] = {
 	name = "Cast on Critical",
 	baseTypeName = "Cast on Critical",
@@ -3476,22 +3373,22 @@ skills["ChargeInfusionPlayer"] = {
 			incrementalEffectiveness = 0.054999999701977,
 			statDescriptionScope = "charge_mastery",
 			statMap = {
-				["skill_charge_matery_skill_speed_+%_final_with_frenzy_charges"] = {
+				["charge_mastery_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" }),
 				},
-				["skill_charge_mastery_crit_chance_+%_final_with_power_charges"] = {
+				["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" }),
 				},
-				["skill_charge_mastery_defences_+%_final_with_endurance_charges"] = {
+				["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" }),
 				},
 			},
 			baseFlags = {
 			},
 			stats = {
-				"skill_charge_matery_skill_speed_+%_final_with_frenzy_charges",
-				"skill_charge_mastery_crit_chance_+%_final_with_power_charges",
-				"skill_charge_mastery_defences_+%_final_with_endurance_charges",
+				"charge_mastery_skill_speed_+%_final_with_frenzy_charges",
+				"charge_mastery_crit_chance_+%_final_with_power_charges",
+				"charge_mastery_defences_+%_final_with_endurance_charges",
 				"consume_frenzy_power_and_endurance_charge_every_x_ms",
 				"base_deal_no_damage",
 			},
@@ -6875,7 +6772,7 @@ skills["FirestormPlayer"] = {
 	name = "Firestorm",
 	baseTypeName = "Firestorm",
 	color = 3,
-	description = "Rain flaming bolts over the targeted area. Ignites on enemies in front of you are Consumed to fuel the Firestorm by creating improved bolts.",
+	description = "Rain flaming bolts over the targeted area. Ignites on enemies and Corpses in front of you are Consumed to fuel the Firestorm by creating improved bolts.",
 	skillTypes = { [SkillType.Spell] = true, [SkillType.Damage] = true, [SkillType.Area] = true, [SkillType.Duration] = true, [SkillType.Trappable] = true, [SkillType.Totemable] = true, [SkillType.Mineable] = true, [SkillType.Multicastable] = true, [SkillType.Triggerable] = true, [SkillType.Fire] = true, [SkillType.Cascadable] = true, [SkillType.CanRapidFire] = true, [SkillType.AreaSpell] = true, [SkillType.UsableWhileMoving] = true, [SkillType.Limit] = true, [SkillType.Sustained] = true, [SkillType.SkillConsumesIgnite] = true, },
 	castTime = 1.4,
 	qualityStats = {