Convert local prices to a flat map

[planeteer] / planeteer.go

diff --git a/planeteer.go b/planeteer.go
index fd697beab4216deaf35127a5c161f875b57f2f36..31dc7d0a07a632e785ae8da32ccdc96b88fd7628 100644 (file)
--- a/planeteer.go
+++ b/planeteer.go
@@ -25,22 +25,21 @@ import "fmt"
 var datafile = flag.String("planet_data_file", "planet-data",
        "The file to read planet data from")
 
+type Commodity struct {
+       Name      string
+       BasePrice int
+       CanSell   bool
+       Limit     int
+}
+
 type planet_data struct {
-       Commodities []struct {
-               Name      string
-               BasePrice int
-               CanSell   bool
-               Limit     int
-       }
+       Commodities []Commodity
        Planets []struct {
                Name     string
                BeaconOn bool
                /* Use relative prices rather than absolute prices because you
                   can get relative prices without traveling to each planet. */
-               RelativePrices []struct {
-                       Name  string
-                       Value int
-               }
+               RelativePrices map [string] int
        }
 }