From 265b20ad61c7a9c2b173206091e10b3478ac93c9 Mon Sep 17 00:00:00 2001 From: Alistair McIntyre Date: Thu, 28 Sep 2017 12:12:22 +1300 Subject: [PATCH 1/3] - Created Madagascar Map Initial tags : #story[1275] --- src/main/java/seng302/model/ClientYacht.java | 5 +- src/main/resources/maps/madagascar.xml | 64 ++++++++++++++++++++ 2 files changed, 65 insertions(+), 4 deletions(-) create mode 100644 src/main/resources/maps/madagascar.xml diff --git a/src/main/java/seng302/model/ClientYacht.java b/src/main/java/seng302/model/ClientYacht.java index 9e38b781..612ca1e5 100644 --- a/src/main/java/seng302/model/ClientYacht.java +++ b/src/main/java/seng302/model/ClientYacht.java @@ -13,15 +13,11 @@ import javafx.beans.property.ReadOnlyIntegerProperty; import javafx.beans.property.ReadOnlyIntegerWrapper; import javafx.beans.property.ReadOnlyLongProperty; import javafx.beans.property.ReadOnlyLongWrapper; -import javafx.beans.value.ObservableObjectValue; -import javafx.collections.FXCollections; import javafx.scene.paint.Color; -import jdk.nashorn.internal.objects.annotations.Function; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import seng302.model.token.TokenType; import seng302.visualiser.fxObjects.assets_3D.BoatMeshType; -import seng302.model.token.TokenType; import seng302.visualiser.fxObjects.assets_3D.BoatObject; /** @@ -286,6 +282,7 @@ public class ClientYacht extends Observable { public void setHeading(Double heading) { this.heading = heading; + System.out.println(heading); setHeadingProperty(); } diff --git a/src/main/resources/maps/madagascar.xml b/src/main/resources/maps/madagascar.xml new file mode 100644 index 00000000..2c82e661 --- /dev/null +++ b/src/main/resources/maps/madagascar.xml @@ -0,0 +1,64 @@ + + + + Madagascar + + 57.6679590 + 11.8503233 + + 10 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From d7fc339ad52dc31facdd8711cdf2210f634397e3 Mon Sep 17 00:00:00 2001 From: Alistair McIntyre Date: Thu, 28 Sep 2017 14:41:35 +1300 Subject: [PATCH 2/3] - Added Madagascar Map tags : #story[1275] --- .../messages/MarkRoundingMessage.java | 1 + .../java/seng302/model/mark/CompoundMark.java | 1 - .../java/seng302/visualiser/MapMaker.java | 4 +- src/main/resources/maps/madagascar.xml | 53 ++++++++++--------- 4 files changed, 30 insertions(+), 29 deletions(-) diff --git a/src/main/java/seng302/gameServer/messages/MarkRoundingMessage.java b/src/main/java/seng302/gameServer/messages/MarkRoundingMessage.java index b1276814..4b7d33c3 100644 --- a/src/main/java/seng302/gameServer/messages/MarkRoundingMessage.java +++ b/src/main/java/seng302/gameServer/messages/MarkRoundingMessage.java @@ -44,6 +44,7 @@ public class MarkRoundingMessage extends Message{ putInt((int) raceId, 4); putInt((int) sourceId, 4); putByte((byte) boatStatus.getCode()); + System.out.println(roundingSide.getCode()); putByte((byte) roundingSide.getCode()); putByte((byte) markType.getCode()); putByte((byte) markId); diff --git a/src/main/java/seng302/model/mark/CompoundMark.java b/src/main/java/seng302/model/mark/CompoundMark.java index b9385446..c45750af 100644 --- a/src/main/java/seng302/model/mark/CompoundMark.java +++ b/src/main/java/seng302/model/mark/CompoundMark.java @@ -72,7 +72,6 @@ public class CompoundMark { getSubMark(1).setRoundingSide(RoundingSide.STARBOARD); break; - } } diff --git a/src/main/java/seng302/visualiser/MapMaker.java b/src/main/java/seng302/visualiser/MapMaker.java index 073c9d60..5bda5b7e 100644 --- a/src/main/java/seng302/visualiser/MapMaker.java +++ b/src/main/java/seng302/visualiser/MapMaker.java @@ -1,6 +1,5 @@ package seng302.visualiser; -import java.io.File; import java.io.IOException; import java.io.StringReader; import java.util.ArrayList; @@ -35,7 +34,8 @@ public class MapMaker { private int index = 0; private XMLGenerator xmlGenerator = new XMLGenerator(); - private List maps = new ArrayList<>(Arrays.asList("default.xml", "horseshoe.xml", "loop.xml")); + private List maps = new ArrayList<>( + Arrays.asList("default.xml", "horseshoe.xml", "madagascar.xml", "loop.xml")); public static MapMaker getInstance() { if (instance == null) { diff --git a/src/main/resources/maps/madagascar.xml b/src/main/resources/maps/madagascar.xml index 2c82e661..37113567 100644 --- a/src/main/resources/maps/madagascar.xml +++ b/src/main/resources/maps/madagascar.xml @@ -3,62 +3,63 @@ Madagascar - 57.6679590 - 11.8503233 + -15.67707 + 49.79338 10 - - + + - + - - + - - + - - + + + + + + - - - + + + + + - - - - - - - - - - - - + + + + + + + + + \ No newline at end of file From 1aedcaddf593ae11d397c24afb7dd14d3d48f176 Mon Sep 17 00:00:00 2001 From: Alistair McIntyre Date: Thu, 28 Sep 2017 14:42:34 +1300 Subject: [PATCH 3/3] removed an added print statement tags : #story[1275] --- .../java/seng302/gameServer/messages/MarkRoundingMessage.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/seng302/gameServer/messages/MarkRoundingMessage.java b/src/main/java/seng302/gameServer/messages/MarkRoundingMessage.java index 4b7d33c3..b1276814 100644 --- a/src/main/java/seng302/gameServer/messages/MarkRoundingMessage.java +++ b/src/main/java/seng302/gameServer/messages/MarkRoundingMessage.java @@ -44,7 +44,6 @@ public class MarkRoundingMessage extends Message{ putInt((int) raceId, 4); putInt((int) sourceId, 4); putByte((byte) boatStatus.getCode()); - System.out.println(roundingSide.getCode()); putByte((byte) roundingSide.getCode()); putByte((byte) markType.getCode()); putByte((byte) markId);