small code modernization and refactoring

4 files changed, 7 insertions, 11 deletions

diff --git a/go/game/costs.go b/go/game/costs.go
index ca944920..da8993db 100644
--- a/go/game/costs.go
+++ b/go/game/costs.go
@@ -24,7 +24,7 @@ func ParseResourceCosts(costsStr string) *ResourceCosts {
 			costs.variadicComponents += 1
 		}
 	}
-	costs.fixed, _ = strconv.Atoi(strings.Replace(costsStr, "X", "", -1))
+	costs.fixed, _ = strconv.Atoi(strings.ReplaceAll(costsStr, "X", ""))
 	return &costs
 }
 
diff --git a/go/game/movement.go b/go/game/movement.go
index b8a8dc56..f13acc96 100644
--- a/go/game/movement.go
+++ b/go/game/movement.go
@@ -16,14 +16,14 @@ func INVALID_MOVEMENT() Movement {
 	return Movement{-1, false}
 }
 
-func parseMovement(desc interface{}) Movement {
+func parseMovement(desc any) Movement {
 	var movementStr string
 	switch typedDesc := desc.(type) {
 	case int:
 		return Movement{typedDesc, false}
 	case string:
 		movementStr = typedDesc
-	case map[string]interface{}:
+	case map[string]any:
 		movementStr = typedDesc["en"].(string)
 	}
 
@@ -33,10 +33,7 @@ func parseMovement(desc interface{}) Movement {
 		log.Panicf("Invalid movement description %s", movementStr)
 	}
 
-	swimming := false
-	if len(tokens) > 1 && tokens[1] == "swimming" {
-		swimming = true
-	}
+	swimming := len(tokens) > 1 && tokens[1] == "swimming" 
 
 	return Movement{r, swimming}
 }
diff --git a/go/game/set.go b/go/game/set.go
index c4733423..8e20487b 100644
--- a/go/game/set.go
+++ b/go/game/set.go
@@ -121,9 +121,8 @@ func (set SetIdentifier) CardPaths() []string {
 
 func SetListToSets(setList string) ([]SetIdentifier, error) {
 	sets := []SetIdentifier{}
-	setList = strings.Replace(setList, " ", "", 0)
-	setsRaw := strings.Split(setList, ",")
-	for _, s := range setsRaw {
+	setList = strings.ReplaceAll(setList, " ", "")
+	for s := range strings.SplitSeq(setList, ",") {
 		set, found := SetNames[s]
 		if found {
 			sets = append(sets, set)
diff --git a/go/game/state.go b/go/game/state.go
index 239eb895..f8a74fa6 100644
--- a/go/game/state.go
+++ b/go/game/state.go
@@ -601,7 +601,7 @@ func (s *LocalState) destroyPermanent(p Permanent) {
 
 	p.Owner().DiscardPile.AddCard(p.Card())
 
-	s.events = append(s.events, Event{eventType: EventTypes.Destruction, affected: []interface{}{p}})
+	s.events = append(s.events, Event{eventType: EventTypes.Destruction, affected: []any{p}})
 }
 
 func (s *LocalState) fight(p1, p2 Permanent) {