mirror of
https://gitlab.com/oloturia/damastodon.git
synced 2025-01-04 20:47:15 +01:00
fixed merge
This commit is contained in:
parent
e08a9a5799
commit
bd8453b351
2 changed files with 0 additions and 12 deletions
|
@ -65,11 +65,7 @@ def check_message(notification):
|
|||
pickle.dump("@"+challenger,f)
|
||||
pickle.dump(False,f)
|
||||
pickle.dump(board,f)
|
||||
<<<<<<< HEAD
|
||||
mastodon.status_post("◾: @"+account+" ◽: @"+challenger+" turn ◽\n"+dama.draw_checkerboard(board,space="🟥",white_norm="◽",white_knight="⚪",black_norm="◾",black_knight="⚫",empty="🟦",frstrow="0🇦 🇧 🇨 🇩 🇪 🇫 🇬 🇭\n"),visibility="direct")
|
||||
=======
|
||||
mastodon.status_post("◾: @"+account+" ◽: @"+challenger+" turn ◽\n"+dama.draw_checkerboard(board,space="🟥 ",white_norm="◽ ",white_knight="⚪ ",black_norm="◾ ",black_knight="⚫ ",empty="🟦 ",frstrow=firow, column=colsx),visibility="direct")
|
||||
>>>>>>> reversecheckboard
|
||||
return
|
||||
elif content.split(" ")[1].lower() == "no":
|
||||
os.remove(save_position+content.split(" ")[0][1:])
|
||||
|
@ -107,11 +103,7 @@ def check_message(notification):
|
|||
colour = "◾"
|
||||
winner = dama.checkWin(board)
|
||||
if winner == (False,False):
|
||||
<<<<<<< HEAD
|
||||
mastodon.status_post("◾: "+black+" ◽: "+white+" turn "+colour+"\n"+dama.draw_checkerboard(board,space="🟥",white_norm="◽",white_knight="⚪",black_norm="◾",black_knight="⚫",empty="🟦",frstrow="0🇦 🇧 🇨 🇩 🇪 🇫 🇬 🇭 \n"),visibility="direct")
|
||||
=======
|
||||
mastodon.status_post("◾: "+black+" ◽: "+white+" turn "+colour+"\n"+dama.draw_checkerboard(board,space="🟥 ",white_norm="◽ ",white_knight="⚪ ",black_norm="◾ ",black_knight="⚫ ",empty="🟦 ",frstrow=firow, column=colsx),visibility="direct")
|
||||
>>>>>>> reversecheckboard
|
||||
return
|
||||
else:
|
||||
if winner == (True,False):
|
||||
|
|
|
@ -2,14 +2,10 @@
|
|||
|
||||
import re
|
||||
|
||||
<<<<<<< HEAD
|
||||
def draw_checkerboard(status,space="▒",white_norm="h",white_knight="H",black_norm="b",black_knight="B",empty=" ",frstrow=" abcdefgh\n",column="12345678"):
|
||||
=======
|
||||
def draw_checkerboard(status,space="▒",white_norm="h",white_knight="H",black_norm="b",black_knight="B",empty=" ",column="12345678",frstrow=" abcdefgh\n"):
|
||||
""" Draw a checkerboard, status is the virtual representation of the board, as a bi-dimensional array, white/black norm/knight are the representation of the pieces
|
||||
space is a non-walkable cell, empty is a walkable cell, column contains labels for the left column, frstrow the labels for the first row.
|
||||
"""
|
||||
>>>>>>> reversecheckboard
|
||||
bstr = ""
|
||||
bstr += frstrow
|
||||
for row in range(0,len(status)):
|
||||
|
|
Loading…
Reference in a new issue