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

Fixed faulty develop merge and completed manual testing before merging back into develop.

Browse Source 
tags: #story[1111]
This commit is contained in:
Alistair McIntyre
2017-08-14 14:15:34 +12:00
parent c52c345e53
commit 8b543488e3
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/seng302/visualiser/GameClient.java
+3 -1
View File
@@ -312,7 +312,9 @@ public class GameClient {
switch (e.getCode()) { switch (e.getCode()) {
//TODO 12/07/17 Determine the sail state and send the appropriate packet (eg. if sails are in, send a sail out packet) //TODO 12/07/17 Determine the sail state and send the appropriate packet (eg. if sails are in, send a sail out packet)
case SHIFT: // sails in/sails out case SHIFT: // sails in/sails out
socketThread.sendBoatAction(BoatAction.SAILS_IN); break; socketThread.sendBoatAction(BoatAction.SAILS_IN);
raceView.getGameView().getPlayerYacht().toggleClientSail();
break;
case PAGE_UP: case PAGE_UP:
case PAGE_DOWN: case PAGE_DOWN:
socketThread.sendBoatAction(BoatAction.MAINTAIN_HEADING); break; socketThread.sendBoatAction(BoatAction.MAINTAIN_HEADING); break;
src/test/java/steps/ToggleSailSteps.java
+4 -7
View File
@@ -3,18 +3,15 @@ package steps;
import cucumber.api.java.en.Given; import cucumber.api.java.en.Given;
import cucumber.api.java.en.Then; import cucumber.api.java.en.Then;
import cucumber.api.java.en.When; import cucumber.api.java.en.When;
import java.util.ArrayList;
import org.junit.Assert; import org.junit.Assert;
import seng302.gameServer.GameStages; import seng302.gameServer.GameStages;
import seng302.gameServer.GameState; import seng302.gameServer.GameState;
import seng302.gameServer.MainServerThread; import seng302.gameServer.MainServerThread;
import seng302.gameServer.server.messages.BoatActionMessage; import seng302.gameServer.server.messages.BoatAction;
import seng302.gameServer.server.messages.BoatActionType;
import seng302.model.Yacht; import seng302.model.Yacht;
import seng302.visualiser.ClientToServerThread; import seng302.visualiser.ClientToServerThread;
import java.util.ArrayList;
import java.util.Collections;
/** /**
* Created by kre39 on 7/08/17. * Created by kre39 on 7/08/17.
*/ */
@@ -45,9 +42,9 @@ public class ToggleSailSteps {
startTime = System.currentTimeMillis(); startTime = System.currentTimeMillis();
if (arg1 == "shift") { if (arg1 == "shift") {
if (sailsIn) { if (sailsIn) {
client.sendBoatActionMessage(new BoatActionMessage(BoatActionType.SAILS_OUT)); client.sendBoatAction(BoatAction.SAILS_OUT);
} else { } else {
client.sendBoatActionMessage(new BoatActionMessage(BoatActionType.SAILS_IN)); client.sendBoatAction(BoatAction.SAILS_IN);
} }
} }
} }