Merge remote-tracking branch 'origin/dev'

CHANGELOG.md

@@ -1,3 +1,9 @@
+### 1.4.153 - 2019/12/11
+ * Added 3.9.0 passive tree
+ * Applied unique balance changes from 3.9.0 (thanks ppoelzl)
+ * Updated many unique items that had changed in previous patches (thanks ppoelzl)
+ * Added Vermillion Ring base (apologies for this being missing for so long)
+
 ### 1.4.152 - 2019/09/15
  * Added support for anointments that grant notable passives
  * Added support for Transfiguration of Body/Mind/Soul

Classes/PassiveTree.lua

@@ -316,7 +316,7 @@ local PassiveTreeClass = newClass("PassiveTree", function(self, treeVersion)
 			socket.attributesInRadius[radiusIndex] = { }
 			local rSq = radiusInfo.rad * radiusInfo.rad
 			for _, node in pairs(self.nodes) do
-				if node ~= socket then
+				if node ~= socket and not node.isBlighted then
 					local vX, vY = node.x - socket.x, node.y - socket.y
 					if vX * vX + vY * vY <= rSq then 
 						socket.nodesInRadius[radiusIndex][node.id] = node

Data/3_0/Bases/ring.lua

@@ -125,6 +125,12 @@ itemBases["Opal Ring"] = {
 	implicit = "(15-25)% increased Elemental Damage",
 	req = { level = 80, },
 }
+itemBases["Vermillion Ring"] = {
+	type = "Ring",
+	tags = { default = true, ring = true, not_for_sale = true, atlas_base_type = true, ringatlas3 = true, },
+	implicit = "(5-7)% increased maximum Life",
+	req = { level = 80, },
+}
 itemBases["Cerulean Ring"] = {
 	type = "Ring",
 	tags = { default = true, ring = true, not_for_sale = true, atlas_base_type = true, ringatlas4 = true, },

Data/3_0/ModMaster.lua

@@ -255,8 +255,8 @@ return {
 	{ type = "Suffix", affix = "of Craft", "Minions have (11-15)% increased maximum Life", statOrder = { 940 }, level = 40, group = "MinionLife", types = { ["Helmet"] = true, }, },
 	{ type = "Suffix", affix = "of Craft", "Minions have (16-20)% increased maximum Life", statOrder = { 940 }, level = 68, group = "MinionLife", types = { ["Helmet"] = true, }, },
 	{ type = "Prefix", affix = "Upgraded", "Minions deal (10-20)% increased Damage", statOrder = { 1133 }, level = 40, group = "MinionDamage", types = { ["Gloves"] = true, }, },
-	{ type = "Suffix", affix = "of Craft", "Minions have (13-17)% increased Movement Speed", statOrder = { 943 }, level = 30, group = "MinionMovementSpeed", types = { ["Ring"] = true, ["Amulet"] = true, }, },
-	{ type = "Suffix", affix = "of Craft", "Minions have (18-22)% increased Movement Speed", statOrder = { 943 }, level = 60, group = "MinionMovementSpeed", types = { ["Ring"] = true, ["Amulet"] = true, }, },
+	{ type = "Suffix", affix = "of Craft", "Minions have (13-17)% increased Movement Speed", statOrder = { 943 }, level = 30, group = "MinionRunSpeed", types = { ["Ring"] = true, ["Amulet"] = true, }, },
+	{ type = "Suffix", affix = "of Craft", "Minions have (18-22)% increased Movement Speed", statOrder = { 943 }, level = 60, group = "MinionRunSpeed", types = { ["Ring"] = true, ["Amulet"] = true, }, },
 	{ type = "Prefix", affix = "Upgraded", "Minions deal (37-51)% increased Damage", statOrder = { 1133 }, level = 30, group = "WeaponCasterDamagePrefix", types = { ["Two Handed Axe"] = true, ["Two Handed Mace"] = true, ["Two Handed Sword"] = true, ["Staff"] = true, ["Staff"] = true, ["Bow"] = true, }, },
 	{ type = "Prefix", affix = "Upgraded", "Minions deal (52-66)% increased Damage", statOrder = { 1133 }, level = 60, group = "WeaponCasterDamagePrefix", types = { ["Two Handed Axe"] = true, ["Two Handed Mace"] = true, ["Two Handed Sword"] = true, ["Staff"] = true, ["Staff"] = true, ["Bow"] = true, }, },
 	{ type = "Prefix", affix = "Upgraded", "Minions deal (67-81)% increased Damage", statOrder = { 1133 }, level = 75, group = "WeaponCasterDamagePrefix", types = { ["Two Handed Axe"] = true, ["Two Handed Mace"] = true, ["Two Handed Sword"] = true, ["Staff"] = true, ["Staff"] = true, ["Bow"] = true, }, },

Data/3_0/Skills/act_dex.lua

@@ -1258,7 +1258,7 @@ skills["CobraLash"] = {
 	baseEffectiveness = 1,
 	incrementalEffectiveness = 0.023299999535084,
 	description = "Fires a poisonous projectile based on your weapon that will chain between enemies. Requires a Dagger or Claw.",
-	skillTypes = { [SkillType.Attack] = true, [SkillType.ProjectileAttack] = true, [SkillType.SkillCanMirageArcher] = true, [SkillType.Projectile] = true, [SkillType.SkillCanVolley] = true, [SkillType.Hit] = true, [SkillType.Triggerable] = true, [SkillType.ChaosSkill] = true, },
+	skillTypes = { [SkillType.Attack] = true, [SkillType.ProjectileAttack] = true, [SkillType.Projectile] = true, [SkillType.SkillCanVolley] = true, [SkillType.Hit] = true, [SkillType.Triggerable] = true, [SkillType.ChaosSkill] = true, },
 	weaponTypes = {
 		["Dagger"] = true,
 		["Claw"] = true,
@@ -2767,7 +2767,7 @@ skills["FlickerStrike"] = {
 		"base_attack_speed_+%_per_frenzy_charge",
 		"add_frenzy_charge_on_skill_hit_%",
 		"flicker_strike_buff_movement_speed_+%",
-		"flicker_strike_buff_duration_ms",
+		"base_skill_effect_duration",
 		"ignores_proximity_shield",
 		"base_skill_show_average_damage_instead_of_dps",
 		"melee_defer_damage_prediction",
@@ -5832,6 +5832,7 @@ skills["SmokeMine"] = {
 		"disable_mine_detonation_cascade",
 		"mine_detonates_instantly",
 		"additive_mine_duration_modifiers_apply_to_buff_effect_duration",
+		"mine_cannot_rearm",
 	},
 	levels = {
 		[1] = { 8000, 4000, 20, 0, 4000, 0, cooldown = 2.5, levelRequirement = 10, manaCost = 6, statInterpolation = { 1, 1, 1, 1, 1, 1, }, },

Data/3_0/Skills/act_int.lua

@@ -7327,7 +7327,6 @@ skills["Skitterbots"] = {
 		"chill_effect_+%",
 		"minion_movement_speed_+%",
 		"display_skitterbot_limit_per_type",
-		"base_deal_no_damage",
 		"display_skitterbot_shocking_aura",
 		"display_skitterbot_chilling_aura",
 	},

Data/3_0/Skills/spectre.lua

@@ -3413,7 +3413,7 @@ skills["SkeletonVulnerability"] = {
 	},
 }
 skills["SlavedriverFlameWhip"] = {
-	name = "Flame Surge",
+	name = "Lightning Surge",
 	hidden = true,
 	color = 3,
 	baseEffectiveness = 2.5,

Data/3_0/Skills/sup_int.lua

@@ -219,7 +219,7 @@ skills["SupportBlasphemy"] = {
 	support = true,
 	requireSkillTypes = { SkillType.AppliesCurse, },
 	addSkillTypes = { SkillType.ManaCostReserved, SkillType.ManaCostPercent, SkillType.Type31, SkillType.Aura, SkillType.AuraDebuff, SkillType.CanHaveBlessing, },
-	excludeSkillTypes = { },
+	excludeSkillTypes = { SkillType.Trap, SkillType.Mine, },
 	ignoreMinionTypes = true,
 	statDescriptionScope = "gem_stat_descriptions",
 	baseMods = {
@@ -1839,7 +1839,7 @@ skills["SupportBurningMinions"] = {
 	incrementalEffectiveness = 0.048500001430511,
 	support = true,
 	requireSkillTypes = { SkillType.CreatesMinion, },
-	addSkillTypes = { },
+	addSkillTypes = { SkillType.CausesBurning, },
 	excludeSkillTypes = { },
 	statDescriptionScope = "gem_stat_descriptions",
 	statMap = {

Data/3_0/Skills/sup_str.lua

@@ -2224,7 +2224,7 @@ skills["SupportRangedAttackTotem"] = {
 }
 skills["SupportReducedMana"] = {
 	name = "Inspiration",
-	description = "Supports any skill.",
+	description = "Supports any skill. Minions, Totems, Traps and Mines cannot gain Inspiration Charges.",
 	color = 1,
 	support = true,
 	requireSkillTypes = { },

Data/Uniques/amulet.lua

@@ -633,14 +633,16 @@ Nearby Allies gain 40% increased Mana Regeneration Rate
 Sidhebreath
 Paua Amulet
 Variant: {2_6}Pre 3.0.0
+Variant: Pre 3.8.0
 Variant: Current
 (20-30)% increased Mana Regeneration Rate
 +25% to Cold Resistance
-0.2% of Physical Attack Damage Leeched as Mana
+{variant:1,2}0.2% of Physical Attack Damage Leeched as Mana
 Minions have (10-15)% increased maximum Life
 Minions have (10-15)% increased Movement Speed
-Minions deal (10-15)% increased Damage
-{variant:2}(10-15)% reduced Mana Cost of Minion Skills
+{variant:1,2}Minions deal (10-15)% increased Damage
+{variant:3}Minions deal (5-9) to (11-15) additional Cold Damage
+{variant:2,3}(10-15)% reduced Mana Cost of Minion Skills
 ]],[[
 Solstice Vigil
 Onyx Amulet
@@ -657,15 +659,18 @@ Star of Wraeclast
 Ruby Amulet
 Source: Vendor recipe
 Variant: Pre 2.6.0
+Variant: Pre 3.8.0
 Variant: Current
 Requires Level 28
+{variant:1,2}Grants level 20 Illusory Warp Skill
+{variant:3}Grants Level 10 Frostblink Skill
 +(20-30)% to Fire Resistance
 (30-50)% increased Cold Damage
 +(10-15)% to all Elemental Resistances
-{variant:1}30% increased Radius of Curse Skills
-{variant:2}60% increased Area of Effect of Curse Skills
+{variant:1}30% increased Area of Effect of Curse Skills
+{variant:2,3}60% increased Area of Effect of Curse Skills
 You are Immune to Silence
-Grants level 20 Illusory Warp Skill
+{variant:3}Frostblink has 50% increased Duration
 Corrupted
 ]],[[
 Stone of Lazhwar

Data/Uniques/body.lua

@@ -245,19 +245,21 @@ Variant: Pre 1.0.0
 Variant: Pre 2.0.0
 Variant: Pre 2.6.0
 Variant: {2_6}Pre 3.5.0
+Variant: Pre 3.9.0
 Variant: Current
 Requires Level 65, 197 Dex
 {variant:1,2,3}+(20-30) to Dexterity
-{variant:4.5}+(40-50) to Dexterity
+{variant:4.5,6}+(40-50) to Dexterity
 {variant:1,2,3}Adds 13 to 24 Cold Damage to Attacks
 {variant:4}Adds (50-60) to (70-80) Cold Damage to Attacks
 {variant:5}Adds (173-188) to (240-262) Cold Damage to Bow Attacks
+{variant:6}Adds (100-145) to (160-200) Cold Damage to Bow Attacks
 {variant:1}(80-120)% increased Evasion Rating
-{variant:2,3,4,5}(140-220)% increased Evasion Rating
+{variant:2,3,4,5,6}(140-220)% increased Evasion Rating
 25% increased Chill Duration on Enemies
 {variant:1,2}Acrobatics
-{variant:3,4,5}10% chance to Dodge Attacks
-{variant:3,4,5}10% chance to Dodge Spell Damage
+{variant:3,4,5,6}10% chance to Dodge Attacks
+{variant:3,4,5,6}10% chance to Dodge Spell Damage
 ]],[[
 Kintsugi
 Exquisite Leather
@@ -607,16 +609,18 @@ Socketed Gems are Supported by level 5 Elemental Proliferation
 Vis Mortis
 Necromancer Silks
 Variant: Pre 2.6.0
+Variant: Pre 3.8.0
 Variant: Current
 Requires Level 59, 160 Int
-+(20-30) to maximum Mana
 {variant:1}(100-120)% increased Energy Shield
-{variant:2}(200-220)% increased Energy Shield
+{variant:2,3}(200-220)% increased Energy Shield
++(20-30) to maximum Mana
 Minions have 20% reduced Maximum Life
 Minions deal 15% increased Damage
-+1 to Maximum number of Spectres
+{variant:1,2}+1 to Maximum number of Spectres
 {variant:1}Minions gain Unholy Might for 5 seconds on Kill
 {variant:2}Minions gain Unholy Might for 10 seconds on Kill
+{variant:3}Minions gain (15-20)% of Elemental Damage as Extra Chaos Damage
 ]],[[
 Zahndethus' Cassock
 Sage's Robe

Data/Uniques/boots.lua

@@ -135,7 +135,7 @@ Requires Level 12, 26 Dex
 15% increased Movement Speed
 (6-10)% chance to Ignite
 Ignite a nearby Enemy on Killing an Ignited Enemy
-Casts level 7 Abberath's Fury when equipped
+Triggers level 7 Abberath's Fury when equipped
 1% increased Fire Damage per 20 Strength
 Burning Hoofprints
 ]],[[
@@ -284,8 +284,8 @@ Requires Level 22, 42 Int
 +20 to maximum Mana
 (40-60)% increased Energy Shield
 (5-15)% increased Movement Speed
-+1 to Maximum number of Zombies
-+1 to Maximum number of Spectres
++1 to Level of all Raise Zombie Gems
++1 to Level of all Raise Spectre Gems
 ]],[[
 Doryani's Delusion
 Sorcerer Boots

Data/Uniques/bow.lua

@@ -267,17 +267,19 @@ Quill Rain
 Short Bow
 Variant: Pre 2.6.0
 Variant: {2_6}Pre 3.5.0
+Variant: Pre 3.9.0
 Variant: Current
 Requires Level 5, 26 Dex
 +(10-20) to Dexterity
-{variant:2,3}100% increased Physical Damage
+{variant:2,3,4}100% increased Physical Damage
 100% increased Attack Speed
 +(25-50) to Accuracy Rating
 (50-100)% increased Projectile Speed
 {variant:1}50% less Weapon Damage
 {variant:2}40% less Weapon Damage
 {variant:3}40% less Damage
-{variant:2,3}+2 Mana gained for each Enemy hit by Attacks
+{variant:4}30% less Damage
+{variant:2,3,4}+2 Mana gained for each Enemy hit by Attacks
 ]],[[
 Reach of the Council
 Spine Bow
@@ -375,12 +377,16 @@ Adds 1 to 85 Lightning Damage
 ]],[[
 Voltaxic Rift
 Spine Bow
+Variant: Pre 3.9.0
+Variant: Current
 Requires Level 64, 212 Dex
 Adds 1 to (275-325) Lightning Damage
 (10-15)% increased Attack Speed
 60% of Lightning Damage Converted to Chaos Damage
 10% Chance to Shock
 Your Chaos Damage can Shock
+{variant:2}Shock Enemies as though dealing 300% more Damage
+{variant:2}Your Shocks can increase Damage taken by up to a maximum of 100%
 ]],[[
 Windripper
 Imperial Bow
@@ -423,13 +429,15 @@ Citadel Bow
 League: Breach
 Source: Upgraded from unique{Xoph's Inception} using currency{Blessing of Xoph}
 Variant: Pre 3.3.0
+Variant: Pre 3.9.0
 Variant: Current
 Requires Level 64, 185 Dex
 (250-300)% increased Physical Damage
 50% of Physical Damage Converted to Fire Damage
 10% chance to Ignite
 {variant:1}Ignites your Skills cause spread to other Enemies within a Radius of 12
 {variant:2}Ignites your Skills cause spread to other Enemies within a Radius of 15
+{variant:3}Socketed Gems are Supported by level 20 Ignite Proliferation
 Recover (40-60) Life when you Ignite an Enemy
 ]],
 }

Data/Uniques/dagger.lua

@@ -53,7 +53,7 @@ Variant: {2_6}Pre 3.0.0
 Variant: Current
 Requires Level 53, 58 Dex, 123 Int
 40% increased Global Critical Strike Chance
-+1 to Level of Socketed Fire Gems
++1 to Level of all Fire Spell Skill Gems
 {variant:1,2}(40-60)% increased Spell Damage
 {variant:3}(40-60)% increased Fire Damage
 +(20-40) to Intelligence

Data/Uniques/gloves.lua

@@ -116,8 +116,8 @@ Requires Level 58
 +(40-50) to Dexterity
 (150-200)% increased Evasion and Energy Shield
 +(50-60) to maximum Life
-15% increased Damage with Ailments per Elder Item Equipped
 +6 to Maximum Life per Elder Item Equipped
++4% to Damage over Time Multiplier for Ailments per Elder Item Equipped
 8% increased Effect of non-Damaging Ailments per Elder Item Equipped
 Remove an Ailment when you use a Flask if all Equipped Items are Elder Items
 Elder Item
@@ -659,6 +659,7 @@ Rampage
 Snakebite
 Assassin's Mitts
 Variant: {2_6}Pre 3.0.0
+Variant: Pre 3.9.0
 Variant: Current
 Requires Level 58, 45 Dex, 45 Int
 (150-180)% increased Evasion Rating
@@ -667,7 +668,8 @@ Requires Level 58, 45 Dex, 45 Int
 6% increased Accuracy Rating per Frenzy Charge
 10% reduced Frenzy Charge Duration per Frenzy Charge
 {variant:1}While at Maximum Frenzy Charges, Attacks Poison Enemies
-{variant:2}Attacks have 60% chance to Poison while at maximum Frenzy Charges
+{variant:2,3}Attacks have 60% chance to Poison while at maximum Frenzy Charges
+{variant:3}+5% to Damage over Time Multiplier for Poison per Frenzy Charge
 ]],[[
 Storm's Gift
 Assassin's Mitts

Data/Uniques/helmet.lua

@@ -207,9 +207,11 @@ Requires Level 8, 23 Int
 Asenath's Chant
 Iron Circlet
 Source: Upgraded from unique{Asenath's Mark} via prophecy{Song of the Sekhema}
+Variant: Pre 3.9.0
+Variant: Current
 Requires Level 45
-Implicits: 0
-25% chance to Trigger a Socketed Spell when you Attack with a Bow
+{variant:1}25% chance to Trigger a Socketed Spell when you Attack with a Bow
+{variant:2}Trigger a Socketed Spell when you Attack with a Bow
 (10–15)% increased Attack Speed
 (10–15)% increased Cast Speed
 +(100–120) to maximum Energy Shield
@@ -513,7 +515,7 @@ Adds 20 to 30 Physical Damage to Attacks
 Extra gore
 Can't use Chest armour
 {variant:1,2}15% Chance to Block
-{variant:3}6% Chance to Block
+{variant:3,4}6% Chance to Block
 ]],[[
 Deidbell
 Gilded Sallet
@@ -782,7 +784,7 @@ Requires Level 68
 +(130–160) to maximum Energy Shield
 +(150–200) to maximum Mana
 (30–40)% increased Mana Regeneration Rate
-+(20–25)% to Fire Resistance
++(20–30)% to Fire Resistance
 10% increased Mana Reserved
 Gain Armour equal to your Reserved Mana
 ]],[[

Data/Uniques/jewel.lua

@@ -217,6 +217,7 @@ Variant: Current
 ]],[[
 Healthy Mind
 Cobalt Jewel
+Limited to: 1
 Radius: Large
 (15-20)% increased maximum Mana
 Increases and Reductions to Life in Radius are Transformed to apply to Mana at 200% of their value
@@ -857,10 +858,13 @@ Attack deals 30% increased Damage
 ]],[[
 Volley Fire
 Viridian Jewel
-Limited to: 3
+Variant: Pre 3.9.0
+Variant: Current
+Limited to: 1
 Radius: Medium
 (6-10)% increased Projectile Damage
-With at least 40 Dexterity in Radius, Barrage fires an additional 2 projectiles simultaneously on the first and final attacks
+{variant:1}With at least 40 Dexterity in Radius, Barrage fires an additional 2 projectiles simultaneously on the first and final attacks
+{variant:2}With at least 40 Dexterity in Radius, Barrage fires an additional 6 projectiles simultaneously on the first and final attacks
 ]],[[
 Weight of the Empire
 Crimson Jewel