AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-24 03:53:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Observatory now available with astronomy

Browse Source 
Wealth and science production fixed to 4:1
Wonder bug fixed
This commit is contained in:
Yair Morgenstern 2017-12-12 22:31:48 +02:00
parent 0715f4b855
commit 761b62038f
5 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
android/assets/jsons/Buildings.json
View File

@ -226,7 +226,7 @@
hurryCostModifier:25, hurryCostModifier:25,
percentStatBonus:{science:50}, percentStatBonus:{science:50},
requiredBuilding:"Library", requiredBuilding:"Library",
requiredTech:"Metal Casting" requiredTech:"Astronomy"
}, },
{ {
name:"Opera House", name:"Opera House",

2
android/build.gradle
View File

@ -21,7 +21,7 @@ android {
applicationId "com.unciv.game" applicationId "com.unciv.game"
minSdkVersion 9 minSdkVersion 9
targetSdkVersion 25 targetSdkVersion 25
versionCode 9 versionCode 10
versionName "0.9" versionName "0.9"
} }
buildTypes { buildTypes {

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

@ -33,7 +33,7 @@ public class CityBuildings
public CityInfo getCity(){return UnCivGame.Current.civInfo.tileMap.get(cityLocation).getCity(); } public CityInfo getCity(){return UnCivGame.Current.civInfo.tileMap.get(cityLocation).getCity(); }
public boolean isBuilt(String buildingName) { return builtBuildings.contains(buildingName); } public boolean isBuilt(String buildingName) { return builtBuildings.contains(buildingName); }
public boolean isBuilding(String buildingName) { return currentBuilding.equals(buildingName); } public boolean isBuilding(String buildingName) { return currentBuilding!=null && currentBuilding.equals(buildingName); }
Building getGameBuilding(String buildingName) { return GameBasics.Buildings.get(buildingName); } Building getGameBuilding(String buildingName) { return GameBasics.Buildings.get(buildingName); }
public LinqCollection<Building> getBuiltBuildings(){ return builtBuildings.select(new LinqCollection.Func<String, Building>() { public LinqCollection<Building> getBuiltBuildings(){ return builtBuildings.select(new LinqCollection.Func<String, Building>() {
@ -46,8 +46,8 @@ public class CityBuildings
public void nextTurn(FullStats cityStats) public void nextTurn(FullStats cityStats)
{ {
if (currentBuilding == null) return; if (currentBuilding == null) return;
if(currentBuilding.equals("Gold")) {cityStats.gold+=cityStats.production/3; return;} if(currentBuilding.equals("Gold")) {cityStats.gold+=cityStats.production/4; return;}
if(currentBuilding.equals("Science")) {cityStats.science+=cityStats.production/3; return;} if(currentBuilding.equals("Science")) {cityStats.science+=cityStats.production/4; return;}
Building gameBuilding = getGameBuilding(currentBuilding); Building gameBuilding = getGameBuilding(currentBuilding);

7
core/src/com/unciv/game/WorldScreen.java
View File

@ -462,9 +462,6 @@ public class WorldScreen extends com.unciv.game.utils.CameraStageBaseScreen {
} }
void setCenterPosition(final Vector2 vector){ void setCenterPosition(final Vector2 vector){
TileGroup TG = tileGroups.linqValues().first(new Predicate<WorldTileGroup>() { TileGroup TG = tileGroups.linqValues().first(new Predicate<WorldTileGroup>() {
@Override @Override
@ -480,10 +477,6 @@ public class WorldScreen extends com.unciv.game.utils.CameraStageBaseScreen {
scrollPane.updateVisualScroll(); scrollPane.updateVisualScroll();
} }
float round(float value, int scale){
return (float) (Math.round(value * Math.pow(10, scale)) / Math.pow(10, scale));
}
} }

4
core/src/com/unciv/game/pickerscreens/BuildingPickerScreen.java
View File

@ -72,11 +72,11 @@ public class BuildingPickerScreen extends PickerScreen {
if(game.civInfo.tech.isResearched("Education")) if(game.civInfo.tech.isResearched("Education"))
specials.addActor(getProductionButton("Science","Produce Science", specials.addActor(getProductionButton("Science","Produce Science",
"Convert production to science at a rate of 3 to 1", "Produce Science")); "Convert production to science at a rate of 4 to 1", "Produce Science"));
if(game.civInfo.tech.isResearched("Currency")) if(game.civInfo.tech.isResearched("Currency"))
specials.addActor(getProductionButton("Gold","Produce Gold", specials.addActor(getProductionButton("Gold","Produce Gold",
"Convert production to gold at a rate of 3 to 1", "Produce Gold")); "Convert production to gold at a rate of 4 to 1", "Produce Gold"));
topTable.add(regularBuildings); topTable.add(regularBuildings);
topTable.add(wonders); topTable.add(wonders);