From deaee56c8a5ac7f40ca9fe85afcb5a3caddea0ca Mon Sep 17 00:00:00 2001 From: Florian Fischer Date: Wed, 30 Jul 2025 20:27:40 +0200 Subject: make format --- go/activities/draft.go | 2 +- go/client/game.go | 1 - go/client/keybindings.go | 1 - go/game/action.go | 3 ++- go/game/action_test.go | 6 ++++-- go/game/card.go | 8 ++------ go/game/draft.go | 3 ++- go/game/permanent.go | 1 - go/game/pileOfCards.go | 2 +- go/game/playerControl.go | 3 +++ go/game/range.go | 1 - go/game/targets.go | 4 +--- go/game/tile.go | 4 +--- 13 files changed, 17 insertions(+), 22 deletions(-) diff --git a/go/activities/draft.go b/go/activities/draft.go index e2af5f5c..742855c0 100644 --- a/go/activities/draft.go +++ b/go/activities/draft.go @@ -234,7 +234,7 @@ func (d *Draft) startDraft(desc string, setList string, aiN int) error { return err } - for range aiN { + for range aiN { d.draft.AddRandomAi() } diff --git a/go/client/game.go b/go/client/game.go index 13209695..d027f07c 100644 --- a/go/client/game.go +++ b/go/client/game.go @@ -219,7 +219,6 @@ func (g *Game) showWinners() { g.passButton.RegisterHandler("click", func(int, int) { activities.PopActivity() }) - } func (g *Game) showStore() { diff --git a/go/client/keybindings.go b/go/client/keybindings.go index 147afced..a9e0eed4 100644 --- a/go/client/keybindings.go +++ b/go/client/keybindings.go @@ -20,7 +20,6 @@ type ( func (g *Game) handleKeyBindings(bindings keyBindings) (err error) { for i, ev := range ui.Input { - for _k, a := range bindings { var remove bool switch k := _k.(type) { diff --git a/go/game/action.go b/go/game/action.go index cfb9809f..d2c46928 100644 --- a/go/game/action.go +++ b/go/game/action.go @@ -110,6 +110,7 @@ func (*DraftPick) String() string { return "draft pick" } func (pick *DraftPick) Pack() PileOfCards { return pick.pack } + func (pick *DraftPick) Pick() *Card { return pick.pick } @@ -778,7 +779,7 @@ func MarshalAction(_a Action) []byte { var ( ErrInvalidActionFormat = errors.New("invalid action format") - ErrUnknownPlayer = errors.New("unknown player") + ErrUnknownPlayer = errors.New("unknown player") ) var ActionRegex = regexp.MustCompile(`^([^\xA0]*)\xA0([^\xA0]*)\xA0?(.*)?$`) diff --git a/go/game/action_test.go b/go/game/action_test.go index 452a0544..f72193ad 100644 --- a/go/game/action_test.go +++ b/go/game/action_test.go @@ -10,8 +10,10 @@ import ( const PASS_STRING = "muhq\u00A0pass" -var s *LocalState = NewLocalState() -var p *Player = s.AddNewPlayer("muhq", NewDeck()) +var ( + s *LocalState = NewLocalState() + p *Player = s.AddNewPlayer("muhq", NewDeck()) +) func TestUpkeepAction(t *testing.T) { s := NewLocalState() diff --git a/go/game/card.go b/go/game/card.go index 72b32335..f26c27c5 100644 --- a/go/game/card.go +++ b/go/game/card.go @@ -193,9 +193,7 @@ func getCardDefinition(set, cardName string) ([]byte, error) { return cardDefinition, nil } -var ( - ErrUnknownCardPath = errors.New("unknown card path") -) +var ErrUnknownCardPath = errors.New("unknown card path") func retrieveCardDefinition(cardPath string) ([]byte, error) { url := PROTOCOL + path.Join(BASE_URL, CARD_DATA_URL, cardPath+".yml") @@ -315,9 +313,7 @@ func (card *Card) hasEffect(effect string) bool { return slices.Contains(card.getEffects(), effect) } -var ( - ErrNoXEffect = errors.New("card has no xeffect") -) +var ErrNoXEffect = errors.New("card has no xeffect") func (card *Card) getXEffect(effect string) (xEffect, error) { for _, e := range card.getEffects() { diff --git a/go/game/draft.go b/go/game/draft.go index 17f64b70..997e676f 100644 --- a/go/game/draft.go +++ b/go/game/draft.go @@ -62,7 +62,7 @@ func (d *Draft) parseDesc(desc string) error { } func (d *Draft) Valid() bool { - required := d.cardsPerPack*len(d.players) + required := d.cardsPerPack * len(d.players) return d.packSize > required } @@ -192,6 +192,7 @@ type randomDraftAiCtrl struct { func (ctrl *randomDraftAiCtrl) Player() *Player { return ctrl.ai } + func (ctrl *randomDraftAiCtrl) Close() { } diff --git a/go/game/permanent.go b/go/game/permanent.go index 12eb3d16..48656931 100644 --- a/go/game/permanent.go +++ b/go/game/permanent.go @@ -178,7 +178,6 @@ func (p *permanentBase) XEffect(effect string) (int, error) { } tmpX, err := parseXEffect(e) - if err != nil { return 0, err } diff --git a/go/game/pileOfCards.go b/go/game/pileOfCards.go index d22e0b6e..1d49fda6 100644 --- a/go/game/pileOfCards.go +++ b/go/game/pileOfCards.go @@ -156,7 +156,7 @@ func (poc *PileOfCardsBase) ToList() (list string) { func NewRandomPackFromPool(pool PileOfCards, packSize int) PileOfCards { pack := NewPileOfCards() - for range packSize { + for range packSize { card := pool.Cards()[rand.Intn(len(pool.Cards())-1)] pool.MoveCard(card, pack) } diff --git a/go/game/playerControl.go b/go/game/playerControl.go index 74af6702..3972cc8e 100644 --- a/go/game/playerControl.go +++ b/go/game/playerControl.go @@ -251,9 +251,11 @@ func (c *ChanPlayerControl) SendAction(a Action) error { c.actions <- a return nil } + func (c *ChanPlayerControl) RecvAction() (Action, error) { return <-c.actions, nil } + func (c *ChanPlayerControl) SendNotification(n PlayerNotification) error { c.notifications <- n return nil @@ -267,6 +269,7 @@ func (c *ChanPlayerControl) RecvNotification() (PlayerNotification, error) { } return n, nil } + func (c *ChanPlayerControl) Close() { close(c.actions) close(c.notifications) diff --git a/go/game/range.go b/go/game/range.go index c98e1c44..83003dfa 100644 --- a/go/game/range.go +++ b/go/game/range.go @@ -27,7 +27,6 @@ func DistanceBetweenPermanents(p1, p2 Permanent) int { } func IsPositionInRange(origin Position, pos Position, r int) bool { - return DistanceBetweenPositions(origin, pos) <= r } diff --git a/go/game/targets.go b/go/game/targets.go index 742d5c7f..75245f58 100644 --- a/go/game/targets.go +++ b/go/game/targets.go @@ -184,9 +184,7 @@ func (d *TargetDesc) requirement() TargetRequirement { } } -var ( - ErrTargetAlreadySelected = errors.New("already selected") -) +var ErrTargetAlreadySelected = errors.New("already selected") // AddSelection adds an object as selection to the target. // If the provided object does not satisfy the target contraint err != nil is returned. diff --git a/go/game/tile.go b/go/game/tile.go index ea4568ca..6d09fc91 100644 --- a/go/game/tile.go +++ b/go/game/tile.go @@ -139,9 +139,7 @@ func INVALID_TILE() Tile { return Tile{Position: INVALID_POSITION()} } -var ( - ErrInvalidTileName = errors.New("unknown tile name") -) +var ErrInvalidTileName = errors.New("unknown tile name") func NewTileFromString(raw string, pos Position) (Tile, error) { tile := strings.ToLower(raw) -- cgit v1.2.3