diff options
-rw-r--r-- | bot/exts/fun/snakes/__init__.py (renamed from bot/exts/evergreen/snakes/__init__.py) | 2 | ||||
-rw-r--r-- | bot/exts/fun/snakes/_converter.py (renamed from bot/exts/evergreen/snakes/_converter.py) | 2 | ||||
-rw-r--r-- | bot/exts/fun/snakes/_snakes_cog.py (renamed from bot/exts/evergreen/snakes/_snakes_cog.py) | 16 | ||||
-rw-r--r-- | bot/exts/fun/snakes/_utils.py (renamed from bot/exts/evergreen/snakes/_utils.py) | 2 | ||||
-rw-r--r-- | bot/resources/fun/snakes/snake_cards/backs/card_back1.jpg (renamed from bot/resources/snakes/snake_cards/backs/card_back1.jpg) | bin | 165788 -> 165788 bytes | |||
-rw-r--r-- | bot/resources/fun/snakes/snake_cards/backs/card_back2.jpg (renamed from bot/resources/snakes/snake_cards/backs/card_back2.jpg) | bin | 140868 -> 140868 bytes | |||
-rw-r--r-- | bot/resources/fun/snakes/snake_cards/card_bottom.png (renamed from bot/resources/snakes/snake_cards/card_bottom.png) | bin | 18165 -> 18165 bytes | |||
-rw-r--r-- | bot/resources/fun/snakes/snake_cards/card_frame.png (renamed from bot/resources/snakes/snake_cards/card_frame.png) | bin | 1460 -> 1460 bytes | |||
-rw-r--r-- | bot/resources/fun/snakes/snake_cards/card_top.png (renamed from bot/resources/snakes/snake_cards/card_top.png) | bin | 12581 -> 12581 bytes | |||
-rw-r--r-- | bot/resources/fun/snakes/snake_cards/expressway.ttf (renamed from bot/resources/snakes/snake_cards/expressway.ttf) | bin | 156244 -> 156244 bytes | |||
-rw-r--r-- | bot/resources/fun/snakes/snake_facts.json (renamed from bot/resources/snakes/snake_facts.json) | 0 | ||||
-rw-r--r-- | bot/resources/fun/snakes/snake_idioms.json (renamed from bot/resources/snakes/snake_idioms.json) | 0 | ||||
-rw-r--r-- | bot/resources/fun/snakes/snake_names.json (renamed from bot/resources/snakes/snake_names.json) | 0 | ||||
-rw-r--r-- | bot/resources/fun/snakes/snake_quiz.json (renamed from bot/resources/snakes/snake_quiz.json) | 0 | ||||
-rw-r--r-- | bot/resources/fun/snakes/snakes_and_ladders/banner.jpg (renamed from bot/resources/snakes/snakes_and_ladders/banner.jpg) | bin | 17928 -> 17928 bytes | |||
-rw-r--r-- | bot/resources/fun/snakes/snakes_and_ladders/board.jpg (renamed from bot/resources/snakes/snakes_and_ladders/board.jpg) | bin | 80264 -> 80264 bytes | |||
-rw-r--r-- | bot/resources/fun/snakes/special_snakes.json (renamed from bot/resources/snakes/special_snakes.json) | 0 |
17 files changed, 11 insertions, 11 deletions
diff --git a/bot/exts/evergreen/snakes/__init__.py b/bot/exts/fun/snakes/__init__.py index 7740429b..ba8333fd 100644 --- a/bot/exts/evergreen/snakes/__init__.py +++ b/bot/exts/fun/snakes/__init__.py @@ -1,7 +1,7 @@ import logging from bot.bot import Bot -from bot.exts.evergreen.snakes._snakes_cog import Snakes +from bot.exts.fun.snakes._snakes_cog import Snakes log = logging.getLogger(__name__) diff --git a/bot/exts/evergreen/snakes/_converter.py b/bot/exts/fun/snakes/_converter.py index 765b983d..c24ba8c6 100644 --- a/bot/exts/evergreen/snakes/_converter.py +++ b/bot/exts/fun/snakes/_converter.py @@ -7,7 +7,7 @@ import discord from discord.ext.commands import Context, Converter from rapidfuzz import fuzz -from bot.exts.evergreen.snakes._utils import SNAKE_RESOURCES +from bot.exts.fun.snakes._utils import SNAKE_RESOURCES from bot.utils import disambiguate log = logging.getLogger(__name__) diff --git a/bot/exts/evergreen/snakes/_snakes_cog.py b/bot/exts/fun/snakes/_snakes_cog.py index 04804222..59e57199 100644 --- a/bot/exts/evergreen/snakes/_snakes_cog.py +++ b/bot/exts/fun/snakes/_snakes_cog.py @@ -19,8 +19,8 @@ from discord.ext.commands import Cog, CommandError, Context, bot_has_permissions from bot.bot import Bot from bot.constants import ERROR_REPLIES, Tokens -from bot.exts.evergreen.snakes import _utils as utils -from bot.exts.evergreen.snakes._converter import Snake +from bot.exts.fun.snakes import _utils as utils +from bot.exts.fun.snakes._converter import Snake from bot.utils.decorators import locked from bot.utils.extensions import invoke_help_command @@ -122,14 +122,14 @@ CORRECT_GUESS = ( # snake card consts CARD = { - "top": Image.open("bot/resources/snakes/snake_cards/card_top.png"), - "frame": Image.open("bot/resources/snakes/snake_cards/card_frame.png"), - "bottom": Image.open("bot/resources/snakes/snake_cards/card_bottom.png"), + "top": Image.open("bot/resources/fun/snakes/snake_cards/card_top.png"), + "frame": Image.open("bot/resources/fun/snakes/snake_cards/card_frame.png"), + "bottom": Image.open("bot/resources/fun/snakes/snake_cards/card_bottom.png"), "backs": [ - Image.open(f"bot/resources/snakes/snake_cards/backs/{file}") - for file in os.listdir("bot/resources/snakes/snake_cards/backs") + Image.open(f"bot/resources/fun/snakes/snake_cards/backs/{file}") + for file in os.listdir("bot/resources/fun/snakes/snake_cards/backs") ], - "font": ImageFont.truetype("bot/resources/snakes/snake_cards/expressway.ttf", 20) + "font": ImageFont.truetype("bot/resources/fun/snakes/snake_cards/expressway.ttf", 20) } # endregion diff --git a/bot/exts/evergreen/snakes/_utils.py b/bot/exts/fun/snakes/_utils.py index b5f13c53..de51339d 100644 --- a/bot/exts/evergreen/snakes/_utils.py +++ b/bot/exts/fun/snakes/_utils.py @@ -14,7 +14,7 @@ from discord.ext.commands import Cog, Context from bot.constants import Roles -SNAKE_RESOURCES = Path("bot/resources/snakes").absolute() +SNAKE_RESOURCES = Path("bot/resources/fun/snakes").absolute() h1 = r"""``` ---- diff --git a/bot/resources/snakes/snake_cards/backs/card_back1.jpg b/bot/resources/fun/snakes/snake_cards/backs/card_back1.jpg Binary files differindex 22959fa7..22959fa7 100644 --- a/bot/resources/snakes/snake_cards/backs/card_back1.jpg +++ b/bot/resources/fun/snakes/snake_cards/backs/card_back1.jpg diff --git a/bot/resources/snakes/snake_cards/backs/card_back2.jpg b/bot/resources/fun/snakes/snake_cards/backs/card_back2.jpg Binary files differindex d56edc32..d56edc32 100644 --- a/bot/resources/snakes/snake_cards/backs/card_back2.jpg +++ b/bot/resources/fun/snakes/snake_cards/backs/card_back2.jpg diff --git a/bot/resources/snakes/snake_cards/card_bottom.png b/bot/resources/fun/snakes/snake_cards/card_bottom.png Binary files differindex 8b2b91c5..8b2b91c5 100644 --- a/bot/resources/snakes/snake_cards/card_bottom.png +++ b/bot/resources/fun/snakes/snake_cards/card_bottom.png diff --git a/bot/resources/snakes/snake_cards/card_frame.png b/bot/resources/fun/snakes/snake_cards/card_frame.png Binary files differindex 149a0a5f..149a0a5f 100644 --- a/bot/resources/snakes/snake_cards/card_frame.png +++ b/bot/resources/fun/snakes/snake_cards/card_frame.png diff --git a/bot/resources/snakes/snake_cards/card_top.png b/bot/resources/fun/snakes/snake_cards/card_top.png Binary files differindex e329c873..e329c873 100644 --- a/bot/resources/snakes/snake_cards/card_top.png +++ b/bot/resources/fun/snakes/snake_cards/card_top.png diff --git a/bot/resources/snakes/snake_cards/expressway.ttf b/bot/resources/fun/snakes/snake_cards/expressway.ttf Binary files differindex 39e15794..39e15794 100644 --- a/bot/resources/snakes/snake_cards/expressway.ttf +++ b/bot/resources/fun/snakes/snake_cards/expressway.ttf diff --git a/bot/resources/snakes/snake_facts.json b/bot/resources/fun/snakes/snake_facts.json index ca9ba769..ca9ba769 100644 --- a/bot/resources/snakes/snake_facts.json +++ b/bot/resources/fun/snakes/snake_facts.json diff --git a/bot/resources/snakes/snake_idioms.json b/bot/resources/fun/snakes/snake_idioms.json index ecbeb6ff..ecbeb6ff 100644 --- a/bot/resources/snakes/snake_idioms.json +++ b/bot/resources/fun/snakes/snake_idioms.json diff --git a/bot/resources/snakes/snake_names.json b/bot/resources/fun/snakes/snake_names.json index 25832550..25832550 100644 --- a/bot/resources/snakes/snake_names.json +++ b/bot/resources/fun/snakes/snake_names.json diff --git a/bot/resources/snakes/snake_quiz.json b/bot/resources/fun/snakes/snake_quiz.json index 8c426b22..8c426b22 100644 --- a/bot/resources/snakes/snake_quiz.json +++ b/bot/resources/fun/snakes/snake_quiz.json diff --git a/bot/resources/snakes/snakes_and_ladders/banner.jpg b/bot/resources/fun/snakes/snakes_and_ladders/banner.jpg Binary files differindex 69eaaf12..69eaaf12 100644 --- a/bot/resources/snakes/snakes_and_ladders/banner.jpg +++ b/bot/resources/fun/snakes/snakes_and_ladders/banner.jpg diff --git a/bot/resources/snakes/snakes_and_ladders/board.jpg b/bot/resources/fun/snakes/snakes_and_ladders/board.jpg Binary files differindex 20032e39..20032e39 100644 --- a/bot/resources/snakes/snakes_and_ladders/board.jpg +++ b/bot/resources/fun/snakes/snakes_and_ladders/board.jpg diff --git a/bot/resources/snakes/special_snakes.json b/bot/resources/fun/snakes/special_snakes.json index 46214f66..46214f66 100644 --- a/bot/resources/snakes/special_snakes.json +++ b/bot/resources/fun/snakes/special_snakes.json |