mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-08 14:57:58 +07:00
Code Issues Packages Projects Releases Wiki Activity

Jungles provide science for cities with universities

Browse Source
This commit is contained in:
Yair Morgenstern
2017-12-13 19:45:56 +02:00
parent 0b4542ff7a
commit 3381cf84d4
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
core/src/com/unciv/civinfo/TileInfo.java
View File

@ -61,15 +61,14 @@ public class TileInfo
else stats.add(terrainFeature); else stats.add(terrainFeature);
} }
CityInfo city = getCity();
TileResource resource = getTileResource(); TileResource resource = getTileResource();
CityInfo City = getCity();
if (hasViewableResource()) if (hasViewableResource())
{ {
stats.add(resource); stats.add(resource); // resource base
if(resource.building !=null && City!=null && City.cityBuildings.isBuilt(resource.building)) if(resource.building !=null && city!=null && city.cityBuildings.isBuilt(resource.building))
{ {
stats.add(resource.GetBuilding().resourceBonusStats); stats.add(resource.GetBuilding().resourceBonusStats); // resource-specific building (eg forge, stable) bonus
} }
} }
@ -77,17 +76,20 @@ public class TileInfo
if (improvement != null) if (improvement != null)
{ {
if (resource != null && resource.improvement.equals(improvement.name)) if (resource != null && resource.improvement.equals(improvement.name))
stats.add(resource.improvementStats); stats.add(resource.improvementStats); // resource-specifc improvement
else stats.add(improvement); else stats.add(improvement); // basic improvement
if (isResearched(improvement.improvingTech)) stats.add(improvement.improvingTechStats); if (isResearched(improvement.improvingTech)) stats.add(improvement.improvingTechStats); // eg Chemistry for mines
} }
if (City != null && City.cityLocation.equals(position)) { if (isCityCenter()) {
if (stats.food < 2) stats.food = 2; if (stats.food < 2) stats.food = 2;
if (stats.production < 1) stats.production = 1; if (stats.production < 1) stats.production = 1;
} }
if (stats.production < 0) stats.production = 0; if (stats.production < 0) stats.production = 0;
if("Jungle".equals(terrainFeature) && city.getBuildingUniques().contains("JunglesProvideScience")) stats.science+=2;
return stats; return stats;
} }