From 397556f81f7d78d8162160ba07fd035a77a9fa82 Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Fri, 23 Feb 2018 13:31:45 +0200 Subject: [PATCH] Deleted unneccesary files, minor changes that were pointed out by code inspection --- android/AndroidManifest.xml | 2 +- .../ImprovementIcons/Camp_(Civ5).png.meta | 74 ------------------- .../ImprovementIcons/Farm_(Civ5).png.meta | 74 ------------------- .../Lumber_mill_(Civ5).png.meta | 74 ------------------- .../ImprovementIcons/Mine_(Civ5).png.meta | 74 ------------------- .../ImprovementIcons/Oil_well_(Civ5).png.meta | 74 ------------------- .../ImprovementIcons/Pasture_(Civ5).png.meta | 74 ------------------- .../Plantation_(Civ5).png.meta | 74 ------------------- .../ImprovementIcons/Quarry_(Civ5).png.meta | 74 ------------------- .../Trading_post_(Civ5).png.meta | 74 ------------------- .../ResourceIcons/Aluminum_(Civ5).png.meta | 74 ------------------- .../ResourceIcons/Bananas_(Civ5).png.meta | 74 ------------------- .../ResourceIcons/Cattle_(Civ5).png.meta | 74 ------------------- .../assets/ResourceIcons/Coal_(Civ5).png.meta | 74 ------------------- .../ResourceIcons/Cotton_(Civ5).png.meta | 74 ------------------- .../assets/ResourceIcons/Deer_(Civ5).png.meta | 74 ------------------- .../assets/ResourceIcons/Dyes_(Civ5).png.meta | 74 ------------------- .../assets/ResourceIcons/Furs_(Civ5).png.meta | 74 ------------------- .../assets/ResourceIcons/Gems_(Civ5).png.meta | 74 ------------------- .../assets/ResourceIcons/Gold_(Civ5).png.meta | 74 ------------------- .../ResourceIcons/Horses_(Civ5).png.meta | 74 ------------------- .../ResourceIcons/Incense_(Civ5).png.meta | 74 ------------------- .../assets/ResourceIcons/Iron_(Civ5).png.meta | 74 ------------------- .../ResourceIcons/Ivory_(Civ5).png.meta | 74 ------------------- .../ResourceIcons/Marble_(Civ5).png.meta | 74 ------------------- .../assets/ResourceIcons/Oil_(Civ5).png.meta | 74 ------------------- .../ResourceIcons/Sheep_(Civ5).png.meta | 74 ------------------- .../assets/ResourceIcons/Silk_(Civ5).png.meta | 74 ------------------- .../ResourceIcons/Silver_(Civ5).png.meta | 74 ------------------- .../ResourceIcons/Spices_(Civ5).png.meta | 74 ------------------- .../ResourceIcons/Stone_(Civ5).png.meta | 74 ------------------- .../ResourceIcons/Sugar_(Civ5).png.meta | 74 ------------------- .../ResourceIcons/Uranium_(Civ5).png.meta | 74 ------------------- .../ResourceIcons/Wheat_(Civ5).png.meta | 74 ------------------- .../assets/ResourceIcons/Wine_(Civ5).png.meta | 74 ------------------- .../TerrainIcons/Desert_(Civ5).png.meta | 74 ------------------- .../TerrainIcons/Flood_plains_(Civ5).png.meta | 74 ------------------- .../TerrainIcons/Forest_(Civ5).png.meta | 74 ------------------- .../TerrainIcons/Grassland_(Civ5).png.meta | 74 ------------------- .../assets/TerrainIcons/Hill_(Civ5).png.meta | 74 ------------------- .../TerrainIcons/Jungle_(Civ5).png.meta | 74 ------------------- .../assets/TerrainIcons/Lakes_(Civ5).png.meta | 74 ------------------- .../assets/TerrainIcons/Marsh_(Civ5).png.meta | 74 ------------------- .../TerrainIcons/Mountain_(Civ5).png.meta | 74 ------------------- .../assets/TerrainIcons/Oasis_(Civ5).png.meta | 74 ------------------- .../TerrainIcons/Plains_(Civ5).png.meta | 74 ------------------- android/build.gradle | 4 +- .../logic/city/CityExpansionManager.java | 2 + .../logic/civilization/CivilizationInfo.java | 17 +++-- .../civilization/GreatPersonManager.java | 28 +++---- .../unciv/logic/civilization/TechManager.java | 3 +- core/src/com/unciv/logic/map/TileInfo.java | 2 +- html/build.gradle | 4 +- 53 files changed, 31 insertions(+), 3361 deletions(-) delete mode 100644 android/assets/ImprovementIcons/Camp_(Civ5).png.meta delete mode 100644 android/assets/ImprovementIcons/Farm_(Civ5).png.meta delete mode 100644 android/assets/ImprovementIcons/Lumber_mill_(Civ5).png.meta delete mode 100644 android/assets/ImprovementIcons/Mine_(Civ5).png.meta delete mode 100644 android/assets/ImprovementIcons/Oil_well_(Civ5).png.meta delete mode 100644 android/assets/ImprovementIcons/Pasture_(Civ5).png.meta delete mode 100644 android/assets/ImprovementIcons/Plantation_(Civ5).png.meta delete mode 100644 android/assets/ImprovementIcons/Quarry_(Civ5).png.meta delete mode 100644 android/assets/ImprovementIcons/Trading_post_(Civ5).png.meta delete mode 100644 android/assets/ResourceIcons/Aluminum_(Civ5).png.meta delete mode 100644 android/assets/ResourceIcons/Bananas_(Civ5).png.meta delete mode 100644 android/assets/ResourceIcons/Cattle_(Civ5).png.meta delete mode 100644 android/assets/ResourceIcons/Coal_(Civ5).png.meta delete mode 100644 android/assets/ResourceIcons/Cotton_(Civ5).png.meta delete mode 100644 android/assets/ResourceIcons/Deer_(Civ5).png.meta delete mode 100644 android/assets/ResourceIcons/Dyes_(Civ5).png.meta delete mode 100644 android/assets/ResourceIcons/Furs_(Civ5).png.meta delete mode 100644 android/assets/ResourceIcons/Gems_(Civ5).png.meta delete mode 100644 android/assets/ResourceIcons/Gold_(Civ5).png.meta delete mode 100644 android/assets/ResourceIcons/Horses_(Civ5).png.meta delete mode 100644 android/assets/ResourceIcons/Incense_(Civ5).png.meta delete mode 100644 android/assets/ResourceIcons/Iron_(Civ5).png.meta delete mode 100644 android/assets/ResourceIcons/Ivory_(Civ5).png.meta delete mode 100644 android/assets/ResourceIcons/Marble_(Civ5).png.meta delete mode 100644 android/assets/ResourceIcons/Oil_(Civ5).png.meta delete mode 100644 android/assets/ResourceIcons/Sheep_(Civ5).png.meta delete mode 100644 android/assets/ResourceIcons/Silk_(Civ5).png.meta delete mode 100644 android/assets/ResourceIcons/Silver_(Civ5).png.meta delete mode 100644 android/assets/ResourceIcons/Spices_(Civ5).png.meta delete mode 100644 android/assets/ResourceIcons/Stone_(Civ5).png.meta delete mode 100644 android/assets/ResourceIcons/Sugar_(Civ5).png.meta delete mode 100644 android/assets/ResourceIcons/Uranium_(Civ5).png.meta delete mode 100644 android/assets/ResourceIcons/Wheat_(Civ5).png.meta delete mode 100644 android/assets/ResourceIcons/Wine_(Civ5).png.meta delete mode 100644 android/assets/TerrainIcons/Desert_(Civ5).png.meta delete mode 100644 android/assets/TerrainIcons/Flood_plains_(Civ5).png.meta delete mode 100644 android/assets/TerrainIcons/Forest_(Civ5).png.meta delete mode 100644 android/assets/TerrainIcons/Grassland_(Civ5).png.meta delete mode 100644 android/assets/TerrainIcons/Hill_(Civ5).png.meta delete mode 100644 android/assets/TerrainIcons/Jungle_(Civ5).png.meta delete mode 100644 android/assets/TerrainIcons/Lakes_(Civ5).png.meta delete mode 100644 android/assets/TerrainIcons/Marsh_(Civ5).png.meta delete mode 100644 android/assets/TerrainIcons/Mountain_(Civ5).png.meta delete mode 100644 android/assets/TerrainIcons/Oasis_(Civ5).png.meta delete mode 100644 android/assets/TerrainIcons/Plains_(Civ5).png.meta diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml index ce551e2d4d..22dba9827e 100644 --- a/android/AndroidManifest.xml +++ b/android/AndroidManifest.xml @@ -2,7 +2,7 @@ - + 0) tech.nextTurn((int)nextTurnStats.science); - for (CityInfo city : cities) city.nextTurn(); - - greatPeople.greatPersonPointsForTurn(); + for (CityInfo city : cities){ + city.nextTurn(); + greatPeople.addGreatPersonPoints(city.getGreatPersonPoints()); + } + String greatPerson = greatPeople.getNewGreatPerson(); + if(greatPerson!=null) { + CityInfo randomCity = cities.getRandom(); + placeUnitNearTile(cities.getRandom().cityLocation, greatPerson); + gameInfo.addNotification("A " + greatPerson + " has been born!", randomCity.cityLocation); + } goldenAges.nextTurn(happiness); @@ -119,7 +124,7 @@ public class CivilizationInfo { } public int getHappinessForNextTurn(){ - int happiness = baseHappiness; + int happiness = 15; // base happiness int happinessPerUniqueLuxury = 5; if(policies.isAdopted("Protectionism")) happinessPerUniqueLuxury+=1; happiness += new Linq(getCivResources().keySet()).count(new Predicate() { diff --git a/core/src/com/unciv/logic/civilization/GreatPersonManager.java b/core/src/com/unciv/logic/civilization/GreatPersonManager.java index 439d63f267..14cc0f818a 100644 --- a/core/src/com/unciv/logic/civilization/GreatPersonManager.java +++ b/core/src/com/unciv/logic/civilization/GreatPersonManager.java @@ -5,41 +5,33 @@ import com.unciv.models.stats.FullStats; public class GreatPersonManager{ - public transient CivilizationInfo civInfo; + private int pointsForNextGreatPerson=100; + private FullStats greatPersonPoints = new FullStats(); - public void addGreatPerson(String unitName){ // This is also done by some wonders and social policies, remember - civInfo.placeUnitNearTile(civInfo.getCapital().cityLocation,unitName); - civInfo.gameInfo.addNotification("A "+unitName+" has been born!",civInfo.getCapital().cityLocation); - } - - public void greatPersonPointsForTurn(){ - for(CityInfo city : civInfo.cities) - greatPersonPoints.add(city.getGreatPersonPoints()); + public void addGreatPersonPoints(FullStats greatPersonPoints){ greatPersonPoints.add(greatPersonPoints);} + public String getNewGreatPerson(){ if(greatPersonPoints.science>pointsForNextGreatPerson){ greatPersonPoints.science-=pointsForNextGreatPerson; pointsForNextGreatPerson*=2; - addGreatPerson("Great Scientist"); + return "Great Scientist"; } if(greatPersonPoints.production>pointsForNextGreatPerson){ greatPersonPoints.production-=pointsForNextGreatPerson; pointsForNextGreatPerson*=2; - addGreatPerson("Great Engineer"); + return "Great Engineer"; } if(greatPersonPoints.culture>pointsForNextGreatPerson){ greatPersonPoints.culture-=pointsForNextGreatPerson; pointsForNextGreatPerson*=2; - addGreatPerson("Great Artist"); + return "Great Artist"; } if(greatPersonPoints.gold>pointsForNextGreatPerson){ greatPersonPoints.gold-=pointsForNextGreatPerson; pointsForNextGreatPerson*=2; - addGreatPerson("Great Merchant"); + return "Great Merchant"; } + return null; } - - public int pointsForNextGreatPerson=100; - - public FullStats greatPersonPoints = new FullStats(); - + } diff --git a/core/src/com/unciv/logic/civilization/TechManager.java b/core/src/com/unciv/logic/civilization/TechManager.java index bc0b636845..527b15e78d 100644 --- a/core/src/com/unciv/logic/civilization/TechManager.java +++ b/core/src/com/unciv/logic/civilization/TechManager.java @@ -21,7 +21,6 @@ public class TechManager { public HashMap techsInProgress = new HashMap(); - public String currentTechnology(){if(techsToResearch.isEmpty()) return null; return techsToResearch.get(0);} public Technology getCurrentTechnology() { @@ -65,7 +64,7 @@ public class TechManager { if (revealedResource != null) for (TileInfo tileInfo : civInfo.gameInfo.tileMap.values()) - if (revealedResource.name.equals(tileInfo.resource) && tileInfo.owner != null) { + if (revealedResource.name.equals(tileInfo.resource) && civInfo.civName.equals(tileInfo.owner)) { for (int i = 0; ; i++) { TileInfo cityTile = civInfo.gameInfo.tileMap.getTilesAtDistance(tileInfo.position, i) .first(new Predicate() { diff --git a/core/src/com/unciv/logic/map/TileInfo.java b/core/src/com/unciv/logic/map/TileInfo.java index dafda8016d..86fa700a07 100644 --- a/core/src/com/unciv/logic/map/TileInfo.java +++ b/core/src/com/unciv/logic/map/TileInfo.java @@ -94,7 +94,7 @@ public class TileInfo else stats.add(improvement); // basic improvement if (observingCiv.tech.isResearched(improvement.improvingTech)) stats.add(improvement.improvingTechStats); // eg Chemistry for mines - if(improvement.name.equals("Trading post") && city.civInfo.policies.isAdopted("Free Thought")) + if(improvement.name.equals("Trading post") && city!=null && city.civInfo.policies.isAdopted("Free Thought")) stats.science+=1; if(new Linq("Academy","Landmark","Manufactory","Customs House").contains(improvement.name) && observingCiv.policies.isAdopted("Freedom Complete")) diff --git a/html/build.gradle b/html/build.gradle index 21c4af605f..4eb5f2f80e 100644 --- a/html/build.gradle +++ b/html/build.gradle @@ -1,3 +1,5 @@ +import de.richsource.gradle.plugins.gwt.GwtSuperDev + apply plugin: "java" apply plugin: "jetty" @@ -24,7 +26,7 @@ task draftRun(type: JettyRunWar) { daemon=true } -task superDev(type: de.richsource.gradle.plugins.gwt.GwtSuperDev) { +task superDev(type: GwtSuperDev) { dependsOn draftRun doFirst { gwt.modules = gwt.devModules