Skip to content

finished assignment.still needs some styling #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
epidemicflu wants to merge 1 commit into
base: master
Choose a base branch
from
Open

finished assignment.still needs some styling #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions starter_code/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
<!-- Link JQuery here -->

<!-- Link script.js here -->
<script src= "script.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script>
Copy link
Member

@Peleg Peleg Oct 29, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you should switch the order of the two. if script.js is relying on jquery you'll have to switch em around

</head>

<body>
Expand Down
26 changes: 25 additions & 1 deletion starter_code/script.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,41 @@ var aiPoint = 0;
// This function returns the selection of the computer
function getAISelection() {
//TODO: randomly choose between 'rock', 'paper', or 'scissors'
var random = Math.random();
if (random < 1/3){
return 'rock';
}
if (random < 2/3){
return 'scissors';
}
return 'paper';

}
Copy link
Member

@Peleg Peleg Oct 29, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice job!


// This function picks the winner
function pickWinner(userValue, aiValue) {
//TODO: pick the correct winner: user or ai
//TODO: Add one point for the winner
if(userValue == aiValue){
return 'draw';
}
// && and
// || or
if(userValue === 'rock' && aiValue === 'scissors' ||
userValue === 'paper' && aiValue === 'rock' ||
userValue === 'scissors' && aiValue === 'paper'){
userPoint++
return 'user'
}
aiPoint += 1;
return 'ai'

}

// This function sets the scoreboard with the correct points
function setScore() {

$('#userPoint').text(userPoint);
$('#aiPoint').text(aiPoint);
}

// This function captures the click and picks the winner
Expand Down