Merge remote-tracking branch 'origin/dev'

Author: Openarl

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/2_6/ModCache.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/Bases/ring.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/Essence.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/ModCache.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/ModMaster.lua

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