Fix nurse shark and remove mid-battle choice.
This commit is contained in:
@@ -157,8 +157,6 @@ func applyBotAction(g *game.Game, playerID string, a *ai.Action) error {
|
||||
return g.TradeChoose(playerID, a.Pick)
|
||||
case "revealChoose":
|
||||
return g.RevealChoose(playerID, a.CardID)
|
||||
case "battleChoose":
|
||||
return g.BattleChoose(playerID, a.Value)
|
||||
case "pass":
|
||||
return g.Pass(playerID)
|
||||
case "arrange":
|
||||
@@ -203,9 +201,6 @@ func botFallback(g *game.Game, playerID string) error {
|
||||
}
|
||||
return g.SubmitOrder(playerID, ids)
|
||||
case game.PhaseBattle:
|
||||
if g.PendingBattle != nil && g.Players[g.PendingBattle.Seat].ID == playerID {
|
||||
return g.BattleChoose(playerID, g.PendingBattle.Max)
|
||||
}
|
||||
return g.AcknowledgeBattle(playerID)
|
||||
}
|
||||
return game.ErrInvalidAction
|
||||
|
||||
@@ -32,7 +32,6 @@ type clientMessage struct {
|
||||
Difficulty string `json:"difficulty"` // addBot
|
||||
Target string `json:"target"` // removePlayer (player ID)
|
||||
Card string `json:"card"` // revealChoose (Cockatoo): pet card id
|
||||
Value int `json:"value"` // battleChoose (Nurse Shark): Trumpets to spend
|
||||
}
|
||||
|
||||
type serverMessage struct {
|
||||
@@ -152,8 +151,6 @@ func (s *Server) apply(r *room, c *client, msg clientMessage) {
|
||||
err = g.TradeChoose(c.playerID, msg.Pick)
|
||||
case "revealChoose":
|
||||
err = g.RevealChoose(c.playerID, msg.Card)
|
||||
case "battleChoose":
|
||||
err = g.BattleChoose(c.playerID, msg.Value)
|
||||
case "pass":
|
||||
err = g.Pass(c.playerID)
|
||||
case "arrange":
|
||||
|
||||
Reference in New Issue
Block a user