X-Git-Url: http://git.scottworley.com/planeteer/blobdiff_plain/797391f853ed1af8da9f37d9367edf3e162203b7..809e65f43c41047a34e0731e11e2f3639e7e0b8a:/planeteer.go

diff --git a/planeteer.go b/planeteer.go
index 6f6f7b7..d17c5a5 100644
--- 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(*end_string, ",") {
+		m[p] = true
+	}
+	return m
+}
+
 type Commodity struct {
 	BasePrice int
 	CanSell   bool
@@ -267,7 +278,9 @@ func FillCellByArriving(data planet_data, dims []int, table []State, addr []int)
 	if addr[Fuel]+2 < dims[Fuel] {
 		other[Fuel] = addr[Fuel] + 2
 		for other[Location] = 0; other[Location] < dims[Location]; other[Location]++ {
-			UpdateCell(table, my_index, EncodeIndex(dims, other), 0)
+			if data.Planets[data.i2p[addr[Location]]].BeaconOn {
+				UpdateCell(table, my_index, EncodeIndex(dims, other), 0)
+			}
 		}
 		other[Location] = addr[Location]
 		other[Fuel] = addr[Fuel]
@@ -276,23 +289,28 @@ 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]
 		}
 	}
 
 	/* Travel here via Eden Warp Unit */
-	for other[Edens] = addr[Edens] + 1; other[Edens] < dims[Edens]; other[Edens]++ {
-		for other[Location] = 0; other[Location] < dims[Location]; other[Location]++ {
-			UpdateCell(table, my_index, EncodeIndex(dims, other), 0)
+	if addr[Edens]+1 < dims[Edens] {
+		_, available := data.Planets[data.i2p[addr[Location]]].RelativePrices["Eden Warp Units"]
+		if !available {
+			other[Edens] = addr[Edens] + 1
+			for other[Location] = 0; other[Location] < dims[Location]; other[Location]++ {
+				UpdateCell(table, my_index, EncodeIndex(dims, other), 0)
+			}
+			other[Location] = addr[Location]
+			other[Edens] = addr[Edens]
 		}
 	}
-	other[Location] = addr[Location]
-	other[Edens] = addr[Edens]
 }
 
 func FillCellBySelling(data planet_data, dims []int, table []State, addr []int) {
@@ -371,7 +389,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]
@@ -464,10 +484,12 @@ func FindBestState(data planet_data, dims []int, table []State) int {
 	max_index := -1
 	max_value := 0
 	for addr[Location] = 0; addr[Location] < dims[Location]; addr[Location]++ {
-		index := EncodeIndex(dims, addr)
-		if table[index].value > max_value {
-			max_value = table[index].value
-			max_index = index
+		if len(end()) == 0 || end()[data.i2p[addr[Location]]] {
+			index := EncodeIndex(dims, addr)
+			if table[index].value > max_value {
+				max_value = table[index].value
+				max_index = index
+			}
 		}
 	}
 	return max_index
@@ -513,6 +535,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 +580,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])