X-Git-Url: http://git.scottworley.com/planeteer/blobdiff_plain/dd6c757dacbc44d4edb6ed5de319ef124ff75d4f..a49e368fd68e6ebd97a8562d6bc0edb1a655e5a4:/planeteer.go

diff --git a/planeteer.go b/planeteer.go
index 71a85dc..513ad1a 100644
--- a/planeteer.go
+++ b/planeteer.go
@@ -193,7 +193,7 @@ func ReadData() (data planet_data) {
  *    * Reduce the size of the Edens dimension from 3 to 2, for the
  *      same reasons as Fuel above.  33% savings.
  *    * Buy more ram.  (Just sayin'.  It's cheaper than you think.)
- *      
+ *
  */
 
 // The official list of dimensions:
@@ -325,7 +325,7 @@ func CreateStateTable(data planet_data, dims LogicalIndex) []State {
 	addr[Edens] = *start_edens
 	addr[Location] = PlanetIndex(data, *start)
 	if *start_hold != "" {
-		addr[Hold] = CommodityIndex(data,*start_hold)
+		addr[Hold] = CommodityIndex(data, *start_hold)
 	}
 	start_index := EncodeIndex(dims, addr)
 	table[start_index].value = Value(*funds)
@@ -373,14 +373,12 @@ func CellValue(data planet_data, dims LogicalIndex, table []State, addr LogicalI
 		other[Traded] = 1 /* Travel from states that have done trading. */
 
 		/* Travel here via a 2-fuel unit jump */
-		if addr[Fuel]+2 < dims[Fuel] {
+		if data.Planets[data.i2p[addr[Location]]].BeaconOn && addr[Fuel]+2 < dims[Fuel] {
 			other[Fuel] = addr[Fuel] + 2
 			hole_index := (dims[Fuel] - 1) - (addr[Fuel] + 2)
 			if hole_index >= len(flight_plan()) || addr[Location] != PlanetIndex(data, flight_plan()[hole_index]) {
 				for other[Location] = 0; other[Location] < dims[Location]; other[Location]++ {
-					if data.Planets[data.i2p[addr[Location]]].BeaconOn {
-						Consider(data, dims, table, other, 0, &best_value, best_source)
-					}
+					Consider(data, dims, table, other, 0, &best_value, best_source)
 				}
 			}
 			other[Location] = addr[Location]
@@ -401,7 +399,7 @@ func CellValue(data planet_data, dims LogicalIndex, table []State, addr LogicalI
 		}
 
 		/* Travel here via Eden Warp Unit */
-		if addr[Edens]+1 < dims[Edens] && addr[UnusedCargo] > 0 {
+		if addr[Edens]+1 < dims[Edens] && (addr[Hold] == 0 || addr[UnusedCargo] > 0) {
 			_, available := data.Planets[data.i2p[addr[Location]]].RelativePrices["Eden Warp Units"]
 			if !available {
 				other[Edens] = addr[Edens] + 1
@@ -633,14 +631,14 @@ func FighterAndShieldCost(data planet_data, dims LogicalIndex, table []State, be
 		final_state[BuyFighters] = 0
 		alt_best := FindBestState(data, dims, table, final_state)
 		cost := table[alt_best].value - table[best].value
-		fmt.Println("\rDrones were", float64(cost)/float64(*drones), "each")
+		fmt.Printf("\rDrones were %.2f each\n", float64(cost)/float64(*drones))
 	}
 	if *batteries > 0 {
 		final_state := FinalState(dims)
 		final_state[BuyShields] = 0
 		alt_best := FindBestState(data, dims, table, final_state)
 		cost := table[alt_best].value - table[best].value
-		fmt.Println("\rBatteries were", float64(cost)/float64(*batteries), "each")
+		fmt.Printf("\rBatteries were %.2f each\n", float64(cost)/float64(*batteries))
 	}
 }
 
@@ -807,7 +805,7 @@ func main() {
 	best := FindBestState(data, dims, table, final_state)
 	print("\n")
 	if best == -1 {
-		print("Cannot acheive success criteria\n")
+		print("Cannot achieve success criteria\n")
 		return
 	}
 	description := DescribePath(data, dims, table, best)