diff --git a/Data/Skills/minion.lua b/Data/Skills/minion.lua index de7a302a..0bad16c0 100644 --- a/Data/Skills/minion.lua +++ b/Data/Skills/minion.lua @@ -993,3 +993,24 @@ skills["MinionInstability"] = { [1] = { }, }, } +skills["BeaconCausticCloud"] = { + name = "Caustic Cloud", + hidden = true, + color = 4, + baseFlags = { + cast = true, + area = true, + chaos = true, + }, + skillTypes = { }, + baseMods = { + skill("ChaosDot", 1, { type = "PerStat", stat = "Life", div = 10 }), + }, + qualityMods = { + }, + levelMods = { + }, + levels = { + [1] = { }, + }, +} diff --git a/Data/Skills/spectre.lua b/Data/Skills/spectre.lua index 2d45e770..4a55e5ce 100644 --- a/Data/Skills/spectre.lua +++ b/Data/Skills/spectre.lua @@ -929,6 +929,70 @@ skills["MassFrenzy"] = { [1] = { }, }, } +skills["MinerThrowFireSpectre"] = { + name = "Throw Fire", + hidden = true, + color = 4, + baseFlags = { + spell = true, + projectile = true, + area = true, + fire = true, + duration = true, + }, + skillTypes = { [3] = true, }, + baseMods = { + skill("castTime", 1), + skill("cooldown", 1.5), + --"base_is_projectile" = ? + --"is_area_damage" = ? + }, + qualityMods = { + }, + levelMods = { + [1] = skill("levelRequirement", nil), + [2] = skill("FireDot", nil), --"base_fire_damage_to_deal_per_minute" + [3] = skill("duration", nil), --"base_skill_effect_duration" + [4] = skill("FireMin", nil), --"spell_minimum_base_fire_damage" + [5] = skill("FireMax", nil), --"spell_maximum_base_fire_damage" + }, + levels = { + [1] = { 3, 2.8333333333333, 2, 1, 2, }, + [2] = { 5, 3.5333333333333, 2.1, 2, 2, }, + [3] = { 8, 4.7833333333333, 2.2, 2, 3, }, + [4] = { 11, 6.3, 2.3, 3, 4, }, + [5] = { 15, 8.7833333333333, 2.4, 4, 6, }, + [6] = { 19, 11.933333333333, 2.5, 5, 8, }, + [7] = { 23, 15.9, 2.6, 7, 11, }, + [8] = { 27, 20.866666666667, 2.7, 9, 14, }, + [9] = { 28, 22.283333333333, 2.8, 10, 15, }, + [10] = { 32, 28.833333333333, 2.9, 13, 19, }, + [11] = { 40, 47.016666666667, 3, 21, 32, }, + [12] = { 47, 70.566666666667, 3, 32, 48, }, + [13] = { 48, 74.683333333333, 3, 34, 50, }, + [14] = { 55, 110.18333333333, 3, 50, 74, }, + [15] = { 60, 144.41666666667, 3, 65, 97, }, + [16] = { 64, 178.61666666667, 3, 80, 121, }, + [17] = { 65, 188.28333333333, 3, 85, 127, }, + [18] = { 66, 198.43333333333, 3, 89, 134, }, + [19] = { 67, 209.1, 3, 94, 141, }, + [20] = { 68, 220.3, 3, 99, 149, }, + [21] = { 69, 232.05, 3, 104, 157, }, + [22] = { 70, 244.4, 3, 110, 165, }, + [23] = { 71, 257.35, 3, 116, 174, }, + [24] = { 72, 270.96666666667, 3, 122, 183, }, + [25] = { 73, 285.25, 3, 128, 193, }, + [26] = { 74, 300.25, 3, 135, 203, }, + [27] = { 75, 315.98333333333, 3, 142, 213, }, + [28] = { 76, 332.5, 3, 150, 224, }, + [29] = { 77, 349.81666666667, 3, 157, 236, }, + [30] = { 78, 368.01666666667, 3, 166, 248, }, + [31] = { 79, 387.08333333333, 4, 174, 261, }, + [32] = { 80, 407.1, 4, 183, 275, }, + [33] = { 81, 428.1, 4, 193, 289, }, + [34] = { 82, 450.13333333333, 4, 203, 304, }, + }, +} skills["MonsterArc"] = { name = "Arc", hidden = true, @@ -3029,6 +3093,74 @@ skills["SnakeSpineProjectile"] = { [1] = { }, }, } +skills["TarMortarTaster"] = { + name = "Tar Projectile", + hidden = true, + color = 4, + baseFlags = { + spell = true, + projectile = true, + area = true, + }, + skillTypes = { [3] = true, [2] = true, [10] = true, [11] = true, [17] = true, [18] = true, [19] = true, [26] = true, [36] = true, }, + baseMods = { + skill("castTime", 1), + skill("cooldown", 4), + --"monster_projectile_variation" = 2 + --"projectile_spread_radius" = 10 + --"spell_maximum_action_distance_+%" = -50 + skill("duration", 2), --"base_skill_effect_duration" = 2000 + --"is_area_damage" = ? + --"base_is_projectile" = ? + mod("ProjectileSpeed", "INC", 33), --"base_projectile_speed_+%" = 33 + }, + qualityMods = { + }, + levelMods = { + [1] = skill("levelRequirement", nil), + [2] = skill("PhysicalMin", nil), --"spell_minimum_base_physical_damage" + [3] = skill("PhysicalMax", nil), --"spell_maximum_base_physical_damage" + }, + levels = { + [1] = { 3, 5, 8, }, + [2] = { 5, 6, 10, }, + [3] = { 8, 9, 13, }, + [4] = { 11, 11, 16, }, + [5] = { 15, 15, 22, }, + [6] = { 20, 21, 31, }, + [7] = { 24, 27, 40, }, + [8] = { 28, 34, 51, }, + [9] = { 29, 36, 54, }, + [10] = { 32, 43, 64, }, + [11] = { 36, 53, 79, }, + [12] = { 40, 65, 98, }, + [13] = { 45, 84, 126, }, + [14] = { 49, 102, 154, }, + [15] = { 50, 108, 161, }, + [16] = { 52, 118, 178, }, + [17] = { 56, 143, 214, }, + [18] = { 60, 172, 258, }, + [19] = { 64, 206, 309, }, + [20] = { 65, 216, 324, }, + [21] = { 66, 226, 338, }, + [22] = { 67, 236, 354, }, + [23] = { 68, 271, 407, }, + [24] = { 69, 284, 425, }, + [25] = { 70, 296, 445, }, + [26] = { 71, 310, 465, }, + [27] = { 72, 324, 485, }, + [28] = { 73, 338, 507, }, + [29] = { 74, 353, 530, }, + [30] = { 75, 369, 553, }, + [31] = { 76, 385, 577, }, + [32] = { 77, 402, 603, }, + [33] = { 78, 420, 629, }, + [34] = { 79, 438, 657, }, + [35] = { 80, 457, 686, }, + [36] = { 81, 477, 715, }, + [37] = { 82, 498, 746, }, + }, +} skills["UndyingWhirlingBlades"] = { name = "Whirling Blades", hidden = true, diff --git a/Data/Spectres.lua b/Data/Spectres.lua index cefe539e..9559933f 100644 --- a/Data/Spectres.lua +++ b/Data/Spectres.lua @@ -313,6 +313,29 @@ minions["Metadata/Monsters/Goatman/GoatmanShamanFireball"] = { -- MonsterCastsMoltenShellText }, } +minions["Metadata/Monsters/Goatman/GoatmanShamanFireChampion"] = { + name = "Goatman Fire-raiser", + life = 1.4, + energyShield = 0.2, + fireResist = 75, + coldResist = 0, + lightningResist = 0, + chaosResist = 0, + damage = 2, + damageSpread = 0.2, + attackTime = 1.5, + weaponType1 = "Staff", + skillList = { + "MonsterFireball", + "GoatmanMoltenShell", + "GoatmanFireMagmaOrb", + }, + modList = { + mod("Damage", "MORE", -11), -- MonsterSpeedAndDamageFixupSmall + mod("Speed", "MORE", 11), -- MonsterSpeedAndDamageFixupSmall + mod("Speed", "INC", -50, ModFlag.Cast), -- MonsterGoatmanShamanCastSpeed + }, +} minions["Metadata/Monsters/Goatman/GoatmanShamanLightning"] = { name = "Bearded Shaman", life = 1, @@ -738,6 +761,43 @@ minions["Metadata/Monsters/MassSkeleton/MassSkeleton"] = { -- MonsterCastsPunctureText }, } +-- Miners +minions["Metadata/Monsters/Miner/MinerLantern"] = { + name = "Pocked Lanternbearer", + life = 1.21, + fireResist = 40, + coldResist = 0, + lightningResist = 0, + chaosResist = 0, + damage = 2.21, + damageSpread = 0.2, + attackTime = 1.395, + skillList = { + "MinerThrowFire", + "MinerThrowFireSpectre", + }, + modList = { + -- IgniteArtVariation + }, +} +minions["Metadata/Monsters/Miner/MinerLanternCrystalVeins"] = { + name = "Pocked Illuminator", + life = 1.21, + fireResist = 40, + coldResist = 0, + lightningResist = 0, + chaosResist = 0, + damage = 2.21, + damageSpread = 0.2, + attackTime = 1.395, + skillList = { + "MinerThrowFire", + "MinerThrowFireSpectre", + }, + modList = { + -- IgniteArtVariation + }, +} -- Voidbearer minions["Metadata/Monsters/Monkeys/FlameBearer"] = { name = "Voidbearer", @@ -1343,6 +1403,47 @@ minions["Metadata/Monsters/Spiders/SpiderThornFlickerStrike"] = { -- MonsterUsesFlickerStrikeText }, } +-- Statue +minions["Metadata/Monsters/Statue/DaressoStatueLargeMaleSpear"] = { + name = "Towering Figment", + life = 5.76, + fireResist = 0, + coldResist = 0, + lightningResist = 0, + chaosResist = 0, + damage = 2.3, + damageSpread = 0.2, + attackTime = 1.875, + weaponType1 = "One Handed Sword", + skillList = { + "Melee", + "MonsterPuncture", + }, + modList = { + mod("Damage", "MORE", -33), -- MonsterSpeedAndDamageFixupComplete + mod("Speed", "MORE", 33), -- MonsterSpeedAndDamageFixupComplete + -- MonsterCastsPunctureText + }, +} +-- Ophidian +minions["Metadata/Monsters/Taster/Taster"] = { + name = "Noisome Ophidian", + life = 1, + fireResist = 40, + coldResist = 0, + lightningResist = 0, + chaosResist = 0, + damage = 2.5, + damageSpread = 0.2, + attackTime = 1.5, + weaponType1 = "Dagger", + skillList = { + "Melee", + "TarMortarTaster", + }, + modList = { + }, +} -- Undying minions["Metadata/Monsters/Undying/CityStalkerMaleCasterArmour"] = { name = "Undying Evangelist", diff --git a/Export/Minions/Spectres.lua b/Export/Minions/Spectres.lua index cefe539e..9559933f 100644 --- a/Export/Minions/Spectres.lua +++ b/Export/Minions/Spectres.lua @@ -313,6 +313,29 @@ minions["Metadata/Monsters/Goatman/GoatmanShamanFireball"] = { -- MonsterCastsMoltenShellText }, } +minions["Metadata/Monsters/Goatman/GoatmanShamanFireChampion"] = { + name = "Goatman Fire-raiser", + life = 1.4, + energyShield = 0.2, + fireResist = 75, + coldResist = 0, + lightningResist = 0, + chaosResist = 0, + damage = 2, + damageSpread = 0.2, + attackTime = 1.5, + weaponType1 = "Staff", + skillList = { + "MonsterFireball", + "GoatmanMoltenShell", + "GoatmanFireMagmaOrb", + }, + modList = { + mod("Damage", "MORE", -11), -- MonsterSpeedAndDamageFixupSmall + mod("Speed", "MORE", 11), -- MonsterSpeedAndDamageFixupSmall + mod("Speed", "INC", -50, ModFlag.Cast), -- MonsterGoatmanShamanCastSpeed + }, +} minions["Metadata/Monsters/Goatman/GoatmanShamanLightning"] = { name = "Bearded Shaman", life = 1, @@ -738,6 +761,43 @@ minions["Metadata/Monsters/MassSkeleton/MassSkeleton"] = { -- MonsterCastsPunctureText }, } +-- Miners +minions["Metadata/Monsters/Miner/MinerLantern"] = { + name = "Pocked Lanternbearer", + life = 1.21, + fireResist = 40, + coldResist = 0, + lightningResist = 0, + chaosResist = 0, + damage = 2.21, + damageSpread = 0.2, + attackTime = 1.395, + skillList = { + "MinerThrowFire", + "MinerThrowFireSpectre", + }, + modList = { + -- IgniteArtVariation + }, +} +minions["Metadata/Monsters/Miner/MinerLanternCrystalVeins"] = { + name = "Pocked Illuminator", + life = 1.21, + fireResist = 40, + coldResist = 0, + lightningResist = 0, + chaosResist = 0, + damage = 2.21, + damageSpread = 0.2, + attackTime = 1.395, + skillList = { + "MinerThrowFire", + "MinerThrowFireSpectre", + }, + modList = { + -- IgniteArtVariation + }, +} -- Voidbearer minions["Metadata/Monsters/Monkeys/FlameBearer"] = { name = "Voidbearer", @@ -1343,6 +1403,47 @@ minions["Metadata/Monsters/Spiders/SpiderThornFlickerStrike"] = { -- MonsterUsesFlickerStrikeText }, } +-- Statue +minions["Metadata/Monsters/Statue/DaressoStatueLargeMaleSpear"] = { + name = "Towering Figment", + life = 5.76, + fireResist = 0, + coldResist = 0, + lightningResist = 0, + chaosResist = 0, + damage = 2.3, + damageSpread = 0.2, + attackTime = 1.875, + weaponType1 = "One Handed Sword", + skillList = { + "Melee", + "MonsterPuncture", + }, + modList = { + mod("Damage", "MORE", -33), -- MonsterSpeedAndDamageFixupComplete + mod("Speed", "MORE", 33), -- MonsterSpeedAndDamageFixupComplete + -- MonsterCastsPunctureText + }, +} +-- Ophidian +minions["Metadata/Monsters/Taster/Taster"] = { + name = "Noisome Ophidian", + life = 1, + fireResist = 40, + coldResist = 0, + lightningResist = 0, + chaosResist = 0, + damage = 2.5, + damageSpread = 0.2, + attackTime = 1.5, + weaponType1 = "Dagger", + skillList = { + "Melee", + "TarMortarTaster", + }, + modList = { + }, +} -- Undying minions["Metadata/Monsters/Undying/CityStalkerMaleCasterArmour"] = { name = "Undying Evangelist", diff --git a/Export/Minions/Spectres.txt b/Export/Minions/Spectres.txt index d1bc1a1d..47ac7484 100644 --- a/Export/Minions/Spectres.txt +++ b/Export/Minions/Spectres.txt @@ -25,6 +25,7 @@ local minions, mod = ... #monster Metadata/Monsters/Goatman/GoatmanLeapSlam #monster Metadata/Monsters/Goatman/GoatmanLightningLeapSlamMaps #monster Metadata/Monsters/Goatman/GoatmanShamanFireball +#monster Metadata/Monsters/Goatman/GoatmanShamanFireChampion #monster Metadata/Monsters/Goatman/GoatmanShamanLightning -- Miscreation #monster Metadata/Monsters/DemonFemale/DemonFemale @@ -58,6 +59,9 @@ local minions, mod = ... #monster Metadata/Monsters/Lion/LionDesertSkinPuncture -- Knitted horror #monster Metadata/Monsters/MassSkeleton/MassSkeleton +-- Miners +#monster Metadata/Monsters/Miner/MinerLantern +#monster Metadata/Monsters/Miner/MinerLanternCrystalVeins -- Voidbearer #monster Metadata/Monsters/Monkeys/FlameBearer -- Stone golem @@ -96,6 +100,10 @@ local minions, mod = ... #monster Metadata/Monsters/Snake/SnakeScorpionMultiShot -- Spider #monster Metadata/Monsters/Spiders/SpiderThornFlickerStrike +-- Statue +#monster Metadata/Monsters/Statue/DaressoStatueLargeMaleSpear +-- Ophidian +#monster Metadata/Monsters/Taster/Taster -- Undying #monster Metadata/Monsters/Undying/CityStalkerMaleCasterArmour #monster Metadata/Monsters/Undying/UndyingOutcastPuncture diff --git a/Export/Skills/minion.lua b/Export/Skills/minion.lua index de7a302a..0bad16c0 100644 --- a/Export/Skills/minion.lua +++ b/Export/Skills/minion.lua @@ -993,3 +993,24 @@ skills["MinionInstability"] = { [1] = { }, }, } +skills["BeaconCausticCloud"] = { + name = "Caustic Cloud", + hidden = true, + color = 4, + baseFlags = { + cast = true, + area = true, + chaos = true, + }, + skillTypes = { }, + baseMods = { + skill("ChaosDot", 1, { type = "PerStat", stat = "Life", div = 10 }), + }, + qualityMods = { + }, + levelMods = { + }, + levels = { + [1] = { }, + }, +} diff --git a/Export/Skills/minion.txt b/Export/Skills/minion.txt index 91730773..a1d7c29d 100644 --- a/Export/Skills/minion.txt +++ b/Export/Skills/minion.txt @@ -95,4 +95,25 @@ skills["MinionInstability"] = { levels = { [1] = { }, }, +} +skills["BeaconCausticCloud"] = { + name = "Caustic Cloud", + hidden = true, + color = 4, + baseFlags = { + cast = true, + area = true, + chaos = true, + }, + skillTypes = { }, + baseMods = { + skill("ChaosDot", 1, { type = "PerStat", stat = "Life", div = 10 }), + }, + qualityMods = { + }, + levelMods = { + }, + levels = { + [1] = { }, + }, } \ No newline at end of file diff --git a/Export/Skills/spectre.lua b/Export/Skills/spectre.lua index 2d45e770..4a55e5ce 100644 --- a/Export/Skills/spectre.lua +++ b/Export/Skills/spectre.lua @@ -929,6 +929,70 @@ skills["MassFrenzy"] = { [1] = { }, }, } +skills["MinerThrowFireSpectre"] = { + name = "Throw Fire", + hidden = true, + color = 4, + baseFlags = { + spell = true, + projectile = true, + area = true, + fire = true, + duration = true, + }, + skillTypes = { [3] = true, }, + baseMods = { + skill("castTime", 1), + skill("cooldown", 1.5), + --"base_is_projectile" = ? + --"is_area_damage" = ? + }, + qualityMods = { + }, + levelMods = { + [1] = skill("levelRequirement", nil), + [2] = skill("FireDot", nil), --"base_fire_damage_to_deal_per_minute" + [3] = skill("duration", nil), --"base_skill_effect_duration" + [4] = skill("FireMin", nil), --"spell_minimum_base_fire_damage" + [5] = skill("FireMax", nil), --"spell_maximum_base_fire_damage" + }, + levels = { + [1] = { 3, 2.8333333333333, 2, 1, 2, }, + [2] = { 5, 3.5333333333333, 2.1, 2, 2, }, + [3] = { 8, 4.7833333333333, 2.2, 2, 3, }, + [4] = { 11, 6.3, 2.3, 3, 4, }, + [5] = { 15, 8.7833333333333, 2.4, 4, 6, }, + [6] = { 19, 11.933333333333, 2.5, 5, 8, }, + [7] = { 23, 15.9, 2.6, 7, 11, }, + [8] = { 27, 20.866666666667, 2.7, 9, 14, }, + [9] = { 28, 22.283333333333, 2.8, 10, 15, }, + [10] = { 32, 28.833333333333, 2.9, 13, 19, }, + [11] = { 40, 47.016666666667, 3, 21, 32, }, + [12] = { 47, 70.566666666667, 3, 32, 48, }, + [13] = { 48, 74.683333333333, 3, 34, 50, }, + [14] = { 55, 110.18333333333, 3, 50, 74, }, + [15] = { 60, 144.41666666667, 3, 65, 97, }, + [16] = { 64, 178.61666666667, 3, 80, 121, }, + [17] = { 65, 188.28333333333, 3, 85, 127, }, + [18] = { 66, 198.43333333333, 3, 89, 134, }, + [19] = { 67, 209.1, 3, 94, 141, }, + [20] = { 68, 220.3, 3, 99, 149, }, + [21] = { 69, 232.05, 3, 104, 157, }, + [22] = { 70, 244.4, 3, 110, 165, }, + [23] = { 71, 257.35, 3, 116, 174, }, + [24] = { 72, 270.96666666667, 3, 122, 183, }, + [25] = { 73, 285.25, 3, 128, 193, }, + [26] = { 74, 300.25, 3, 135, 203, }, + [27] = { 75, 315.98333333333, 3, 142, 213, }, + [28] = { 76, 332.5, 3, 150, 224, }, + [29] = { 77, 349.81666666667, 3, 157, 236, }, + [30] = { 78, 368.01666666667, 3, 166, 248, }, + [31] = { 79, 387.08333333333, 4, 174, 261, }, + [32] = { 80, 407.1, 4, 183, 275, }, + [33] = { 81, 428.1, 4, 193, 289, }, + [34] = { 82, 450.13333333333, 4, 203, 304, }, + }, +} skills["MonsterArc"] = { name = "Arc", hidden = true, @@ -3029,6 +3093,74 @@ skills["SnakeSpineProjectile"] = { [1] = { }, }, } +skills["TarMortarTaster"] = { + name = "Tar Projectile", + hidden = true, + color = 4, + baseFlags = { + spell = true, + projectile = true, + area = true, + }, + skillTypes = { [3] = true, [2] = true, [10] = true, [11] = true, [17] = true, [18] = true, [19] = true, [26] = true, [36] = true, }, + baseMods = { + skill("castTime", 1), + skill("cooldown", 4), + --"monster_projectile_variation" = 2 + --"projectile_spread_radius" = 10 + --"spell_maximum_action_distance_+%" = -50 + skill("duration", 2), --"base_skill_effect_duration" = 2000 + --"is_area_damage" = ? + --"base_is_projectile" = ? + mod("ProjectileSpeed", "INC", 33), --"base_projectile_speed_+%" = 33 + }, + qualityMods = { + }, + levelMods = { + [1] = skill("levelRequirement", nil), + [2] = skill("PhysicalMin", nil), --"spell_minimum_base_physical_damage" + [3] = skill("PhysicalMax", nil), --"spell_maximum_base_physical_damage" + }, + levels = { + [1] = { 3, 5, 8, }, + [2] = { 5, 6, 10, }, + [3] = { 8, 9, 13, }, + [4] = { 11, 11, 16, }, + [5] = { 15, 15, 22, }, + [6] = { 20, 21, 31, }, + [7] = { 24, 27, 40, }, + [8] = { 28, 34, 51, }, + [9] = { 29, 36, 54, }, + [10] = { 32, 43, 64, }, + [11] = { 36, 53, 79, }, + [12] = { 40, 65, 98, }, + [13] = { 45, 84, 126, }, + [14] = { 49, 102, 154, }, + [15] = { 50, 108, 161, }, + [16] = { 52, 118, 178, }, + [17] = { 56, 143, 214, }, + [18] = { 60, 172, 258, }, + [19] = { 64, 206, 309, }, + [20] = { 65, 216, 324, }, + [21] = { 66, 226, 338, }, + [22] = { 67, 236, 354, }, + [23] = { 68, 271, 407, }, + [24] = { 69, 284, 425, }, + [25] = { 70, 296, 445, }, + [26] = { 71, 310, 465, }, + [27] = { 72, 324, 485, }, + [28] = { 73, 338, 507, }, + [29] = { 74, 353, 530, }, + [30] = { 75, 369, 553, }, + [31] = { 76, 385, 577, }, + [32] = { 77, 402, 603, }, + [33] = { 78, 420, 629, }, + [34] = { 79, 438, 657, }, + [35] = { 80, 457, 686, }, + [36] = { 81, 477, 715, }, + [37] = { 82, 498, 746, }, + }, +} skills["UndyingWhirlingBlades"] = { name = "Whirling Blades", hidden = true, diff --git a/Export/Skills/spectre.txt b/Export/Skills/spectre.txt index 90fcfc39..1a33487d 100644 --- a/Export/Skills/spectre.txt +++ b/Export/Skills/spectre.txt @@ -78,6 +78,10 @@ local skills, mod, flag, skill = ... #flags spell area #mods +#skill MinerThrowFireSpectre Throw Fire +#flags spell projectile area fire duration +#mods + #skill MonsterArc Arc #flags spell lightning #mods @@ -249,6 +253,10 @@ local skills, mod, flag, skill = ... #flags attack projectile #mods +#skill TarMortarTaster Tar Projectile +#flags spell projectile area +#mods + #skill UndyingWhirlingBlades Whirling Blades #flags attack melee movement #mods \ No newline at end of file diff --git a/Modules/CalcActiveSkill.lua b/Modules/CalcActiveSkill.lua index 61f793d1..ae84aa97 100644 --- a/Modules/CalcActiveSkill.lua +++ b/Modules/CalcActiveSkill.lua @@ -494,6 +494,9 @@ function calcs.createMinionSkills(env, activeSkill) if env.modDB:Sum("FLAG", nil, "MinionInstability") then t_insert(skillIdList, "MinionInstability") end + if env.modDB:Sum("FLAG", nil, "MinionCausticCloudOnDeath") then + t_insert(skillIdList, "BeaconCausticCloud") + end for _, skillId in ipairs(skillIdList) do local gem = { name = data.skills[skillId].name, diff --git a/Modules/CalcPerform.lua b/Modules/CalcPerform.lua index 84ea20d1..216e90d3 100644 --- a/Modules/CalcPerform.lua +++ b/Modules/CalcPerform.lua @@ -250,8 +250,6 @@ local function doActorMisc(env, actor) condList[value.var] = true elseif value.type == "EnemyCondition" then enemyDB.conditions[value.var] = true - elseif value.type == "Multiplier" then - modDB.multipliers[value.var] = (modDB.multipliers[value.var] or 0) + value.value end end -- Process enemy modifiers last in case they depend on conditions that were set by misc modifiers @@ -365,6 +363,13 @@ function calcs.perform(env) end end + -- Set multipliers + for _, value in ipairs(modDB:Sum("LIST", nil, "Misc")) do + if value.type == "Multiplier" then + modDB.multipliers[value.var] = (modDB.multipliers[value.var] or 0) + value.value + end + end + -- Merge flask modifiers if env.mode_combat then local effectInc = modDB:Sum("INC", nil, "FlaskEffect") diff --git a/Modules/ModParser.lua b/Modules/ModParser.lua index 55efd355..f51bd0b1 100644 --- a/Modules/ModParser.lua +++ b/Modules/ModParser.lua @@ -654,6 +654,7 @@ local specialModList = { ["warcries cost no mana"] = { mod("ManaCost", "MORE", -100, nil, 0, KeywordFlag.Warcry) }, ["enemies you taunt take (%d+)%% increased damage"] = function(num) return { mod("Misc", "LIST", { type = "EnemyModifier", mod = mod("DamageTaken", "INC", num, { type = "Condition", var = "Taunted" }) }) } end, ["you have phasing while at maximum frenzy charges"] = { mod("Misc", "LIST", { type = "Condition", var = "Phasing" }, { type = "Condition", var = "AtMaxFrenzyCharges" }) }, + ["your minions spread caustic cloud on death, dealing 10%% of their maximum life as chaos damage per second"] = { flag("MinionCausticCloudOnDeath") }, -- Item local modifiers ["has no sockets"] = { }, ["has 1 socket"] = { }, diff --git a/README.md b/README.md index 2a7e71d7..8cf55342 100644 --- a/README.md +++ b/README.md @@ -47,6 +47,11 @@ Head over to the [Releases](https://github.com/Openarl/PathOfBuilding/releases) ![ss3](https://cloud.githubusercontent.com/assets/19189971/18089780/f0ff234a-6f04-11e6-8c88-6193fe59a5c4.png) ## Changelog +### 1.4.2 - 2017/04/16 + * Added support for Beacon of Corruption's Caustic Cloud (adds an extra 'Caustic Cloud' skill to your minions) + * Added Goatman Fire-raiser, Towering Figment, Noisome Ophidian and Pocked Lanternbearer/Illuminator to the spectre library + * Fixed the flat mana modifier on Grand Spectrum + ### 1.4.1 - 2017/04/16 * Added Slashed Miscreation, Spectral Scoundrel and Cannibal Fire-eater to the spectre library * The DPS for monster versions of Blade Vortex won't be accurate yet diff --git a/changelog.txt b/changelog.txt index 2a15e05f..f23124ee 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,7 @@ +VERSION[1.4.2][2017/04/16] + * Added support for Beacon of Corruption's Caustic Cloud (adds an extra 'Caustic Cloud' skill to your minions) + * Added Goatman Fire-raiser, Towering Figment, Noisome Ophidian and Pocked Lanternbearer/Illuminator to the spectre library + * Fixed the flat mana modifier on Grand Spectrum VERSION[1.4.1][2017/04/16] * Added Slashed Miscreation, Spectral Scoundrel and Cannibal Fire-eater to the spectre library * The DPS for monster versions of Blade Vortex won't be accurate yet diff --git a/manifest.xml b/manifest.xml index 6a12878e..196bbef0 100644 --- a/manifest.xml +++ b/manifest.xml @@ -1,13 +1,13 @@ - + - + @@ -45,11 +45,11 @@ - + - + @@ -58,7 +58,7 @@ - + @@ -69,13 +69,13 @@ - + - + - +