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

diff --git a/planeteer.go b/planeteer.go
index d5c359a..1b8de84 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]
@@ -287,13 +300,17 @@ func FillCellByArriving(data planet_data, dims []int, table []State, addr []int)
 	}
 
 	/* 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) {
@@ -467,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
@@ -490,27 +509,26 @@ func Commas(n int) (s string) {
 
 func DescribePath(data planet_data, dims []int, table []State, start int) (description []string) {
 	for index := start; index > 0 && table[index].from > 0; index = table[index].from {
-		line := fmt.Sprintf("%13v", Commas(table[index].value))
+		var line string
 		addr := DecodeIndex(dims, index)
 		prev := DecodeIndex(dims, table[index].from)
-		if addr[Location] != prev[Location] {
+		if addr[Fuel] != prev[Fuel] {
 			from := data.i2p[prev[Location]]
 			to := data.i2p[addr[Location]]
-			if addr[Fuel] != prev[Fuel] {
-				line += fmt.Sprintf(" Jump from %v to %v (%v reactor units)", from, to, prev[Fuel]-addr[Fuel])
-			} else if addr[Edens] != prev[Edens] {
-				line += fmt.Sprintf(" Eden warp from %v to %v", from, to)
-			} else {
-				panic("Traveling without fuel?")
-			}
+			line += fmt.Sprintf("Jump from %v to %v (%v reactor units)", from, to, prev[Fuel]-addr[Fuel])
+		}
+		if addr[Edens] != prev[Edens] {
+			from := data.i2p[prev[Location]]
+			to := data.i2p[addr[Location]]
+			line += fmt.Sprintf("Eden warp from %v to %v", from, to)
 		}
 		if addr[Hold] != prev[Hold] {
 			if addr[Hold] == 0 {
 				quantity := *hold - (prev[UnusedCargo] + prev[Edens] + prev[Cloaks])
-				line += fmt.Sprintf(" Sell %v %v", quantity, data.i2c[prev[Hold]])
+				line += fmt.Sprintf("Sell %v %v", quantity, data.i2c[prev[Hold]])
 			} else if prev[Hold] == 0 {
 				quantity := *hold - (addr[UnusedCargo] + addr[Edens] + addr[Cloaks])
-				line += fmt.Sprintf(" Buy %v %v", quantity, data.i2c[addr[Hold]])
+				line += fmt.Sprintf("Buy %v %v", quantity, data.i2c[addr[Hold]])
 			} else {
 				panic("Switched cargo?")
 			}
@@ -518,9 +536,15 @@ 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"
+			line += "Buy a Cloak"
+		}
+		if addr[Edens] != prev[Edens] {
+			line += fmt.Sprint("Buy ", addr[Edens] - prev[Edens], " Eden Warp Units")
+		}
+		if line == "" {
+			line = fmt.Sprint(prev, " -> ", addr)
 		}
-		description = append(description, line)
+		description = append(description, fmt.Sprintf("%13v ", Commas(table[index].value)) + line)
 	}
 	return
 }