Skip to content
Open
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
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ repos:
- id: end-of-file-fixer
- id: trailing-whitespace
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.15.20
rev: v0.16.3
hooks:
- id: ruff
args: [--fix, --unsafe-fixes]
Expand Down
8 changes: 2 additions & 6 deletions heist/commands/owner_commands.py
Original file line number Diff line number Diff line change
Expand Up @@ -154,9 +154,7 @@ async def heistset_cooldownreset(
await ctx.send(f"Reset all heist cooldowns for {member.display_name}.")

@heistset.command(name="setlevel")
async def heistset_setlevel(
self, ctx: commands.Context, member: discord.Member, level: int
):
async def heistset_setlevel(self, ctx: commands.Context, member: discord.Member, level: int):
"""Manually set a member's heist level.

This is a safety net for the level migration, use it if a member's
Expand All @@ -174,9 +172,7 @@ async def heistset_setlevel(
xp_for_level = XP_TABLE[level - 1]
await self.config.user(member).level.set(level)
await self.config.user(member).xp.set(xp_for_level)
await ctx.send(
f"Set {member.display_name}'s level to **{level}** ({xp_for_level:,} XP)."
)
await ctx.send(f"Set {member.display_name}'s level to **{level}** ({xp_for_level:,} XP).")

@heistset.command(name="settings")
@commands.bot_has_permissions(embed_links=True)
Expand Down
65 changes: 59 additions & 6 deletions heist/leveling.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,65 @@
MAX_LEVEL = 120
BASE_XP_REWARD = 212
_WOW_XP_TABLE = [
400, 900, 1400, 2100, 2800, 3600, 4500, 5400, 6500, 7600,
8800, 10100, 11400, 12900, 14400, 16000, 17700, 19400, 21300, 23200,
25200, 27300, 29400, 31700, 34000, 36400, 38900, 41400, 44300, 47400,
50800, 54500, 58600, 62800, 67100, 71600, 76100, 80800, 85700, 90700,
95800, 101000, 106300, 111800, 117500, 123200, 129100, 135100, 141200, 147500,
153900, 160400, 167100, 173900, 180800, 187900, 195000, 202300, 209800,
400,
900,
1400,
2100,
2800,
3600,
4500,
5400,
6500,
7600,
8800,
10100,
11400,
12900,
14400,
16000,
17700,
19400,
21300,
23200,
25200,
27300,
29400,
31700,
34000,
36400,
38900,
41400,
44300,
47400,
50800,
54500,
58600,
62800,
67100,
71600,
76100,
80800,
85700,
90700,
95800,
101000,
106300,
111800,
117500,
123200,
129100,
135100,
141200,
147500,
153900,
160400,
167100,
173900,
180800,
187900,
195000,
202300,
209800,
]


Expand Down
14 changes: 9 additions & 5 deletions heist/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
import asyncio
import contextlib
import datetime
from typing import Any, Optional
from typing import Any

import discord
from red_commons.logging import getLogger
Expand Down Expand Up @@ -81,8 +81,8 @@ def __init__(
direction: str,
parent_view: Any,
disabled: bool = False,
label: Optional[str] = None,
emoji: Optional[str] = None,
label: str | None = None,
emoji: str | None = None,
) -> None:
default_label = "◀" if direction == "prev" else "▶"
super().__init__(
Expand Down Expand Up @@ -891,7 +891,9 @@ def _build_content(self, disabled: bool = False):
select_row = discord.ui.ActionRow(_ItemSelect(self, self.page, disabled=disabled))
nav_row = discord.ui.ActionRow()
if self.page > 0:
nav_row.add_item(_PageNavBtn("prev", self, disabled=disabled, label="Previous", emoji="◀️"))
nav_row.add_item(
_PageNavBtn("prev", self, disabled=disabled, label="Previous", emoji="◀️")
)
if self.page < self.total_pages - 1:
nav_row.add_item(_PageNavBtn("next", self, disabled=disabled, label="Next", emoji="▶️"))
nav_row.add_item(_SetPriceBtn(self, disabled=disabled))
Expand Down Expand Up @@ -1438,7 +1440,9 @@ def _build_content(self, disabled: bool = False):
)
nav_row = discord.ui.ActionRow()
if self.page > 0:
nav_row.add_item(_PageNavBtn("prev", self, disabled=disabled, label="Previous", emoji="◀️"))
nav_row.add_item(
_PageNavBtn("prev", self, disabled=disabled, label="Previous", emoji="◀️")
)
if self.page < self.total_pages - 1:
nav_row.add_item(_PageNavBtn("next", self, disabled=disabled, label="Next", emoji="▶️"))
nav_row.add_item(craft_btn)
Expand Down
Loading