mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-01-13 00:04:38 +07:00
Code Issues Packages Projects Releases Wiki Activity

Cities provide resources that are in the city center

Browse Source 
Cities founded on forest/jungle/marsh remove terrain feature
This commit is contained in:
Yair Morgenstern 2017-12-05 11:07:13 +02:00
parent 65bff07905
commit 060be89e55
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
core/src/com/unciv/civinfo/CityInfo.java
View File

@ -59,24 +59,27 @@ public class CityInfo {
tileInfo.owner = civInfo.civName; tileInfo.owner = civInfo.civName;
} }
getTile().workingCity = this.name; TileInfo tile = getTile();
getTile().roadStatus = RoadStatus.Railroad; tile.workingCity = this.name;
tile.roadStatus = RoadStatus.Railroad;
if("Forest".equals(tile.terrainFeature) || "Jungle".equals(tile.terrainFeature) || "Marsh".equals(tile.terrainFeature))
tile.terrainFeature=null;
autoAssignWorker(); autoAssignWorker();
civInfo.cities.add(this); civInfo.cities.add(this);
} }
ArrayList<String> getLuxuryResources() { ArrayList<String> getLuxuryResources() {
ArrayList<String> LuxuryResources = new ArrayList<String>(); LinqCollection<String> LuxuryResources = new LinqCollection<String>();
for (TileInfo tileInfo : getTilesInRange()) { for (TileInfo tileInfo : getTilesInRange()) {
TileResource resource = tileInfo.getTileResource(); TileResource resource = tileInfo.getTileResource();
if (resource != null && resource.resourceType == ResourceType.Luxury && resource.improvement.equals(tileInfo.improvement)) if (resource != null && resource.resourceType == ResourceType.Luxury &&
(resource.improvement.equals(tileInfo.improvement) || tileInfo.isCityCenter()))
LuxuryResources.add(tileInfo.resource); LuxuryResources.add(tileInfo.resource);
} }
return LuxuryResources; return LuxuryResources.unique();
} }
private int getWorkingPopulation() { private int getWorkingPopulation() {
return getTilesInRange().count(new Predicate<TileInfo>() { return getTilesInRange().count(new Predicate<TileInfo>() {
@Override @Override