# HG changeset patch # User Andrew # Date 1662578411 14400 # Wed Sep 07 15:20:11 2022 -0400 # Node ID 315fb9054556891f5e6fa1f324a70193e7e69724 # Parent 4278a4c8d6f2c568090824fec65dff9000a0d17e Write to turn events so I don't have to copy it. Set resources to average for everything b/c it's a 1.0 = average thing, not a 0-100 thing. diff --git a/src/main/java/DBObjects/CityDB.java b/src/main/java/DBObjects/CityDB.java --- a/src/main/java/DBObjects/CityDB.java +++ b/src/main/java/DBObjects/CityDB.java @@ -330,7 +330,10 @@ 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 diff --git a/src/main/java/com/ajtjp/gearCity/Main.java b/src/main/java/com/ajtjp/gearCity/Main.java --- a/src/main/java/com/ajtjp/gearCity/Main.java +++ b/src/main/java/com/ajtjp/gearCity/Main.java @@ -196,10 +196,9 @@ List cityIDsExpected = new ArrayList<>(); Map cityToStatusMap = new HashMap<>(); List 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"); }