Skip to content

multiple rounds card reset bug #133

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 8, 2022
Merged

multiple rounds card reset bug #133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ba8f8c0
multiple rounds card reset bug
Saransh-255 Sep 21, 2022
0364b19
Saransh-255 Sep 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,4 +156,5 @@ cython_debug/

#### BRAINBOT ####

brainbot.ini
brainbot.ini
black.png
Binary file modified black.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
42 changes: 26 additions & 16 deletions main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -779,16 +779,21 @@ async def _on_chat(msg):

#cards against humanity
async def gameStart():
game['selectionTime'] = False

imgGen = ImageGenerator()
global randomQ
randomQ = random.choice(cah['black'])['text']
imgGen.createImage(randomQ, "black.png")

fileCard = await ryver.upload_file("black", open("black.png", "rb"), "png")

console.log(game)
for player in game['players']:
player['selectedCard'] = ''

game['playing'] = list(game['players'])
queen = game['playing'].pop(random.randint( 0,len(game['playing'])-1 ))
console.log(game)

queen = game['playing'].pop(random.randint( 0, len(game['playing'])-1 ))

for player in game['playing']:
playerObj = ryver.get_user(username=player['name'])
Expand All @@ -797,7 +802,7 @@ async def gameStart():
for index, card in enumerate(player['cards']):
cardList += f"{str(index+1)}. {card} \n"
await send_message(
f"**This is your current set of cards:**\n {cardList}",
f"**This is your current set of cards:**\n *Send `!card <card number>` in the game chat to select a card.* \n\n {cardList}",
ryver.get_chat(id=playerObj.get_id())
)

Expand Down Expand Up @@ -835,7 +840,7 @@ async def gameStart():
game['waitingForJoin'] = True
else:
await send_message(
"Missing Arguments: Must add the number of rounds after command",
"Missing Arguments: Must add the number of rounds after command. `!cah <number of rounds>`",
bot_chat
)

Expand Down Expand Up @@ -883,9 +888,10 @@ async def gameStart():
if(msg.text.lower().startswith("!card")):
selected = msg.text.lstrip("!card ").strip()
thisUser = ryver.get_user(jid=msg.from_jid)
userInfo = next((player for player in game['playing'] if player['name'] == user.get_username()), None)
userInfo = next((player for player in game['players'] if player['name'] == user.get_username()), None)
playerInfo = next((player for player in game['playing'] if player['name'] == user.get_username()), None)

if(userInfo):
if(playerInfo):
selectedCard = userInfo['cards'].pop(int(selected)-1)
userInfo['cards'].append(random.choice(cah['white'])['text'])

Expand All @@ -897,14 +903,14 @@ async def gameStart():
f"@{user.get_username()} has selected a card!",
bot_chat
)
userInfo['selectedCard'] = selectedCard
playerInfo['selectedCard'] = selectedCard

if(not next((player for player in game['playing'] if not player['selectedCard']), None)):
allCards = ''
for index, player in enumerate(game['playing']):
allCards += f"{index+1}. {player['selectedCard']} \n"
await send_message(
f"@{game['cardQueen']['name']}, Pick a winning card: (!pick <number>) \n {allCards}",
f"@{game['cardQueen']['name']}, Pick a winning card: (!pick <number>) \n **{randomQ}** \n {allCards}",
bot_chat
)
game['selectionTime'] = True
Expand Down Expand Up @@ -946,8 +952,10 @@ async def gameStart():
'running': False,
'waitingForJoin': False,
'readCommands': False,
'selectionTime': False,
'players': [],
'playing': [],
'roundsLeft': 2,
'selectionTime': False,
'cardQueen': '' #username of card queen
}

Expand All @@ -965,12 +973,14 @@ async def gameStart():

elif(msg.text.lower().startswith("!end")):
game = {
'running': False,
'waitingForJoin': False,
'readCommands': False,
'selectionTime': False,
'players': [],
'cardQueen': '' #username of card queen
'running': False,
'waitingForJoin': False,
'readCommands': False,
'players': [],
'playing': [],
'roundsLeft': 2,
'selectionTime': False,
'cardQueen': '' #username of card queen
}
await send_message(
f"@{user.get_username()} ended the game.",
Expand Down