local-sandbox
/
cards
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove unused discard

master
Bel LaPointe 2021-03-16 22:42:28 -05:00
parent 3e71ab6217
commit ec81bb24ad
2 changed files with 2 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/entity/deck.go
View File

@ -3,8 +3,7 @@ package entity
import "math/rand" import "math/rand"
type Deck struct { type Deck struct {
Deck []Card Deck []Card
Discard []Card
} }
func (d *Deck) Shuffle() { func (d *Deck) Shuffle() {
@ -12,9 +11,6 @@ func (d *Deck) Shuffle() {
} }
func (d *Deck) Draw() Card { func (d *Deck) Draw() Card {
if len(d.Deck) == 0 {
d.ShuffleInDiscard()
}
if len(d.Deck) == 0 { if len(d.Deck) == 0 {
panic("cannot draw from an empty deck") panic("cannot draw from an empty deck")
} }
@ -23,17 +19,6 @@ func (d *Deck) Draw() Card {
return card return card
} }
func (d *Deck) ShuffleInDiscard() {
if len(d.Discard) == 0 {
return
}
for i := range d.Discard {
d.Deck = append(d.Deck, d.Discard[i])
}
d.Discard = d.Discard[:0]
shuffle(d.Deck)
}
func shuffle(cards []Card) { func shuffle(cards []Card) {
if len(cards) == 0 { if len(cards) == 0 {
return return

6
src/game/rule/operation/phase_test.go
View File

@ -150,18 +150,14 @@ func TestDeal(t *testing.T) {
func newDeck() entity.Deck { func newDeck() entity.Deck {
deck := make([]entity.Card, 0, 26) deck := make([]entity.Card, 0, 26)
discard := make([]entity.Card, 0, 26)
for i := 0; i < 52; i++ { for i := 0; i < 52; i++ {
card := entity.Card{Suit: i % 4, Value: i % 13} card := entity.Card{Suit: i % 4, Value: i % 13}
if i%2 == 1 { if i%2 == 1 {
deck = append(deck, card) deck = append(deck, card)
} else {
discard = append(discard, card)
} }
} }
return entity.Deck{ return entity.Deck{
Deck: deck, Deck: deck,
Discard: discard,
} }
} }