Update: WillieTimer

This commit is contained in:
Logan Cusano
2021-12-30 00:14:47 -05:00
parent e122acbf37
commit 51b7768854
2 changed files with 444 additions and 8 deletions

View File

@@ -17,7 +17,8 @@ class WillieTimer(commands.Cog):
self.channel = self.bot.get_channel(id=self.channel_id)
self.guild = self.channel.guild
self.lock = False
self.current_phrase = None
self.current_420_phrase = None
self.current_warm_up_phrase = None
self.caller_name = None
#self.PG = PhraseGenerator()
@@ -127,9 +128,10 @@ class WillieTimer(commands.Cog):
selected_phrase = choice(phrases)
if selected_phrase is not None:
if selected_phrase != self.current_phrase:
self.current_phrase = selected_phrase
return selected_phrase.replace('\n', '')
if selected_phrase != self.current_420_phrase:
selected_phrase = selected_phrase.replace('\n', '')
self.current_420_phrase = selected_phrase
return selected_phrase
else:
selected_phrase = None
continue
@@ -138,14 +140,15 @@ class WillieTimer(commands.Cog):
selected_phrase = None
while not selected_phrase:
#selected_phrase = self.PG.pg_generate()
with open('./modules/WillieTimer/Phrases.txt', 'r') as phrase_file:
with open('./modules/WillieTimer/lyrics.min.txt', 'r') as phrase_file:
phrases = phrase_file.readlines()
selected_phrase = choice(phrases)
if selected_phrase is not None:
if selected_phrase != self.current_phrase:
self.current_phrase = selected_phrase
return selected_phrase.replace('\n', '')
if selected_phrase != self.current_warm_up_phrase:
selected_phrase = selected_phrase.replace('\n', '')
self.current_warm_up_phrase = selected_phrase
return selected_phrase
else:
selected_phrase = None
continue