fanwuyang/SENG302
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Made SailsInCommand and SailsOutCommand one class. #story[1098]

Browse Source
This commit is contained in:
Joseph Gardner
2017-08-10 13:14:58 +12:00
parent 321dcde72f
commit 20302496f0
5 changed files with 14 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
racevisionGame/src/main/java/mock/model/MockBoat.java
+1 -1
View File
@@ -33,7 +33,7 @@ public class MockBoat extends Boat {
/**
* Stores whether the boat is on autoVMG or not
*/
private boolean autoVMG = true;
private boolean autoVMG = false;
racevisionGame/src/main/java/mock/model/MockRace.java
+4 -4
View File
@@ -321,10 +321,10 @@ public class MockRace extends Race {
if (!finish && totalElapsedMilliseconds >= updatePeriodMilliseconds && !boat.isSailsOut()) {
if (boat.getCurrentSpeed() == 0) {
newOptimalVMG(boat);
boat.setBearing(boat.calculateBearingToNextMarker());
}
// if (boat.getCurrentSpeed() == 0) {
// newOptimalVMG(boat);
// boat.setBearing(boat.calculateBearingToNextMarker());
// }
setBoatSpeed(boat);
racevisionGame/src/main/java/mock/model/commandFactory/CommandFactory.java
+4 -2
View File
@@ -19,8 +19,10 @@ public class CommandFactory {
switch(action) {
case AUTO_PILOT: return new VMGCommand(race, boat);
case TACK_GYBE: return new TackGybeCommand(race, boat);
case SAILS_IN: return new SailsInCommand(race, boat);
case SAILS_OUT: return new SailsOutCommand(race, boat);
case UPWIND: return new WindCommand(race, boat, true);
case DOWNWIND: return new WindCommand(race, boat, false);
case SAILS_OUT: return new SailsCommand(race, boat, true);
case SAILS_IN: return new SailsCommand(race, boat, false);
default: return null; // TODO - please please have discussion over what to default to
}
}
racevisionGame/src/main/java/mock/model/commandFactory/SailsInCommand.java → racevisionGame/src/main/java/mock/model/commandFactory/SailsCommand.java
+5 -4
View File
@@ -3,18 +3,19 @@ package mock.model.commandFactory;
import mock.model.MockBoat;
import mock.model.MockRace;
public class SailsInCommand implements Command {
public class SailsCommand implements Command {
private MockRace race;
private MockBoat boat;
private boolean sailsOut;
public SailsInCommand(MockRace race, MockBoat boat) {
public SailsCommand(MockRace race, MockBoat boat, Boolean sailsOut) {
this.race = race;
this.boat = boat;
this.sailsOut = sailsOut;
}
@Override
public void execute() {
this.boat.setSailsOut(false);
System.out.println("hi");
this.boat.setSailsOut(this.sailsOut);
}
}
racevisionGame/src/main/java/mock/model/commandFactory/SailsOutCommand.java
-20
View File
@@ -1,20 +0,0 @@
package mock.model.commandFactory;
import mock.model.MockBoat;
import mock.model.MockRace;
public class SailsOutCommand implements Command {
private MockRace race;
private MockBoat boat;
public SailsOutCommand(MockRace race, MockBoat boat) {
this.race = race;
this.boat = boat;
}
@Override
public void execute() {
this.boat.setSailsOut(true);
System.out.println("hi2");
}
}