alex_orid/Praxis_Bot
2
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

master branch updates #19

Merged
alex_orid merged 32 commits from master into db-module 2021-04-09 20:43:03 +00:00
Conversation 0 Commits 32 Files Changed 17 +125 -27
1 changed files with 125 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 533d69787f - Show all commits

152
commands/implemented/command_roll_discord.py
View File

@ -28,6 +28,72 @@ class CommandRoll(AbstractCommand, metaclass=ABCMeta):
#await discord_message.channel.send("Rolling Dice...")
print("Rolling Dice...")
if "f" in discord_message.content.lower():
await diceRoll = self.roll(2, discord_message)
else:
await diceRoll = self.roll(1, discord_message)
#========================
#Old Code Below
#========================
# temp_preParsedMessage = discord_message.content.split("+")
# tempParsedMessage = temp_preParsedMessage[0].split(" ")
# temp_dice_stmt: str = tempParsedMessage[1]
# parsedMessage = temp_dice_stmt.lower().split("d")
# loopBool: bool = False
# if parsedMessage[0] != "":
# loopBool = True
# if loopBool == True:
# if int(parsedMessage[0]) == 1:
# loopBool = False
# # If roll is in xdx+x format
# if loopBool == True:
# rolls: list = []
# for x in range(int(parsedMessage[0])):
# rolls.append(random.randint(1, int(parsedMessage[1])))
# rollTotal = 0
# for roll in rolls:
# rollTotal = rollTotal + roll
# diceRoll = diceRoll + str(roll) + ", "
# diceRoll = diceRoll[:-2] # This removes the last two characters in the string
# if len(temp_preParsedMessage) == 2:
# diceRoll = diceRoll + " + " + temp_preParsedMessage[1] + " = " + str(
# rollTotal + int(temp_preParsedMessage[1]))
# else:
# diceRoll = diceRoll + " = " + str(rollTotal)
# # If roll is in dx+x format
# if loopBool == False:
# roll: int = random.randint(1, int(parsedMessage[1]))
# if len(temp_preParsedMessage) == 2:
# diceRoll = str(roll) + " + " + temp_preParsedMessage[1] + " = " + str(
# roll + int(temp_preParsedMessage[1]))
# else:
# diceRoll = str(roll)
# diceRoll = discord_message.author.mention + " rolled: " + diceRoll
# print(diceRoll)
#========================
#Old Code Above
#========================
await bot.send_message(discord_message, diceRoll)
#await discord_message.channel.send(diceRoll)
async def roll(self, roll_type, discord_message: discord.Message):
switch = {
1: "Standard",
2: "Fudge Dice"
}
temp_preParsedMessage = discord_message.content.split("+")
tempParsedMessage = temp_preParsedMessage[0].split(" ")
@ -41,34 +107,66 @@ class CommandRoll(AbstractCommand, metaclass=ABCMeta):
if int(parsedMessage[0]) == 1:
loopBool = False
# If roll is in xdx+x format
if loopBool == True:
rolls: list = []
for x in range(int(parsedMessage[0])):
rolls.append(random.randint(1, int(parsedMessage[1])))
if roll_type == 1:
# If roll is in xdx+x format
if loopBool == True:
rolls: list = []
for x in range(int(parsedMessage[0])):
rolls.append(random.randint(1, int(parsedMessage[1]))) # This is the roller
rollTotal = 0
for roll in rolls:
rollTotal = rollTotal + roll
diceRoll = diceRoll + str(roll) + ", "
diceRoll = diceRoll[:-2] # This removes the last two characters in the string
rollTotal = 0
for roll in rolls:
rollTotal = rollTotal + roll
diceRoll = diceRoll + str(roll) + ", "
diceRoll = diceRoll[:-2] # This removes the last two characters in the string
if len(temp_preParsedMessage) == 2:
diceRoll = diceRoll + " + " + temp_preParsedMessage[1] + " = " + str(
rollTotal + int(temp_preParsedMessage[1]))
else:
diceRoll = diceRoll + " = " + str(rollTotal)
# If roll is in dx+x format
if loopBool == False:
roll: int = random.randint(1, int(parsedMessage[1]))
if len(temp_preParsedMessage) == 2:
diceRoll = diceRoll + " + " + temp_preParsedMessage[1] + " = " + str(
rollTotal + int(temp_preParsedMessage[1]))
else:
diceRoll = diceRoll + " = " + str(rollTotal)
# If roll is in dx+x format
if loopBool == False:
roll: int = random.randint(1, int(parsedMessage[1])) # This is the roller
if len(temp_preParsedMessage) == 2:
diceRoll = str(roll) + " + " + temp_preParsedMessage[1] + " = " + str(
roll + int(temp_preParsedMessage[1]))
else:
diceRoll = str(roll)
if len(temp_preParsedMessage) == 2:
diceRoll = str(roll) + " + " + temp_preParsedMessage[1] + " = " + str(
roll + int(temp_preParsedMessage[1]))
else:
diceRoll = str(roll)
diceRoll = discord_message.author.mention + " rolled: " + diceRoll
print(diceRoll)
await bot.send_message(discord_message, diceRoll)
#await discord_message.channel.send(diceRoll)
diceRoll = discord_message.author.mention + " rolled: " + diceRoll
print(diceRoll)
if roll_type == 2:
# If roll is in xdx+x format
if loopBool == True:
rolls: list = []
for x in range(int(parsedMessage[0])):
rolls.append(random.randint(1, 3)) # This is the roller
rollTotal = 0
for roll in rolls:
rollTotal = rollTotal + roll
diceRoll = diceRoll + str(roll) + ", "
diceRoll = diceRoll[:-2] # This removes the last two characters in the string
if len(temp_preParsedMessage) == 2:
diceRoll = diceRoll + " + " + temp_preParsedMessage[1] + " = " + str(
rollTotal + int(temp_preParsedMessage[1]))
else:
diceRoll = diceRoll + " = " + str(rollTotal)
# If roll is in dx+x format
if loopBool == False:
roll: int = random.randint(1, 3) # This is the roller
if len(temp_preParsedMessage) == 2:
diceRoll = str(roll) + " + " + temp_preParsedMessage[1] + " = " + str(
roll + int(temp_preParsedMessage[1]))
else:
diceRoll = str(roll)
diceRoll = discord_message.author.mention + " rolled: " + diceRoll
print(diceRoll)
return diceRoll