Read --end into a map

[planeteer] / planeteer.go

diff --git a/planeteer.go b/planeteer.go
index 6f6f7b758c849c6b4be6efda5da317292a6d7925..c207c13c1fe05719c3e5fcfdc19f677282fcb63c 100644 (file)
--- a/planeteer.go
+++ b/planeteer.go
@@ -32,7 +32,7 @@ var start = flag.String("start", "",
 var flight_plan_string = flag.String("flight_plan", "",
        "Your hidey-holes for the day, comma-separated.")
 
-var end = flag.String("end", "",
+var end_string = flag.String("end", "",
        "A comma-separated list of acceptable ending planets.")
 
 var planet_data_file = flag.String("planet_data_file", "planet-data",
@@ -60,18 +60,29 @@ var visit_string = flag.String("visit", "",
 
 func visit() []string {
        if *visit_string == "" {
-               return []string{}
+               return nil
        }
        return strings.Split(*visit_string, ",")
 }
 
 func flight_plan() []string {
        if *flight_plan_string == "" {
-               return []string{}
+               return nil
        }
        return strings.Split(*flight_plan_string, ",")
 }
 
+func end() map[string]bool {
+       if *end_string == "" {
+               return nil
+       }
+       m := make(map[string]bool)
+       for _, p := range strings.Split(*flight_plan_string, ",") {
+               m[p] = true
+       }
+       return m
+}
+
 type Commodity struct {
        BasePrice int
        CanSell   bool
@@ -276,10 +287,11 @@ func FillCellByArriving(data planet_data, dims []int, table []State, addr []int)
        /* Travel here via a hidey hole */
        if addr[Fuel]+1 < dims[Fuel] {
                hole_index := (dims[Fuel] - 1) - (addr[Fuel] + 1)
-               if hole_index < len(flight_plan()) {
+               if hole_index < len(flight_plan()) && addr[Location] == data.p2i[flight_plan()[hole_index]] {
                        other[Fuel] = addr[Fuel] + 1
-                       other[Location] = data.p2i[flight_plan()[hole_index]]
-                       UpdateCell(table, my_index, EncodeIndex(dims, other), 0)
+                       for other[Location] = 0; other[Location] < dims[Location]; other[Location]++ {
+                               UpdateCell(table, my_index, EncodeIndex(dims, other), 0)
+                       }
                        other[Location] = addr[Location]
                        other[Fuel] = addr[Fuel]
                }
@@ -371,7 +383,9 @@ func FillCellByMisc(data planet_data, dims []int, table []State, addr []int) {
                if available {
                        absolute_price := int(float64(data.Commodities["Device Of Cloakings"].BasePrice) * float64(relative_price) / 100.0)
                        other[Cloaks] = 0
-                       other[UnusedCargo] = addr[UnusedCargo] + 1
+                       if other[Hold] != 0 {
+                               other[UnusedCargo] = addr[UnusedCargo] + 1
+                       }
                        UpdateCell(table, my_index, EncodeIndex(dims, other), -absolute_price)
                        other[UnusedCargo] = addr[UnusedCargo]
                        other[Cloaks] = addr[Cloaks]
@@ -513,6 +527,10 @@ func DescribePath(data planet_data, dims []int, table []State, start int) (descr
                        }
 
                }
+               if addr[Cloaks] == 1 && prev[Cloaks] == 0 {
+                       // TODO: Dump cloaks, convert from cargo?
+                       line += " Buy a Cloak"
+               }
                description = append(description, line)
        }
        return
@@ -554,8 +572,6 @@ func main() {
        if best == -1 {
                print("Cannot acheive success criteria\n")
        } else {
-               fmt.Printf("Best state: %v (%v) with $%v\n",
-                       best, DecodeIndex(dims, best), Commas(table[best].value))
                description := DescribePath(data, dims, table, best)
                for i := len(description) - 1; i >= 0; i-- {
                        fmt.Println(description[i])