Revert "Support Crossplay Layout, Distribution, and Rules"

Author: domino14

ai/bot/elite.go

@@ -111,7 +111,7 @@ func endGameBest(ctx context.Context, p *BotTurnPlayer, endgamePlies int) (*move
 	gameCopy := p.Game.Copy()
 	gameCopy.SetBackupMode(game.SimulationMode)
 	gameCopy.SetStateStackLength(endgamePlies + 1)
-	gen1 := movegen.NewGordonGenerator(gd, gameCopy.Board(), p.Game.Rules().LetterDistribution(), p.Game.Rules().BingoBonus())
+	gen1 := movegen.NewGordonGenerator(gd, gameCopy.Board(), p.Game.Rules().LetterDistribution())
 	err = p.endgamer.Init(gen1, gameCopy)
 	if err != nil {
 		return nil, err

ai/turnplayer/static_player.go

@@ -57,7 +57,7 @@ func AddAIFields(p *turnplayer.BaseTurnPlayer, conf *config.Config, calculators
 	if err != nil {
 		return nil, err
 	}
-	gen := movegen.NewGordonGenerator(gd, p.Board(), p.Bag().LetterDistribution(), p.Rules().BingoBonus())
+	gen := movegen.NewGordonGenerator(gd, p.Board(), p.Bag().LetterDistribution())
 	gen.SetEquityCalculators(calculators)
 	ret := &AIStaticTurnPlayer{*p, calculators, gen, conf}
 	return ret, nil

board/board.go

@@ -844,16 +844,16 @@ func (g *GameBoard) formedCrossWord(crossVertical bool, letter tilemapping.Machi
 // assume the row stays static as we iterate through the letters of the
 // word.
 func (g *GameBoard) ScoreWord(word tilemapping.MachineWord, row, col, tilesPlayed int,
-	crossDir BoardDirection, ld *tilemapping.LetterDistribution, bingoBonus int) int {
+	crossDir BoardDirection, ld *tilemapping.LetterDistribution) int {
 
 	// letterScore:
 	var ls int
 
 	mainWordScore := 0
 	crossScores := 0
-	bonus := 0
+	bingoBonus := 0
 	if tilesPlayed == 7 {
-		bonus = bingoBonus
+		bingoBonus = 50
 	}
 	wordMultiplier := 1
 
@@ -904,7 +904,7 @@ func (g *GameBoard) ScoreWord(word tilemapping.MachineWord, row, col, tilesPlaye
 			crossScores += ls*letterMultiplier*thisWordMultiplier + cs*thisWordMultiplier
 		}
 	}
-	return mainWordScore*wordMultiplier + crossScores + bonus
+	return mainWordScore*wordMultiplier + crossScores + bingoBonus
 
 }
 

board/layouts.go

@@ -7,15 +7,11 @@ var (
 	// SuperCrosswordGameBoard is a board for a bigger Crossword game, featuring
 	// even more wingos and blonks.
 	SuperCrosswordGameBoard []string
-	// CrossplayGameBoard is a board like Crossword but with alternate wingo blonk
-	// arrangement.
-	CrossplayGameBoard []string
 )
 
 const (
 	CrosswordGameLayout      = "CrosswordGame"
 	SuperCrosswordGameLayout = "SuperCrosswordGame"
-	CrossplayGameLayout      = "CrossplayGame"
 )
 
 func init() {
@@ -59,21 +55,4 @@ func init() {
 		` -  "   -   -   "  - `,
 		`~  '   =  '  =   '  ~`,
 	}
-	CrossplayGameBoard = []string{
-		`"  =   '   =  "`,
-		` -    " "    - `,
-		`    '     '    `,
-		`=  '   -   '  =`,
-		`  '  "   "  '  `,
-		`    "  '  "    `,
-		` "           " `,
-		`'  - '   ' -  '`,
-		` "           " `,
-		`    "  '  "    `,
-		`  '  "   "  '  `,
-		`=  '   -   '  =`,
-		`    '     '    `,
-		` -    " "    - `,
-		`"  =   '   =  "`,
-	}
 }

config/config.go

@@ -40,7 +40,6 @@ const (
 	ConfigOpenaiApiKey                     = "openai-api-key"
 	ConfigDeepseekApiKey                   = "deepseek-api-key"
 	ConfigWooglesApiKey                    = "woogles-api-key"
-	ConfigBingoBonus                       = "bingo-bonus"
 	ConfigAliases                          = "aliases"
 )
 
@@ -114,7 +113,6 @@ func (c *Config) Load(args []string) error {
 	c.BindEnv(ConfigOpenaiApiKey)
 	c.BindEnv(ConfigDeepseekApiKey)
 	c.BindEnv(ConfigWooglesApiKey)
-	c.BindEnv(ConfigBingoBonus)
 
 	cfgdir, err := os.UserConfigDir()
 	if err != nil {
@@ -168,7 +166,6 @@ func (c *Config) Load(args []string) error {
 	c.SetDefault(ConfigOpenaiApiKey, "")
 	c.SetDefault(ConfigDeepseekApiKey, "")
 	c.SetDefault(ConfigWooglesApiKey, "")
-	c.SetDefault(ConfigBingoBonus, 50)
 
 	return nil
 }

data/letterdistributions/english_crossplay

@@ -360,7 +360,7 @@ func (s *Solver) makeGameCopies() error {
 	s.movegens = []movegen.MoveGenerator{}
 	gaddag := s.stmMovegen.(*movegen.GordonGenerator).GADDAG()
 	for i := 0; i < s.threads-1; i++ {
-		mg := movegen.NewGordonGenerator(gaddag, s.gameCopies[i].Board(), s.gameCopies[i].Bag().LetterDistribution(), s.gameCopies[i].Rules().BingoBonus())
+		mg := movegen.NewGordonGenerator(gaddag, s.gameCopies[i].Board(), s.gameCopies[i].Bag().LetterDistribution())
 		mg.SetSortingParameter(movegen.SortByNone)
 		mg.SetGenPass(true)
 		mg.SetPlayRecorder(movegen.AllPlaysSmallRecorder)

endgame/negamax/solver.go

@@ -87,7 +87,7 @@ func TestEndgameTiming(t *testing.T) {
 	bd := board.MakeBoard(board.CrosswordGameBoard)
 	ld, err := tilemapping.EnglishLetterDistribution(DefaultConfig.WGLConfig())
 	assert.Nil(t, err)
-	generator := movegen.NewGordonGenerator(gd, bd, ld, 50)
+	generator := movegen.NewGordonGenerator(gd, bd, ld)
 	tilesInPlay := bd.SetToGame(gd.GetAlphabet(), board.MavenVsMacondo)
 	cross_set.GenAllCrossSets(bd, gd, ld)
 	generator.GenAll(tilemapping.RackFromString("AEEORS?", alph), false)
@@ -131,7 +131,7 @@ func TestPreendgameTiming(t *testing.T) {
 	bd := board.MakeBoard(board.CrosswordGameBoard)
 	ld, err := tilemapping.EnglishLetterDistribution(DefaultConfig.WGLConfig())
 	assert.Nil(t, err)
-	generator := movegen.NewGordonGenerator(gd, bd, ld, 50)
+	generator := movegen.NewGordonGenerator(gd, bd, ld)
 	tilesInPlay := bd.SetToGame(gd.GetAlphabet(), board.VsOxy)
 	cross_set.GenAllCrossSets(bd, gd, ld)
 	generator.GenAll(tilemapping.RackFromString("OXPBAZE", alph), false)
@@ -170,7 +170,7 @@ func TestOpeningPlayHeuristic(t *testing.T) {
 	bd := board.MakeBoard(board.CrosswordGameBoard)
 	ld, err := tilemapping.EnglishLetterDistribution(DefaultConfig.WGLConfig())
 	assert.Nil(t, err)
-	generator := movegen.NewGordonGenerator(gd, bd, ld, 50)
+	generator := movegen.NewGordonGenerator(gd, bd, ld)
 	cross_set.GenAllCrossSets(bd, gd, ld)
 	generator.GenAll(tilemapping.RackFromString("AEFLR", alph), false)
 	els, err := equity.NewCombinedStaticCalculator(

equity/calculators_test.go

@@ -166,7 +166,6 @@ func (g *Game) Copy() *Game {
 		maxScorelessTurns: g.maxScorelessTurns,
 		exchangeLimit:     g.exchangeLimit,
 		players:           copyPlayers(g.players),
-		rules:             g.rules,
 		// stackPtr only changes during a sim, etc. This Copy should
 		// only be called at the beginning of everything.
 		stackPtr: 0,

game/backup.go

@@ -823,7 +823,7 @@ func (g *Game) CreateAndScorePlacementMove(coords string, tiles string, rack str
 	// ScoreWord assumes the play is always horizontal, so we have to
 	// do the transpositions beforehand.
 	score := g.Board().ScoreWord(mw, row, col, tilesPlayed,
-		crossDir, g.bag.LetterDistribution(), g.rules.BingoBonus())
+		crossDir, g.bag.LetterDistribution())
 	// reset row, col back for the actual creation of the play.
 	if vertical {
 		row, col = col, row