Skip to content

Commit e1884c8

Browse files
author
Thomas Schissler
committed
Fixed formatting of js files
1 parent 9f2e5da commit e1884c8

File tree

7 files changed

+86
-93
lines changed

7 files changed

+86
-93
lines changed

‎GameController/gameController.js

+11-14
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,24 @@
11
class GameController {
2-
static InitializeShips ()
3-
{
2+
static InitializeShips() {
43
var colors = require("cli-color");
54
const Ship = require("./ship.js");
6-
var ships =
7-
[
8-
new Ship("Aircraft Carrier", 5, colors.CadetBlue ),
9-
new Ship("Battleship", 4, colors.Red ),
10-
new Ship("Submarine", 3, colors.Chartreuse ),
11-
new Ship("Destroyer", 3, colors.Yellow ),
12-
new Ship("Patrol Boat", 2, colors.Orange )
5+
var ships = [
6+
new Ship("Aircraft Carrier", 5, colors.CadetBlue),
7+
new Ship("Battleship", 4, colors.Red),
8+
new Ship("Submarine", 3, colors.Chartreuse),
9+
new Ship("Destroyer", 3, colors.Yellow),
10+
new Ship("Patrol Boat", 2, colors.Orange)
1311
];
1412
return ships;
1513
}
16-
17-
static CheckIsHit (ships, shot)
18-
{
14+
15+
static CheckIsHit(ships, shot) {
1916
if (shot == undefined)
2017
throw "The shooting position is not defined";
2118
if (ships == undefined)
2219
throw "No ships defined";
2320
var returnvalue = false;
24-
ships.forEach(function(ship) {
21+
ships.forEach(function (ship) {
2522
ship.positions.forEach(position => {
2623
if (position.row == shot.row && position.column == shot.column)
2724
returnvalue = true;
@@ -30,7 +27,7 @@ class GameController {
3027
return returnvalue;
3128
}
3229

33-
static isShipValid (ship) {
30+
static isShipValid(ship) {
3431
return ship.positions.length == ship.size;
3532
}
3633
}

‎GameController/letters.js

+12-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,15 @@
11
require('enum').register();
2-
var Letters = new Enum({'A': 1, 'B': 2, 'C': 3, 'D': 4, 'E': 5, 'F': 6, 'G': 7, 'H': 8}, { ignoreCase: true });
2+
var Letters = new Enum({
3+
'A': 1,
4+
'B': 2,
5+
'C': 3,
6+
'D': 4,
7+
'E': 5,
8+
'F': 6,
9+
'G': 7,
10+
'H': 8
11+
}, {
12+
ignoreCase: true
13+
});
314

415
module.exports = Letters;

‎GameController/position.js

+3-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
1-
class Position
2-
{
3-
constructor(column, row)
4-
{
1+
class Position {
2+
constructor(column, row) {
53
this.column = column;
64
this.row = row;
75
}
86
}
97

10-
module.exports = Position;
8+
module.exports = Position;

‎GameController/ship.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
class Ship
2-
{
3-
constructor (name, size, color) {
1+
class Ship {
2+
constructor(name, size, color) {
43
this.name = name;
54
this.size = size;
65
this.color = color;

‎GameController_Tests/checkIsHitTests.js

+17-18
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,38 @@
11
const assert = require('assert').strict;
2-
const gameController=require("../GameController/gameController.js");
3-
const letters=require("../GameController/letters.js");
4-
const position=require("../GameController/position.js")
2+
const gameController = require("../GameController/gameController.js");
3+
const letters = require("../GameController/letters.js");
4+
const position = require("../GameController/position.js")
55

6-
describe('checkIsHitTests', function() {
6+
describe('checkIsHitTests', function () {
77

8-
it('should return true if there is a ship at the shooting position', function() {
8+
it('should return true if there is a ship at the shooting position', function () {
99
var ships = gameController.InitializeShips();
10-
counter=1;
10+
counter = 1;
1111
ships.forEach(ship => {
12-
for(var i = 1; i <= ship.size; i++) {
12+
for (var i = 1; i <= ship.size; i++) {
1313
column = letters.get(counter);
1414
ship.addPosition(new position(letters.get(counter), i))
1515
}
1616
counter++;
1717
})
18-
var actual = gameController.CheckIsHit(ships, new position(letters.B,3));
18+
var actual = gameController.CheckIsHit(ships, new position(letters.B, 3));
1919
assert.ok(actual);
2020
});
2121

22-
it('should return false if there is no ship at the shooting position', function() {
22+
it('should return false if there is no ship at the shooting position', function () {
2323
var ships = gameController.InitializeShips();
24-
counter=1;
24+
counter = 1;
2525
ships.forEach(ship => {
26-
for(var i = 1; i <= ship.size; i++) {
26+
for (var i = 1; i <= ship.size; i++) {
2727
ship.addPosition(new position(letters.get(counter), i))
2828
}
2929
counter++;
3030
})
31-
var actual = gameController.CheckIsHit(ships, new position(letters.G,1));
32-
assert.strictEqual(actual, false );
31+
var actual = gameController.CheckIsHit(ships, new position(letters.G, 1));
32+
assert.strictEqual(actual, false);
3333
});
3434

35-
it('should throw an exception if positstion is undefined', function() {
35+
it('should throw an exception if positstion is undefined', function () {
3636
var ships = gameController.InitializeShips();
3737
assert.throws(
3838
() => {
@@ -41,12 +41,11 @@ describe('checkIsHitTests', function() {
4141
)
4242
});
4343

44-
it('should throw an exception if ship is undefined', function() {
44+
it('should throw an exception if ship is undefined', function () {
4545
assert.throws(
4646
() => {
47-
var actual = gameController.CheckIsHit(undefined, new position(letters.G,1));
47+
var actual = gameController.CheckIsHit(undefined, new position(letters.G, 1));
4848
}
4949
)
5050
});
51-
});
52-
51+
});

‎GameController_Tests/isShipValidTests.js

+8-10
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
const assert = require('assert').strict;
2-
const gameController=require("../GameController/gameController.js");
3-
const letters=require("../GameController/letters.js");
4-
const position=require("../GameController/position.js")
5-
const ship=require("../GameController/ship");
2+
const gameController = require("../GameController/gameController.js");
3+
const letters = require("../GameController/letters.js");
4+
const position = require("../GameController/position.js")
5+
const ship = require("../GameController/ship");
66

7-
describe('isShipValidTests', function() {
7+
describe('isShipValidTests', function () {
88

9-
it('should return true if the ship is valid', function() {
9+
it('should return true if the ship is valid', function () {
1010
var testship = new ship("Battleship", 3, 0);
1111
testship.addPosition(new position(letters.A, 1));
1212
testship.addPosition(new position(letters.A, 2));
@@ -16,12 +16,10 @@ describe('isShipValidTests', function() {
1616
assert.ok(actual);
1717
});
1818

19-
it('should return false if the ship is invalid', function() {
19+
it('should return false if the ship is invalid', function () {
2020
var testship = new ship("Battleship", 3, 0);
2121

2222
var actual = gameController.isShipValid(testship);
2323
assert.ok(!actual);
2424
});
25-
});
26-
27-
25+
});

‎battleship.js

+33-42
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
const readline = require('readline-sync');
2-
const gameController=require("./GameController/gameController.js");
2+
const gameController = require("./GameController/gameController.js");
33
const cliColor = require('cli-color');
44
const beep = require('beepbeep');
5-
const position=require("./GameController/position.js");
6-
const letters=require("./GameController/letters.js");
5+
const position = require("./GameController/position.js");
6+
const letters = require("./GameController/letters.js");
77

88
class Battleship {
99

@@ -27,8 +27,7 @@ class Battleship {
2727
this.StartGame();
2828
}
2929

30-
StartGame()
31-
{
30+
StartGame() {
3231
console.clear();
3332
console.log(" __");
3433
console.log(" / \\");
@@ -41,15 +40,13 @@ class Battleship {
4140
console.log(" \\ \\_/");
4241
console.log(" \"\"\"\"");
4342

44-
do
45-
{
43+
do {
4644
console.log();
4745
console.log("Player, it's your turn");
4846
console.log("Enter coordinates for your shot :");
4947
var position = Battleship.ParsePosition(readline.question());
5048
var isHit = gameController.CheckIsHit(this.enemyFleet, position);
51-
if (isHit)
52-
{
49+
if (isHit) {
5350
beep();
5451

5552
console.log(" \\ . ./");
@@ -67,9 +64,8 @@ class Battleship {
6764
var computerPos = this.GetRandomPosition();
6865
var isHit = gameController.CheckIsHit(this.myFleet, computerPos);
6966
console.log();
70-
console.log(`Computer shot in ${computerPos.column}${computerPos.row} and `+ (isHit ? `has hit your ship !` : `miss`));
71-
if (isHit)
72-
{
67+
console.log(`Computer shot in ${computerPos.column}${computerPos.row} and ` + (isHit ? `has hit your ship !` : `miss`));
68+
if (isHit) {
7369
beep();
7470

7571
console.log(" \\ . ./");
@@ -85,72 +81,67 @@ class Battleship {
8581
while (true);
8682
}
8783

88-
static ParsePosition(input)
89-
{
84+
static ParsePosition(input) {
9085
var letter = letters.get(input.toUpperCase().substring(0, 1));
9186
var number = parseInt(input.substring(1, 2), 10);
9287
return new position(letter, number);
9388
}
9489

95-
GetRandomPosition()
96-
{
90+
GetRandomPosition() {
9791
var rows = 8;
9892
var lines = 8;
9993
var rndColumn = Math.floor((Math.random() * lines));
100-
var letter = letters.get(rndColumn+1);
94+
var letter = letters.get(rndColumn + 1);
10195
var number = Math.floor((Math.random() * rows));
10296
var result = new position(letter, number);
10397
return result;
10498
}
10599

106-
InitializeGame()
107-
{
100+
InitializeGame() {
108101
this.InitializeMyFleet();
109102
this.InitializeEnemyFleet();
110103
}
111104

112-
InitializeMyFleet()
113-
{
105+
InitializeMyFleet() {
114106
this.myFleet = gameController.InitializeShips();
115107

116108
console.log("Please position your fleet (Game board size is from A to H and 1 to 8) :");
117109

118-
this.myFleet.forEach(function(ship) {
110+
this.myFleet.forEach(function (ship) {
119111
console.log();
120112
console.log(`Please enter the positions for the ${ship.name} (size: ${ship.size})`);
121-
for (var i = 1; i < ship.size+1; i++) {
113+
for (var i = 1; i < ship.size + 1; i++) {
122114
console.log(`Enter position ${i} of ${ship.size} (i.e A3):`);
123115
const position = readline.question();
124116
ship.addPosition(Battleship.ParsePosition(position));
125117
}
126118
})
127119
}
128120

129-
InitializeEnemyFleet()
130-
{
121+
InitializeEnemyFleet() {
131122
this.enemyFleet = gameController.InitializeShips();
132123

133-
this.enemyFleet[0].addPosition(new position ( letters.B, 4 ));
134-
this.enemyFleet[0].addPosition(new position ( letters.B, 5 ));
135-
this.enemyFleet[0].addPosition(new position ( letters.B, 6 ));
136-
this.enemyFleet[0].addPosition(new position ( letters.B, 7 ));
137-
this.enemyFleet[0].addPosition(new position ( letters.B, 8 ));
124+
this.enemyFleet[0].addPosition(new position(letters.B, 4));
125+
this.enemyFleet[0].addPosition(new position(letters.B, 5));
126+
this.enemyFleet[0].addPosition(new position(letters.B, 6));
127+
this.enemyFleet[0].addPosition(new position(letters.B, 7));
128+
this.enemyFleet[0].addPosition(new position(letters.B, 8));
138129

139-
this.enemyFleet[1].addPosition(new position ( letters.E, 6 ));
140-
this.enemyFleet[1].addPosition(new position ( letters.E, 7 ));
141-
this.enemyFleet[1].addPosition(new position ( letters.E, 8 ));
142-
this.enemyFleet[1].addPosition(new position ( letters.E, 9 ));
130+
this.enemyFleet[1].addPosition(new position(letters.E, 6));
131+
this.enemyFleet[1].addPosition(new position(letters.E, 7));
132+
this.enemyFleet[1].addPosition(new position(letters.E, 8));
133+
this.enemyFleet[1].addPosition(new position(letters.E, 9));
143134

144-
this.enemyFleet[2].addPosition(new position ( letters.A, 3 ));
145-
this.enemyFleet[2].addPosition(new position ( letters.B, 3 ));
146-
this.enemyFleet[2].addPosition(new position ( letters.C, 3 ));
135+
this.enemyFleet[2].addPosition(new position(letters.A, 3));
136+
this.enemyFleet[2].addPosition(new position(letters.B, 3));
137+
this.enemyFleet[2].addPosition(new position(letters.C, 3));
147138

148-
this.enemyFleet[3].addPosition(new position ( letters.F, 8 ));
149-
this.enemyFleet[3].addPosition(new position ( letters.G, 8 ));
150-
this.enemyFleet[3].addPosition(new position ( letters.H, 8 ));
139+
this.enemyFleet[3].addPosition(new position(letters.F, 8));
140+
this.enemyFleet[3].addPosition(new position(letters.G, 8));
141+
this.enemyFleet[3].addPosition(new position(letters.H, 8));
151142

152-
this.enemyFleet[4].addPosition(new position ( letters.C, 5 ));
153-
this.enemyFleet[4].addPosition(new position ( letters.C, 6 ));
143+
this.enemyFleet[4].addPosition(new position(letters.C, 5));
144+
this.enemyFleet[4].addPosition(new position(letters.C, 6));
154145
}
155146
}
156147

0 commit comments

Comments
 (0)