Added medieval tech icons

This commit is contained in:
Yair Morgenstern 2018-10-03 23:03:53 +03:00
parent 2e6dcce6ca
commit a8bb9f53b7
15 changed files with 287 additions and 210 deletions

View file

@ -224,4 +224,16 @@ All the following are from [the Noun Project](https://thenounproject.com) licenc
* [Brain](https://thenounproject.com/term/brain/64073/) By Tony Gines
* [Coins](https://thenounproject.com/term/coins/1806100/) By Adrien Coquet
* [Engineering Blueprint](https://thenounproject.com/term/engineering-blueprint/1588543/) By Sachin Modgekar
* [Metalworking](https://thenounproject.com/term/metalworking/1561383/) By Symbolon
* [Metalworking](https://thenounproject.com/term/metalworking/1561383/) By Symbolon
## Medieval
* [Judaism](https://thenounproject.com/term/judaism/324145/) By Ben Davis
* [Institution](https://thenounproject.com/term/institution/260586/) By Luis Prado
* [Education](https://thenounproject.com/term/education/1817512/) By Tomas Knopp
* [Casting](https://thenounproject.com/term/casting/10773/) By Jasmine Rae Friedrich
* [Bar association](https://thenounproject.com/term/bar-association/217443/) By Miroslav Kurdov
* [Knight](https://thenounproject.com/term/knight/1026633/) By Robert Bjurshagen
* [Machinery](https://thenounproject.com/term/machinery/1170931/) By Greenhill
* [Lever](https://thenounproject.com/term/lever/4927/) By Jakob Ukrop
* [Sword](https://thenounproject.com/term/sword/1365080/) By Jonathan P Lambert
*

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 831 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.9 KiB

File diff suppressed because it is too large Load diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 802 KiB

After

Width:  |  Height:  |  Size: 817 KiB

View file

@ -21,8 +21,8 @@ android {
applicationId "com.unciv.game"
minSdkVersion 14
targetSdkVersion 26
versionCode 142
versionName "2.8.10"
versionCode 143
versionName "2.8.11"
}
buildTypes {
release {

View file

@ -1,6 +1,7 @@
package com.unciv.ui.pickerscreens
import com.badlogic.gdx.graphics.Color
import com.badlogic.gdx.scenes.scene2d.Touchable
import com.badlogic.gdx.scenes.scene2d.ui.Label
import com.badlogic.gdx.scenes.scene2d.ui.Table
import com.unciv.UnCivGame
@ -38,6 +39,7 @@ class TechPickerScreen(internal val civInfo: CivilizationInfo) : PickerScreen()
class TechButton(techName:String) : Table(skin) {
val text=Label("",skin).setFontColor(Color.WHITE)
init {
touchable = Touchable.enabled
defaults().pad(10f)
background = ImageGetter.getDrawable("OtherIcons/civTableBackground.png")
if(ImageGetter.techIconExists(techName))

View file

@ -85,7 +85,7 @@ class WorldTileGroup(tileInfo: TileInfo) : TileGroup(tileInfo) {
toFront() // so this tile is rendered over neighboring tiles
}
val cityButtonText = city.name + " (" + city.population.population + ")"
val cityButtonText = city.population.population.toString() +" | " +city.name
val label = Label(cityButtonText, CameraStageBaseScreen.skin)
label.setFontColor(city.civInfo.getNation().getSecondaryColor())
if (city.civInfo.isPlayerCivilization())