Skip to content
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

Jump to bottom

in many descriptions, changing "ball" to "countryball" #298

Merged
merged 2 commits into from
Jun 27, 2024
Merged

in many descriptions, changing "ball" to "countryball" #298

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fc5cfef
changing many descriptions to countryball from ball
imtherealF1 Jun 27, 2024
0ceffdf
Merge branch 'master' into patch-19
flaree Jun 27, 2024
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
37 changes: 19 additions & 18 deletions ballsdex/packages/admin/cog.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,8 @@ async def cooldown(
informations.append("The manager is currently on cooldown.")
if delta < 600:
informations.append(
"The manager is less than 10 minutes old, balls cannot spawn at the moment."
f"The manager is less than 10 minutes old, {settings.collectible_name}s "
"cannot spawn at the moment."
)
if informations:
embed.add_field(
Expand Down Expand Up @@ -477,7 +478,7 @@ async def spawn(
n: int = 1,
):
"""
Force spawn a random or specified ball.
Force spawn a random or specified countryball.

Parameters
----------
Expand Down Expand Up @@ -904,12 +905,12 @@ async def blacklist_info_guild(
@app_commands.checks.has_any_role(*settings.root_role_ids, *settings.admin_role_ids)
async def balls_info(self, interaction: discord.Interaction, ball_id: str):
"""
Show information about a ball.
Show information about a countryball.

Parameters
----------
ball_id: str
The ID of the ball you want to get information about.
The ID of the countryball you want to get information about.
"""
try:
pk = int(ball_id, 16)
Expand Down Expand Up @@ -954,12 +955,12 @@ async def balls_info(self, interaction: discord.Interaction, ball_id: str):
@app_commands.checks.has_any_role(*settings.root_role_ids)
async def balls_delete(self, interaction: discord.Interaction, ball_id: str):
"""
Delete a ball.
Delete a countryball.

Parameters
----------
ball_id: str
The ID of the ball you want to get information about.
The ID of the countryball you want to delete.
"""
try:
ballIdConverted = int(ball_id, 16)
Expand Down Expand Up @@ -987,14 +988,14 @@ async def balls_transfer(
self, interaction: discord.Interaction, ball_id: str, user: discord.User
):
"""
Transfer a ball to another user.
Transfer a countryball to another user.

Parameters
----------
ball_id: str
The ID of the ball you want to get information about.
The ID of the countryball you want to transfer.
user: discord.User
The user you want to transfer the ball to.
The user you want to transfer the countryball to.
"""
try:
ballIdConverted = int(ball_id, 16)
Expand Down Expand Up @@ -1032,14 +1033,14 @@ async def balls_reset(
self, interaction: discord.Interaction, user: discord.User, percentage: int | None = None
):
"""
Reset a player's balls.
Reset a player's countryballs.

Parameters
----------
user: discord.User
The user you want to reset the balls of.
The user you want to reset the countryballs of.
percentage: int | None
The percentage of balls to delete, if not all. Used for sanctions.
The percentage of countryballs to delete, if not all. Used for sanctions.
"""
player = await Player.get(discord_id=user.id)
if not player:
Expand Down Expand Up @@ -1098,12 +1099,12 @@ async def balls_count(
special: SpecialTransform | None = None,
):
"""
Count the number of balls that a player has or how many exist in total.
Count the number of countryballs that a player has or how many exist in total.

Parameters
----------
user: discord.User
The user you want to count the balls of.
The user you want to count the countryballs of.
ball: Ball
shiny: bool
special: Special
Expand Down Expand Up @@ -1401,12 +1402,12 @@ async def history_ball(
days: Optional[int] = None,
):
"""
Show the history of a ball.
Show the history of a countryball.

Parameters
----------
ballid: str
The ID of the ball you want to check the history of.
The ID of the countryball you want to check the history of.
sorting: str
The sorting method you want to use.
days: Optional[int]
Expand Down Expand Up @@ -1513,7 +1514,7 @@ async def guild(
guild_id: str | None
The ID of the guild you want to get information about.
days: int
The amount of days to look back for the amount of balls caught.
The amount of days to look back for the amount of countryballs caught.
"""
await interaction.response.defer(ephemeral=True, thinking=True)
guild = self.bot.get_guild(int(guild_id))
Expand Down Expand Up @@ -1584,7 +1585,7 @@ async def user(
user: discord.User | None
The user you want to get information about.
days: int
The amount of days to look back for the amount of balls caught.
The amount of days to look back for the amount of countryballs caught.
"""
await interaction.response.defer(ephemeral=True, thinking=True)
player = await Player.get_or_none(discord_id=user.id)
Expand Down
Loading