From 17301e8f141e91aaf8633ec33179a4185886194c Mon Sep 17 00:00:00 2001
From: Sean Paeglis <s.paeglis@student.unimelb.edu.au>
Date: Thu, 16 May 2019 14:30:03 +1000
Subject: [PATCH] s

---
 Snek/player/Player.py                         |   1 +
 Snek/player/__pycache__/Player.cpython-36.pyc | Bin 1100 -> 1136 bytes
 Snek/util/Board.py                            |  28 +++++++++++++++---
 Snek/util/__pycache__/Board.cpython-36.pyc    | Bin 3696 -> 4355 bytes
 4 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/Snek/player/Player.py b/Snek/player/Player.py
index 422d3ca..291fbb6 100644
--- a/Snek/player/Player.py
+++ b/Snek/player/Player.py
@@ -22,4 +22,5 @@ class Player:
 		return(moves[0])
 
 	def update(self, colour, action):
+		action = self.board.convert_coords_local(action)
 		self.board.move(action)
diff --git a/Snek/player/__pycache__/Player.cpython-36.pyc b/Snek/player/__pycache__/Player.cpython-36.pyc
index 1c5f91be7a2d1e9018a546b768e4a7af0e07b61d..d74593c9d792478260edce43a4da4a63fde9ca77 100644
GIT binary patch
delta 99
zcmX@Z@qvTWn3tDJ@Zz1AjE$Ve%nmXP3=B04Sqxc>HB8NnwM<|(6Nt^okirnmpvmZ`
x$y~(Bz`zhClANDcmReL2pPZjxlu{g@lb@WJGdYUch@FLjfq{XMXYxem-2ln}7}5X$

delta 63
zcmeysafXA_n3tC;`sAG$(~X?Q%yI$@3=B04Sqxc>HB8Nnj0`CZ!3>&=ews{0tPBhc
QlWUlbSeY0=tgXzu0o2_MQUCw|

diff --git a/Snek/util/Board.py b/Snek/util/Board.py
index e73cbc9..425e13c 100644
--- a/Snek/util/Board.py
+++ b/Snek/util/Board.py
@@ -95,24 +95,44 @@ class Board:
 
 	def convert_coords_local(self, action):
 		if action[0] == 'EXIT':
-			return (action[0], (action[1][0], action[1][1]))
+			return (action[0], (action[1][0]+3, action[1][1]+3))
 
 		return (action[0], ((action[1][0][0]+3, action[1][0][1]+3), (action[1][1][0]+3, action[1][1][1]+3)))
 
 	def convert_coords_ref(self, action):
 		if action[0] == 'EXIT':
-			return (action[0], (action[1][0], action[1][1]))
+			return (action[0], (action[1][0]-3, action[1][1]-3))
 
 		return (action[0], ((action[1][0][0]-3, action[1][0][1]-3), (action[1][1][0]-3, action[1][1][1]-3)))
 
 	def move(self, action):
 
-		if action[0] ==  'MOVE' or action == 'JUMP':
+		if action[0] ==  'MOVE':
 			piece = self.tiles[action[1][0][1]][action[1][0][0]]
 			self.tiles[action[1][0][1]][action[1][0][0]] = None
 			self.tiles[action[1][1][1]][action[1][1][0]] = piece
 			self.tiles[action[1][1][1]][action[1][1][0]].pos = action[1][1]
 
-		elif action[0] == 'EXIT':
+		elif action[0] == 'JUMP':
 			piece = self.tiles[action[1][0][1]][action[1][0][0]]
+			direction = (action[1][1][0]-action[1][0][0], action[1][1][1]-action[1][0][1])
+			direction = (int(direction[0]/2), int(direction[1]/2))
+			print("MID: " + str((piece.pos[0] + direction[0]-3, piece.pos[1] + direction[1]-3)))
+			mid_tile = (piece.pos[0] + direction[0], piece.pos[1] + direction[1])
+			taken_piece = self.tiles[mid_tile[1]][mid_tile[0]]
+			print(len(self.pieces[taken_piece.colour]))
+			for i in range(len(self.pieces[taken_piece.colour])):
+				if self.pieces[taken_piece.colour][i] is taken_piece:
+					self.pieces[taken_piece.colour].pop(i)
+					self.pieces[piece.colour].append(taken_piece)
+					taken_piece.colour = piece.colour
+					break
 			self.tiles[action[1][0][1]][action[1][0][0]] = None
+			self.tiles[action[1][1][1]][action[1][1][0]] = piece
+			self.tiles[action[1][1][1]][action[1][1][0]].pos = action[1][1]
+
+
+		elif action[0] == 'EXIT':
+			piece = self.tiles[action[1][1]][action[1][0]]
+			self.tiles[action[1][1]][action[1][0]] = None
+			self.pieces[piece.colour].remove(piece)
diff --git a/Snek/util/__pycache__/Board.cpython-36.pyc b/Snek/util/__pycache__/Board.cpython-36.pyc
index 803df5803e155c9ffd9182a00dfdeb7b5bf7d4e1..0ad5a8382cc8ab13b09b209bc90970a7b5293e00 100644
GIT binary patch
delta 1237
zcmew$)2zg0%*)Gl@7|plRl$v1lQ<=M7#J987*iM}8B&<CnTkvx>>9?&|2V~&Si~pa
z<C2~Hh;u%d22+)kQ+{Gmir(Y|E|JOexx@@{X-#34WB?n;A^|cQ!~<a#iOKi4wliu>
zp2n>b%g(^S0K(1;3=GA5%qVWyRKt)3(+F}Gvm}EgGM^E|uVqSMz@=`oJdbES$Vw=N
z>jv=|B^hjBrZGz*n*owVwhP1u+ZE3^fhjKn5;7?)*-R6diq_$>8|rn&dWa)y7{Q?d
zH44fDd5Tez0VQ-mPJyTe$ufgv)0k?ROPFey!C}cN&CtvU=7G!t^T6`VDQqPyHB4FH
zD1@jLXGmd}sAm8Rf{bMbIRPxlkjB)^D9+H#$Ow^Tlw^QuL06r|RLcVPBMV5kBts1g
z$QhChwX7w~C9E|JS!^||S?rPw&5R(^Dw0Y#P(^c^8C@7+y=vJIN^9688EROwIVLa`
zJwk|Pan`Vbi~x%;fsD-Js$m6-FlDjVu*S0oFic=9d=$<=&j`<pfkrn+Hq!*=A}(-H
zK;j2EiGY&_Bq`Rz(=3_-8&Dc!tATipyM_tmwG@V622D=CB1Q%Vh9U(J!2%)_K?EBE
z149+7ucwQZLJ=s76v;C%Flh1=iGw7i7#J9CF=ytL6iI_w#U(|zm~&F|iX{9%(xM<j
z5G+%WUr;0oVzCva=H{2BYO)u}fMnG`ge-_qVPIg0;>gWRi7&~_NsZzzNz6{oi!aDb
zO-?Q1oh;5PTW`X^z`(%7!>9&^CQN*cYK#ty3XB$vDvV-`B8*auVvItJLW~@Y9AFhj
z%zTV;jB<=sT#%vyWUt@L|NsC0*JLWv2iXbsFo>ne1o1qG4VKbmDguWANC3)~0xN;3
SM3&W`ypq?KQE&2h-bw)E#^B@t

delta 576
zcmZox`XIw)%*)GVc;QY=3GYU(Nt~K33=9l4j46zg3@J?6Ohq~nb`4_+vm^sZ6v|?j
zocxYUcJeFE`HTvaySR)=(zl&aVe&F=6<cNo1_l-e1_oya28LoWMr4bNML-s1GZpQq
zVaNhGhy`MO3X3FzB$z+>Keu>2hA31Oqa=e3Lk$y>UXV(-UP%U!IUw)YfX#yN39FW5
zh-b`;f&@tlYc`Y21jZsEByFHjgIhw_fhi2Z44Q0yMT`s#3`GhcLJ>rOf}}{Efq_Aj
zsYo0oAO&JG7s-IwY9K-uL~z3iJ_ZJcTP(TxWvMx!kQ88GU|?VpVN_#Ob7NFvG-Bdo
zRAa2-a>`FEO3?$U@_YIJ|NsA*OhsBCBfz$USei@_mw?z{DNUv#uv@eyO9;qtfP_JM
PCff-3GHOol5~u_Ko-Sty

-- 
GitLab