From 36c6d9bf324d9794c15710f102745d9b2afcecf8 Mon Sep 17 00:00:00 2001
From: Francesco Bariatti <francesco.bariatti@insa-rennes.fr>
Date: Wed, 16 Mar 2016 16:24:03 +0100
Subject: [PATCH] Added nb moves to json dump
---
src/game/penguin.cpp | 3 +++
tools/gui.py | 4 ++--
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/game/penguin.cpp b/src/game/penguin.cpp
index ddbdb2b..ccd9f05 100644
--- a/src/game/penguin.cpp
+++ b/src/game/penguin.cpp
@@ -405,6 +405,9 @@ namespace game
json["possible_moves"]["blue"] = state.nb_moves_blue;
json["current_player"] = state.current_player_red ? "Red" : "Blue";
+
+ json["nb_moves"]["red"] = state.nb_moves_red;
+ json["nb_moves"]["blue"] = state.nb_moves_blue;
return json;
}
diff --git a/tools/gui.py b/tools/gui.py
index f100775..3d50e59 100755
--- a/tools/gui.py
+++ b/tools/gui.py
@@ -32,10 +32,10 @@ if __name__ == "__main__":
print("Comments: {}".format(''.join(comments)))
state = json.loads(''.join(json_data))
drawState.drawBitboard(state["bitboards"]["onefish"],state["bitboards"]["twofish"],state["bitboards"]["threefish"])
- print("Red penguins")
+ print("Red penguins (Red score: {}, Total moves: {})".format(state["score"]["red"], state["nb_moves"]["red"]))
for i in range(4):
drawState.drawPenguin(state["penguins"]["red"][i])
- print("Blue penguins")
+ print("Blue penguins (Blue score: {}, Total moves: {})".format(state["score"]["blue"], state["nb_moves"]["blue"]))
for i in range(4):
drawState.drawPenguin(state["penguins"]["blue"][i])
#PLAY NEXT MOVE
--
GitLab