oloturia/damastodon
1
0
Fork 0
mirror of https://gitlab.com/oloturia/damastodon.git synced 2025-01-06 21:47:15 +01:00
Code Issues Releases Wiki Activity

fixed merge

Browse source
This commit is contained in:
oloturia 2021-10-30 17:29:46 +02:00
parent e08a9a5799
commit bd8453b351
2 changed files with 0 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
damastodon.py
View file

@ -65,11 +65,7 @@ def check_message(notification):
pickle.dump("@"+challenger,f) pickle.dump("@"+challenger,f)
pickle.dump(False,f) pickle.dump(False,f)
pickle.dump(board,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") 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 return
elif content.split(" ")[1].lower() == "no": elif content.split(" ")[1].lower() == "no":
os.remove(save_position+content.split(" ")[0][1:]) os.remove(save_position+content.split(" ")[0][1:])
@ -107,11 +103,7 @@ def check_message(notification):
colour = "◾" colour = "◾"
winner = dama.checkWin(board) winner = dama.checkWin(board)
if winner == (False,False): 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") 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 return
else: else:
if winner == (True,False): if winner == (True,False):

4
draughts_engine.py
View file

@ -2,14 +2,10 @@
import re 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"): 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 """ 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. 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 = ""
bstr += frstrow bstr += frstrow
for row in range(0,len(status)): for row in range(0,len(status)):