55import com .unciv .game .HexMath ;
66import com .unciv .game .UnCivGame ;
77import com .unciv .models .LinqCollection ;
8+ import com .unciv .models .gamebasics .ResourceType ;
9+ import com .unciv .models .gamebasics .TileResource ;
810import com .unciv .models .stats .FullStats ;
911
1012import java .util .ArrayList ;
13+ import java .util .Comparator ;
1114
1215public class CityInfo {
1316 public final Vector2 cityLocation ;
1417 public String Name ;
1518
1619 public CityBuildings cityBuildings ;
1720 public CityPopulation cityPopulation ;
21+ public int cultureStored ;
22+ private int tilesClaimed ;
23+
1824
1925 public LinqCollection <Vector2 > CityTileLocations = new LinqCollection <Vector2 >();
2026
21- public LinqCollection <TileInfo > GetCityTiles (){
27+ public LinqCollection <TileInfo > getCityTiles (){
2228 return CityTileLocations .select (new com .unciv .models .LinqCollection .Func <Vector2 , TileInfo >() {
2329 @ Override
2430 public TileInfo GetBy (Vector2 arg0 ) {
@@ -27,13 +33,23 @@ public TileInfo GetBy(Vector2 arg0) {
2733 });
2834 }
2935
30- String [] CityNames = new String []{"Assur" , "Ninveh" , "Nimrud" , "Kar-Tukuli-Ninurta" , "Dur-Sharrukin" };
36+ private String [] CityNames = new String []{"Assur" , "Ninveh" , "Nimrud" , "Kar-Tukuli-Ninurta" , "Dur-Sharrukin" };
3137
3238 public CityInfo (){
3339 cityLocation = Vector2 .Zero ;
3440 } // for json parsing, we need to have a default constructor
3541
36- public CityInfo (CivilizationInfo civInfo , Vector2 cityLocation ) {
42+ public int getCultureToNextTile (){
43+ // This one has conflicting sources -
44+ // http://civilization.wikia.com/wiki/Mathematics_of_Civilization_V says it's 20+(10(t-1))^1.1
45+ // https://www.reddit.com/r/civ/comments/58rxkk/how_in_gods_name_do_borders_expand_in_civ_vi/ has it
46+ // (per game XML files) at 6*(t+0.4813)^1.3
47+ // The second seems to be more based, so I'll go with that
48+ double a = 6 *Math .pow (tilesClaimed +1.4813 ,1.3 );
49+ return (int )Math .round (a );
50+ }
51+
52+ CityInfo (CivilizationInfo civInfo , Vector2 cityLocation ) {
3753 Name = CityNames [civInfo .Cities .size ()];
3854 this .cityLocation = cityLocation ;
3955 cityBuildings = new CityBuildings (this );
@@ -45,36 +61,36 @@ public CityInfo(CivilizationInfo civInfo, Vector2 cityLocation) {
4561 CityTileLocations .add (vector );
4662 }
4763
48- AutoAssignWorker ();
64+ autoAssignWorker ();
4965 civInfo .Cities .add (this );
5066 }
5167
52- public ArrayList <String > GetLuxuryResources () {
68+ ArrayList <String > getLuxuryResources () {
5369 ArrayList <String > LuxuryResources = new ArrayList <String >();
54- for (TileInfo tileInfo : GetCityTiles ()) {
70+ for (TileInfo tileInfo : getCityTiles ()) {
5571 com .unciv .models .gamebasics .TileResource resource = tileInfo .GetTileResource ();
56- if (resource != null && resource .ResourceType . equals ( " Luxury" ) && resource .Improvement .equals (tileInfo .Improvement ))
72+ if (resource != null && resource .ResourceType == ResourceType . Luxury && resource .Improvement .equals (tileInfo .Improvement ))
5773 LuxuryResources .add (tileInfo .Resource );
5874 }
5975 return LuxuryResources ;
6076 }
6177
6278
63- public int GetWorkingPopulation () {
64- return GetCityTiles ().count (new Predicate <TileInfo >() {
79+ private int getWorkingPopulation () {
80+ return getCityTiles ().count (new Predicate <TileInfo >() {
6581 @ Override
6682 public boolean evaluate (TileInfo arg0 ) {
6783 return arg0 .IsWorked ;
6884 }
6985 });
7086 }
7187
72- public int GetFreePopulation () {
73- return cityPopulation .Population - GetWorkingPopulation ();
88+ public int getFreePopulation () {
89+ return cityPopulation .Population - getWorkingPopulation ();
7490 }
7591
76- public boolean HasNonWorkingPopulation () {
77- return GetFreePopulation () > 0 ;
92+ public boolean hasNonWorkingPopulation () {
93+ return getFreePopulation () > 0 ;
7894 }
7995
8096 public FullStats getCityStats () {
@@ -85,39 +101,72 @@ public FullStats getCityStats() {
85101 stats .Science += cityPopulation .Population ;
86102
87103 // Working ppl
88- for (TileInfo cell : GetCityTiles ()) {
104+ for (TileInfo cell : getCityTiles ()) {
89105 if (cell .IsWorked || cell .IsCityCenter ()) stats .add (cell .GetTileStats ());
90106 }
91107 //idle ppl
92- stats .Production += GetFreePopulation ();
108+ stats .Production += getFreePopulation ();
93109 stats .Food -= cityPopulation .Population * 2 ;
94110
95111 stats .add (cityBuildings .GetStats ());
96112
97113 return stats ;
98114 }
99115
100- public void NextTurn () {
116+ void nextTurn () {
101117 FullStats stats = getCityStats ();
102118
103- if (cityBuildings .CurrentBuilding .equals (cityBuildings .Settler ) && stats .Food > 0 ) {
119+ if (cityBuildings .CurrentBuilding .equals (CityBuildings .Settler ) && stats .Food > 0 ) {
104120 stats .Production += stats .Food ;
105121 stats .Food = 0 ;
106122 }
107123
108- if (cityPopulation .NextTurn (stats .Food )) AutoAssignWorker ();
124+ if (cityPopulation .NextTurn (stats .Food )) autoAssignWorker ();
109125
110126 cityBuildings .NextTurn (stats .Production );
111127
112- for (TileInfo tileInfo : GetCityTiles ()) {
128+ for (TileInfo tileInfo : getCityTiles ()) {
113129 tileInfo .NextTurn ();
114130 }
131+
132+ cultureStored +=stats .Culture ;
133+ if (cultureStored >=getCultureToNextTile ()){
134+ addNewTile ();
135+ }
136+ }
137+
138+ private void addNewTile (){
139+ cultureStored -= getCultureToNextTile ();
140+ tilesClaimed ++;
141+ LinqCollection <Vector2 > possibleNewTileVectors = new LinqCollection <Vector2 >();
142+ for (TileInfo tile : getCityTiles ())
143+ for (Vector2 vector : HexMath .GetAdjacentVectors (tile .Position ))
144+ if (!CityTileLocations .contains (vector ) && !possibleNewTileVectors .contains (vector ))
145+ possibleNewTileVectors .add (vector );
146+
147+ LinqCollection <TileInfo > possibleNewTiles = new LinqCollection <TileInfo >();
148+ TileMap tileMap = UnCivGame .Current .civInfo .tileMap ;
149+ for (Vector2 vector : possibleNewTileVectors )
150+ if (tileMap .contains (vector ) && tileMap .get (vector ).GetCity ()==null )
151+ possibleNewTiles .add (tileMap .get (vector ));
152+
153+ TileInfo TileChosen =null ;
154+ double TileChosenRank =0 ;
155+ for (TileInfo tile : possibleNewTiles ){
156+ double rank = rankTile (tile );
157+ if (rank >TileChosenRank ){
158+ TileChosenRank = rank ;
159+ TileChosen = tile ;
160+ }
161+ }
162+
163+ CityTileLocations .add (TileChosen .Position );
115164 }
116165
117- public void AutoAssignWorker () {
166+ private void autoAssignWorker () {
118167 double maxValue = 0 ;
119168 TileInfo toWork = null ;
120- for (TileInfo tileInfo : GetCityTiles ()) {
169+ for (TileInfo tileInfo : getCityTiles ()) {
121170 if (tileInfo .IsWorked || tileInfo .IsCityCenter ()) continue ;
122171 FullStats stats = tileInfo .GetTileStats ();
123172
@@ -129,4 +178,17 @@ public void AutoAssignWorker() {
129178 }
130179 toWork .IsWorked = true ;
131180 }
181+
182+ private double rankTile (TileInfo tile ){
183+ FullStats stats = tile .GetTileStats ();
184+ double rank =0 ;
185+ if (stats .Food <2 ) rank +=stats .Food ;
186+ else rank += 2 + (stats .Food -2 )/2 ; // 1 point for each food up to 2, from there on half a point
187+ rank +=stats .Gold /2 ;
188+ rank +=stats .Production ;
189+ rank +=stats .Science ;
190+ rank +=stats .Culture ;
191+ if (tile .Improvement ==null ) rank +=0.5 ; // Improvement potential!
192+ return rank ;
193+ }
132194}
0 commit comments