From 87f2f1fe637976e9bfa44ec7e2c78a709aca635a Mon Sep 17 00:00:00 2001 From: William Muir Date: Thu, 10 Aug 2017 12:07:47 +1200 Subject: [PATCH] Fixed Mark rounding Algorithm Algorithm now knows when a player has to round a gate or just pass right through #story[1124] #pair[wmu16, hyi25] --- src/main/resources/server_config/xml_templates/race.ftlh | 7 +++++++ src/test/java/seng302/models/MarkOrderTest.java | 3 +++ 2 files changed, 10 insertions(+) diff --git a/src/main/resources/server_config/xml_templates/race.ftlh b/src/main/resources/server_config/xml_templates/race.ftlh index e8421c5c..e38bf0b7 100644 --- a/src/main/resources/server_config/xml_templates/race.ftlh +++ b/src/main/resources/server_config/xml_templates/race.ftlh @@ -36,6 +36,13 @@ + + + + + + + diff --git a/src/test/java/seng302/models/MarkOrderTest.java b/src/test/java/seng302/models/MarkOrderTest.java index 42531563..d30f999a 100644 --- a/src/test/java/seng302/models/MarkOrderTest.java +++ b/src/test/java/seng302/models/MarkOrderTest.java @@ -42,6 +42,9 @@ public class MarkOrderTest { @Test public void testGetNextMark() { currentSeqID = 4; + for (CompoundMark mark : markOrder.getMarkOrder()) { + System.out.println(mark.getName()); + } CompoundMark nextMark = markOrder.getMarkOrder().get(4 + 1); assertEquals(nextMark, markOrder.getNextMark(currentSeqID));