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

diff --git a/planeteer.go b/planeteer.go
index ca90a02..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]
 		}
@@ -324,7 +325,7 @@ func FillCellBySelling(data planet_data, dims []int, table []State, addr []int)
 
 		for other[UnusedCargo] = 0; other[UnusedCargo] < dims[UnusedCargo]; other[UnusedCargo]++ {
 
-			quantity := *hold - other[UnusedCargo] // TODO: Partial sales
+			quantity := *hold - (other[UnusedCargo] + other[Cloaks] + other[Edens])
 			sale_value := quantity * sell_price
 			UpdateCell(table, my_index, EncodeIndex(dims, other), sale_value)
 		}
@@ -351,15 +352,34 @@ func FillCellByBuying(data planet_data, dims []int, table []State, addr []int) {
 	}
 	base_price := data.Commodities[commodity].BasePrice
 	absolute_price := int(float64(base_price) * float64(relative_price) / 100.0)
-	quantity := *hold - addr[UnusedCargo]
+	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) {
+	my_index := EncodeIndex(dims, addr)
+	other := make([]int, NumDimensions)
+	copy(other, addr)
 	/* Buy Eden warp units */
 	/* Buy a Device of Cloaking */
+	if addr[Cloaks] == 1 && addr[UnusedCargo] < dims[UnusedCargo]-1 {
+		relative_price, available := data.Planets[data.i2p[addr[Location]]].RelativePrices["Device Of Cloakings"]
+		if available {
+			absolute_price := int(float64(data.Commodities["Device Of Cloakings"].BasePrice) * float64(relative_price) / 100.0)
+			other[Cloaks] = 0
+			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]
+		}
+	}
 	/* Silly: Dump a Device of Cloaking */
 	/* Buy Fighter Drones */
 	/* Buy Shield Batteries */
@@ -444,7 +464,7 @@ func FindBestState(data planet_data, dims []int, table []State) int {
 	addr[NeedShields] = dims[NeedShields] - 1
 	addr[Visit] = dims[Visit] - 1
 	// Fuel, Hold, UnusedCargo left at 0
-	var max_index int
+	max_index := -1
 	max_value := 0
 	for addr[Location] = 0; addr[Location] < dims[Location]; addr[Location]++ {
 		index := EncodeIndex(dims, addr)
@@ -496,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
@@ -534,10 +558,12 @@ func main() {
 	table := InitializeStateTable(data, dims)
 	FillStateTable1(data, dims, table)
 	best := FindBestState(data, dims, table)
-	fmt.Printf("Best state: %v (%v) with $%v\n",
-		best, DecodeIndex(dims, best), table[best].value)
-	description := DescribePath(data, dims, table, best)
-	for i := len(description) - 1; i >= 0; i-- {
-		fmt.Println(description[i])
+	if best == -1 {
+		print("Cannot acheive success criteria\n")
+	} else {
+		description := DescribePath(data, dims, table, best)
+		for i := len(description) - 1; i >= 0; i-- {
+			fmt.Println(description[i])
+		}
 	}
 }