Skip to content

Added partial support for Hall of grandmasters pvp scaling #277

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.

Sign up for GitHub

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

Closed
wants to merge 15 commits into from
Closed

Added partial support for Hall of grandmasters pvp scaling #277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
c00c5f4
Added initial support for pvp scaling
Regisle Feb 29, 2020
02867f6
added tvalueOverride and pvpMultiplier
Regisle Feb 29, 2020
f4f0528
added flags to hide/show stats
Regisle Mar 1, 2020
e7fd756
fixed issue with wrong flag
Regisle Mar 1, 2020
0313498
moved pvp calculation
Regisle Mar 1, 2020
3446e2e
Added support for more pvp scaling
Regisle Mar 1, 2020
bc61a92
added base support for all dots
Regisle Mar 1, 2020
282d538
Moved calculations and fixed display
Regisle Mar 1, 2020
87d3014
added flag to PvpAverageHit
Regisle Mar 1, 2020
166fbf1
added dot specific Tvalue and minions stats
Regisle Mar 2, 2020
8baa93a
updated pvp breakdowns
Regisle Mar 4, 2020
d243410
Fixed things displaying when not a number
Regisle Mar 4, 2020
427863c
Merge branch 'dev2'
Regisle Mar 4, 2020
fbc7cdd
changed Tvalue overrides to be milliseconds instead of seconds
Regisle Mar 5, 2020
b949dc1
Fixed Tvalue for Traps and Mines
Regisle Mar 5, 2020
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
31 changes: 30 additions & 1 deletion Modules/Build.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,9 @@ function buildMode:Init(dbFileName, buildName, buildXML, targetVersion)
self.displayStats = {
{ stat = "ActiveMinionLimit", label = "Active Minion Limit", fmt = "d" },
{ stat = "AverageHit", label = "Average Hit", fmt = ".1f", compPercent = true },
{ stat = "PvpAverageHit", label = "PvP Average Hit", fmt = ".1f", compPercent = true, flag = "isPvP" },
{ stat = "AverageDamage", label = "Average Damage", fmt = ".1f", compPercent = true, flag = "attack" },
{ stat = "PvpAverageDamage", label = "PvP Average Damage", fmt = ".1f", compPercent = true, flag = "attackPvP" },
{ stat = "Speed", label = "Attack Rate", fmt = ".2f", compPercent = true, flag = "attack" },
{ stat = "Speed", label = "Cast Rate", fmt = ".2f", compPercent = true, flag = "spell" },
{ stat = "HitSpeed", label = "Hit Rate", fmt = ".2f", compPercent = true },
Expand All @@ -245,22 +247,39 @@ function buildMode:Init(dbFileName, buildName, buildXML, targetVersion)
{ stat = "CritMultiplier", label = "Crit Multiplier", fmt = "d%%", pc = true, condFunc = function(v,o) return (o.CritChance or 0) > 0 end },
{ stat = "HitChance", label = "Hit Chance", fmt = ".0f%%", flag = "attack" },
{ stat = "TotalDPS", label = "Total DPS", fmt = ".1f", compPercent = true, flag = "notAverage" },
{ stat = "PvpTotalDPS", label = "PvP Total DPS", fmt = ".1f", compPercent = true, flag = "notAveragePvP" },
{ stat = "TotalDot", label = "DoT DPS", fmt = ".1f", compPercent = true },
{ stat = "PvpTotalDot", label = "PvP DoT DPS", fmt = ".1f", compPercent = true },
{ stat = "BleedDPS", label = "Bleed DPS", fmt = ".1f", compPercent = true },
{ stat = "PvpBleedDPS", label = "PvP Bleed DPS", fmt = ".1f", compPercent = true },
{ stat = "IgniteDPS", label = "Ignite DPS", fmt = ".1f", compPercent = true },
{ stat = "PvpIgniteDPS", label = "PvP Ignite DPS", fmt = ".1f", compPercent = true },
{ stat = "IgniteDamage", label = "Total Damage per Ignite", fmt = ".1f", compPercent = true },
{ stat = "PvpIgniteDamage", label = "Total PvP Damage per Ignite", fmt = ".1f", compPercent = true },
{ stat = "WithIgniteDPS", label = "Total DPS inc. Ignite", fmt = ".1f", compPercent = true },
{ stat = "PvpWithIgniteDPS", label = "Total PvP DPS inc. Ignite", fmt = ".1f", compPercent = true },
{ stat = "WithIgniteAverageDamage", label = "Average Dmg. inc. Ignite", fmt = ".1f", compPercent = true },
{ stat = "PvpWithIgniteAverageDamage", label = "Average PvP Dmg. inc. Ignite", fmt = ".1f", compPercent = true },
{ stat = "PoisonDPS", label = "Poison DPS", fmt = ".1f", compPercent = true },
{ stat = "PvpPoisonDPS", label = "PvP Poison DPS", fmt = ".1f", compPercent = true },
{ stat = "PoisonDamage", label = "Total Damage per Poison", fmt = ".1f", compPercent = true },
{ stat = "PvpPoisonDamage", label = "Total PvP Damage per Poison", fmt = ".1f", compPercent = true },
{ stat = "WithPoisonDPS", label = "Total DPS inc. Poison", fmt = ".1f", compPercent = true, flag = "poison", condFunc = function(v,o) return v ~= o.TotalDPS end },
{ stat = "PvpWithPoisonDPS", label = "Total Pvp DPS inc. Poison", fmt = ".1f", compPercent = true, flag = "poison", condFunc = function(v,o) return v ~= o.PvpTotalDPS end },
{ stat = "WithPoisonAverageDamage", label = "Average Dmg. inc. Poison", fmt = ".1f", compPercent = true, flag = "poison", condFunc = function(v,o) return v ~= o.AverageDamage end },
{ stat = "PvpWithPoisonAverageDamage", label = "Average Pvp Dmg. inc. Poison", fmt = ".1f", compPercent = true, flag = "poison", condFunc = function(v,o) return v ~= o.PvpAverageDamage end },
{ stat = "DecayDPS", label = "Decay DPS", fmt = ".1f", compPercent = true },
{ stat = "PvpDecayDPS", label = "PvP Decay DPS", fmt = ".1f", compPercent = true },
{ stat = "ImpaleDPS", label = "Impale added Damage", fmt = ".1f", compPercent = true, flag = "impale", flag = "showAverage" },
{ stat = "PvpImpaleDPS", label = "PvP Impale added Damage", fmt = ".1f", compPercent = true, flag = "impale", flag = "showAverage" },
{ stat = "WithImpaleDPS", label = "Damage inc. Impale", fmt = ".1f", compPercent = true, flag = "impale", flag = "showAverage" },
{ stat = "PvpWithImpaleDPS", label = "PvP Damage inc. Impale", fmt = ".1f", compPercent = true, flag = "impale", flag = "showAverage" },
{ stat = "ImpaleDPS", label = "Impale DPS", fmt = ".1f", compPercent = true, flag = "impale", flag = "notAverage" },
{ stat = "PvpImpaleDPS", label = "PvP Impale DPS", fmt = ".1f", compPercent = true, flag = "impale", flag = "notAverage" },
{ stat = "WithImpaleDPS", label = "Total DPS inc. Impale", fmt = ".1f", compPercent = true, flag = "impale", flag = "notAverage" },
{ stat = "PvpWithImpaleDPS", label = "PvP Total DPS inc. Impale", fmt = ".1f", compPercent = true, flag = "impale", flag = "notAverage" },
{ stat = "CombinedDPS", label = "Combined DPS", fmt = ".1f", compPercent = true, flag = "notAverage", condFunc = function(v,o) return v ~= o.TotalDPS and v ~= o.WithImpaleDPS and v ~= o.WithPoisonDPS and v ~= o.WithIgniteDPS end},
{ stat = "PvpCombinedDPS", label = "PvP Combined DPS", fmt = ".1f", compPercent = true, flag = "notAverage", condFunc = function(v,o) return v ~= o.PvpTotalDPS and v ~= o.PvpWithImpaleDPS and v ~= o.PvpWithPoisonDPS and v ~= o.PvpWithIgniteDPS end},
{ stat = "Cooldown", label = "Skill Cooldown", fmt = ".2fs", lowerIsBetter = true },
{ stat = "AreaOfEffectRadius", label = "AoE Radius", fmt = "d" },
{ stat = "ManaCost", label = "Mana Cost", fmt = "d", compPercent = true, lowerIsBetter = true, condFunc = function() return true end },
Expand Down Expand Up @@ -324,17 +343,27 @@ function buildMode:Init(dbFileName, buildName, buildXML, targetVersion)
}
self.minionDisplayStats = {
{ stat = "AverageDamage", label = "Average Damage", fmt = ".1f", compPercent = true },
{ stat = "PvpAverageHit", label = "PvP Average Hit", fmt = ".1f", compPercent = true, flag = "isPvP" },
{ stat = "Speed", label = "Attack/Cast Rate", fmt = ".2f", compPercent = true },
{ stat = "HitSpeed", label = "Hit Rate", fmt = ".2f" },
{ stat = "TotalDPS", label = "Total DPS", fmt = ".1f", compPercent = true },
{ stat = "PvpTotalDPS", label = "PvP Total DPS", fmt = ".1f", compPercent = true, flag = "notAveragePvP" },
{ stat = "TotalDot", label = "DoT DPS", fmt = ".1f", compPercent = true },
{ stat = "PvpTotalDot", label = "PvP DoT DPS", fmt = ".1f", compPercent = true },
{ stat = "BleedDPS", label = "Bleed DPS", fmt = ".1f", compPercent = true },
{ stat = "PvpBleedDPS", label = "PvP Bleed DPS", fmt = ".1f", compPercent = true },
{ stat = "IgniteDPS", label = "Ignite DPS", fmt = ".1f", compPercent = true },
{ stat = "PvpIgniteDPS", label = "PvP Ignite DPS", fmt = ".1f", compPercent = true },
{ stat = "WithPoisonDPS", label = "DPS inc. Poison", fmt = ".1f", compPercent = true },
{ stat = "PvpWithPoisonDPS", label = "Pvp DPS inc. Poison", fmt = ".1f", compPercent = true },
{ stat = "DecayDPS", label = "Decay DPS", fmt = ".1f", compPercent = true },
{ stat = "PvpDecayDPS", label = "PvP Decay DPS", fmt = ".1f", compPercent = true },
{ stat = "ImpaleDPS", label = "Impale DPS", fmt = ".1f", compPercent = true, flag = "impale" },
{ stat = "PvpImpaleDPS", label = "PvP Impale DPS", fmt = ".1f", compPercent = true, flag = "impale" },
{ stat = "WithImpaleDPS", label = "Total DPS inc. Impale", fmt = ".1f", compPercent = true, flag = "impale" },
{ stat = "CombinedDPS", label = "Combined DPS", fmt = ".1f", compPercent = true, flag = "notAverage", condFunc = function(v,o) return v ~= o.TotalDPS and v ~= o.WithImpaleDPS and v ~= o.WithPoisonDPS and v ~= o.WithIgniteDPS end},
{ stat = "PvpWithImpaleDPS", label = "PvP Total DPS inc. Impale", fmt = ".1f", compPercent = true, flag = "impale" },
{ stat = "CombinedDPS", label = "Combined DPS", fmt = ".1f", compPercent = true, flag = "notAverage", condFunc = function(v,o) return v ~= o.TotalDPS and v ~= o.WithImpaleDPS and v ~= o.WithPoisonDPS end},
{ stat = "PvpCombinedDPS", label = "PvP Combined DPS", fmt = ".1f", compPercent = true, flag = "notAverage", condFunc = function(v,o) return v ~= o.PvpTotalDPS and v ~= o.PvpWithImpaleDPS and v ~= o.PvpWithPoisonDPS end},
{ stat = "Cooldown", label = "Skill Cooldown", fmt = ".2fs", lowerIsBetter = true },
{ stat = "Life", label = "Total Life", fmt = ".1f", compPercent = true },
{ stat = "LifeRegen", label = "Life Regen", fmt = ".1f" },
Expand Down
Loading