aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Janine vN <[email protected]>2021-09-04 23:31:14 -0400
committerGravatar Janine vN <[email protected]>2021-09-04 23:31:14 -0400
commit3377e46dc890626a29b05e134799b6219598107b (patch)
treebdb4a2c6efbe113ec0e355a9eff5070cc8ec52aa
parentMove Easter to Holidays Folder (diff)
Move Halloween to Holidays folder
Moves all the hallowen features to the holidays folder. Also updates the paths to reflect the folder moves.
-rw-r--r--bot/exts/holidays/halloween/8ball.py (renamed from bot/exts/halloween/8ball.py)2
-rw-r--r--bot/exts/holidays/halloween/__init__.py0
-rw-r--r--bot/exts/holidays/halloween/candy_collection.py (renamed from bot/exts/halloween/candy_collection.py)0
-rw-r--r--bot/exts/holidays/halloween/halloween_facts.py (renamed from bot/exts/halloween/halloween_facts.py)2
-rw-r--r--bot/exts/holidays/halloween/halloweenify.py (renamed from bot/exts/halloween/halloweenify.py)2
-rw-r--r--bot/exts/holidays/halloween/monsterbio.py (renamed from bot/exts/halloween/monsterbio.py)2
-rw-r--r--bot/exts/holidays/halloween/monstersurvey.py (renamed from bot/exts/halloween/monstersurvey.py)2
-rw-r--r--bot/exts/holidays/halloween/scarymovie.py (renamed from bot/exts/halloween/scarymovie.py)0
-rw-r--r--bot/exts/holidays/halloween/spookygif.py (renamed from bot/exts/halloween/spookygif.py)0
-rw-r--r--bot/exts/holidays/halloween/spookynamerate.py (renamed from bot/exts/halloween/spookynamerate.py)2
-rw-r--r--bot/exts/holidays/halloween/spookyrating.py (renamed from bot/exts/halloween/spookyrating.py)4
-rw-r--r--bot/exts/holidays/halloween/spookyreact.py (renamed from bot/exts/halloween/spookyreact.py)0
-rw-r--r--bot/resources/holidays/halloween/bat-clipart.png (renamed from bot/resources/halloween/bat-clipart.png)bin12313 -> 12313 bytes
-rw-r--r--bot/resources/holidays/halloween/bloody-pentagram.png (renamed from bot/resources/halloween/bloody-pentagram.png)bin7006 -> 7006 bytes
-rw-r--r--bot/resources/holidays/halloween/halloween_facts.json (renamed from bot/resources/halloween/halloween_facts.json)0
-rw-r--r--bot/resources/holidays/halloween/halloweenify.json (renamed from bot/resources/halloween/halloweenify.json)0
-rw-r--r--bot/resources/holidays/halloween/monster.json (renamed from bot/resources/halloween/monster.json)0
-rw-r--r--bot/resources/holidays/halloween/monstersurvey.json (renamed from bot/resources/halloween/monstersurvey.json)0
-rw-r--r--bot/resources/holidays/halloween/responses.json (renamed from bot/resources/halloween/responses.json)0
-rw-r--r--bot/resources/holidays/halloween/spooky_rating.json (renamed from bot/resources/halloween/spooky_rating.json)0
-rw-r--r--bot/resources/holidays/halloween/spookynamerate_names.json (renamed from bot/resources/halloween/spookynamerate_names.json)0
-rw-r--r--bot/resources/holidays/halloween/spookyrating/baby.jpeg (renamed from bot/resources/halloween/spookyrating/baby.jpeg)bin110346 -> 110346 bytes
-rw-r--r--bot/resources/holidays/halloween/spookyrating/candle.jpeg (renamed from bot/resources/halloween/spookyrating/candle.jpeg)bin45981 -> 45981 bytes
-rw-r--r--bot/resources/holidays/halloween/spookyrating/clown.jpeg (renamed from bot/resources/halloween/spookyrating/clown.jpeg)bin53035 -> 53035 bytes
-rw-r--r--bot/resources/holidays/halloween/spookyrating/costume.jpeg (renamed from bot/resources/halloween/spookyrating/costume.jpeg)bin88629 -> 88629 bytes
-rw-r--r--bot/resources/holidays/halloween/spookyrating/devil.jpeg (renamed from bot/resources/halloween/spookyrating/devil.jpeg)bin336208 -> 336208 bytes
-rw-r--r--bot/resources/holidays/halloween/spookyrating/ghost.jpeg (renamed from bot/resources/halloween/spookyrating/ghost.jpeg)bin29635 -> 29635 bytes
-rw-r--r--bot/resources/holidays/halloween/spookyrating/jackolantern.jpeg (renamed from bot/resources/halloween/spookyrating/jackolantern.jpeg)bin17598 -> 17598 bytes
-rw-r--r--bot/resources/holidays/halloween/spookyrating/necromancer.jpeg (renamed from bot/resources/halloween/spookyrating/necromancer.jpeg)bin139672 -> 139672 bytes
-rw-r--r--bot/resources/holidays/halloween/spookyrating/tiger.jpeg (renamed from bot/resources/halloween/spookyrating/tiger.jpeg)bin52851 -> 52851 bytes
30 files changed, 9 insertions, 7 deletions
diff --git a/bot/exts/halloween/8ball.py b/bot/exts/holidays/halloween/8ball.py
index a2431190..4fec8463 100644
--- a/bot/exts/halloween/8ball.py
+++ b/bot/exts/holidays/halloween/8ball.py
@@ -10,7 +10,7 @@ from bot.bot import Bot
log = logging.getLogger(__name__)
-RESPONSES = json.loads(Path("bot/resources/halloween/responses.json").read_text("utf8"))
+RESPONSES = json.loads(Path("bot/resources/holidays/halloween/responses.json").read_text("utf8"))
class SpookyEightBall(commands.Cog):
diff --git a/bot/exts/holidays/halloween/__init__.py b/bot/exts/holidays/halloween/__init__.py
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/bot/exts/holidays/halloween/__init__.py
diff --git a/bot/exts/halloween/candy_collection.py b/bot/exts/holidays/halloween/candy_collection.py
index 4afd5913..4afd5913 100644
--- a/bot/exts/halloween/candy_collection.py
+++ b/bot/exts/holidays/halloween/candy_collection.py
diff --git a/bot/exts/halloween/halloween_facts.py b/bot/exts/holidays/halloween/halloween_facts.py
index ba3b5d17..adde2310 100644
--- a/bot/exts/halloween/halloween_facts.py
+++ b/bot/exts/holidays/halloween/halloween_facts.py
@@ -24,7 +24,7 @@ SPOOKY_EMOJIS = [
PUMPKIN_ORANGE = 0xFF7518
INTERVAL = timedelta(hours=6).total_seconds()
-FACTS = json.loads(Path("bot/resources/halloween/halloween_facts.json").read_text("utf8"))
+FACTS = json.loads(Path("bot/resources/holidays/halloween/halloween_facts.json").read_text("utf8"))
FACTS = list(enumerate(FACTS))
diff --git a/bot/exts/halloween/halloweenify.py b/bot/exts/holidays/halloween/halloweenify.py
index 83cfbaa7..03b52589 100644
--- a/bot/exts/halloween/halloweenify.py
+++ b/bot/exts/holidays/halloween/halloweenify.py
@@ -12,7 +12,7 @@ from bot.bot import Bot
log = logging.getLogger(__name__)
-HALLOWEENIFY_DATA = loads(Path("bot/resources/halloween/halloweenify.json").read_text("utf8"))
+HALLOWEENIFY_DATA = loads(Path("bot/resources/holidays/halloween/halloweenify.json").read_text("utf8"))
class Halloweenify(commands.Cog):
diff --git a/bot/exts/halloween/monsterbio.py b/bot/exts/holidays/halloween/monsterbio.py
index 69e898cb..0556a193 100644
--- a/bot/exts/halloween/monsterbio.py
+++ b/bot/exts/holidays/halloween/monsterbio.py
@@ -12,7 +12,7 @@ from bot.constants import Colours
log = logging.getLogger(__name__)
TEXT_OPTIONS = json.loads(
- Path("bot/resources/halloween/monster.json").read_text("utf8")
+ Path("bot/resources/holidays/halloween/monster.json").read_text("utf8")
) # Data for a mad-lib style generation of text
diff --git a/bot/exts/halloween/monstersurvey.py b/bot/exts/holidays/halloween/monstersurvey.py
index 96cda11e..f3433886 100644
--- a/bot/exts/halloween/monstersurvey.py
+++ b/bot/exts/holidays/halloween/monstersurvey.py
@@ -25,7 +25,7 @@ class MonsterSurvey(Cog):
def __init__(self):
"""Initializes values for the bot to use within the voting commands."""
- self.registry_path = pathlib.Path("bot", "resources", "halloween", "monstersurvey.json")
+ self.registry_path = pathlib.Path("bot", "resources", "holidays", "halloween", "monstersurvey.json")
self.voter_registry = json.loads(self.registry_path.read_text("utf8"))
def json_write(self) -> None:
diff --git a/bot/exts/halloween/scarymovie.py b/bot/exts/holidays/halloween/scarymovie.py
index 33659fd8..33659fd8 100644
--- a/bot/exts/halloween/scarymovie.py
+++ b/bot/exts/holidays/halloween/scarymovie.py
diff --git a/bot/exts/halloween/spookygif.py b/bot/exts/holidays/halloween/spookygif.py
index 9511d407..9511d407 100644
--- a/bot/exts/halloween/spookygif.py
+++ b/bot/exts/holidays/halloween/spookygif.py
diff --git a/bot/exts/halloween/spookynamerate.py b/bot/exts/holidays/halloween/spookynamerate.py
index 5c21ead7..2e59d4a8 100644
--- a/bot/exts/halloween/spookynamerate.py
+++ b/bot/exts/holidays/halloween/spookynamerate.py
@@ -66,7 +66,7 @@ HELP_MESSAGE_DICT = {
}
# The names are from https://www.mockaroo.com/
-NAMES = json.loads(Path("bot/resources/halloween/spookynamerate_names.json").read_text("utf8"))
+NAMES = json.loads(Path("bot/resources/holidays/halloween/spookynamerate_names.json").read_text("utf8"))
FIRST_NAMES = NAMES["first_names"]
LAST_NAMES = NAMES["last_names"]
diff --git a/bot/exts/halloween/spookyrating.py b/bot/exts/holidays/halloween/spookyrating.py
index f566fac2..ec6e8821 100644
--- a/bot/exts/halloween/spookyrating.py
+++ b/bot/exts/holidays/halloween/spookyrating.py
@@ -12,7 +12,9 @@ from bot.constants import Colours
log = logging.getLogger(__name__)
-data: dict[str, dict[str, str]] = json.loads(Path("bot/resources/halloween/spooky_rating.json").read_text("utf8"))
+data: dict[str, dict[str, str]] = json.loads(
+ Path("bot/resources/holidays/halloween/spooky_rating.json").read_text("utf8")
+)
SPOOKY_DATA = sorted((int(key), value) for key, value in data.items())
diff --git a/bot/exts/halloween/spookyreact.py b/bot/exts/holidays/halloween/spookyreact.py
index 25e783f4..25e783f4 100644
--- a/bot/exts/halloween/spookyreact.py
+++ b/bot/exts/holidays/halloween/spookyreact.py
diff --git a/bot/resources/halloween/bat-clipart.png b/bot/resources/holidays/halloween/bat-clipart.png
index 7df26ba9..7df26ba9 100644
--- a/bot/resources/halloween/bat-clipart.png
+++ b/bot/resources/holidays/halloween/bat-clipart.png
Binary files differ
diff --git a/bot/resources/halloween/bloody-pentagram.png b/bot/resources/holidays/halloween/bloody-pentagram.png
index 4e6da07a..4e6da07a 100644
--- a/bot/resources/halloween/bloody-pentagram.png
+++ b/bot/resources/holidays/halloween/bloody-pentagram.png
Binary files differ
diff --git a/bot/resources/halloween/halloween_facts.json b/bot/resources/holidays/halloween/halloween_facts.json
index fc6fa85f..fc6fa85f 100644
--- a/bot/resources/halloween/halloween_facts.json
+++ b/bot/resources/holidays/halloween/halloween_facts.json
diff --git a/bot/resources/halloween/halloweenify.json b/bot/resources/holidays/halloween/halloweenify.json
index af9204b2..af9204b2 100644
--- a/bot/resources/halloween/halloweenify.json
+++ b/bot/resources/holidays/halloween/halloweenify.json
diff --git a/bot/resources/halloween/monster.json b/bot/resources/holidays/halloween/monster.json
index 5958dc9c..5958dc9c 100644
--- a/bot/resources/halloween/monster.json
+++ b/bot/resources/holidays/halloween/monster.json
diff --git a/bot/resources/halloween/monstersurvey.json b/bot/resources/holidays/halloween/monstersurvey.json
index d8cc72e7..d8cc72e7 100644
--- a/bot/resources/halloween/monstersurvey.json
+++ b/bot/resources/holidays/halloween/monstersurvey.json
diff --git a/bot/resources/halloween/responses.json b/bot/resources/holidays/halloween/responses.json
index c0f24c1a..c0f24c1a 100644
--- a/bot/resources/halloween/responses.json
+++ b/bot/resources/holidays/halloween/responses.json
diff --git a/bot/resources/halloween/spooky_rating.json b/bot/resources/holidays/halloween/spooky_rating.json
index 8e3e66bb..8e3e66bb 100644
--- a/bot/resources/halloween/spooky_rating.json
+++ b/bot/resources/holidays/halloween/spooky_rating.json
diff --git a/bot/resources/halloween/spookynamerate_names.json b/bot/resources/holidays/halloween/spookynamerate_names.json
index 7657880b..7657880b 100644
--- a/bot/resources/halloween/spookynamerate_names.json
+++ b/bot/resources/holidays/halloween/spookynamerate_names.json
diff --git a/bot/resources/halloween/spookyrating/baby.jpeg b/bot/resources/holidays/halloween/spookyrating/baby.jpeg
index 199f8bca..199f8bca 100644
--- a/bot/resources/halloween/spookyrating/baby.jpeg
+++ b/bot/resources/holidays/halloween/spookyrating/baby.jpeg
Binary files differ
diff --git a/bot/resources/halloween/spookyrating/candle.jpeg b/bot/resources/holidays/halloween/spookyrating/candle.jpeg
index 9913752b..9913752b 100644
--- a/bot/resources/halloween/spookyrating/candle.jpeg
+++ b/bot/resources/holidays/halloween/spookyrating/candle.jpeg
Binary files differ
diff --git a/bot/resources/halloween/spookyrating/clown.jpeg b/bot/resources/holidays/halloween/spookyrating/clown.jpeg
index f23c4f70..f23c4f70 100644
--- a/bot/resources/halloween/spookyrating/clown.jpeg
+++ b/bot/resources/holidays/halloween/spookyrating/clown.jpeg
Binary files differ
diff --git a/bot/resources/halloween/spookyrating/costume.jpeg b/bot/resources/holidays/halloween/spookyrating/costume.jpeg
index b3c21af0..b3c21af0 100644
--- a/bot/resources/halloween/spookyrating/costume.jpeg
+++ b/bot/resources/holidays/halloween/spookyrating/costume.jpeg
Binary files differ
diff --git a/bot/resources/halloween/spookyrating/devil.jpeg b/bot/resources/holidays/halloween/spookyrating/devil.jpeg
index 4f45aaa7..4f45aaa7 100644
--- a/bot/resources/halloween/spookyrating/devil.jpeg
+++ b/bot/resources/holidays/halloween/spookyrating/devil.jpeg
Binary files differ
diff --git a/bot/resources/halloween/spookyrating/ghost.jpeg b/bot/resources/holidays/halloween/spookyrating/ghost.jpeg
index 0cb13346..0cb13346 100644
--- a/bot/resources/halloween/spookyrating/ghost.jpeg
+++ b/bot/resources/holidays/halloween/spookyrating/ghost.jpeg
Binary files differ
diff --git a/bot/resources/halloween/spookyrating/jackolantern.jpeg b/bot/resources/holidays/halloween/spookyrating/jackolantern.jpeg
index d7cf3d08..d7cf3d08 100644
--- a/bot/resources/halloween/spookyrating/jackolantern.jpeg
+++ b/bot/resources/holidays/halloween/spookyrating/jackolantern.jpeg
Binary files differ
diff --git a/bot/resources/halloween/spookyrating/necromancer.jpeg b/bot/resources/holidays/halloween/spookyrating/necromancer.jpeg
index 60b1e689..60b1e689 100644
--- a/bot/resources/halloween/spookyrating/necromancer.jpeg
+++ b/bot/resources/holidays/halloween/spookyrating/necromancer.jpeg
Binary files differ
diff --git a/bot/resources/halloween/spookyrating/tiger.jpeg b/bot/resources/holidays/halloween/spookyrating/tiger.jpeg
index 0419f5df..0419f5df 100644
--- a/bot/resources/halloween/spookyrating/tiger.jpeg
+++ b/bot/resources/holidays/halloween/spookyrating/tiger.jpeg
Binary files differ