Fix randomness of spell choosing

bobtfish · Jan 1, 2021 · e4b4aa2 · e4b4aa2
1 parent 08cdbde
commit e4b4aa2
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -7,7 +7,7 @@ sprite_sheet.go: sprite_sheet.png utils/sprite_sheet_gen/main.go
 character/yaml.go: character/characters.yaml utils/character_gen/main.go
 	go run utils/character_gen/main.go > character/yaml.go
 
-mayhem: sprite_sheet.go character/yaml.go *.go */*.go go.mod go.sum
+mayhem: sprite_sheet.go character/yaml.go *.go */*.go */*/*.go go.mod go.sum
 	go build
 
 .PHONY: test

diff --git a/spells/iface/main.go b/spells/iface/main.go
@@ -1,7 +1,7 @@
 package iface
 
 import (
-	"math/rand"
+	"github.com/bobtfish/mayhem/rand"
 
 	"github.com/bobtfish/mayhem/fx"
 	"github.com/bobtfish/mayhem/grid"
@@ -57,10 +57,10 @@ func ChooseSpells() []Spell {
 		spells[i] = AllSpells[idx]
 	}
 
-	for i := 0; i < len(AllSpells); i++ {
+	/*for i := 0; i < len(AllSpells); i++ {
 		if AllSpells[i].GetName() == "Magic Bolt" {
 			spells[1] = AllSpells[i]
 		}
-	}
+	}*/
 	return spells
 }
diff --git a/spellswithscreen/lightning.go b/spellswithscreen/lightning.go
@@ -2,9 +2,10 @@ package spellswithscreen
 
 import (
 	"fmt"
-	"math/rand"
 	"time"
 
+	"github.com/bobtfish/mayhem/rand"
+
 	"github.com/bobtfish/mayhem/fx"
 	"github.com/bobtfish/mayhem/game"
 	"github.com/bobtfish/mayhem/grid"