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

Bugfixes

Browse Source
This commit is contained in:
Yair Morgenstern
2018-05-14 22:45:41 +03:00
parent 41f37f5ee7
commit 030ddafce6
7 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -121,7 +121,7 @@
improvingTechStats:{production:1}
},
{
name:"Customs House",
name:"Customs house",
gold:4,
improvingTech:"Economics",
improvingTechStats:{gold:1}

4
android/build.gradle
View File

@ -21,8 +21,8 @@ android {
applicationId "com.unciv.game"
minSdkVersion 14
targetSdkVersion 26
versionCode 54
versionName "2.1.4"
versionCode 55
versionName "2.1.5"
}
buildTypes {
release {

2
core/src/com/unciv/logic/GameInfo.kt
View File

@ -39,8 +39,8 @@ class GameInfo {
// maybe one of them has a wonder that affects the stats of all the rest of the cities
for (civInfo in civilizations.filterNot { it.isPlayerCivilization() }){
Automation().automateCivMoves(civInfo)
civInfo.startTurn()
Automation().automateCivMoves(civInfo)
}
if(turns%10 == 0){ // every 10 turns add a barbarian in a random place

2
core/src/com/unciv/logic/city/CityExpansionManager.kt
View File

@ -31,7 +31,7 @@ class CityExpansionManager {
cultureStored -= getCultureToNextTile()
val chosenTile = getNewTile()
cityInfo.tiles.add(chosenTile!!.position)
if(chosenTile!=null) cityInfo.tiles.add(chosenTile!!.position)
}
fun getNewTile(): TileInfo? {

3
core/src/com/unciv/ui/utils/ImageGetter.kt
View File

@ -31,8 +31,7 @@ object ImageGetter {
textureRegionByFileName[fileName] = TextureRegion(texture)
}
} catch (ex: Exception) {
print("File $fileName not found!")
throw ex
throw Exception("File $fileName not found!",ex)
}
return textureRegionByFileName[fileName]!!

3
core/src/com/unciv/ui/worldscreen/TileMapHolder.kt
View File

@ -13,6 +13,7 @@ import com.unciv.logic.map.UnitType
import com.unciv.ui.cityscreen.addClickListener
import com.unciv.ui.tilegroups.WorldTileGroup
import com.unciv.ui.utils.HexMath
import com.unciv.ui.utils.fromRGB
class TileMapHolder(internal val worldScreen: WorldScreen, internal val tileMap: TileMap, internal val civInfo: CivilizationInfo) : ScrollPane(null) {
internal var selectedTile: TileInfo? = null
@ -113,7 +114,7 @@ class TileMapHolder(internal val worldScreen: WorldScreen, internal val tileMap:
}
for (tile in attackableTiles.filter { it.unit!=null && it.unit!!.owner != unit.owner && civViewableTiles.contains(it)})
tileGroups[tile]!!.showCircle(Color(237/255f,41/255f,57/255f,1f))
tileGroups[tile]!!.showCircle(Color().fromRGB(237,41,57))
}
}

2
core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt
View File

@ -131,7 +131,7 @@ class UnitActions {
tile.unit = null // destroy!
},unit.currentMovement != 0f)
actionList += UnitAction( "Construct Customs House",
constructImprovementAndDestroyUnit(tile, "Customs House"),
constructImprovementAndDestroyUnit(tile, "Customs house"),
unit.currentMovement != 0f)
}