M src/main/java/DBObjects/CityDB.java +4 -1
@@ 330,7 330,10 @@ public class CityDB {
public double getResources(int year) {
double inf = this.getCalculatedInfrastructure(year);
double manu = this.getManufacturingLevel(year);
- return (inf+manu)/2;
+// return (inf+manu)/2;
+//TODO: This is supposed to be relative to average, 1.0 = average.
+//For now just always return 1.0
+ return 1.0;
}
// public void get
M src/main/java/com/ajtjp/gearCity/Main.java +2 -3
@@ 196,10 196,9 @@ cityDBLoop: for (CityDB city : cities) {
List<Integer> cityIDsExpected = new ArrayList<>();
Map<Integer, Integer> cityToStatusMap = new HashMap<>();
List<Integer> cityIDsFound = new ArrayList<>();
- File tempOutput = new File("D:/Gear City Mods/Europe Expanded II/Maps/Europe Expanded II/Scripts/TurnEventsUpdated.xml");
try {
- FileWriter fw = new FileWriter("D:/Gear City Mods/Europe Expanded II/Maps/Europe Expanded II/scripts/TurnEventsUpdated.xml");
- File source = new File("D:/Gear City Mods/Europe Expanded II/Maps/Europe Expanded II/scripts/TurnEvents.xml");
+ FileWriter fw = new FileWriter("D:/Gear City Mods/Europe Expanded II/Maps/Europe Expanded II/scripts/TurnEvents.xml");
+ File source = new File("D:/Gear City Mods/Europe Expanded II/Maps/Europe Expanded II/scripts/TurnEventsOrig.xml");
if (!source.exists()) {
System.out.println(source + " does not exist");
}