Skip to content

Commit 2bd4c64

Browse files
author
Pratham Gupta
committed
getters and setters for player, card, structuring
1 parent e33237d commit 2bd4c64

File tree

10 files changed

+81
-51
lines changed

10 files changed

+81
-51
lines changed

‎client/index.ejs

+6-6
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,21 @@
44
<script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.22.2/moment.min.js"></script>
55
<script src="https://cdnjs.cloudflare.com/ajax/libs/qs/6.6.0/qs.min.js"></script>
66
<script src="/socket.io/socket.io.js"></script>
7-
<script src="js/Card.js"></script>
8-
<script src="js/Game.js"></script>
9-
<script src="js/Player.js"></script>
10-
<script src="js/renderDeck.js"></script>
7+
<script src="js/elements/Card.js"></script>
8+
<script src="js/elements/Game.js"></script>
9+
<script src="js/elements/Player.js"></script>
1110
<script src="js/bluff.js"></script>
12-
<script src="js/cardStack.js"></script>
1311
<script src="js/bluffData.js"></script>
14-
<script src="js/submitCard.js"></script>
12+
<script src="js/modal.js"></script>
1513
<script src="js/check.js"></script>
1614
<script src="js/activate-deactivate/deactivateAllPlayers.js"></script>
1715
<script src="js/activate-deactivate/activatePlayer.js"></script>
1816
<script src="js/activate-deactivate/deactivatePlayer.js"></script>
17+
<script src="js/render-elements/renderDeck.js"></script>
1918
<script src="js/render-elements/renderPlayer.js"></script>
2019
<script src="js/render-elements/renderCard.js"></script>
2120
<script src="js/render-elements/renderButton.js"></script>
21+
<script src="js/render-elements/renderStackCard.js"></script>
2222
<head>
2323
<meta charset="UTF-8">
2424
<meta name="viewport" content="width=device-width, initial-scale=1.0">

‎client/js/Card.js

-12
This file was deleted.

‎client/js/Player.js

-13
This file was deleted.

‎client/js/cardStack.js

-15
This file was deleted.

‎client/js/elements/Card.js

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
/* eslint-disable no-unused-vars */
2+
/*
3+
* Card class whose objects are used inside Game Decks.
4+
*/
5+
6+
class Card {
7+
constructor (cardSuit, cardValue, cardId) {
8+
this._suit = cardSuit
9+
this._value = cardValue
10+
this._id = cardId
11+
}
12+
13+
get suit () {
14+
return this._suit
15+
}
16+
17+
get value () {
18+
return this._value
19+
}
20+
21+
get id () {
22+
return this._id
23+
}
24+
}

‎client/js/Game.js renamed to ‎client/js/elements/Game.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ class Game {
164164

165165
// Attaching the number of cards each player gets to the player, to keep track of the number of cards the player has
166166
for (let i = 0; i < playerCount; i++) {
167-
this._players[i].numberOfCards = parts[i]
167+
this._players[i].cards.length = parts[i]
168168
}
169169
}
170170

@@ -173,9 +173,9 @@ class Game {
173173
let temp = this.deck
174174
for (let j = 0; j < this.players.length; j++) {
175175
// Giving the slice of cards each player will get
176-
this.players[j].cards = temp.slice(0, this.players[j].numberOfCards)
176+
this.players[j].cards = temp.slice(0, this.players[j].cards.length)
177177
// Reamaining cards for the next iteration
178-
temp = temp.splice(this.players[j].numberOfCards)
178+
temp = temp.splice(this.players[j].cards.length)
179179
}
180180
}
181181
}

‎client/js/elements/Player.js

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
/* eslint-disable no-unused-vars */
2+
// Creating the player containing the name of the player,
3+
// number of cards of the player and cards that the player has
4+
// and the cards he has selected
5+
6+
class Player {
7+
constructor (name) {
8+
this._name = name
9+
this._cards = []
10+
this._selectedCards = []
11+
}
12+
13+
get name () {
14+
return this._name
15+
}
16+
17+
get cards () {
18+
return this._cards
19+
}
20+
21+
set cards (cards) {
22+
this._cards = cards
23+
}
24+
25+
get selectedCards () {
26+
return this._selectedCards
27+
}
28+
29+
set selectedCards (cards) {
30+
this._selectedCards = cards
31+
}
32+
}

‎client/js/submitCard.js renamed to ‎client/js/modal.js

File renamed without changes.

‎client/js/render-elements/renderButton.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,8 @@ function renderButton (game) {
1515
// Adding the clicked Card to Central Stack array
1616
game.centralStack.push(card)
1717
player.cards.splice(i, 1)
18-
player.numberOfCards = player.cards.length
1918
// rendering another flipped card to central deck
20-
cardStack()
19+
renderStackCard()
2120
}
2221
})
2322
})

‎client/js/render-elements/renderStackCard.js

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
/* eslint-disable no-unused-vars */
2+
/*
3+
* To add 'dummy' flipped cards to the rendered Central Deck
4+
* This is different from the CentralDeck array that actually stores the cards moved to the central deck
5+
*/
6+
7+
function renderStackCard () {
8+
const card = document.createElement('div')
9+
card.className = 'Card'
10+
const cardText = document.createElement('div')
11+
cardText.innerHTML = 'BLUFF!?'
12+
cardText.className = 'cardRank'
13+
card.appendChild(cardText)
14+
document.getElementById('CentralStack').appendChild(card)
15+
}

0 commit comments

Comments
 (0)