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

Changed Forest icon

Browse Source 
Narrowed hexagon edges
This commit is contained in:
Yair Morgenstern
2018-11-27 21:51:52 +02:00
parent 2cd7e5dc88
commit 6096bde9cd
9 changed files with 362 additions and 356 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
android/Images/TerrainIcons/Forest.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

BIN
android/Images/TerrainIcons/Hexagon.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.9 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB

707
android/assets/game.atlas
View File

File diff suppressed because it is too large Load Diff

BIN
android/assets/game.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 798 KiB

After

Width:  |  Height:  |  Size: 790 KiB

4
android/build.gradle
View File

@ -21,8 +21,8 @@ android {
applicationId "com.unciv.game" applicationId "com.unciv.game"
minSdkVersion 14 minSdkVersion 14
targetSdkVersion 26 targetSdkVersion 26
versionCode 166 versionCode 167
versionName "2.10.5" versionName "2.10.6"
} }
buildTypes { buildTypes {
release { release {

1
core/src/com/unciv/ui/cityscreen/CityTileGroup.kt
View File

@ -28,7 +28,6 @@ class CityTileGroup(private val city: CityInfo, tileInfo: TileInfo) : TileGroup(
if (cityImage != null) cityImage!!.setColor(1f, 1f, 1f, 0.5f) if (cityImage != null) cityImage!!.setColor(1f, 1f, 1f, 0.5f)
if (civilianUnitImage != null) civilianUnitImage!!.setColor(1f, 1f, 1f, 0.5f) if (civilianUnitImage != null) civilianUnitImage!!.setColor(1f, 1f, 1f, 0.5f)
if (militaryUnitImage!= null) militaryUnitImage!!.setColor(1f, 1f, 1f, 0.5f) if (militaryUnitImage!= null) militaryUnitImage!!.setColor(1f, 1f, 1f, 0.5f)
if (terrainFeatureImage!= null) terrainFeatureImage!!.setColor(1f, 1f, 1f, 0.5f)
updateYieldGroup() updateYieldGroup()
} }

2
core/src/com/unciv/ui/tilegroups/TileGroup.kt
View File

@ -260,7 +260,7 @@ open class TileGroup(var tileInfo: TileInfo) : Group() {
addActor(terrainFeatureImage) addActor(terrainFeatureImage)
terrainFeatureImage!!.run { terrainFeatureImage!!.run {
setSize(30f, 30f) setSize(30f, 30f)
//setColor(1f, 1f, 1f, 0.5f) setColor(1f, 1f, 1f, 0.5f)
center(this@TileGroup) center(this@TileGroup)
} }
} }

2
core/src/com/unciv/ui/trade/OffersList.kt
View File

@ -27,7 +27,7 @@ class OffersList(val offers: TradeOffersList, val correspondingOffers: TradeOffe
val labelName = when(offertype){ val labelName = when(offertype){
Gold, Gold_Per_Turn, Treaty,Introduction -> "" Gold, Gold_Per_Turn, Treaty,Introduction -> ""
Luxury_Resource -> "Luxury resources" Luxury_Resource -> "Luxury resources"
Strategic_Resource -> "Luxury resources" Strategic_Resource -> "Strategic resources"
Technology -> "Technologies" Technology -> "Technologies"
WarDeclaration -> "Declarations of war" WarDeclaration -> "Declarations of war"
City -> "Cities" City -> "Cities"

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

@ -66,7 +66,7 @@ object ImageGetter {
return getImage("UnitIcons/$unitName").apply { this.color=color } return getImage("UnitIcons/$unitName").apply { this.color=color }
} }
val foodCircleColor = Color.GREEN.cpy().lerp(Color.WHITE,0.5f) val foodCircleColor = colorFromRGB(129, 199, 132)// .GREEN.cpy().lerp(Color.WHITE,0.5f)
val productionCircleColor = Color.BROWN.cpy().lerp(Color.WHITE,0.5f) val productionCircleColor = Color.BROWN.cpy().lerp(Color.WHITE,0.5f)
val goldCircleColor = Color.GOLD.cpy().lerp(Color.WHITE,0.5f) val goldCircleColor = Color.GOLD.cpy().lerp(Color.WHITE,0.5f)
fun getImprovementIcon(improvementName:String, size:Float=20f):Actor{ fun getImprovementIcon(improvementName:String, size:Float=20f):Actor{