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

diff --git a/planeteer.go b/planeteer.go
index 1de4687..3dd2037 100644
--- a/planeteer.go
+++ b/planeteer.go
@@ -354,7 +354,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 +371,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 +515,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 +560,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])