Whirlpools - interrupting trade routes

Previously trade routes were interrupted and cancelled when pirate ships ended on them. However this created the possibility of other players luring pirate ships onto opposition trade paths. Instead, whirlpools will now be used as the interruptors of trade paths whilst pirate ships will just chase ships and steal cargo.

contracts.js
* Method (contractObstacle) updated to check for whirlpools rather than pirate ships.

contracts.js

@@ -198,7 +198,7 @@ let tradeContracts = {
             for (let resourceType of this.resourcePieces) {
                 if (island.contracts[resourceType.goods].team == game.turn) {
                     if(island.contracts[resourceType.goods].struck == 'active') {
-                        if(this.contractObstacle(island.contracts[resourceType.goods].contractPath) == true) {
+                        if(this.contractObstacle(island.contracts[resourceType.goods].contractPath) === true) {
                             IDtradeRoute = resourceType.goods + '_' + island.name;
                             let closedTradeRoute = document.getElementById(IDtradeRoute);
                             closedTradeRoute.remove();
@@ -233,8 +233,8 @@ let tradeContracts = {
     // ------------------------------------------------------------------------------------------
     contractObstacle: function(tradePath) {
         let obstacle = false;
-        for (var i = 0; i < tradePath.length; i++) {
-            if(game.boardArray[tradePath[i].fromRow][tradePath[i].fromCol].piece.team == 'Pirate') {
+        for (let i = 0; i < tradePath.length; i+=1) {
+            if (game.boardArray[tradePath[i].fromRow][tradePath[i].fromCol].piece.type == 'whirlpool') {
                 obstacle = true;
                 //console.log(tradePath[i], 'Pirate');
             } else {

movement.js

@@ -177,7 +177,6 @@ let pieceMovement = {
                                         game.boardArray[startRow+i][startCol+j].tile.activeStatus = 'inactive';
                                     // Prevents damaged pirate ships targeting other ships
                                     } else if (game.boardArray[startRow][startCol].piece.damageStatus === 0) {
-                                        console.log('here2')
                                         this.findPath[startRow+i][startCol+j].activeStatus = 'inactive';
                                         game.boardArray[startRow+i][startCol+j].tile.activeStatus = 'inactive';
                                     }