mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-19 20:28:56 +07:00
Code Issues Packages Projects Releases Wiki Activity

Added Navigation tech with Seaport building and Frigate unit

Browse Source 
Water maps are out of beta and are now default!
This commit is contained in:
Yair Morgenstern
2018-11-12 13:05:42 +02:00
parent d5a5c400bd
commit 62ef51f38e
11 changed files with 265 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/src/com/unciv/logic/map/TileInfo.kt
View File

@ -139,9 +139,14 @@ open class TileInfo {
if(resource.name=="Oil" && city!=null
&& city.getBuildingUniques().contains("+2 Gold for each source of Oil and oasis"))
stats.gold += 2
if(city!=null && isWater()
&& city.getBuildingUniques().contains("+1 production from all sea resources worked by the city"))
stats.production+=1
if(city!=null && isWater()){
if(city.getBuildingUniques().contains("+1 production from all sea resources worked by the city"))
stats.production+=1
if(city.getBuildingUniques().contains("+1 production and gold from all sea resources worked by the city")){
stats.production+=1
stats.gold+=1
}
}
}
val improvement = getTileImprovement()

9
core/src/com/unciv/ui/NewGameScreen.kt
View File

@ -26,7 +26,7 @@ class NewGameScreen: PickerScreen(){
var nation="Babylon"
var mapRadius=20
var numberOfEnemies=3
var mapType=MapType.LandOnly
var mapType=MapType.WithWater
}
val newGameParameters=NewGameParameters()
@ -145,13 +145,6 @@ class NewGameScreen: PickerScreen(){
newGameOptionsTable.add(difficultySelectBox).pad(10f).row()
val checkBox = CheckBox("Add water tiles \n(EXPERIMENTAL/WIP)",skin)
checkBox.onClick {
if(checkBox.isChecked) newGameParameters.mapType = NewGameParameters.MapType.WithWater
else newGameParameters.mapType = NewGameParameters.MapType.LandOnly
}
newGameOptionsTable.add(checkBox).row()
rightSideButton.enable()
rightSideButton.setText("Start game!".tr())
rightSideButton.onClick {