michael/Party-Parrots-At-Sea
1
0
Fork 0
mirror of https://github.com/michaelrausch/Party-Parrots-At-Sea.git synced 2026-05-09 06:18:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Added Madagascar Map

Browse Source 
tags : #story[1275]
This commit is contained in:
Alistair McIntyre
2017-09-28 14:41:35 +13:00
parent d2a05de25a
commit d7fc339ad5
4 changed files with 30 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/seng302/gameServer/messages/MarkRoundingMessage.java
+1
View File
@@ -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);
src/main/java/seng302/model/mark/CompoundMark.java
-1
View File
@@ -72,7 +72,6 @@ public class CompoundMark {
getSubMark(1).setRoundingSide(RoundingSide.STARBOARD);
break;
}
}
src/main/java/seng302/visualiser/MapMaker.java
+2 -2
View File
@@ -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<String> maps = new ArrayList<>(Arrays.asList("default.xml", "horseshoe.xml", "loop.xml"));
private List<String> maps = new ArrayList<>(
Arrays.asList("default.xml", "horseshoe.xml", "madagascar.xml", "loop.xml"));
public static MapMaker getInstance() {
if (instance == null) {
src/main/resources/maps/madagascar.xml
+27 -26
View File
@@ -3,62 +3,63 @@
<CourseName>Madagascar</CourseName>
<CentralLat>57.6679590</CentralLat>
<CentralLng>11.8503233</CentralLng>
<CentralLat>-15.67707</CentralLat>
<CentralLng>49.79338</CentralLng>
<MaxPlayers>10</MaxPlayers>
<Marks>
<CompoundMark CompoundMarkID="1">
<Mark Lat="57.670603" Lng="11.828262"/>
<Mark Lat="57.669445" Lng="11.826413"/>
<Mark Lat="-15.67466" Lng="49.79104"/>
<Mark Lat="-15.67408" Lng="49.79224"/>
</CompoundMark>
<CompoundMark CompoundMarkID="2">
<Mark Lat="57.6675700" Lng="11.8359880"/>
<Mark Lat="-15.67548" Lng="49.79271"/>
</CompoundMark>
<CompoundMark CompoundMarkID="3">
<Mark Lat="57.6708220" Lng="11.8433900"/>
<Mark Lat="57.671629" Lng="11.840951"/>
<Mark Lat="-15.67744" Lng="49.79235"/>
</CompoundMark>
<CompoundMark CompoundMarkID="4">
<Mark Lat="57.664190" Lng="11.829576"/>
<Mark Lat="57.665316" Lng="11.827184"/>
<Mark Lat="-15.67691" Lng="49.79501"/>
</CompoundMark>
<CompoundMark CompoundMarkID="5">
<Mark Lat="57.672350" Lng="11.842535"/>
<Mark Lat="57.6715240" Lng="11.8444950"/>
<Mark Lat="-15.67775" Lng="49.79619"/>
<Mark Lat="-15.67827" Lng="49.79713"/>
</CompoundMark>
<CompoundMark CompoundMarkID="6">
<Mark Lat="-15.67922" Lng="49.79318"/>
<Mark Lat="-15.67972" Lng="49.79393"/>
</CompoundMark>
</Marks>
<Course>
<OpeningSegment>
<Corner CompoundMarkID="1" Rounding="PS"/>
<Corner CompoundMarkID="2" Rounding="P"/>
</OpeningSegment>
<RepeatingSegment>
<Corner CompoundMarkID="3" Rounding="SP"/>
<Corner CompoundMarkID="4" Rounding="PS"/>
<Corner CompoundMarkID="2" Rounding="P"/>
<Corner CompoundMarkID="3" Rounding="S"/>
<Corner CompoundMarkID="4" Rounding="S"/>
<Corner CompoundMarkID="3" Rounding="P"/>
</RepeatingSegment>
<ClosingSegment>
<Corner CompoundMarkID="5" Rounding="PS"/>
<Corner CompoundMarkID="6" Rounding="PS"/>
</ClosingSegment>
</Course>
<CourseLimit>
<Limit Lat="57.6739450" Lng="11.8417100"/>
<Limit Lat="57.6709520" Lng="11.8485010"/>
<Limit Lat="57.6690260" Lng="11.8472790"/>
<Limit Lat="57.6693140" Lng="11.8457610"/>
<Limit Lat="57.6665370" Lng="11.8432910"/>
<Limit Lat="57.6641400" Lng="11.8385840"/>
<Limit Lat="57.6629430" Lng="11.8332030"/>
<Limit Lat="57.6629480" Lng="11.8249660"/>
<Limit Lat="57.6686890" Lng="11.8250920"/>
<Limit Lat="57.6692230" Lng="11.8231430"/>
<Limit Lat="57.6725370" Lng="11.8272480"/>
<Limit Lat="57.6708220" Lng="11.8321340"/>
<Limit Lat="-15.67571" Lng="49.78984"/>
<Limit Lat="-15.6787" Lng="49.79024"/>
<Limit Lat="-15.68046" Lng="49.79247"/>
<Limit Lat="-15.68073" Lng="49.79599"/>
<Limit Lat="-15.67939" Lng="49.79855"/>
<Limit Lat="-15.67662" Lng="49.79855"/>
<Limit Lat="-15.67474" Lng="49.79694"/>
<Limit Lat="-15.67271" Lng="49.79355"/>
<Limit Lat="-15.67333" Lng="49.79071"/>
</CourseLimit>
</RaceDefinition>