✨ Add new AV spells and calc_runs

tookender · Oct 19, 2024 · 6ac3c71 · 6ac3c71
1 parent 87b8e2b
commit 6ac3c71
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 1 deletion.
diff --git a/extensions/dq/calculators.py b/extensions/dq/calculators.py
@@ -57,11 +57,24 @@ async def calc_potential(self, ctx, current_power: int, current_upgrades: int, t
 	@app_commands.describe(ring2_power="The power of your 2nd ring.")
 	@app_commands.describe(damage_skill_points="The amount of damage skill points you have.")
 	@app_commands.choices(ability=[
+		# AV
+		app_commands.Choice(name="Gravity Leap", value="Gravity Leap"),
+		app_commands.Choice(name="Unstable Warp (2 ticks)", value="Unstable Warp (2 ticks)"),
+		app_commands.Choice(name="Mighty Cleave (fully charged, 2 ticks)", value="Mighty Cleave (fully charged, 2 ticks)"),
+		app_commands.Choice(name="Mighty Cleave (half charged)", value="Mighty Cleave (half charged)"),
+		app_commands.Choice(name="Sacrificial Orbs (fully charged)", value="Sacrificial Orbs (fully charged)"),
+		app_commands.Choice(name="Sacrificial Orbs (half charged)", value="Sacrificial Orbs (half charged)"),
+		app_commands.Choice(name="Shatterstrike (6 ticks)", value="Shatterstrike (6 ticks)"),
+		app_commands.Choice(name="Voidflames (5 ticks)", value="Voidflames (5 ticks)"),
+
+		# YP
 		app_commands.Choice(name="Spinning Blade Smash / Void Dragon", value="Spinning Blade Smash / Void Dragon"),
 		app_commands.Choice(name="Kunai Knives (3 ticks)", value="Kunai Knives (3 ticks)"),
 		app_commands.Choice(name="Rift Beam (37 ticks)", value="Rift Beam (37 ticks)"),
 		app_commands.Choice(name="Triple Quake (3 ticks)", value="Triple Quake (3 ticks)"),
 		app_commands.Choice(name="Chain Storm (6 ticks)", value="Chain Storm (6 ticks)"),
+
+		# GS
 		app_commands.Choice(name="Blade Barrage / God Spear / Amethyst Beams / Jade Rain", value="Blade Barrage / God Spear / Amethyst Beams / Jade Rain"),
 		app_commands.Choice(name="Jade Roller", value="Jade Roller"),
 		app_commands.Choice(name="Solar Beam (2 ticks)", value="Solar Beam (2 ticks)"),
@@ -119,7 +132,7 @@ async def calc_damage(self, ctx, ability: app_commands.Choice[str], helmet_power
 		app_commands.Choice(name="Desert Temple (Current)", value="Desert Temple (Current)"),
 		app_commands.Choice(name="Desert Temple (Legacy)", value="Desert Temple (Legacy)"),
 	])
-	async def calc_runs(self, ctx, current_level: int, goal_level: int, dungeon_name: Optional[str] = None, event_active: Optional[bool] = False, booster_active: Optional[bool] = False, vip: Optional[bool] = False):
+	async def calc_runs(self, ctx, current_level: int, goal_level: int, dungeon_name: str, event_active: Optional[bool] = False, booster_active: Optional[bool] = False, vip: Optional[bool] = False):
 		result = calculate_runs(current_level, goal_level, dungeon_name, event_active, booster_active, vip)
 
 		embed = Embed(title="Dungeon Runs Calculator",

diff --git a/utils/dq/data.py b/utils/dq/data.py
@@ -3,11 +3,24 @@
 # --------------------------------------------- #
 
 abilities = [
+	# AV
+	{"name": "Gravity Leap", "multiplier": 190},
+	{"name": "Unstable Warp (2 ticks)", "multiplier": 180 / 2},
+	{"name": "Mighty Cleave (fully charged, 2 ticks)", "multiplier": 280 / 2},
+	{"name": "Mighty Cleave (half charged)", "multiplier": 120},
+	{"name": "Sacrificial Orbs (fully charged)", "multiplier": 280},
+	{"name": "Sacrificial Orbs (half charged)", "multiplier": 140},
+	{"name": "Shatterstrike (6 ticks)", "multiplier": 186 / 6},
+	{"name": "Voidflames (5 ticks)", "multiplier": 185 / 5},
+
+	# YP
 	{"name": "Spinning Blade Smash / Void Dragon", "multiplier": 148},
 	{"name": "Kunai Knives (3 ticks)", "multiplier": 150 / 3},
 	{"name": "Rift Beam (37 ticks)", "multiplier": 203 / 37},
 	{"name": "Triple Quake (3 ticks)", "multiplier": 144 / 3},
 	{"name": "Chain Storm (6 ticks)", "multiplier": 147 / 6},
+
+	# GS
 	{"name": "Blade Barrage / God Spear / Amethyst Beams / Jade Rain", "multiplier": 133},
 	{"name": "Jade Roller", "multiplier": 126},
 	{"name": "Solar Beam (2 ticks)", "multiplier": 126 / 2}