studio/shotgun
2
0
Fork 0
Code Issues 3 Pull Requests Packages Projects Releases Wiki Activity

add adrenaline to dto

Browse Source
This commit is contained in:
Branden J Brown 2024-04-07 21:27:32 -05:00
parent 93716a7f0f
commit d0b3cbd47a
3 changed files with 35 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
game/game.go
View File

@ -277,6 +277,7 @@ func (g *Match) DTO(id player.ID, deadline time.Time) serve.Game {
Round: g.round, Round: g.round,
Dealer: g.CurrentPlayer() == &g.players[0], Dealer: g.CurrentPlayer() == &g.players[0],
Damage: g.damage, Damage: g.damage,
Adrenaline: g.adrenaline,
Shell: g.Peek(id), Shell: g.Peek(id),
Previous: g.prev, Previous: g.prev,
Deadline: deadline.UnixMilli(), Deadline: deadline.UnixMilli(),

6
game/game_test.go
View File

@ -32,6 +32,7 @@ func TestNewGame(t *testing.T) {
{g.hp < 2 || g.hp > 4, "hp is %d, want 2-4", []any{g.hp}}, {g.hp < 2 || g.hp > 4, "hp is %d, want 2-4", []any{g.hp}},
{g.damage != 1, "damage is %d, want 1", []any{g.damage}}, {g.damage != 1, "damage is %d, want 1", []any{g.damage}},
{g.reveal, "revealed at start", nil}, {g.reveal, "revealed at start", nil},
{g.adrenaline, "adrenaline at start", nil},
{g.prev != nil, "already discharged", nil}, {g.prev != nil, "already discharged", nil},
} }
for _, c := range checks { for _, c := range checks {
@ -60,6 +61,7 @@ func TestGameStartRound(t *testing.T) {
{g.hp < 2 || g.hp > 4, "hp is %d, want 2-4", []any{g.hp}}, {g.hp < 2 || g.hp > 4, "hp is %d, want 2-4", []any{g.hp}},
{g.damage != 1, "damage is %d, want 1", []any{g.damage}}, {g.damage != 1, "damage is %d, want 1", []any{g.damage}},
{g.reveal, "revealed at start", nil}, {g.reveal, "revealed at start", nil},
{g.adrenaline, "adrenaline at start", nil},
{g.prev != nil, "already discharged", nil}, {g.prev != nil, "already discharged", nil},
} }
for _, c := range checks { for _, c := range checks {
@ -95,6 +97,7 @@ func TestGameStartGroup(t *testing.T) {
{g.turn != 1, "turn is %d, want 1", []any{g.turn}}, {g.turn != 1, "turn is %d, want 1", []any{g.turn}},
{g.damage != 1, "damage is %d, want 1", []any{g.damage}}, {g.damage != 1, "damage is %d, want 1", []any{g.damage}},
{g.reveal, "revealed at start", nil}, {g.reveal, "revealed at start", nil},
{g.adrenaline, "adrenaline at start", nil},
{g.prev != nil, "already discharged", nil}, {g.prev != nil, "already discharged", nil},
} }
for _, c := range checks { for _, c := range checks {
@ -128,6 +131,7 @@ func TestGameNextTurn(t *testing.T) {
{g.turn != i, "turn is %d, want %d", []any{g.turn, i}}, {g.turn != i, "turn is %d, want %d", []any{g.turn, i}},
{g.damage != 1, "damage is %d, want 1", []any{g.damage}}, {g.damage != 1, "damage is %d, want 1", []any{g.damage}},
{g.reveal, "revealed at start", nil}, {g.reveal, "revealed at start", nil},
{g.adrenaline, "adrenaline at start", nil},
{g.CurrentPlayer().cuffs != uncuffed, "cuffs is %d, want %d", []any{g.CurrentPlayer().cuffs, uncuffed}}, {g.CurrentPlayer().cuffs != uncuffed, "cuffs is %d, want %d", []any{g.CurrentPlayer().cuffs, uncuffed}},
} }
for _, c := range checks { for _, c := range checks {
@ -451,6 +455,7 @@ func TestGameDTO(t *testing.T) {
Round: g.round, Round: g.round,
Dealer: false, Dealer: false,
Damage: g.damage, Damage: g.damage,
Adrenaline: false,
Shell: nil, Shell: nil,
Previous: nil, Previous: nil,
Live: len(g.shells) / 2, Live: len(g.shells) / 2,
@ -477,6 +482,7 @@ func TestGameDTO(t *testing.T) {
Round: g.round, Round: g.round,
Dealer: true, Dealer: true,
Damage: g.damage, Damage: g.damage,
Adrenaline: false,
Shell: nil, Shell: nil,
Previous: &g.shellArray[0], Previous: &g.shellArray[0],
Live: 0, Live: 0,

2
serve/dto.go
View File

@ -17,6 +17,8 @@ type Game struct {
Dealer bool `json:"dealer"` Dealer bool `json:"dealer"`
// Damage is the damage a live shell will deal this turn. // Damage is the damage a live shell will deal this turn.
Damage int8 `json:"damage"` Damage int8 `json:"damage"`
// Adrenaline indicates whether the current player has adrenaline.
Adrenaline bool `json:"adrenaline"`
// Shell gives whether the current shell is live if it is revealed. // Shell gives whether the current shell is live if it is revealed.
// Undefined if this game state is not for the current player or if the // Undefined if this game state is not for the current player or if the
// current player hasn't revealed it. // current player hasn't revealed it.