X-Git-Url: http://git.scottworley.com/planeteer/blobdiff_plain/ada59973ea301cad7d858ce76340a66d5e58bd43..7b5d9d135761c478762c98b5afb46500ad883de2:/planeteer.go

diff --git a/planeteer.go b/planeteer.go
index 1de4687..d5c359a 100644
--- a/planeteer.go
+++ b/planeteer.go
@@ -276,10 +276,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]
 		}
@@ -354,7 +355,10 @@ func FillCellByBuying(data planet_data, dims []int, table []State, addr []int) {
 	quantity := *hold - (addr[UnusedCargo] + addr[Cloaks] + addr[Edens])
 	total_price := quantity * absolute_price
 	other[Hold] = 0
+	other[UnusedCargo] = 0
 	UpdateCell(table, my_index, EncodeIndex(dims, other), -total_price)
+	other[UnusedCargo] = addr[UnusedCargo]
+	other[Hold] = addr[Hold]
 }
 
 func FillCellByMisc(data planet_data, dims []int, table []State, addr []int) {
@@ -368,7 +372,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]
@@ -510,6 +516,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
@@ -551,8 +561,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])