Skip to content

Commit

Permalink
🧮
Browse files Browse the repository at this point in the history
  • Loading branch information
tookender committed Oct 18, 2024
1 parent b927947 commit 4c4d446
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 7 deletions.
2 changes: 1 addition & 1 deletion extensions/dq/calculators.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
7 changes: 1 addition & 6 deletions utils/calculators.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 4c4d446

Please sign in to comment.