Merge pull request #11 from chrisreddington/extend-rockpaperscissors

Extend rockpaperscissors

Author: chrisreddington

cmd/rockpaperscissors.go

@@ -2,7 +2,7 @@
 // The game logic is in the internal/rockpaperscissors package.
 
 // This file sets up the command line interface for the game. It should call the PlayGame function from the rockpaperscissors package.
-
+// Package cmd contains all the commands for the CLI application.
 package cmd
 
 import (
@@ -13,6 +13,8 @@ import (
 	"github.com/spf13/cobra"
 )
 
+var secretMode bool
+
 // rootCmd represents the base command when called without any subcommands
 var rockPaperScissorsCmd = &cobra.Command{
 	Use:   "rockpaperscissors",
@@ -21,6 +23,11 @@ var rockPaperScissorsCmd = &cobra.Command{
 You can choose from rock, paper, or scissors. The computer will randomly choose its move and the winner will be determined based on the rules of the game.`,
 	Run: func(cmd *cobra.Command, args []string) {
 		input := userPrompt.New(os.Stdin, os.Stdout, os.Stderr)
-		rockpaperscissors.PlayGame(input)
+		rockpaperscissors.PlayGame(input, secretMode)
 	},
 }
+
+func init() {
+	rockPaperScissorsCmd.Flags().BoolVar(&secretMode, "spock", false, "Enable secret game mode")
+	rootCmd.AddCommand(rockPaperScissorsCmd)
+}

internal/rockpaperscissors/rockpaperscissors.go

@@ -9,7 +9,8 @@ import (
 
 // Game options
 var (
-	options = []string{"rock", "paper", "scissors", "exit"}
+	standardOptions = []string{"rock", "paper", "scissors", "exit"}
+	secretOptions   = []string{"rock", "paper", "scissors", "lizard", "spock", "exit"}
 )
 
 // Game represents a single game of Rock Paper Scissors.
@@ -32,14 +33,16 @@ type Game struct {
 	GameOverMessage string
 	// GamesPlayed tracks the number of games played
 	GamesPlayed int
+	// SecretMode indicates if the game is in secret mode
+	SecretMode bool
 }
 
 // Prompter defines an interface for getting user input
 type Prompter interface {
 	Select(prompt, defaultValue string, options []string) (int, error)
 }
 
-func NewGame(bestOf int) *Game {
+func NewGame(bestOf int, secretMode bool) *Game {
 	if bestOf%2 == 0 {
 		bestOf++ // Ensure we have an odd number for "best of"
 	}
@@ -53,6 +56,7 @@ func NewGame(bestOf int) *Game {
 		BestOf:          bestOf,
 		GameOver:        false,
 		GameOverMessage: "",
+		SecretMode:      secretMode,
 	}
 }
 
@@ -78,6 +82,10 @@ func (g *Game) Play(playerChoice string) {
 // getComputerChoice returns the choice made by the computer.
 func (g *Game) getComputerChoice() string {
 	rand.Seed(time.Now().UnixNano())
+	options := standardOptions
+	if g.SecretMode {
+		options = secretOptions
+	}
 	// Only use the game options excluding "exit"
 	choices := options[:len(options)-1]
 	return choices[rand.Intn(len(choices))]
@@ -88,10 +96,19 @@ func (g *Game) getWinner() string {
 	if g.PlayerChoice == g.ComputerChoice {
 		return "draw"
 	}
-	if (g.PlayerChoice == "rock" && g.ComputerChoice == "scissors") ||
-		(g.PlayerChoice == "paper" && g.ComputerChoice == "rock") ||
-		(g.PlayerChoice == "scissors" && g.ComputerChoice == "paper") {
-		return "player"
+
+	winningMoves := map[string][]string{
+		"rock":     {"scissors", "lizard"},
+		"paper":    {"rock", "spock"},
+		"scissors": {"paper", "lizard"},
+		"lizard":   {"paper", "spock"},
+		"spock":    {"rock", "scissors"},
+	}
+
+	for _, beatenChoice := range winningMoves[g.PlayerChoice] {
+		if g.ComputerChoice == beatenChoice {
+			return "player"
+		}
 	}
 	return "computer"
 }
@@ -143,7 +160,7 @@ func (g *Game) getRoundResultMessage() string {
 }
 
 // PlayGame plays a game of Rock Paper Scissors.
-func PlayGame(prompter Prompter) {
+func PlayGame(prompter Prompter, secretMode bool) {
 	// Get the number of rounds from the user
 	roundOptions := []string{"3", "5", "7", "9"}
 	roundIndex, err := prompter.Select("How many rounds would you like to play (best of)?", "3", roundOptions)
@@ -156,12 +173,20 @@ func PlayGame(prompter Prompter) {
 		bestOf = parseInt(roundOptions[roundIndex])
 	}
 
-	game := NewGame(bestOf)
+	game := NewGame(bestOf, secretMode)
 	fmt.Printf("Playing best of %d games\n", bestOf)
+	if secretMode {
+		fmt.Println("🖖 Secret mode activated: Rock Paper Scissors Lizard Spock!")
+	}
 
 	for !game.GameOver {
 		fmt.Printf("\nCurrent score - Player: %d, Computer: %d\n", game.PlayerScore, game.ComputerScore)
-
+		
+		options := standardOptions
+		if secretMode {
+			options = secretOptions
+		}
+		
 		// Get player choice using prompter
 		playerChoiceIndex, err := prompter.Select("Choose your move", "rock", options)
 		if err != nil {