diff --git a/src/Data/Skills/spectre.lua b/src/Data/Skills/spectre.lua index 815f349886..2428c4a053 100644 --- a/src/Data/Skills/spectre.lua +++ b/src/Data/Skills/spectre.lua @@ -4980,6 +4980,53 @@ skills["HarvestRhexScreechDebuff"] = { }, } +skills["GAHarvestMinerHammerSlam"] = { + name = "Hammer Slam", + hidden = true, + color = 4, + skillTypes = { [SkillType.Triggerable] = true, [SkillType.Attack] = true, }, + statDescriptionScope = "skill_stat_descriptions", + castTime = 2.67, + baseFlags = { + attack = true, + area = true, + triggerable = true, + }, + stats = { + "is_area_damage", + "cast_time_overrides_attack_duration", + }, + levels = { + [1] = { baseMultiplier = 2, cooldown = 8, levelRequirement = 1, storedUses = 1, }, + }, +}skills["EDSHarvestMinerHammerSmoke"] = { + name = "Hammer Smoke", + hidden = true, + color = 4, + baseEffectiveness = 0.40000000596046, + incrementalEffectiveness = 0.028999999165535, + skillTypes = { [SkillType.Spell] = true, [SkillType.Triggerable] = true, }, + statDescriptionScope = "skill_stat_descriptions", + castTime = 1, + baseFlags = { + spell = true, + hit = true, + area = true, + triggerable = true, + }, + stats = { + "spell_minimum_base_physical_damage", + "spell_maximum_base_physical_damage", + "is_area_damage", + }, + notMinionStat = { + "spell_minimum_base_physical_damage", + "spell_maximum_base_physical_damage", + }, + levels = { + [1] = { 0.80000001192093, 1.2000000476837, levelRequirement = 1, statInterpolation = { 3, 3, }, }, + }, +} skills["LegionTemplarJudgeBallLightning"] = { name = "Ball Lightning", hidden = true, @@ -5218,6 +5265,106 @@ skills["HeistThugRangedExplosiveArrow"] = { [1] = { 0.80000001192093, 1.2000000476837, levelRequirement = 1, statInterpolation = { 3, 3, }, }, }, } +skills["HeistCultistUnarmedLeap"] = { + name = "Whirling Blades", + hidden = true, + color = 4, + description = "Dive through enemies, dealing weapon damage. If dual wielding attacks with both weapons, dealing the damage of both in one hit. Only works with Daggers, Claws, and One-Handed Swords.", + skillTypes = { [SkillType.Attack] = true, [SkillType.Melee] = true, [SkillType.Movement] = true, [SkillType.Travel] = true, }, + weaponTypes = { + ["Claw"] = true, + ["Dagger"] = true, + ["One Handed Sword"] = true, + ["Thrusting One Handed Sword"] = true, + }, + statDescriptionScope = "skill_stat_descriptions", + castTime = 1.13, + baseFlags = { + attack = true, + melee = true, + movement = true, + }, + constantStats = { + { "skill_sound_variation", 2 }, + }, + stats = { + "ignores_proximity_shield", + "cast_time_overrides_attack_duration", + }, + levels = { + [1] = { cooldown = 9, levelRequirement = 0, storedUses = 1, }, + }, +} +skills["HeistProjectUnarmedMelee1"] = { + name = "Default Attack", + hidden = true, + color = 4, + baseEffectiveness = 0, + description = "Strike your foes down with a powerful blow.", + skillTypes = { [SkillType.Attack] = true, [SkillType.RangedAttack] = true, [SkillType.MirageArcherCanUse] = true, [SkillType.Projectile] = true, [SkillType.MeleeSingleTarget] = true, [SkillType.Multistrikeable] = true, [SkillType.Melee] = true, [SkillType.ProjectilesFromUser] = true, }, + statDescriptionScope = "skill_stat_descriptions", + castTime = 1, + baseFlags = { + attack = true, + melee = true, + projectile = true, + }, + stats = { + "skill_can_fire_arrows", + "skill_can_fire_wand_projectiles", + }, + levels = { + [1] = { levelRequirement = 1, }, + }, +} +skills["GAHeistCultistUnarmedLeapImpact"] = { + name = "Whirling Blades Impact", + hidden = true, + color = 4, + skillTypes = { [SkillType.Triggerable] = true, [SkillType.Attack] = true, }, + statDescriptionScope = "skill_stat_descriptions", + castTime = 1.333, + baseFlags = { + attack = true, + area = true, + triggerable = true, + }, + stats = { + "is_area_damage", + }, + levels = { + [1] = { levelRequirement = 1, }, + }, +} +skills["EDSHeistScienceUnarmedGas"] = { + name = "Gas", + hidden = true, + color = 4, + baseEffectiveness = 0.40000000596046, + incrementalEffectiveness = 0.028999999165535, + skillTypes = { [SkillType.Spell] = true, [SkillType.Triggerable] = true, }, + statDescriptionScope = "skill_stat_descriptions", + castTime = 1, + baseFlags = { + spell = true, + hit = true, + area = true, + triggerable = true, + }, + stats = { + "spell_minimum_base_chaos_damage", + "spell_maximum_base_chaos_damage", + "is_area_damage", + "visual_hit_effect_chaos_is_green", + }, + notMinionStat = { + "spell_minimum_base_chaos_damage", + "spell_maximum_base_chaos_damage", + }, + levels = { + [1] = { 0.80000001192093, 1.2000000476837, levelRequirement = 1, statInterpolation = { 3, 3, }, }, + }, +} skills["EmptyActionAttackSecretPoliceDaggers"] = { name = "Dagger Trigger Attack", hidden = true, @@ -11605,4 +11752,136 @@ skills["FaridunCasterUndeadDamageOverTimeAura"] = { [1] = { 14, 10, cooldown = 0.5, levelRequirement = 0, storedUses = 1, statInterpolation = { 2, 2, }, }, [2] = { 17, 14, cooldown = 0.5, levelRequirement = 80, storedUses = 1, statInterpolation = { 2, 2, }, }, }, +} +skills["MPSHellscapeFleshEliteBasicProj"] = { + name = "Projectile", + hidden = true, + color = 4, + baseEffectiveness = 2.5, + incrementalEffectiveness = 0.032000001519918, + skillTypes = { [SkillType.Spell] = true, [SkillType.Projectile] = true, [SkillType.ProjectilesFromUser] = true, [SkillType.Triggerable] = true, }, + statDescriptionScope = "skill_stat_descriptions", + castTime = 1.166, + baseFlags = { + spell = true, + projectile = true, + triggerable = true, + }, + constantStats = { + { "monster_projectile_variation", 207 }, + { "spell_maximum_action_distance_+%", -50 }, + }, + stats = { + "spell_minimum_base_physical_damage", + "spell_maximum_base_physical_damage", + "base_is_projectile", + "projectile_uses_contact_position", + "use_scaled_contact_offset", + "action_attack_or_cast_time_uses_animation_length", + }, + notMinionStat = { + "spell_minimum_base_physical_damage", + "spell_maximum_base_physical_damage", + }, + levels = { + [1] = { 0.80000001192093, 1.2000000476837, critChance = 5, levelRequirement = 1, statInterpolation = { 3, 3, }, }, + }, +} +skills["GPSHellscapeFleshEliteSpikeBarrage"] = { + name = "Spike Barrage", + hidden = true, + color = 4, + baseEffectiveness = 1.7999999523163, + incrementalEffectiveness = 0.02449999935925, + skillTypes = { [SkillType.Spell] = true, [SkillType.Triggerable] = true, }, + statDescriptionScope = "skill_stat_descriptions", + castTime = 2, + baseFlags = { + spell = true, + hit = true, + projectile = true, + triggerable = true, + }, + constantStats = { + { "spell_maximum_action_distance_+%", -50 }, + }, + stats = { + "spell_minimum_base_physical_damage", + "spell_maximum_base_physical_damage", + "base_is_projectile", + "use_scaled_contact_offset", + "projectile_uses_contact_position", + }, + notMinionStat = { + "spell_minimum_base_physical_damage", + "spell_maximum_base_physical_damage", + }, + levels = { + [1] = { 0.80000001192093, 1.2000000476837, cooldown = 7, critChance = 5, levelRequirement = 1, storedUses = 1, statInterpolation = { 3, 3, }, }, + }, +} +skills["GSHellscapeFleshEliteBloodOrbExplosion"] = { + name = "Blood Orb Explosion", + hidden = true, + color = 4, + baseEffectiveness = 5, + incrementalEffectiveness = 0.033250000327826, + skillTypes = { [SkillType.Spell] = true, [SkillType.Triggerable] = true, }, + statDescriptionScope = "skill_stat_descriptions", + castTime = 1, + baseFlags = { + spell = true, + hit = true, + area = true, + triggerable = true, + }, + stats = { + "spell_minimum_base_physical_damage", + "spell_maximum_base_physical_damage", + "is_area_damage", + }, + notMinionStat = { + "spell_minimum_base_physical_damage", + "spell_maximum_base_physical_damage", + }, + levels = { + [1] = { 0.80000001192093, 1.2000000476837, critChance = 5, levelRequirement = 1, statInterpolation = { 3, 3, }, }, + }, +} +skills["VaalOverseerHeavyStrike"] = { + name = "Heavy Strike", + hidden = true, + color = 4, + baseEffectiveness = 0, + description = "Attacks enemies with a forceful blow. Requires a Mace, Sceptre, Axe, Sword or Staff.", + skillTypes = { [SkillType.Attack] = true, [SkillType.MeleeSingleTarget] = true, [SkillType.Multistrikeable] = true, [SkillType.Melee] = true, }, + weaponTypes = { + ["One Handed Axe"] = true, + ["One Handed Mace"] = true, + ["One Handed Sword"] = true, + ["Sceptre"] = true, + ["Staff"] = true, + ["Thrusting One Handed Sword"] = true, + ["Two Handed Axe"] = true, + ["Two Handed Mace"] = true, + ["Two Handed Sword"] = true, + }, + statDescriptionScope = "skill_stat_descriptions", + castTime = 1, + baseFlags = { + attack = true, + melee = true, + }, + constantStats = { + { "base_stun_threshold_reduction_+%", 1 }, + { "skill_physical_damage_%_to_convert_to_fire", 40 }, + }, + stats = { + "action_attack_or_cast_time_uses_animation_length", + "global_knockback", + }, + levels = { + [1] = { baseMultiplier = 1.26, cooldown = 2, levelRequirement = 1, storedUses = 1, }, + [2] = { baseMultiplier = 1.26, cooldown = 2, levelRequirement = 68, storedUses = 1, }, + }, } \ No newline at end of file diff --git a/src/Data/Spectres.lua b/src/Data/Spectres.lua index 050caa11cf..d4bcb91941 100644 --- a/src/Data/Spectres.lua +++ b/src/Data/Spectres.lua @@ -3196,6 +3196,35 @@ minions["Metadata/Monsters/LeagueHarvest/Blue/HarvestRhexT3Spectre"] = { -- damage_hit_effect_index [damage_hit_effect_index = 2] }, } +-- Wild Homunculus +minions["Metadata/Monsters/LeagueHarvest/Red/HarvestMinerHammerT2Spectre"] = { + name = "Wild Homunculus", + monsterTags = { "animal_claw_weapon", "caster", "flesh_armour", "is_unarmed", "melee", "physical_affinity", "red_blood", "undead", "very_slow_movement", }, + baseDamageIgnoresAttackSpeed = true, + life = 3.08, + lifeScaling = "AltLife1", + fireResist = 0, + coldResist = 40, + lightningResist = 0, + chaosResist = 0, + damage = 1.07, + damageSpread = 0.2, + attackTime = 0.93, + attackRange = 9, + accuracy = 1, + skillList = { + "MeleeAtAnimationSpeed", + "HarvestMinerMelee", + "GAHarvestMinerHammerSlam", + "EDSHarvestMinerHammerSmoke", + "EASHarvestEmerge", + }, + modList = { + -- BreachReducedBeyondPortalChance [monster_beyond_portal_chance_+%_final = -66] + -- BreachReducedBeyondPortalChance [monster_hellscape_charge_+% = -66] + -- damage_hit_effect_index [damage_hit_effect_index = 1] + }, +} -- Templar Tactician minions["Metadata/Monsters/LegionLeague/LegionTemplarCaster1Spectre"] = { name = "Templar Tactician", @@ -3367,6 +3396,39 @@ minions["Metadata/Monsters/LeagueHeist/Robot/RobotPyreKnightEliteSpectre"] = { modList = { }, } +-- Violator +minions["Metadata/Monsters/LeagueHeist/Science/ProjectUnarmedEliteGuardSpectre"] = { + name = "Violator", + monsterTags = { "caster", "chaos_affinity", "fast_movement", "has_claw", "has_one_handed_melee", "human", "humanoid", "light_armour", "melee", "no_pantheon_mod", "not_int", "physical_affinity", "red_blood", "slashing_weapon", }, + life = 3.57, + lifeScaling = "AltLife2", + armour = 0.5, + evasion = 0.5, + fireResist = 30, + coldResist = 30, + lightningResist = 30, + chaosResist = 20, + damage = 1.82, + damageSpread = 0.2, + attackTime = 1.005, + attackRange = 10, + accuracy = 1, + weaponType1 = "Claw", + skillList = { + "HeistProjectUnarmedMelee1", + "HeistProjectUnarmedMelee2", + "DoLiterallyNothing", + "WalkEmergeHeistScience", + "EDSHeistScienceUnarmedGas", + "EASHeistScienceUnarmedGasTime", + "ChangeToStance1Heist", + "HeistCultistUnarmedLeap", + "GAHeistCultistUnarmedLeapImpact", + "EASHeistMindControlSuicide", + }, + modList = { + }, +} -- Snow Rhex minions["Metadata/Monsters/AtlasExiles/EyrieInfluenceMonsters/EyrieArmouredBirdSpectre__"] = { name = "Snow Rhex", @@ -3622,7 +3684,7 @@ minions["Metadata/Monsters/LeagueHellscape/PaleFaction/HellscapePaleElite2Spectr modList = { }, } --- Ravenous Mishapen +-- Ravenous Misshapen minions["Metadata/Monsters/LeagueHellscape/FleshFaction/HellscapeFleshFodder4Spectre"] = { name = "Ravenous Misshapen", monsterTags = { "animal_claw_weapon", "beyond_demon", "caster", "demon", "flesh_armour", "is_unarmed", "lightning_affinity", "medium_movement", "melee", "not_dex", "not_str", "physical_affinity", "red_blood", }, @@ -3646,6 +3708,33 @@ minions["Metadata/Monsters/LeagueHellscape/FleshFaction/HellscapeFleshFodder4Spe modList = { }, } +-- Ravenous Bloodshaper +minions["Metadata/Monsters/LeagueHellscape/FleshFaction/HellscapeFleshElite1Spectre"] = { + name = "Ravenous Bloodshaper", + monsterTags = { "animal_claw_weapon", "beyond_demon", "caster", "demon", "flesh_armour", "is_unarmed", "not_dex", "physical_affinity", "ranged", "red_blood", "very_fast_movement", }, + baseDamageIgnoresAttackSpeed = true, + life = 2.7, + energyShield = 0.2, + armour = 0.5, + fireResist = 75, + coldResist = 0, + lightningResist = 0, + chaosResist = 0, + damage = 3.51, + damageSpread = 0.2, + attackTime = 1.5, + attackRange = 12, + accuracy = 1, + weaponType1 = "None", + skillList = { + "MPSHellscapeFleshEliteBasicProj", + "GPSHellscapeFleshEliteSpikeBarrage", + "SOHellscapeFleshEliteBloodOrb", + "GSHellscapeFleshEliteBloodOrbExplosion", + }, + modList = { + }, +} -- Aurid Synthete minions["Metadata/Monsters/LeagueSynthesis/SynthesisSoulstealer4Spectre"] = { name = "Aurid Synthete", @@ -7112,3 +7201,27 @@ minions["Metadata/Monsters/FaridunLeague/FaridunWarlock/FaridunWarlockHigh"] = { -- map_related_item_drop_chance_+%_final_from_league [map_related_item_drop_chance_+%_final_from_league = -50] }, } +-- Undead Vaal Commander +minions["Metadata/Monsters/VaalMonsters/VaalOverseer"] = { + name = "Undead Vaal Commander", + monsterTags = { "fire_affinity", "has_one_hand_sword", "has_one_handed_melee", "human", "humanoid", "medium_movement", "melee", "not_dex", "not_int", "physical_affinity", "plate_armour", "red_blood", "slashing_weapon", }, + baseDamageIgnoresAttackSpeed = true, + life = 2.59, + armour = 0.75, + fireResist = 40, + coldResist = 0, + lightningResist = 0, + chaosResist = 0, + damage = 2.59, + damageSpread = 0.2, + attackTime = 1.335, + attackRange = 17, + accuracy = 1, + weaponType1 = "One Handed Sword", + skillList = { + "MeleeAtAnimationSpeed", + "VaalOverseerHeavyStrike", + }, + modList = { + }, +} diff --git a/src/Export/Minions/Spectres.txt b/src/Export/Minions/Spectres.txt index 23086775e1..653f476b0e 100644 --- a/src/Export/Minions/Spectres.txt +++ b/src/Export/Minions/Spectres.txt @@ -184,6 +184,8 @@ local minions, mod, flag = ... #spectre Metadata/Monsters/LeagueHarvest/Blue/HarvestNessaCrabT3Spectre # HarvestNessaCrabScreechDebuff -- Primal Rhex Matriarch #spectre Metadata/Monsters/LeagueHarvest/Blue/HarvestRhexT3Spectre # HarvestRhexScreechDebuff +-- Wild Homunculus +#spectre Metadata/Monsters/LeagueHarvest/Red/HarvestMinerHammerT2Spectre -- Templar Tactician #spectre Metadata/Monsters/LegionLeague/LegionTemplarCaster1Spectre -- Frost Auto-Scout @@ -196,6 +198,8 @@ local minions, mod, flag = ... #spectre Metadata/Monsters/LeagueHeist/Thug/ThugRanged1EliteSpectre -- Ashblessed Warden #spectre Metadata/Monsters/LeagueHeist/Robot/RobotPyreKnightEliteSpectre +-- Violator +#spectre Metadata/Monsters/LeagueHeist/Science/ProjectUnarmedEliteGuardSpectre -- Snow Rhex #spectre Metadata/Monsters/AtlasExiles/EyrieInfluenceMonsters/EyrieArmouredBirdSpectre__ -- Flickershade @@ -214,8 +218,10 @@ local minions, mod, flag = ... #spectre Metadata/Monsters/LeagueHellscape/DemonFaction/HellscapeDemonElite2_Spectre -- Pale Seraphim #spectre Metadata/Monsters/LeagueHellscape/PaleFaction/HellscapePaleElite2Spectre --- Ravenous Mishapen +-- Ravenous Misshapen #spectre Metadata/Monsters/LeagueHellscape/FleshFaction/HellscapeFleshFodder4Spectre +-- Ravenous Bloodshaper +#spectre Metadata/Monsters/LeagueHellscape/FleshFaction/HellscapeFleshElite1Spectre -- Aurid Synthete #spectre Metadata/Monsters/LeagueSynthesis/SynthesisSoulstealer4Spectre -- Ruins Hellion @@ -438,4 +444,6 @@ local minions, mod, flag = ... -- Conjuror of Rot #spectre Metadata/Monsters/FaridunLeague/FaridunWarlock/FaridunWarlockLow #spectre Metadata/Monsters/FaridunLeague/FaridunWarlock/FaridunWarlockMid_ -#spectre Metadata/Monsters/FaridunLeague/FaridunWarlock/FaridunWarlockHigh \ No newline at end of file +#spectre Metadata/Monsters/FaridunLeague/FaridunWarlock/FaridunWarlockHigh +-- Undead Vaal Commander +#spectre Metadata/Monsters/VaalMonsters/VaalOverseer \ No newline at end of file diff --git a/src/Export/Skills/spectre.txt b/src/Export/Skills/spectre.txt index b2118317e2..3fbdfff204 100644 --- a/src/Export/Skills/spectre.txt +++ b/src/Export/Skills/spectre.txt @@ -832,6 +832,13 @@ skills["HarvestRhexScreechDebuff"] = { }, } +#skill GAHarvestMinerHammerSlam Hammer Slam +#flags attack area triggerable +#mods +#skill EDSHarvestMinerHammerSmoke Hammer Smoke +#flags spell hit area triggerable +#mods + #skill LegionTemplarJudgeBallLightning Ball Lightning #flags spell hit triggerable area projectile #mods @@ -878,6 +885,22 @@ skills["HarvestRhexScreechDebuff"] = { #baseMod mod("Multiplier:ExplosiveArrowFuse", "BASE", 20) #mods +#skill HeistCultistUnarmedLeap Whirling Blades +#flags attack melee movement +#mods + +#skill HeistProjectUnarmedMelee1 Default Attack +#flags attack melee projectile +#mods + +#skill GAHeistCultistUnarmedLeapImpact Whirling Blades Impact +#flags attack area triggerable +#mods + +#skill EDSHeistScienceUnarmedGas Gas +#flags spell hit area triggerable +#mods + #skill EmptyActionAttackSecretPoliceDaggers Dagger Trigger Attack #flags attack #mods @@ -2261,3 +2284,19 @@ skills["LegionKaruiMeleeCombo2"] = { }, }, #mods + +#skill MPSHellscapeFleshEliteBasicProj Projectile +#flags spell projectile triggerable +#mods + +#skill GPSHellscapeFleshEliteSpikeBarrage Spike Barrage +#flags spell hit projectile triggerable +#mods + +#skill GSHellscapeFleshEliteBloodOrbExplosion Blood Orb Explosion +#flags spell hit area triggerable +#mods + +#skill VaalOverseerHeavyStrike Heavy Strike +#flags attack melee +#mods \ No newline at end of file