Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/Classes/ModStore.lua
Original file line number Diff line number Diff line change
Expand Up @@ -423,6 +423,9 @@ function ModStoreClass:EvalMod(mod, cfg, globalLimits)
end
local percent = tag.percent or self:GetMultiplier(tag.percentVar, cfg)
local mult = base * (percent and percent / 100 or 1)
if tag.floor then
mult = m_floor(mult)
end
local limitTotal
if tag.limit or tag.limitVar then
local limit = tag.limit or self:GetMultiplier(tag.limitVar, cfg)
Expand Down
64 changes: 64 additions & 0 deletions src/Data/Minions.lua
Original file line number Diff line number Diff line change
Expand Up @@ -519,6 +519,7 @@ minions["AnimatedWeapon"] = {
attackTime = 1,
attackRange = 6,
accuracy = 3.4,
limit = "ActiveAnimatedWeaponLimit",
skillList = {
"Melee",
},
Expand Down Expand Up @@ -588,6 +589,7 @@ minions["UniqueAnimatedWeapon"] = {
attackTime = 1,
attackRange = 105,
accuracy = 3.4,
limit = "ActiveAnimatedWeaponLimit",
skillList = {
"Melee",
"DancingDervishCycloneChannelled",
Expand Down Expand Up @@ -718,6 +720,7 @@ minions["AxisEliteSoldierDominatingBlow"] = {
accuracy = 3.4,
weaponType1 = "One Handed Mace",
weaponType2 = "Shield",
limit = "ActiveSentinelOfDominanceLimit",
skillList = {
"Melee",
"DominatingBlowMinionCharge",
Expand All @@ -744,6 +747,7 @@ minions["AxisEliteSoldierDominatingBlowVaal"] = {
attackTime = 0.83,
attackRange = 28,
accuracy = 3.4,
limit = "ActiveSentinelOfDominanceLimit",
skillList = {
"TeleportVaalDomination",
"GAVaalDominationTeleportSlam",
Expand Down Expand Up @@ -773,6 +777,7 @@ minions["AbsolutionTemplarJudge"] = {
attackRange = 9,
accuracy = 1,
weaponType1 = "One Handed Mace",
limit = "ActiveSentinelOfAbsolutionLimit",
skillList = {
"Melee",
"AbsolutionMinion",
Expand All @@ -796,6 +801,7 @@ minions["AbsolutionTemplarJudgeVaal"] = {
attackTime = 1.17,
attackRange = 9,
accuracy = 1,
limit = "ActiveSentinelOfAbsolutionLimit",
skillList = {
"AbsolutionMinionVaal",
"AbsolutionMinionVaalCascade",
Expand Down Expand Up @@ -977,6 +983,34 @@ minions["SkitterbotLightning"] = {
},
}

minions["SkitterbotFire"] = {
name = "Scorching Skitterbot",
monsterTags = { "construct", "extra_extra_small_height", "is_unarmed", "non_attacking", "stone_armour", "very_fast_movement", },
life = 1,
fireResist = 0,
coldResist = 0,
lightningResist = 0,
chaosResist = 0,
damage = 1,
damageSpread = 0,
attackTime = 1,
attackRange = 6,
accuracy = 1,
skillList = {
"SkitterbotDetonateMines",
"SkitterbotWait",
},
modList = {
-- MonsterNoDropsOrExperience [monster_no_drops_or_experience = 1]
-- CannotBeAugmented [cannot_have_azmeri_dust = 1]
-- CannotBeAugmented [cant_possess_this = 1]
-- CannotBeAugmented [cant_touch_this = 1]
-- CannotBeAugmented [cannot_be_tagged_by_sentinel = 1]
-- CannotBeAugmented [cannot_be_afflicted = 1]
-- CannotBeAugmented [cannot_have_affliction_mods = 1]
},
}

minions["SummonedReaper"] = {
name = "Reaper",
monsterTags = { "bone_armour", "bones", "fast_movement", "has_dual_wield_melee", "has_one_hand_sword", "has_one_handed_melee", "melee", "not_int", "physical_affinity", "skeleton", "slashing_weapon", "undead", },
Expand All @@ -994,6 +1028,7 @@ minions["SummonedReaper"] = {
accuracy = 3.4,
weaponType1 = "One Handed Sword",
weaponType2 = "One Handed Sword",
limit = "ActiveReaperLimit",
skillList = {
"ReaperConsumeMinionForHeal",
"ReaperConsumeMinionForBuff",
Expand Down Expand Up @@ -1159,3 +1194,32 @@ minions["GuardianRelicLightning"] = {
-- EmergeSpeedHigh [emerge_speed_+% = 0]
},
}

minions["VoidSpawn"] = {
name = "Void Spawn",
monsterTags = { "caster", "construct", "elder_monster", "eldritch", "extra_large_height", "flesh_armour", "influence_monster", "is_unarmed", "lightning_affinity", "medium_movement", "not_dex", "not_str", "ranged", "red_blood", },
life = 3,
energyShield = 0.2,
fireResist = 30,
coldResist = 30,
lightningResist = 30,
chaosResist = 20,
damage = 1.5,
damageSpread = 0.2,
attackTime = 1,
attackRange = 9,
accuracy = 1,
limit = "ActiveVoidSpawnLimit",
skillList = {
"ElderTentacleMinionProjectileDeepcaller",
},
modList = {
-- MonsterNoDropsOrExperience [monster_no_drops_or_experience = 1]
-- CannotBeAugmented [cannot_have_azmeri_dust = 1]
-- CannotBeAugmented [cant_possess_this = 1]
-- CannotBeAugmented [cant_touch_this = 1]
-- CannotBeAugmented [cannot_be_tagged_by_sentinel = 1]
-- CannotBeAugmented [cannot_be_afflicted = 1]
-- CannotBeAugmented [cannot_have_affliction_mods = 1]
},
}
237 changes: 221 additions & 16 deletions src/Data/ModCache.lua

Large diffs are not rendered by default.

9 changes: 9 additions & 0 deletions src/Data/SkillStatMap.lua
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,9 @@ return {
["cast_spell_on_linked_melee_kill"] = {
skill("triggeredByMeleeKill", true, { type = "SkillType", skillType = SkillType.Triggerable }, { type = "SkillType", skillType = SkillType.Spell }, { type = "Condition", var = "KilledRecently" }),
},
["chance_to_cast_on_kill_%"] = {
skill("triggeredBySquirmingTerror", true , { type = "SkillType", skillType = SkillType.Triggerable }, { type = "SkillType", skillType = SkillType.Spell }, { type = "Condition", var = "KilledRecently" })
},
["cast_linked_spells_on_melee_kill_%"] = {
skill("chanceToTriggerOnMeleeKill", nil , { type = "SkillType", skillType = SkillType.Attack }, { type = "SkillType", skillType = SkillType.Melee })
},
Expand Down Expand Up @@ -265,6 +268,9 @@ return {
["base_melee_attack_repeat_count"] = {
mod("RepeatCount", "BASE", nil, 0, 0, { type = "SkillType", skillType = SkillType.Multistrikeable }),
},
["skill_repeat_count"] = {
mod("RepeatCount", "BASE", nil, 0, 0, { type = "SkillType", skillType = SkillType.Multicastable }),
},
["display_skill_minions_level_is_corpse_level"] = {
skill("minionLevelIsEnemyLevel", true),
},
Expand Down Expand Up @@ -1890,6 +1896,9 @@ return {
["number_of_spider_minions_allowed"] = {
mod("ActiveSpiderLimit", "BASE", nil),
},
["base_number_of_void_spawns_allowed"] = {
mod("ActiveVoidSpawnLimit", "BASE", nil),
},
["active_skill_minion_damage_+%_final"] = {
mod("MinionModifier", "LIST", { mod = mod("Damage", "MORE", nil) }),
},
Expand Down
1 change: 1 addition & 0 deletions src/Data/Skills/act_int.lua
Original file line number Diff line number Diff line change
Expand Up @@ -18580,6 +18580,7 @@ skills["SummonSkitterbots"] = {
minionList = {
"SkitterbotCold",
"SkitterbotLightning",
"SkitterbotFire",
},
statMap = {
["skitterbots_trap_mine_damage_+%_final"] = {
Expand Down
28 changes: 28 additions & 0 deletions src/Data/Skills/minion.lua
Original file line number Diff line number Diff line change
Expand Up @@ -1968,4 +1968,32 @@ skills["AnimateGuardianSmite"] = {
levels = {
[1] = { damageEffectiveness = 3.25, baseMultiplier = 3.25, levelRequirement = 1, },
},
}
skills["ElderTentacleMinionProjectileDeepcaller"] = {
name = "Projectile Spell",
hidden = true,
color = 4,
baseEffectiveness = 5.5,
incrementalEffectiveness = 0.029999999329448,
skillTypes = { [SkillType.Spell] = true, [SkillType.Projectile] = true, [SkillType.ProjectilesFromUser] = true, [SkillType.Triggerable] = true, },
statDescriptionScope = "skill_stat_descriptions",
castTime = 1.17,
baseFlags = {
spell = true,
projectile = true,
},
constantStats = {
{ "monster_projectile_variation", 44 },
{ "skill_visual_scale_+%", 50 },
{ "base_chance_to_shock_%", 60 },
},
stats = {
"spell_minimum_base_lightning_damage",
"spell_maximum_base_lightning_damage",
"base_is_projectile",
"projectile_uses_contact_position",
},
levels = {
[1] = { 0.5, 1.5, critChance = 5, levelRequirement = 1, statInterpolation = { 3, 3, }, },
},
}
Loading