mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-09 15:29:32 +07:00
Code Issues Packages Projects Releases Wiki Activity

Added education buildings

Browse Source
This commit is contained in:
Yair Morgenstern
2017-11-25 23:51:58 +02:00
parent 279269d4a3
commit c8dd598438
7 changed files with 52 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/src/com/unciv/civinfo/CityBuildings.java
View File

@ -3,6 +3,7 @@ package com.unciv.civinfo;
import com.badlogic.gdx.math.Vector2;
import com.badlogic.gdx.utils.Predicate;
import com.unciv.game.UnCivGame;
import com.unciv.models.LinqCollection;
import com.unciv.models.gamebasics.Building;
import com.unciv.models.gamebasics.GameBasics;
import com.unciv.models.stats.FullStats;
@ -25,7 +26,7 @@ public class CityBuildings
cityLocation = cityInfo.cityLocation;
}
public ArrayList<String> BuiltBuildings = new ArrayList<String>();
public LinqCollection<String> BuiltBuildings = new LinqCollection<String>();
public HashMap<String, Integer> InProgressBuildings = new HashMap<String, Integer>();
public String CurrentBuilding = Worker; // default starting building!
@ -34,6 +35,12 @@ public class CityBuildings
public boolean IsBuilding(String buildingName) { return CurrentBuilding.equals(buildingName); }
Building GetGameBuilding(String buildingName) { return GameBasics.Buildings.get(buildingName); }
public LinqCollection<Building> GetBuiltBuildings(){ return BuiltBuildings.select(new LinqCollection.Func<String, Building>() {
@Override
public Building GetBy(String arg0) {
return GetGameBuilding(arg0);
}
}); }
public void NextTurn(int ProductionProduced)
{
@ -94,7 +101,7 @@ public class CityBuildings
@Override
public boolean evaluate(CityInfo arg0) {
CityBuildings CB = arg0.cityBuildings;
return CB.IsBuilt(building.Name) || CB.IsBuilt(building.Name);
return CB.IsBuilding(building.Name) || CB.IsBuilt(building.Name);
}
}) ) return false;
if (building.RequiredBuilding != null && !IsBuilt(building.RequiredBuilding)) return false;

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

@ -5,6 +5,7 @@ import com.badlogic.gdx.utils.Predicate;
import com.unciv.game.HexMath;
import com.unciv.game.UnCivGame;
import com.unciv.models.LinqCollection;
import com.unciv.models.gamebasics.Building;
import com.unciv.models.gamebasics.ResourceType;
import com.unciv.models.gamebasics.TileResource;
import com.unciv.models.stats.FullStats;

12
core/src/com/unciv/models/gamebasics/Building.java
View File

@ -1,14 +1,18 @@
package com.unciv.models.gamebasics;
import com.unciv.models.LinqHashMap;
import com.unciv.models.stats.FullStats;
import com.unciv.models.stats.NamedStats;
import java.util.Dictionary;
public class Building extends NamedStats implements ICivilopedia {
public String Description;
public String RequiredTech;
public Technology GetRequiredTech(){return GameBasics.Technologies.get(RequiredTech);}
public int Cost;
public int Maintainance = 0;
public com.unciv.models.stats.FullStats PercentStatBonus = new com.unciv.models.stats.FullStats();
public FullStats PercentStatBonus = new FullStats();
//public Func<CityInfo,FullStats> GetFlatBonusStats;
public boolean IsWonder = false;
public boolean ResourceRequired = false;
@ -18,13 +22,13 @@ public class Building extends NamedStats implements ICivilopedia {
// Uniques
public String ProvidesFreeBuilding;
public int FreeTechs;
public int NewTileCostReduction;
/** The bonus stats that a resource gets when this building is built */
public com.unciv.models.stats.FullStats ResourceBonusStats;
public FullStats ResourceBonusStats;
public String GetDescription() {
com.unciv.models.stats.FullStats stats = new com.unciv.models.stats.FullStats(this);
FullStats stats = new FullStats(this);
StringBuilder stringBuilder = new StringBuilder();
if(IsWonder) stringBuilder.append("Wonder\r\n");
stringBuilder.append(Description + "\r\n" + stats);