diff options
Diffstat (limited to 'go/game')
| -rw-r--r-- | go/game/card.go | 3 | ||||
| -rw-r--r-- | go/game/map.go | 9 | ||||
| -rw-r--r-- | go/game/set.go | 3 |
3 files changed, 8 insertions, 7 deletions
diff --git a/go/game/card.go b/go/game/card.go index 06a04f1b..438fb384 100644 --- a/go/game/card.go +++ b/go/game/card.go @@ -11,6 +11,7 @@ import ( "golang.org/x/exp/slices" "gopkg.in/yaml.v3" + "muhq.space/muhqs-game/go/assets" ) type CardType int @@ -196,7 +197,7 @@ func getCardDefinition(set, cardName string) ([]byte, error) { var ErrUnknownCardPath = errors.New("unknown card path") func retrieveCardDefinition(cardPath string) ([]byte, error) { - url := PROTOCOL + path.Join(BASE_URL, CARD_DATA_URL, cardPath+".yml") + url := assets.PROTOCOL + path.Join(assets.BASE_URL, CARD_DATA_URL, cardPath+".yml") log.Printf("loading card from %s\n", url) resp, err := http.Get(url) if err != nil { diff --git a/go/game/map.go b/go/game/map.go index 9a07e308..48ec8be3 100644 --- a/go/game/map.go +++ b/go/game/map.go @@ -13,12 +13,11 @@ import ( "golang.org/x/exp/slices" "gopkg.in/yaml.v3" + + "muhq.space/muhqs-game/go/assets" ) const ( - PROTOCOL string = "https://" - // BASE_URL string = "localhost:8000/" - BASE_URL string = "muhq.space/muhqs-game" MAP_URL_PART string = "html/build/maps" DEFAULT_RESOURCE_GAIN int = 5 @@ -195,9 +194,9 @@ func (m *Map) FindFortificationConnections(x int, y int) (connections int, left, // GetMap creates a new map from the definition retrieved for the map's name. func GetMap(name string) (*Map, error) { - url := path.Join(BASE_URL, MAP_URL_PART, name+".yml") + url := path.Join(assets.BASE_URL, MAP_URL_PART, name+".yml") log.Printf("loading map from %s\n", url) - resp, err := http.Get(PROTOCOL + url) + resp, err := http.Get(assets.PROTOCOL + url) if err != nil { log.Fatal(err) } diff --git a/go/game/set.go b/go/game/set.go index 3690e839..e4a08f3b 100644 --- a/go/game/set.go +++ b/go/game/set.go @@ -8,6 +8,7 @@ import ( "strings" "golang.org/x/net/html" + "muhq.space/muhqs-game/go/assets" ) type SetIdentifier int @@ -86,7 +87,7 @@ var SetNames = map[string]SetIdentifier{ } func (set SetIdentifier) CardPaths() []string { - url := PROTOCOL + path.Join(BASE_URL, CARD_DATA_URL, set.String()) + url := assets.PROTOCOL + path.Join(assets.BASE_URL, CARD_DATA_URL, set.String()) log.Printf("loading set from %s\n", url) resp, err := http.Get(url) if err != nil { |
