Merge branch 'dev' into int_gems

Author: LocalIdentity

src/Data/Gems.lua

@@ -4953,6 +4953,25 @@ return {
 		reqInt = 0,
 		naturalMaxLevel = 20,
 	},
+	["Metadata/Items/Gems/SkillGemSpectralShieldThrowAltY"] = {
+		name = "Spectral Shield Throw of Trarthus",
+		baseTypeName = "Spectral Shield Throw of Trarthus",
+		gameId = "Metadata/Items/Gems/SkillGemThrownShieldProjectile",
+		variantId = "SpectralShieldThrowAltY",
+		grantedEffectId = "SpectralShieldThrowAltY",
+		tags = {
+			dexterity = true,
+			grants_active_skill = true,
+			attack = true,
+			projectile = true,
+			physical = true,
+		},
+		tagString = "Attack, Projectile, Physical",
+		reqStr = 40,
+		reqDex = 60,
+		reqInt = 0,
+		naturalMaxLevel = 20,
+	},
 	["Metadata/Items/Gems/SkillGemSpectralThrow"] = {
 		name = "Spectral Throw",
 		baseTypeName = "Spectral Throw",
@@ -4989,6 +5008,25 @@ return {
 		reqInt = 0,
 		naturalMaxLevel = 20,
 	},
+	["Metadata/Items/Gems/SkillGemSpectralThrowAltY"] = {
+		name = "Spectral Throw of Trarthus",
+		baseTypeName = "Spectral Throw of Trarthus",
+		gameId = "Metadata/Items/Gems/SkillGemThrownWeapon",
+		variantId = "SpectralThrowAltY",
+		grantedEffectId = "SpectralThrowAltY",
+		tags = {
+			trap = true,
+			dexterity = true,
+			grants_active_skill = true,
+			attack = true,
+			projectile = true,
+		},
+		tagString = "Trap, Attack, Projectile",
+		reqStr = 40,
+		reqDex = 60,
+		reqInt = 0,
+		naturalMaxLevel = 20,
+	},
 	["Metadata/Items/Gems/SkillGemVaalSpectralThrow"] = {
 		name = "Vaal Spectral Throw",
 		baseTypeName = "Vaal Spectral Throw",
@@ -7146,6 +7184,28 @@ return {
 		reqInt = 0,
 		naturalMaxLevel = 20,
 	},
+	["Metadata/Items/Gems/SkillGemBlastRainAltX"] = {
+		name = "Blast Rain of Trarthus",
+		baseTypeName = "Blast Rain of Trarthus",
+		gameId = "Metadata/Items/Gems/SkillGemBlastRain",
+		variantId = "BlastRainAltX",
+		grantedEffectId = "BlastRainAltX",
+		tags = {
+			fire = true,
+			dexterity = true,
+			grants_active_skill = true,
+			attack = true,
+			area = true,
+			projectile = true,
+			duration = true,
+			bow = true,
+		},
+		tagString = "Fire, Attack, AoE, Projectile, Duration, Bow",
+		reqStr = 0,
+		reqDex = 100,
+		reqInt = 0,
+		naturalMaxLevel = 20,
+	},
 	["Metadata/Items/Gems/SkillGemGalvanicArrow"] = {
 		name = "Galvanic Arrow",
 		baseTypeName = "Galvanic Arrow",
@@ -7268,6 +7328,27 @@ return {
 		reqInt = 0,
 		naturalMaxLevel = 20,
 	},
+	["Metadata/Items/Gems/SkillGemBladefallAltZ"] = {
+		name = "Bladefall of Trarthus",
+		baseTypeName = "Bladefall of Trarthus",
+		gameId = "Metadata/Items/Gems/SkillGemBladefall",
+		variantId = "BladefallAltZ",
+		grantedEffectId = "BladefallAltZ",
+		tags = {
+			dexterity = true,
+			grants_active_skill = true,
+			spell = true,
+			area = true,
+			physical = true,
+			arcane = true,
+			duration = true,
+		},
+		tagString = "Spell, AoE, Physical, Arcane, Duration",
+		reqStr = 0,
+		reqDex = 100,
+		reqInt = 0,
+		naturalMaxLevel = 20,
+	},
 	["Metadata/Items/Gems/SkillGemBladeVortex"] = {
 		name = "Blade Vortex",
 		baseTypeName = "Blade Vortex",
@@ -7433,6 +7514,26 @@ return {
 		reqInt = 0,
 		naturalMaxLevel = 20,
 	},
+	["Metadata/Items/Gems/SkillGemSiegeBallistaAltY"] = {
+		name = "Siege Ballista of Trarthus",
+		baseTypeName = "Siege Ballista of Trarthus",
+		gameId = "Metadata/Items/Gems/SkillGemSiegeBallista",
+		variantId = "SiegeBallistaAltY",
+		grantedEffectId = "SiegeBallistaAltY",
+		tags = {
+			dexterity = true,
+			grants_active_skill = true,
+			attack = true,
+			projectile = true,
+			totem = true,
+			bow = true,
+		},
+		tagString = "Attack, Projectile, Totem, Bow",
+		reqStr = 0,
+		reqDex = 100,
+		reqInt = 0,
+		naturalMaxLevel = 20,
+	},
 	["Metadata/Items/Gems/SkillGemOrbOfStorms"] = {
 		name = "Orb of Storms",
 		baseTypeName = "Orb of Storms",
@@ -12523,6 +12624,25 @@ return {
 		reqInt = 0,
 		naturalMaxLevel = 20,
 	},
+	["Metadata/Items/Gems/SkillGemSpectralHelixAltY"] = {
+		name = "Spectral Helix of Trarthus",
+		baseTypeName = "Spectral Helix of Trarthus",
+		gameId = "Metadata/Items/Gems/SkillGemSpectralHelix",
+		variantId = "SpectralHelixAltY",
+		grantedEffectId = "SpectralHelixAltY",
+		tags = {
+			trap = true,
+			dexterity = true,
+			grants_active_skill = true,
+			attack = true,
+			projectile = true,
+		},
+		tagString = "Trap, Attack, Projectile",
+		reqStr = 40,
+		reqDex = 60,
+		reqInt = 0,
+		naturalMaxLevel = 20,
+	},
 	["Metadata/Items/Gems/SkillGemBattlemagesCry"] = {
 		name = "Battlemage's Cry",
 		baseTypeName = "Battlemage's Cry",

src/Data/SkillStatMap.lua

@@ -1696,6 +1696,9 @@ return {
 ["active_skill_trap_throwing_speed_+%_final"] = {
 	mod("TrapThrowingSpeed", "MORE", nil),
 },
+["trap_throwing_speed_+%_while_wielding_2hand"] = {
+	mod("TrapThrowingSpeed", "INC", nil, 0, 0, { type = "Condition", var = "UsingTwoHandedWeapon" }),
+},
 ["trap_critical_strike_multiplier_+_per_power_charge"] = {
 	mod("CritMultiplier", "BASE", nil, 0, KeywordFlag.Trap, { type = "Multiplier", var = "PowerCharge" }),
 },
@@ -1708,6 +1711,9 @@ return {
 ["number_of_additional_traps_to_throw"] = {
 	mod("TrapThrowCount", "BASE", nil)
 },
+["throw_X_additional_traps_if_dual_wielding"] = {
+	mod("TrapThrowCount", "BASE", nil, 0, 0, { type = "Condition", var = "DualWielding" })
+},
 -- Mine
 ["number_of_additional_remote_mines_allowed"] = {
 	mod("ActiveMineLimit", "BASE", nil),