diff --git a/src/Data/Skills/spectre.lua b/src/Data/Skills/spectre.lua index 3ef7e781a4..eea8f0e990 100644 --- a/src/Data/Skills/spectre.lua +++ b/src/Data/Skills/spectre.lua @@ -544,7 +544,7 @@ skills["DemonModularBladeVortexSpectre"] = { }, } skills["ElementalHitSkeletonKnight"] = { - name = "Elemental Hit Fire", + name = "Elemental Hit - Pseudo Tri-Conversion", hidden = true, color = 2, baseEffectiveness = 1.1667000055313, @@ -555,23 +555,27 @@ skills["ElementalHitSkeletonKnight"] = { castTime = 1, baseFlags = { attack = true, - projectile = true, + area = true, melee = true, + projectile = true, + Fire = true, + Cold = true, + Lightning = true, }, baseMods = { flag("DealNoPhysical"), flag("DealNoChaos"), - flag("DealNoCold"), - flag("DealNoLightning"), - mod("AreaOfEffect", "MORE", 80, 0, 0, { type = "ActorCondition", actor = "enemy", var = "Ignited" }), + mod("PhysicalDamageConvertToFire", "BASE", 100, 0, 0, { type = "BASE", }), + mod("PhysicalDamageConvertToCold", "BASE", 100, 0, 0, { type = "BASE", }), + mod("PhysicalDamageConvertToLightning", "BASE", 100, 0, 0, { type = "BASE", }), + mod("AreaOfEffect", "MORE", 80, 0, 0, { type = "ActorCondition", actor = "enemy", var = "Ignited", "Scorched", "Chilled", "Frozen", "Brittle", "Shocked", "Sapped" }), mod("Multiplier:ElementalHitAilmentOnEnemy", "BASE", 1, 0, 0, { type = "ActorCondition", actor = "enemy", var = "Ignited" }), + mod("Multiplier:ElementalHitAilmentOnEnemy", "BASE", 1, 0, 0, { type = "ActorCondition", actor = "enemy", var = "Scorched" }), mod("Multiplier:ElementalHitAilmentOnEnemy", "BASE", 1, 0, 0, { type = "ActorCondition", actor = "enemy", var = "Chilled" }), mod("Multiplier:ElementalHitAilmentOnEnemy", "BASE", 1, 0, 0, { type = "ActorCondition", actor = "enemy", var = "Frozen" }), - mod("Multiplier:ElementalHitAilmentOnEnemy", "BASE", 1, 0, 0, { type = "ActorCondition", actor = "enemy", var = "Shocked" }), - mod("Multiplier:ElementalHitAilmentOnEnemy", "BASE", 1, 0, 0, { type = "ActorCondition", actor = "enemy", var = "Scorched" }), mod("Multiplier:ElementalHitAilmentOnEnemy", "BASE", 1, 0, 0, { type = "ActorCondition", actor = "enemy", var = "Brittle" }), + mod("Multiplier:ElementalHitAilmentOnEnemy", "BASE", 1, 0, 0, { type = "ActorCondition", actor = "enemy", var = "Shocked" }), mod("Multiplier:ElementalHitAilmentOnEnemy", "BASE", 1, 0, 0, { type = "ActorCondition", actor = "enemy", var = "Sapped" }), - mod("Damage", "MORE", 10, 0, 0, { type = "Multiplier", var = "ElementalHitAilmentOnEnemy" }), }, constantStats = { { "chance_to_freeze_shock_ignite_%", 50 }, diff --git a/src/Data/Spectres.lua b/src/Data/Spectres.lua index 073ce0a4c7..87b155d7ec 100644 --- a/src/Data/Spectres.lua +++ b/src/Data/Spectres.lua @@ -527,6 +527,28 @@ minions["Metadata/Monster/CageSpider/CageSpider2"] = { modList = { }, } +-- Colossal Vaal Fallen +minions["Metadata/Monsters/Skeletons/SkeletonMeleeKnightElementalLargeSword"] = { + name = "Colossal Vaal Fallen", + life = 1.98, + armour = 0.8, + fireResist = 37, + coldResist = 37, + lightningResist = 37, + chaosResist = 0, + damage = 4.05, + damageSpread = 0.2, + attackTime = 1.5, + attackRange = 15, + accuracy = 1, + weaponType1 = "One Handed Sword", + skillList = { + "MeleeAtAnimationSpeed", + "ElementalHitSkeletonKnight", + }, + modList = { + }, +} -- Cannibals minions["Metadata/Monsters/Cannibal/CannibalMaleChampion"] = { name = "Cannibal Fire-eater", diff --git a/src/Export/Minions/Spectres.txt b/src/Export/Minions/Spectres.txt index 249c2bee7e..ad7008796b 100644 --- a/src/Export/Minions/Spectres.txt +++ b/src/Export/Minions/Spectres.txt @@ -33,6 +33,8 @@ local minions, mod, flag = ... #spectre Metadata/Monsters/Bull/Bull -- Cage Spider #spectre Metadata/Monster/CageSpider/CageSpider2 +-- Colossal Vaal Fallen +#spectre Metadata/Monsters/Skeletons/SkeletonMeleeKnightElementalLargeSword -- Cannibals #spectre Metadata/Monsters/Cannibal/CannibalMaleChampion -- Goatmen diff --git a/src/Export/Skills/spectre.txt b/src/Export/Skills/spectre.txt index 86d49535f4..58dbe14486 100644 --- a/src/Export/Skills/spectre.txt +++ b/src/Export/Skills/spectre.txt @@ -101,21 +101,21 @@ local skills, mod, flag, skill = ... #baseMod skill("hitTimeOverride", 1) #mods -#skill ElementalHitSkeletonKnight Elemental Hit Fire -#flags attack projectile melee +#skill ElementalHitSkeletonKnight Elemental Hit - Pseudo Tri-Conversion +#flags attack area melee projectile Fire Cold Lightning #baseMod flag("DealNoPhysical") #baseMod flag("DealNoChaos") -#baseMod flag("DealNoCold") -#baseMod flag("DealNoLightning") -#baseMod mod("AreaOfEffect", "MORE", 80, 0, 0, { type = "ActorCondition", actor = "enemy", var = "Ignited" }) +#baseMod mod("PhysicalDamageConvertToFire", "BASE", 100, 0, 0, { type = "BASE", }) +#baseMod mod("PhysicalDamageConvertToCold", "BASE", 100, 0, 0, { type = "BASE", }) +#baseMod mod("PhysicalDamageConvertToLightning", "BASE", 100, 0, 0, { type = "BASE", }) +#baseMod mod("AreaOfEffect", "MORE", 80, 0, 0, { type = "ActorCondition", actor = "enemy", var = "Ignited", "Scorched", "Chilled", "Frozen", "Brittle", "Shocked", "Sapped" }) #baseMod mod("Multiplier:ElementalHitAilmentOnEnemy", "BASE", 1, 0, 0, { type = "ActorCondition", actor = "enemy", var = "Ignited" }) +#baseMod mod("Multiplier:ElementalHitAilmentOnEnemy", "BASE", 1, 0, 0, { type = "ActorCondition", actor = "enemy", var = "Scorched" }) #baseMod mod("Multiplier:ElementalHitAilmentOnEnemy", "BASE", 1, 0, 0, { type = "ActorCondition", actor = "enemy", var = "Chilled" }) #baseMod mod("Multiplier:ElementalHitAilmentOnEnemy", "BASE", 1, 0, 0, { type = "ActorCondition", actor = "enemy", var = "Frozen" }) -#baseMod mod("Multiplier:ElementalHitAilmentOnEnemy", "BASE", 1, 0, 0, { type = "ActorCondition", actor = "enemy", var = "Shocked" }) -#baseMod mod("Multiplier:ElementalHitAilmentOnEnemy", "BASE", 1, 0, 0, { type = "ActorCondition", actor = "enemy", var = "Scorched" }) #baseMod mod("Multiplier:ElementalHitAilmentOnEnemy", "BASE", 1, 0, 0, { type = "ActorCondition", actor = "enemy", var = "Brittle" }) +#baseMod mod("Multiplier:ElementalHitAilmentOnEnemy", "BASE", 1, 0, 0, { type = "ActorCondition", actor = "enemy", var = "Shocked" }) #baseMod mod("Multiplier:ElementalHitAilmentOnEnemy", "BASE", 1, 0, 0, { type = "ActorCondition", actor = "enemy", var = "Sapped" }) -#baseMod mod("Damage", "MORE", 10, 0, 0, { type = "Multiplier", var = "ElementalHitAilmentOnEnemy" }) #mods #skill ElementalHitSkeletonKnightIncursion