X-Git-Url: http://git.scottworley.com/planeteer/blobdiff_plain/58c3880d618ba797aba4e17e9feceb5dd9c24d34..3cd35cb0f41da9be4e12057441145bf5d5a8f5c4:/planeteer.go

diff --git a/planeteer.go b/planeteer.go
index 6c8f087..cf00d56 100644
--- a/planeteer.go
+++ b/planeteer.go
@@ -3,8 +3,7 @@
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
+ * published by the Free Software Foundation, version 3.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -146,12 +145,13 @@ func json_slurp(filename string, receptacle interface{}) error {
 	return nil
 }
 
-func ReadData() (data planet_data) {
+func ReadData() planet_data {
+	var data planet_data
 	err := json_slurp(*planet_data_file, &data)
 	if err != nil {
 		panic(err)
 	}
-	return
+	return data
 }
 
 /* This program operates by filling in a state table representing the best
@@ -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)
@@ -399,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
@@ -606,7 +606,8 @@ func FindBestState(data planet_data, dims LogicalIndex, table []State, addr Logi
 	return max_index
 }
 
-func Commas(n Value) (s string) {
+func Commas(n Value) string {
+	var s string
 	if n < 0 {
 		panic(n)
 	}
@@ -618,7 +619,7 @@ func Commas(n Value) (s string) {
 		n /= 1000
 	}
 	s = fmt.Sprint(r) + s
-	return
+	return s
 }
 
 func FighterAndShieldCost(data planet_data, dims LogicalIndex, table []State, best PhysicalIndex) {
@@ -688,7 +689,8 @@ func EndLocationCost(data planet_data, dims LogicalIndex, table []State, best Ph
 	*end_string = save_end_string
 }
 
-func DescribePath(data planet_data, dims LogicalIndex, table []State, start PhysicalIndex) (description []string) {
+func DescribePath(data planet_data, dims LogicalIndex, table []State, start PhysicalIndex) []string {
+	var description []string
 	for index := start; table[index].from > FROM_ROOT; index = table[index].from {
 		if table[index].from == FROM_UNINITIALIZED {
 			panic(index)
@@ -745,7 +747,7 @@ func DescribePath(data planet_data, dims LogicalIndex, table []State, start Phys
 		}
 		description = append(description, fmt.Sprintf("%13v ", Commas(table[index].value))+line)
 	}
-	return
+	return description
 }
 
 // (Example of a use case for generics in Go)