From badced43bc443619d05246ff267795681c69110e Mon Sep 17 00:00:00 2001
From: "john.wohl@uconn.edu" <jnw900@gmail.com>
Date: Thu, 12 Dec 2019 23:31:00 -0500
Subject: [PATCH] finished

---
 Konane.py                         |  21 ++++++++++++++-------
 __pycache__/client.cpython-36.pyc | Bin 3393 -> 3446 bytes
 client.py                         |  12 ++++++------
 3 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/Konane.py b/Konane.py
index ffd9f4c..7e6b6eb 100644
--- a/Konane.py
+++ b/Konane.py
@@ -6,22 +6,30 @@ import math
 # Top level class that has the client and the state
 
 class Konane:
-    def __init__(self):
-        self.client = client.ArtemisClient("artemis.engr.uconn.edu", 4705)
+    def __init__(self, pretty=False):
+        self.client = client.ArtemisClient("artemis.engr.uconn.edu", 4705, pretty)
         self.state = state.State()
+
         self.playerNumber = None
         self.color = None
         self.player = None
 
+        self.pretty = pretty
+
     def stringToCoords(self, string):
         coords = []
         coords.append(int(string[string.find("[")+1:string.find(":")]))
         coords.append(int(string[string.find(":")+1:string.find("]")]))
 
-        return coords
+        # convert from BOTTOM-lowest to TOP-lowest
+        newCoords = [17-coords[0], coords[1]]
+
+        return newCoords
     
     def coordsToString(self, coords):
-        return "[{0}:{1}]".format(coords[0], coords[1])
+        #convert from TOP-lowest to BOTTOM-lowest
+        newCoords = [17-coords[0], coords[1]]
+        return "[{0}:{1}]".format(newCoords[0], newCoords[1])
 
     def start(self):
         firstMove = self.coordsToString(self.state.first_moves_set()[0])
@@ -57,8 +65,6 @@ class Konane:
             myTurn = False
 
         finished = False
-        #print(self.state)
-        turns = 0
         while(not finished):
             if(myTurn):
                 moveCoords = self.state.makeMove(self.color)
@@ -88,7 +94,8 @@ class Konane:
                     break
 
             myTurn = not myTurn
-            print(self.state)
+            if(self.pretty):
+                print(self.state)
         
         self.client.close()
 
