Skip to content

Finished assignment, still needs styling #2

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
Inferiorbunny24 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Finished assignment, still needs styling #2

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
5 changes: 4 additions & 1 deletion starter_code/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,20 @@
<!-- Enter a title for your game here -->
</title>
<!-- Link CSS here -->
<link rel="stylesheet" href="style.css" type="text/css"/>

<!-- Link JQuery here -->

<script src ="https://code.jquery.com/jquery-2.1.4.min.js"></script>
<!-- Link script.js here -->
<script src ="script.js"></script>
</head>

<body>

<div class="container">
<div id="rock" class="token">ROCK</div>
<div id="paper" class="token">PAPER</div>
<div id="scissors" class="token">SCISSORS</div>
<!-- Create Scissors option here -->
</div>

Expand Down
33 changes: 30 additions & 3 deletions starter_code/script.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,26 +4,52 @@ 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 'paper';
}
return 'scissors';
}

// 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';
}

if(userValue === 'rock' && aiValue === 'paper' ||
userValue === 'paper' && aiValue === 'scissors'||
userValue === 'scissors' && aiValue === 'rock')
{
aiPoint += 1;
return 'ai'
}
userPoint += 1;
return 'user'
}

// 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
function evaluate(evt) {
debugger
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.

did that work alright for you? if not, make sure to have your browser's console open when you run the function!

var userValue = evt.target.getAttribute('id');
var aiValue = getAISelection();

var winner = pickWinner(userValue, aiValue);

setScore();
if ( 'user' === winner ) {
$('#message').delay(50).text('You have won!, Click a box to play again');
} else if ( winner === 'draw' ) {
Expand All @@ -35,5 +61,6 @@ function evaluate(evt) {

// This function runs on page load
$(document).ready(function(){

setScore();
$('.token').on('click', evaluate);
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.

really nice work

});