From 72a74a962831bfc668ed4df274f92a2f85354ef7 Mon Sep 17 00:00:00 2001
From: bvanvugt <1531419+bvanvugt@users.noreply.github.com>
Date: Fri, 2 Jul 2021 20:09:55 -0700
Subject: [PATCH] Remove ruleset versions for GitHub release version (future).

---
 cli/commands/play.go | 2 +-
 royale.go            | 6 ++----
 ruleset.go           | 3 +--
 solo.go              | 4 ++--
 squad.go             | 3 +--
 standard.go          | 3 +--
 6 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/cli/commands/play.go b/cli/commands/play.go
index 9f68292..1fcae19 100644
--- a/cli/commands/play.go
+++ b/cli/commands/play.go
@@ -325,7 +325,7 @@ func getIndividualBoardStateForSnake(state *rules.BoardState, snake Battlesnake,
 	response := ResponsePayload{
 		Game: GameResponse{Id: GameId, Timeout: Timeout, Ruleset: GameResponseRuleset{
 			Name:    ruleset.Name(),
-			Version: ruleset.Version(),
+			Version: "cli", // TODO: Use GitHub Release Version
 		}},
 		Turn: Turn,
 		Board: BoardResponse{
diff --git a/royale.go b/royale.go
index 34fedb5..49c75b4 100644
--- a/royale.go
+++ b/royale.go
@@ -18,6 +18,8 @@ type RoyaleRuleset struct {
 	OutOfBounds []Point
 }
 
+func (r *RoyaleRuleset) Name() string { return "royale" }
+
 func (r *RoyaleRuleset) CreateNextBoardState(prevState *BoardState, moves []SnakeMove) (*BoardState, error) {
 	if r.ShrinkEveryNTurns < 1 {
 		return nil, errors.New("royale game must shrink at least every turn")
@@ -55,10 +57,6 @@ func (r *RoyaleRuleset) CreateNextBoardState(prevState *BoardState, moves []Snak
 	return nextBoardState, nil
 }
 
-func (r *RoyaleRuleset) Name() string { return "royale" }
-
-func (r *RoyaleRuleset) Version() string { return "1.0.0" }
-
 func (r *RoyaleRuleset) populateOutOfBounds(b *BoardState, turn int32) error {
 	r.OutOfBounds = []Point{}
 
diff --git a/ruleset.go b/ruleset.go
index 89cbb9f..6f79f61 100644
--- a/ruleset.go
+++ b/ruleset.go
@@ -59,9 +59,8 @@ type SnakeMove struct {
 }
 
 type Ruleset interface {
+	Name() string
 	CreateInitialBoardState(width int32, height int32, snakeIDs []string) (*BoardState, error)
 	CreateNextBoardState(prevState *BoardState, moves []SnakeMove) (*BoardState, error)
 	IsGameOver(state *BoardState) (bool, error)
-	Name() string
-	Version() string
 }
diff --git a/solo.go b/solo.go
index 15a05ca..18ad8a6 100644
--- a/solo.go
+++ b/solo.go
@@ -4,6 +4,8 @@ type SoloRuleset struct {
 	StandardRuleset
 }
 
+func (r *SoloRuleset) Name() string { return "solo" }
+
 func (r *SoloRuleset) IsGameOver(b *BoardState) (bool, error) {
 	for i := 0; i < len(b.Snakes); i++ {
 		if b.Snakes[i].EliminatedCause == NotEliminated {
@@ -12,5 +14,3 @@ func (r *SoloRuleset) IsGameOver(b *BoardState) (bool, error) {
 	}
 	return true, nil
 }
-func (r *SoloRuleset) Name() string    { return "solo" }
-func (r *SoloRuleset) Version() string { return "1.0.0" }
diff --git a/squad.go b/squad.go
index 5e8290d..55591be 100644
--- a/squad.go
+++ b/squad.go
@@ -18,8 +18,7 @@ type SquadRuleset struct {
 
 const EliminatedBySquad = "squad-eliminated"
 
-func (r *SquadRuleset) Name() string    { return "squad" }
-func (r *SquadRuleset) Version() string { return "1.0.0" }
+func (r *SquadRuleset) Name() string { return "squad" }
 
 func (r *SquadRuleset) CreateNextBoardState(prevState *BoardState, moves []SnakeMove) (*BoardState, error) {
 	nextBoardState, err := r.StandardRuleset.CreateNextBoardState(prevState, moves)
diff --git a/standard.go b/standard.go
index d5ffe80..0997c7f 100644
--- a/standard.go
+++ b/standard.go
@@ -10,8 +10,7 @@ type StandardRuleset struct {
 	MinimumFood     int32
 }
 
-func (r *StandardRuleset) Name() string    { return "standard" }
-func (r *StandardRuleset) Version() string { return "1.0.0" }
+func (r *StandardRuleset) Name() string { return "standard" }
 
 func (r *StandardRuleset) CreateInitialBoardState(width int32, height int32, snakeIDs []string) (*BoardState, error) {
 	initialBoardState := &BoardState{