From 2a9c53c2715aae687335b7c842e4142973f28ad7 Mon Sep 17 00:00:00 2001 From: JBM Date: Sun, 24 May 2020 17:51:50 +0200 Subject: [PATCH 1/1] Cleanup and meta updates --- PLAN.org | 5 ++++- src/main/java/com/codingame/game/Referee.java | 18 +++++++++--------- .../resources/view/assets/avatar_frame.xcf | Bin 0 -> 15919 bytes 3 files changed, 13 insertions(+), 10 deletions(-) create mode 100644 src/main/resources/view/assets/avatar_frame.xcf diff --git a/PLAN.org b/PLAN.org index 8872d2f..a73572d 100644 --- a/PLAN.org +++ b/PLAN.org @@ -5,12 +5,15 @@ * DONE easter egg for YannT * DONE messages * TODO referee cleanup + +That one's probably never going to be DONE ^^' + * DONE left win bias bug * DONE upgrade deps * DONE Timings * TODO Protocol * DONE fenceposts -* Quotes +* Quotes to include Trolls, it is said, were bred by Melkor because he desired a race as powerful as the giant Ents, the Tree-herds. David Day in Tolkien : The Illustrated Encyclopaedia (1993), p. 226 diff --git a/src/main/java/com/codingame/game/Referee.java b/src/main/java/com/codingame/game/Referee.java index b678534..979e283 100644 --- a/src/main/java/com/codingame/game/Referee.java +++ b/src/main/java/com/codingame/game/Referee.java @@ -30,16 +30,16 @@ public class Referee extends AbstractReferee { gameManager.getPlayer(0).model = model.p0; gameManager.getPlayer(1).model = model.p1; - for (Player p : gameManager.getPlayers()) { - p.sendInputLine(String.format("%d %d", model.roadLength, model.initialStones)); + for (Player p: gameManager.getPlayers()) { + p.sendInputLine(String.format("%d %d", + model.roadLength, + model.initialStones)); } view.init(model); - gameManager.getPlayer(0).view = view.p0; gameManager.getPlayer(1).view = view.p1; - - gameManager.setFrameDuration(2000); // XXX + gameManager.setFrameDuration(2000); } @Override @@ -56,10 +56,10 @@ public class Referee extends AbstractReferee { for (Player player : gameManager.getActivePlayers()) { Model.Player p = player.model; { - int trollDistance = p.getTrollDistance(); - int stones = p.getStones(); - int oppStones = p.getOppStones(); - player.sendInputLine(String.format("%d %d %d", trollDistance, stones, oppStones)); + player.sendInputLine(String.format("%d %d %d", + p.getTrollDistance(), + p.getStones(), + p.getOppStones())); } player.execute(); } diff --git a/src/main/resources/view/assets/avatar_frame.xcf b/src/main/resources/view/assets/avatar_frame.xcf new file mode 100644 index 0000000000000000000000000000000000000000..a4f839c6ffdcefa8e571b28dd785bbb01b24eeb9 GIT binary patch literal 15919 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 H&g%aG?ueq= literal 0 HcmV?d00001 -- 2.30.2