CodeMirror/Bonfire
1
0
Fork 0
mirror of synced 2024-05-03 12:12:31 +12:00
Code Issues Releases Wiki Activity

Ensure settings exist in battle

Browse source
This commit is contained in:
phxntxm 2019-01-28 23:45:15 -06:00
parent 943b46d4e9
commit e13b74ce38
1 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
cogs/interaction.py
View file

@ -242,17 +242,16 @@ class Interaction:
"SELECT custom_battles, include_default_battles FROM guilds WHERE id = $1",
ctx.guild.id
)
custom_msgs = settings["custom_battles"]
default_on = settings["include_default_battles"]
# if they exist, then we want to see if we want to use default as well
if custom_msgs:
if default_on or default_on is None:
msgs = battle_outcomes + custom_msgs
else:
msgs = custom_msgs
# Otherwise we simply just want to use the default, no matter what the default setting is
else:
msgs = battle_outcomes
msgs = battle_outcomes
if settings:
custom_msgs = settings["custom_battles"]
default_on = settings["include_default_battles"]
# if they exist, then we want to see if we want to use default as well
if custom_msgs:
if default_on or default_on is None:
msgs += custom_msgs
else:
msgs = custom_msgs
fmt = random.SystemRandom().choice(msgs)
# Due to our previous checks, the ID should only be in the dictionary once, in the current battle we're checking