Skip to content

Commit a30c0f0

Browse files
committed
updates to chapter 2 code
1 parent 1949082 commit a30c0f0

File tree

2 files changed

+41
-62
lines changed

2 files changed

+41
-62
lines changed

chapter2/battleship-final.js

Lines changed: 21 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,30 @@
1-
// Ready Bake Code
2-
function logToBrowser(message) {
3-
var results = document.getElementById("results");
4-
results.innerHTML = results.innerHTML + "<br>" + message;
5-
}
6-
71
var randomLoc = Math.floor(Math.random() * 5);
82
var location1 = randomLoc;
93
var location2 = location1 + 1;
10-
var location3 = location2 + 1;
11-
var guess;
4+
var location3 = location1 + 2;
5+
var guess;
126
var hits = 0;
137
var guesses = 0;
148
var isSunk = false;
159

16-
while (isSunk == false) {
17-
guess = prompt("Ready, aim, fire! (enter a number from 0-6):");
18-
if (guess < 0 || guess > 6) {
19-
logToBrowser("Please enter a valid cell number!");
10+
while (isSunk == false) {
11+
guess = prompt("Ready, aim, fire! (enter a number from 0-6):");
12+
if (guess < 0 || guess > 6) {
13+
alert("Please enter a valid cell number!");
2014
} else {
21-
guesses = guesses + 1;
22-
23-
if (guess == location1 || guess == location2 || guess == location3) {
24-
logToBrowser("HIT!");
25-
hits = hits + 1;
26-
if (hits == 3) {
27-
isSunk = true;
28-
logToBrowser("You sank my battleship!");
29-
}
30-
} else {
31-
logToBrowser("MISS");
32-
}
33-
}
34-
}
15+
guesses = guesses + 1;
16+
if (guess == location1 || guess == location2 || guess == location3) {
17+
alert("HIT!");
18+
hits = hits + 1;
19+
if (hits == 3) {
20+
isSunk = true;
21+
alert("You sank my battleship!");
22+
}
23+
} else {
24+
alert("MISS");
25+
}
26+
}
27+
}
3528
var stats = "You took " + guesses + " guesses to sink the battleship, " +
36-
"which means your shooting accuracy was " + (3/guesses);
37-
logToBrowser(stats);
29+
"which means your shooting accuracy was " + (3/guesses);
30+
alert(stats);

chapter2/battleship.js

Lines changed: 20 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,29 @@
1-
// Ready Bake Code
2-
function logToBrowser(message) {
3-
var results = document.getElementById("results");
4-
results.innerHTML = results.innerHTML + "<br>" + message;
5-
console.log(message);
6-
alert(message);
7-
}
8-
9-
function getUserInput() {
10-
var input = prompt("Ready, aim, fire! (enter a number from 0-6):");
11-
return input;
12-
}
13-
141
var location1 = 3;
152
var location2 = 4;
163
var location3 = 5;
17-
var guess;
4+
var guess;
185
var hits = 0;
196
var guesses = 0;
207
var isSunk = false;
218

22-
while (isSunk == false) {
23-
guess = getUserInput();
24-
if (guess < 0 || guess > 6) {
25-
logToBrowser("Please enter a valid cell number!");
9+
while (isSunk == false) {
10+
guess = prompt("Ready, aim, fire! (enter a number from 0-6):");
11+
if (guess < 0 || guess > 6) {
12+
alert("Please enter a valid cell number!");
2613
} else {
27-
guesses = guesses + 1;
28-
29-
if (guess == location1 || guess == location2 || guess == location3) {
30-
logToBrowser("HIT!");
31-
hits = hits + 1;
32-
if (hits == 3) {
33-
isSunk = true;
34-
logToBrowser("You sank my battleship!");
35-
}
36-
} else {
37-
logToBrowser("MISS");
38-
}
39-
}
40-
}
14+
guesses = guesses + 1;
15+
if (guess == location1 || guess == location2 || guess == location3) {
16+
alert("HIT!");
17+
hits = hits + 1;
18+
if (hits == 3) {
19+
isSunk = true;
20+
alert("You sank my battleship!");
21+
}
22+
} else {
23+
alert("MISS");
24+
}
25+
}
26+
}
4127
var stats = "You took " + guesses + " guesses to sink the battleship, " +
42-
"which means your shooting accuracy was " + (3/guesses);
43-
logToBrowser(stats);
28+
"which means your shooting accuracy was " + (3/guesses);
29+
alert(stats);

0 commit comments

Comments
 (0)