diff --git a/__pycache__/client.cpython-36.pyc b/__pycache__/client.cpython-36.pyc
index dec3fe6480f71de0adb02e0c7fdb5a8a3d4666de..b68e817b4f5ebf383759e9a446c03a5b06bfaf54 100644
GIT binary patch
delta 1371
zcmZWo&2Jk;6rY*>@OZs;(%6ZMX-W!3?Uqt0q#zWvjiXW{A(~cAX(iJSS$^xtCTp9w
z8)zy=k#PTkX#N6@oH%gggv5~pT=#^8ij*srI3nI#Cn~tM=J(s3eeXB#YksQzUCXZ&
zi{5Ja#lv3@@(=bcAw->4+#v`>Q-WwJcnuU-&t%gA8=PmNX@d(nVh1$jiCyrZK%4^~
zio_a9FhiV&SvW!L!5ox{3s8Z1VjmWuN?e4Kn<A*C#dS==s2g8j-0p_`q|vtNbpA0b
zTGwgC^@D#_7Dm=cJk}ry^B~AuZ8QSUtjo_Yx<d?;WH;4Ytth<pRfvI|+HttuLCy+U
z3kw9_2`rf(<!7>DPN;cvRvla|(st^`33mHisXOR&;xK9E;&3aXaInOl8O*R<DSVP(
ztDW4rar4%_8y{87U+Vj}=Gdl8aLDln66cv5WMy1nsG6UxGmBGN{*hLubjm3E4_P*U
z+MgB|*@Yo+(Kl;O^(qUd&X7V(0+s2e8pC)v=*Qu7h%;Zex=CYzcaFZFGsf9mt&_q?
z^aOe!H^oTy<XC{JiakZU3NI!WSR;A|yDG*~vaQ{7MyltUn!B-|L!Sh&!oYRJHyAtu
zE^{AJH|)0u5C+!Etedl)0Y<GP3E}aiyi=j#o8<pKt(e7ybfv9)!ddxr?szJ)p}1sz
zci+3j)<@Ylonbd@zmmGgp-ftH&D3*)4>A{fQZOe@T9~93nM|58)eg<h+>3SdJa=#T
z44sB2Uml4|yfNkDajho@Hq5rZvR@}7F7ueicTeqEPtK2|FYxln>Pe7e3Dy^i-l*i+
zZf3b>eObECUetgwH7Bq)o;qtc2Q<YzRFg@tF$;(XVbY4%=_xo$&5d^N?qDC6R%w%N
z)=m`d9=CrwWX&OSnxBwutO<nl)oJ;|-TWh2;{#K1m}8R5hc5A9*6*76#k>D5$B;VR
z{%|Kjhn}+zB3mIVVV)r?8cn~sU8tO1qMfFXVMOV`?dhhOZwlX@S|Jm<G}&$We|>Sq
ztod&%*)VPY+{d%W;>fvA>cI`hvkd1M0)}@OK4f6!|Ky*E&zRr*@<XqrwJzwA&TC6M
t+SZ=FfQrniq|5AenV@MW-6+hqUs0jYslE~oU}rnLCh0BaDriZ6^)F~u8$AF3

delta 1323
zcmZuwOKTHR6uys{$<1UYt+BQms;!8R_(CnHh@zqu6s=-?Kzx*tb1SJPsduKnNa>>D
zzTA~dm*T>O{sI4h;KI$|&Q;ffxT>Br6RnLV%=g{7bKc**-^(A$`LQtce}v!ed|t}m
zUJ#72Q}{%Hpjnjzs|w&Cp0lb12@bLYE_lc;<Uk>NkOv<*2L%X_6@*Yk&O;ycBm1xp
zO2`FR4+F>nY=A-J5QZjMWn&VaHnDCtqB9Q~W!;MF5>wNUnCdx$Pjt+3KGqMs!=@B4
z^b-^3DtUW>-x^W(YE6Clkv0{XIFWuZZOGF&2(Ot5?I(VHpoA}sdu#soxLD$W{U|n%
zgyfJy5m!l3KZ#AP9$y{5bos{k*^>3;+imN}hT<$!Q59|mh+GrU{sw|U`$cZu+!HJ4
z#!4fVZQ1$COLoP%SQ{o6f{JGfwDu9Ij?wi;i3hsg2A!rz+*#9T#TAieN|e#jY`Ycd
ztlrh4`ySUC@wv9S+Wo%WzHuk{G5gcqRE`D6ju>L#46#MdS%=NY8K)y=Tzk};Sm+k8
zo~qdLyA+yb3ldMasFaFaZM51y-8Riy9BY`0Vl3`nPc3FE1{uRAqMm5(jtF?ad{$bO
z8kOEp3F?B`Ah%~fxpaH1y0Z;k|EEEp%ri+&Se<JhPF<XAEN&FnOq@tG$;9Z9L6I|Q
zaLW4X#=%j{W`<T%ni1OQ@$qS*S;BF<q>e8fMI#&?TVxKK7xVJTXom;P?Cr=I4t$Y=
zyf5%AwV0O=i#N$ybi^XZ1M5sYb5CAs<2j{6lqoOGD6Q!vnKDA9+l|+JdTq|M(yH*D
z%r%=&QPzF`)m>4Q)Y*9q5Ge%412HJxy~y9?Wy+PX<s1<|xa=V>r>AX`UGZ;Djncl`
zXwA;W#>I82oFOYikxZT-ol|zull*kUL~+^%#mp)UjBa9MaHUr^`@ZmM_z>FRbxH5Z
z+6kLO_F=Hyz6^FO^!-kh&LJBM>1(zT>?GJlu$$lr0fqfbu|F5V(DkHVqCo`3RiKnA
ksG{<fRIYMxy*stRVIQCvbWn$@PTXkfbpM~Awi*uq0xo$9X#fBK

diff --git a/client.py b/client.py
index 98fa29f..55340b7 100644
--- a/client.py
+++ b/client.py
@@ -3,7 +3,7 @@ import sys
 import time
 
 class ArtemisClient:
-    def __init__(self, server_host, server_port):
+    def __init__(self, server_host, server_port, pretty=False):
         self.server_host = server_host
         self.server_port = server_port
         self.username = None
@@ -13,6 +13,8 @@ class ArtemisClient:
         self.color = None
         self.server_sock = None
 
+        self.pretty = pretty
+
         self.gameOver = False
 
     def extractREMOVED(self, string):
@@ -53,9 +55,8 @@ class ArtemisClient:
             return "GAME OVER"
 
         formatted_string = string.rstrip() + "\r\n"
-        print("**********************\n" + formatted_string + "**********************")
-        #formatted_string = string
-        #print(formatted_string, end="")
+        if(self.pretty):
+            print("**********************\n" + formatted_string + "**********************")
         self.server_sock.send(formatted_string.encode())
     
     def sendREMOVE(self, piece):
@@ -73,8 +74,7 @@ class ArtemisClient:
     def waitMOVE(self, myTurn):
         response = dummyResponse = self.waitForResponse()
         # wait til i receive '?Move', so I know can transmit once it's my turn
-        while(not myTurn and dummyResponse.find("?Move") == -1):
-            #print("hit")
+        while(not myTurn and dummyResponse.find("?Move") == -1 and (not self.gameOver)):
             dummyResponse = self.waitForResponse()