Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enemy dot skills #6809

Merged
merged 9 commits into from
Jul 22, 2024
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
22 changes: 22 additions & 0 deletions src/Data/BossSkills.lua
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,17 @@ return {
},
tooltip = "Cannot be Evaded. Allocating Cosmic Wounds increases Damage by a further 100% (Applied on Uber) and cannot be blocked or dodged"
},
["Shaper Beam"] = {
DamageType = "DamageOverTime",
DamageMultipliers = {
Lightning = { 12.58958162968, 0 },
Cold = { 9.1363649598343, 0 },
Fire = { 11.141451836499, 0 }
},
speed = 1000,
critChance = 0,
tooltip = "Damage Over Time skill"
},
["Sirus Meteor"] = {
DamageType = "Spell",
DamageMultipliers = {
Expand All @@ -76,6 +87,15 @@ return {
},
tooltip = "Earlier ones with less walls do less damage. Allocating The Perfect Storm increases Damage by a further 50% (Applied on Uber)"
},
["Cortex Ground Degen"] = {
DamageType = "DamageOverTime",
DamageMultipliers = {
Physical = { 5.3012106087214, 0 }
},
speed = 1630,
critChance = 0,
tooltip = "Damage Over Time skill"
},
["Exarch Ball"] = {
DamageType = "SpellProjectile",
DamageMultipliers = {
Expand Down Expand Up @@ -152,7 +172,9 @@ return {
{ val = "Atziri Flameblast", label = "Atziri Flameblast" },
{ val = "Shaper Ball", label = "Shaper Ball" },
{ val = "Shaper Slam", label = "Shaper Slam" },
{ val = "Shaper Beam", label = "Shaper Beam" },
{ val = "Sirus Meteor", label = "Sirus Meteor" },
{ val = "Cortex Ground Degen", label = "Cortex Ground Degen" },
{ val = "Exarch Ball", label = "Exarch Ball" },
{ val = "Eater Beam", label = "Eater Beam" },
{ val = "Maven Fireball", label = "Maven Fireball" },
Expand Down
5 changes: 5 additions & 0 deletions src/Export/Enemies/BossSkills.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,14 @@ return {
#tooltip "Allocating Cosmic Wounds increases the penetration to 40% (Applied on Uber) and adds 2 projectiles"
#skill Slam AtlasBossFlickerSlam, speedMult = 8775,
#tooltip "Cannot be Evaded. Allocating Cosmic Wounds increases Damage by a further 100% (Applied on Uber) and cannot be blocked or dodged"
#skill Beam AtlasBossCelestialBeam, skillIndexUber = nil,
#tooltip "Damage Over Time skill"
#boss Sirus Metadata/Monsters/AtlasExiles/AtlasExile5 false false
#skill Meteor AtlasExileOrionCircleMazeBlast3, skillIndex = 4,
#tooltip "Earlier ones with less walls do less damage. Allocating The Perfect Storm increases Damage by a further 50% (Applied on Uber)"
#boss Cortex Metadata/Monsters/LeagueSynthesis/SynthesisVenariusBoss false true
#skill GroundDegen SynthesisVenariusQuicksand, skillIndexUber = nil, SkillExtraDamageMult = 226,
#tooltip "Damage Over Time skill"
#boss Exarch Metadata/Monsters/AtlasInvaders/CleansingMonsters/CleansingBoss false false
#skill Ball CleansingFireWall, skillIndexUber = nil, speedMult = 4545,
#tooltip "Spawns 8-18 waves of balls depending on which fight and which ball phase, Cannot be Blocked, Dodged, or Suppressed"
Expand Down
32 changes: 32 additions & 0 deletions src/Export/Scripts/bossData.lua
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,26 @@ local function calcSkillDamage(state)
baseDamages["maxChaos"..i] = 1 + statsPerLevel.BaseResolvedValues[j]
end
end
if state.DamageType == "DamageOverTime" then
for j, floatStat in ipairs(statsPerLevel.FloatStats) do
if floatStat.Id == "base_physical_damage_to_deal_per_minute" then
baseDamages["minPhysical"..i] = 1 + statsPerLevel.BaseResolvedValues[j] / 60
baseDamages["maxPhysical"..i] = 1 + statsPerLevel.BaseResolvedValues[j] / 60
elseif floatStat.Id == "base_lightning_damage_to_deal_per_minute" then
baseDamages["minLightning"..i] = 1 + statsPerLevel.BaseResolvedValues[j] / 60
baseDamages["maxLightning"..i] = 1 + statsPerLevel.BaseResolvedValues[j] / 60
elseif floatStat.Id == "base_cold_damage_to_deal_per_minute" then
baseDamages["minCold"..i] = 1 + statsPerLevel.BaseResolvedValues[j] / 60
baseDamages["maxCold"..i] = 1 + statsPerLevel.BaseResolvedValues[j] / 60
elseif floatStat.Id == "base_fire_damage_to_deal_per_minute" then
baseDamages["minFire"..i] = 1 + statsPerLevel.BaseResolvedValues[j] / 60
baseDamages["maxFire"..i] = 1 + statsPerLevel.BaseResolvedValues[j] / 60
elseif floatStat.Id == "base_chaos_damage_to_deal_per_minute" then
baseDamages["minChaos"..i] = 1 + statsPerLevel.BaseResolvedValues[j] / 60
baseDamages["maxChaos"..i] = 1 + statsPerLevel.BaseResolvedValues[j] / 60
end
end
end
end
monsterLevel = skill.statsPerLevel[skill.index].PlayerLevelReq
local damageMult = state.SkillExtraDamageMult * ExtraDamageMult[1] * (rarityDamageMult[rarityType] or 1) * (boss.mapBoss and monsterMapDifficultyMult[monsterLevel] or 1) / (monsterBaseDamage[monsterLevel] or 1) -- * boss.damageMult / 100
Expand Down Expand Up @@ -137,6 +157,7 @@ local function getStat(state, stat)
local boss = state.boss
if stat == "DamageType" then
local DamageType = "Untyped"
local isHit = false
for _, implicitStat in ipairs(skill.GrantedEffectStatSets.ImplicitStats) do
if implicitStat.Id == "base_is_projectile" then
DamageType = "Projectile"
Expand All @@ -154,13 +175,22 @@ local function getStat(state, stat)
end
for _, contextFlag in ipairs(skill.skillData.ActiveSkill.StatContextFlags) do
if contextFlag.Id == "AttackHit" then
isHit = true
DamageType = (DamageType == "Projectile") and "Projectile" or "Melee"
elseif contextFlag.Id == "SpellHit" then
isHit = true
DamageType = (DamageType == "Projectile") and "SpellProjectile" or "Spell"
elseif contextFlag.Id == "Projectile" then
DamageType = (DamageType == "Spell") and "SpellProjectile" or "Projectile"
end
end
if not isHit then
for _, contextFlag in ipairs(skill.skillData.ActiveSkill.StatContextFlags) do
if contextFlag.Id == "DamageOverTime" then
return "DamageOverTime"
end
end
end
return DamageType
elseif stat == "Penetration" then
DamageData["PhysOverwhelm"], DamageData["PhysUberOverwhelm"], DamageData["LightningPen"], DamageData["LightningUberPen"], DamageData["ColdPen"], DamageData["ColdUberPen"], DamageData["FirePen"], DamageData["FireUberPen"], DamageData["ChaosPen"], DamageData["ChaosUberPen"] = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
Expand Down Expand Up @@ -384,6 +414,8 @@ directiveTable.skills.skill = function(state, args, out)
end
if displayName == "MemoryGame" then
displayName = "Memory Game"
elseif displayName == "GroundDegen" then
displayName = "Ground Degen"
end
local boss = state.boss
state.skillList = state.skillList or {}
Expand Down
2 changes: 1 addition & 1 deletion src/Modules/Build.lua
Original file line number Diff line number Diff line change
Expand Up @@ -473,7 +473,7 @@ function buildMode:Init(dbFileName, buildName, buildXML, convertBuild)
{ stat = "Rage", label = "Rage", fmt = "d", color = colorCodes.RAGE, compPercent = true },
{ stat = "RageRegenRecovery", label = "Rage Regen", fmt = ".1f", color = colorCodes.RAGE, compPercent = true },
{ },
{ stat = "TotalDegen", label = "Total Degen", fmt = ".1f", lowerIsBetter = true },
{ stat = "TotalBuildDegen", label = "Total Degen", fmt = ".1f", lowerIsBetter = true },
{ stat = "TotalNetRegen", label = "Total Net Recovery", fmt = "+.1f" },
{ stat = "NetLifeRegen", label = "Net Life Recovery", fmt = "+.1f", color = colorCodes.LIFE },
{ stat = "NetManaRegen", label = "Net Mana Recovery", fmt = "+.1f", color = colorCodes.MANA },
Expand Down
Loading
Loading