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 proper the starting locations for marks and boats.

Browse Source
This commit is contained in:
Kusal Ekanayake
2017-07-25 18:48:33 +12:00
parent e569574c01
commit 4f2dca7ecf
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/seng302/models/Yacht.java
+2 -2
View File
@@ -108,8 +108,8 @@ public class Yacht {
this.country = country; this.country = country;
this.position = "-"; this.position = "-";
this.sailIn = false; this.sailIn = false;
this.location = new GeoPoint(57.6679590, 11.8503233); this.location = new GeoPoint(57.670341, 11.826856);
this.heading = 0.0; this.heading = 120.0;
this.velocity = 50000.0; this.velocity = 50000.0;
} }
src/main/resources/config/course.xml
+2 -2
View File
@@ -12,8 +12,8 @@
</mark> </mark>
<mark> <mark>
<name>Start2</name> <name>Start2</name>
<latitude>57.6706330</latitude> <latitude>57.6703330</latitude>
<longitude>11.8281330</longitude> <longitude>11.8271333</longitude>
<id>123</id> <id>123</id>
</mark> </mark>
</gate> </gate>
src/main/resources/server_config/xml_templates/race.ftlh
+6 -6
View File
@@ -13,19 +13,19 @@
<Course> <Course>
<CompoundMark CompoundMarkID="1" Name="Mark0"> <CompoundMark CompoundMarkID="1" Name="Mark0">
<Mark SeqID="1" Name="Start Line 1" TargetLat="57.6703330" TargetLng="11.8278330" SourceID="122" /> <Mark SeqID="1" Name="Start Line 1" TargetLat="57.670603" TargetLng="11.828262" SourceID="122" />
<Mark SeqID="2" Name="Start Line 2" TargetLat="57.6703330" TargetLng="11.8278330" SourceID="123" /> <Mark SeqID="2" Name="Start Line 2" TargetLat="57.669445" TargetLng="11.826413" SourceID="123" />
</CompoundMark> </CompoundMark>
<CompoundMark CompoundMarkID="2" Name="Mark1"> <CompoundMark CompoundMarkID="2" Name="Mark1">
<Mark SeqID="1" Name="Mark1" TargetLat="57.6675700" TargetLng="11.8359880" SourceID="131" /> <Mark SeqID="1" Name="Mark1" TargetLat="57.6675700" TargetLng="11.8359880" SourceID="131" />
</CompoundMark> </CompoundMark>
<CompoundMark CompoundMarkID="3" Name="Mark2"> <CompoundMark CompoundMarkID="3" Name="Mark2">
<Mark SeqID="1" Name="Lee Gate 1" TargetLat="57.6708220" TargetLng="11.8433900" SourceID="124" /> <Mark SeqID="1" Name="Lee Gate 1" TargetLat="57.6708220" TargetLng="11.8433900" SourceID="124" />
<Mark SeqID="2" Name="Lee Gate 2" TargetLat="57.6708220" TargetLng="11.8433900" SourceID="125" /> <Mark SeqID="2" Name="Lee Gate 2" TargetLat="57.671629" TargetLng="11.840951" SourceID="125" />
</CompoundMark> </CompoundMark>
<CompoundMark CompoundMarkID="4" Name="Mark3"> <CompoundMark CompoundMarkID="4" Name="Mark3">
<Mark SeqID="1" Name="Wind Gate 1" TargetLat="57.6650170" TargetLng="11.8279170" SourceID="126" /> <Mark SeqID="1" Name="Wind Gate 1" TargetLat="57.665316" TargetLng="11.827184" SourceID="126" />
<Mark SeqID="2" Name="Wind Gate 2" TargetLat="57.6650170" TargetLng="11.8279170" SourceID="127" /> <Mark SeqID="2" Name="Wind Gate 2" TargetLat="57.664190" TargetLng="11.829576" SourceID="127" />
</CompoundMark> </CompoundMark>
<CompoundMark CompoundMarkID="5" Name="Mark2"> <CompoundMark CompoundMarkID="5" Name="Mark2">
<Mark SeqID="1" Name="Lee Gate 1" TargetLat="57.6708220" TargetLng="11.8433900" SourceID="124" /> <Mark SeqID="1" Name="Lee Gate 1" TargetLat="57.6708220" TargetLng="11.8433900" SourceID="124" />
@@ -52,7 +52,7 @@
<Mark SeqID="2" Name="Wind Gate 2" TargetLat="57.6650170" TargetLng="11.8279170" SourceID="127" /> <Mark SeqID="2" Name="Wind Gate 2" TargetLat="57.6650170" TargetLng="11.8279170" SourceID="127" />
</CompoundMark> </CompoundMark>
<CompoundMark CompoundMarkID="11" Name="Mark4"> <CompoundMark CompoundMarkID="11" Name="Mark4">
<Mark SeqID="1" Name="Finish Line 1" TargetLat="57.6715240" TargetLng="11.8444950" SourceID="128" /> <Mark SeqID="1" Name="Finish Line 1" TargetLat="57.672350" TargetLng="11.842535" SourceID="128" />
<Mark SeqID="2" Name="Finish Line 2" TargetLat="57.6715240" TargetLng="11.8444950" SourceID="129" /> <Mark SeqID="2" Name="Finish Line 2" TargetLat="57.6715240" TargetLng="11.8444950" SourceID="129" />
</CompoundMark> </CompoundMark>
</Course> </Course>