diff --git a/src/DLS.py b/src/DLS.py index e0f5dc0..1286024 100644 --- a/src/DLS.py +++ b/src/DLS.py @@ -889,17 +889,12 @@ def depthLimitedSearch2(curAnimals, turn, ID): # depth = 2 return x else: - x = eagleToHome(curAnimals, ID, turn) - if x: - return x - - else: - x = killTheMouth(curAnimals, ID, turn) + x = elephantAttack(curAnimals, ID, turn) if x: return x else: - x = elephantAttack(curAnimals, ID, turn) + x = eagleToHome(curAnimals, ID, turn) if x: return x @@ -1064,7 +1059,7 @@ def lionAttack(Animals, ID, turn): print('in') print('AnimalsPos:', AnimalsPos[6]) if AnimalsPos[6][0] == 8: - des = (6, 8, 3) + des = (6, 8, 1) return findWayToDes(Animals, 6, des, ID) if AnimalsPos[6][1] == 0: @@ -1083,7 +1078,7 @@ def lionAttack(Animals, ID, turn): else: if ID[13]: if AnimalsPos[13][0] == 0: - des = (13, 0, 3) + des = (13, 0, 1) return findWayToDes(Animals, 13, des, ID) if AnimalsPos[13][1] == 6: @@ -1106,7 +1101,7 @@ def elephantAttack(Animals, ID, turn): if turn == 0: if ID[7]: if AnimalsPos[7][1] == 3: - des = (7, 8, 3) + des = (7, 6, 3) return findWayToDes(Animals, 7, des, ID) if AnimalsPos[7][1] != 3: @@ -1117,7 +1112,7 @@ def elephantAttack(Animals, ID, turn): else: if ID[14]: if AnimalsPos[14][1] == 3: - des = (14, 0, 3) + des = (14, 2, 3) return findWayToDes(Animals, 14, des, ID) if AnimalsPos[14][1] != 3: @@ -1145,7 +1140,7 @@ def killTheMouth(Animals, ID, turn): if turn == 0 and ID[2] and ID[8]: if AnimalsPos[8] in pool: return None - x = killtheAnimal(curAnimals, ID, turn, 2, 8) + x = killtheAnimal(Animals, ID, turn, 2, 8) if x: return x if turn == 1 and ID[9] and ID[1]: @@ -1157,6 +1152,27 @@ def killTheMouth(Animals, ID, turn): return None +def huangLAE(Animals, ID, turn): + AnimalsPos = getAnimalsPos(Animals, ID) + if turn == 0: + if ID[7] and ID[6] and AnimalsPos[7] == (6, 3) and Animals[6] == (8, 1): + return (7, 7 ,3) + if ID[7] and AnimalsPos[7] == (7, 3): + return (7, 8, 3) + if ID[6] and AnimalsPos[6] == (8, 1): + return (6, 8, 2) + if ID[6] and AnimalsPos[6] == (8, 2): + return (6, 8, 3) + else: + if ID[14] and ID[13] and AnimalsPos[14] == (2, 3) and Animals[6] == (0, 5): + return (14, 1 ,3) + if ID[14] and AnimalsPos[14] == (1, 3): + return (14, 0, 3) + if ID[13] and AnimalsPos[13] == (0, 5): + return (13, 0, 4) + if ID[13] and AnimalsPos[6] == (0, 4): + return (13, 0, 4) + def main(): axis = [(0, 0), (2, 6), (1, 3), (1, 5), (2, 2), (2, 4), (2, 3), (2, 0), (6, 0), (7, 5), (7, 1), (6, 4), (6, 2), (6, 3), (6, 6)] diff --git a/src/__pycache__/Client_connection.cpython-38.pyc b/src/__pycache__/Client_connection.cpython-38.pyc index d7275da..c049a4d 100644 Binary files a/src/__pycache__/Client_connection.cpython-38.pyc and b/src/__pycache__/Client_connection.cpython-38.pyc differ diff --git a/src/__pycache__/init.cpython-38.pyc b/src/__pycache__/init.cpython-38.pyc index 1e638c0..cf3442b 100644 Binary files a/src/__pycache__/init.cpython-38.pyc and b/src/__pycache__/init.cpython-38.pyc differ diff --git a/src/__pycache__/socket_client.cpython-38.pyc b/src/__pycache__/socket_client.cpython-38.pyc index abf292a..c22674a 100644 Binary files a/src/__pycache__/socket_client.cpython-38.pyc and b/src/__pycache__/socket_client.cpython-38.pyc differ diff --git a/src/__pycache__/start_game.cpython-38.pyc b/src/__pycache__/start_game.cpython-38.pyc index a07e1a8..c785ede 100644 Binary files a/src/__pycache__/start_game.cpython-38.pyc and b/src/__pycache__/start_game.cpython-38.pyc differ