diff --git a/game/game.go b/game/game.go index 1100097..f7071f5 100644 --- a/game/game.go +++ b/game/game.go @@ -28,8 +28,9 @@ func NewGame() *Game { } func (g *Game) StartRound() { - g.PP[0].StartRound() - g.PP[1].StartRound() + g.HP = int8(g.RNG.Intn(3) + 2) + g.PP[0].StartRound(g.HP) + g.PP[1].StartRound(g.HP) g.Round++ g.Group = 0 g.StartGroup() @@ -37,9 +38,8 @@ func (g *Game) StartRound() { func (g *Game) StartGroup() { items := g.RNG.Intn(4) + 1 - g.HP = int8(g.RNG.Intn(3) + 2) - g.PP[0].StartGroup(&g.RNG, g.HP, items) - g.PP[1].StartGroup(&g.RNG, g.HP, items) + g.PP[0].StartGroup(&g.RNG, items) + g.PP[1].StartGroup(&g.RNG, items) shells := g.RNG.Intn(6) + 2 for i := 0; i < shells/2; i++ { g.ShellArray[i] = true diff --git a/game/player.go b/game/player.go index a86233a..46eeada 100644 --- a/game/player.go +++ b/game/player.go @@ -13,12 +13,12 @@ type Player struct { Cuffs CuffState } -func (p *Player) StartRound() { +func (p *Player) StartRound(hp int8) { + p.HP = hp clear(p.Items[:]) } -func (p *Player) StartGroup(rng *RNG, hp int8, items int) { - p.HP = hp +func (p *Player) StartGroup(rng *RNG, items int) { for i := 0; i < items; i++ { k := slices.Index(p.Items[:], ItemNone) if k < 0 {