diff --git a/extensions/dq/calculators.py b/extensions/dq/calculators.py index a647a09..fc0ec24 100644 --- a/extensions/dq/calculators.py +++ b/extensions/dq/calculators.py @@ -68,7 +68,7 @@ async def calc_damage(self, ctx, ability: app_commands.Choice[str], helmet_power ei_avg = damage['With Enhanced Inner']['Average'] ei_high = damage["With Enhanced Inner"]["High Damage"] - embed = Embed(title="Damage Range Calculator") + embed = Embed(title="Damage Range Calculator", description=f"{damage}") embed.add_field(name="❌ No Inner", value=f"Low Damage: {ni_low:,} ({n(ni_low)})\nAverage Damage: {ni_avg:,} ({n(ni_avg)})\n High Damage: {ni_high:,} ({n(ni_high)})", inline=False) embed.add_field(name="✨ With Inner", value=f"Low Damage: {wi_low:,} ({n(wi_low)})\nAverage Damage: {wi_avg:,} ({n(wi_avg)})\n High Damage: {wi_high:,} ({n(wi_high)})", inline=False) diff --git a/utils/calculators.py b/utils/calculators.py index ed1cf2f..e07dfe2 100644 --- a/utils/calculators.py +++ b/utils/calculators.py @@ -42,15 +42,10 @@ def calculate_damage(selected_ability, armor, helmet, weapon, ring1, ring2, skil {"name": "Jade Roller", "multiplier": 126}, {"name": "Solar Beam (2 ticks)", "multiplier": 126 / 2} ] - - ability_multiplier = 1 - for ability in abilities: - if ability["name"] == selected_ability: - ability_multiplier = ability["multiplier"] + ability_multiplier = (a["multiplier"] for a in abilities if a["name"] == selected_ability) dmg = int(weapon * (0.6597 + 0.013202 * skill) * (armor + helmet + ring1 + ring2) * 0.0028 * ability_multiplier) - low = dmg * 0.95 high = dmg * 1.05