From f546a49c49469bec9f9f4935e176e615cd2fec6a Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Thu, 17 May 2018 21:28:41 +0300 Subject: [PATCH] Added icons for Medieval and Renaissance era units --- android/assets/UnitIcons/Cannon.png | Bin 0 -> 2427 bytes android/assets/UnitIcons/Knight.png | Bin 0 -> 3815 bytes android/assets/UnitIcons/Lancer.png | Bin 0 -> 2484 bytes android/assets/UnitIcons/Musketman.png | Bin 0 -> 2017 bytes android/assets/UnitIcons/Trebuchet.png | Bin 0 -> 5381 bytes core/src/com/unciv/logic/map/TileInfo.kt | 2 +- .../unciv/ui/utils/CameraStageBaseScreen.kt | 2 +- .../com/unciv/ui/worldscreen/TileInfoTable.kt | 27 +++++++++++------- 8 files changed, 18 insertions(+), 13 deletions(-) create mode 100644 android/assets/UnitIcons/Cannon.png create mode 100644 android/assets/UnitIcons/Knight.png create mode 100644 android/assets/UnitIcons/Lancer.png create mode 100644 android/assets/UnitIcons/Musketman.png create mode 100644 android/assets/UnitIcons/Trebuchet.png diff --git a/android/assets/UnitIcons/Cannon.png b/android/assets/UnitIcons/Cannon.png new file mode 100644 index 0000000000000000000000000000000000000000..7401b30f1c0dde5eb62fa55cc97f316959825c1f GIT binary patch literal 2427 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 literal 0 HcmV?d00001 diff --git a/android/assets/UnitIcons/Lancer.png b/android/assets/UnitIcons/Lancer.png new file mode 100644 index 0000000000000000000000000000000000000000..aeb3973ff03699ecd17189e57df883ec6a8ff52f GIT binary patch literal 2484 zcmYjTc~lZu7iV)r#d0OYWn4;f39}FtO-&KhAW6$COS5v)T*xdmP0Yp>N!&A|bWjJ) zavUquhL|##v>_v0QZol~`ZO1)Tuc36{`k)K&b#lP`@73I@0|O7?-uMQ1?WN%Pyhg+ zOC0Ldn)q(xa|$P za@*1=8}Dro1wpr?`s>??ArRmxdta1V*XvW?Wqm!@(>;FwIF>R#Kb~^y___6Z)cnxc zHkT!b_dsH)&Hwi9Q9S<|-H4yS$D|2aUBZ(Su&5t<6qb0aU(MuzpJix$tzlhS?I0Ci zusY(!2ML(Z2$Cw8y78N1$Y;WLhqqQ-G1GPUIUKo{kBG|1O>01J1Gm_j3pdGSI$r{# zdESrEx%4C1S_ zHaB$MXDUuFSoc;0v<*D<^w?XhG5A}qGOHSj^I5@G0yTb88pGGVwuHRJ9s~ubT-dA9 zhfD@;5U}lEOFf*lg3YD7JZ-83)%va+3CO*cbX65rBzg)5IVnpwzXc=%Zwj5Y;X3Td z<}m?Zi?86s3bTAaQpa@8ZhEB2g_-VLt$$B(zb12vqI|I8bRqpe`Y>?o(6b>+{p;h6 zcK1S;FM0xzFo$OOe0h6!r6}v11EA4Q&&hunuWSI|C2r9 zMc_ofLs_6tBYHL6zngUjc={@7yV|HJjb-Tfnn2RN84AT9g>nrZ!A6gj7{EfDnZ@?{ zwP#H{o<1-S5!o)X8&aQ#>?-w?;txJqwQAi{o_hE=GRA*rd{5RBtEhto@!?B(?QydL zXTS8hj4Ih~EwU?aUo1K`UC8+nnZ%7&=awX#nIF1A+LD(p4u5$4kWm5km)Oj* z6UWPocET1qMp2hB+(9I+@RG$uJqws2SN%Sw*Jml9rl6boh9RKJCZfph;u#> z@bxKl1`cvZJ9t?Xb>=>}!3dpid zf?ou0D50AM(-6n z+H9sC&3{)=oZ%Y3tkJ)6}!-mi73i_QWFnr4jG3(G~`BDSSDm12tYnj!xSAU z3~dF|8zct8Fxs=a^kKsZwdn%c3_q1nF zteuz7P+G@>)4x%gs187;if#r>>B1=-^JDf}PHa`&?t-treI(hkM_Z68Q~-4CPeY~< zl8Q?alln^fiRIihY{0vfiDb(dwjd0A(>r#^{UEqW#e&%CudpZWR0lOCOhuO-a{Wo! zvYwnN=QaRFfnlXCD~jL+1gg!JUV zIL>c&S%@Wuin&kkpNkOg6t5qm#F+U$iZ|O)y7;6N5w91u`MHe7=-8-`gpYzZ>S@R? zgm1@*#rL(6EuPD&_oZ+3i@T%XCn>)Ge;VRY=7ff!c8uvh2Yk3o&nP zSQPWazaR{JtZ5BvzAa(adiVG-{)v%mGV`cWB|-ji0m80d!zS|IbWR)G0P6K$Mpl(1 zUaUeS;gaoVZwWkIUR6`f_i)zUbP8i@LVBg~9VWscPGk^=r*IxAk`cvsZ7Biivq7Ig zVnKgj_6yFA>G*CFY`I~9WQcwGE179Z?5-pfV}PAk&c`ic2Q#DR-PcWolV8Wle%v-K z{*IN6d804c^B@n#@^3E0Ch99FJEZqSB$a{la+SVH(#yco@Tj5-QaI>xRlGN<>7IBT zHD<&Kh-(;0ePi7?n^=y{K7XlO;(B`jOmtJb4anc zd7*BNIB#TO&#Y1mp%&_H(m%pIm`!xg6kWT?c9h&QMo8T=)z>LGr0gZ<3&@A!)z^o) z3a8UE*t=Gd2CP-l6vIq7^rd*~WGbYsa8UKEdR=SEhjvYbMF^Ms~KDw#1>@^h!nyFC* z>Xe9riy1OfR7>q%;ydYCypU>!cK+l?sS3YzsbBj)%$r*p?#gvgi~;_Z>#?jZ(F)&J jEVB8(k%lzp#$?vXj)Rq4N=e>*< literal 0 HcmV?d00001 diff --git a/android/assets/UnitIcons/Musketman.png b/android/assets/UnitIcons/Musketman.png new file mode 100644 index 0000000000000000000000000000000000000000..44afec9a48f3b5b05590ab56c3db58c6168070e7 GIT binary patch literal 2017 zcmcIli$4>H1K%toY-E+Ai!f83?fAt=j_r4vL_!{!WEOs$Fl=KUJ4c(him}8U30`6NEUqP zY>%pft-vIzJNmz`HE4ffK7Dp!#PIJX8 zpXZkvZd5JKdNsp2zn>Vq@5&N9E3*k=V>LA;e$HNCPPhEeaLzS4CfWDMF@G@sy53D} zpv$l4SjO4D#zw5+JAX_rvl==(9TN7J3Dp6e#FcvEITYzmvj+L?R#9vxC7!rKSw?k@ zsAj{l_x~m4mAKH@+!b0EsIMcXRMP=i42YNURxIR)m|qcAat&T|=fsZ&V$}X3ktL*h zK;c**=E|tC$3D#nU}vWK5L|OCKR`^{xrazn>-X;i)_q^#5$`HEYx?}?#7*|clFb6V zDkJ>d85ww<6CuO){jfsQIq^6I1@a7CF4)t>B;+?<4bau(;t0AK2+Em`;0}`ku2yf7~(3Lp}uCv~_nPm9@skRZ0B- zY03@EWr3j~Gh>d%mqWIsC*CJVmD5dxu9G|dt?QvdS}#LNrq-u|j4-fLqqaMws5^x@tq`Fd7L!7) zGc{0R<4DSECP|8<#0zupKWW+R0AOu z0(y{cr)^{X8uUi0MLOQm^rS!EA6TEV4Y)HTeAXL!yI}G1hk^CeSz|@U8|3PBia1Kl zsn48|*Xc^DT!?|^@q>P;xaLH9;>NY%E(oUIafue{#WLSZJqJN$GS7Iyv$TYP_i$V$ zgO&k(zJmmaqrIvB0W2ebkfGyybQXK3m^cd)%SWozx)wfXHwCxvHxR_I6=dOF$1 z=I$}tNTDhSzlP@JbmC_j3IeVEOc+el035)LVxg`1TM5eT!PQBBpFK13!{5JCixjDl zx5a1A$^^94I*8ED5y!LjX)6Jr>?mve~ML{@-v@dZDdAy36 zp-5|>&y5<99bL}L(M%bwpW3Md?%ymGYWyad3kQdOpmBj$XL9>WF>bcXwB_wBr7lLMY`uGKhk9;!YP(U%A96Se4?|IwEm{gxrk*vq`GJ`AYk^)p}Y?iP~ zd#jpTmKW4ZcR&F;Wz6H34zN=pIbH{~8|u*;7QLIbdS4<=s*LIh;F334;+E>01hc+< zo7(HWu!jSs<9+zXTQD>CvnL-yxMp;yu>bW)|Z6uzg)Ye5AkJv-RcmPhlP~w>I@%QRW12Y>CTyZdtW3RAUwMLD6`C7 z06Q?<4DFSfhL)IF@!t#E5hVkSH#LVqRB5vODs;jQCx}Z|K#!G`L}AjVDcnYe;3;19 zD!vn`K=K?YFgj&(v3JlD9W!y8AE^;;Vj1Mgf~Tx0UN?`PZt3Zk69fIi2>d_AN@0H5 zIrb2W4o9YDSqBlp4%XrlhspDqG)Q{tunswnYE{ literal 0 HcmV?d00001 diff --git a/android/assets/UnitIcons/Trebuchet.png b/android/assets/UnitIcons/Trebuchet.png new file mode 100644 index 0000000000000000000000000000000000000000..defa91545323d8683aeb9662be5bec6dfce2977f GIT binary patch literal 5381 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 literal 0 HcmV?d00001 diff --git a/core/src/com/unciv/logic/map/TileInfo.kt b/core/src/com/unciv/logic/map/TileInfo.kt index c22dd821ab..4f638f25eb 100644 --- a/core/src/com/unciv/logic/map/TileInfo.kt +++ b/core/src/com/unciv/logic/map/TileInfo.kt @@ -158,7 +158,7 @@ class TileInfo { if(unit!!.getBaseUnit().unitType!=UnitType.Civilian) unitString += "(" + unit!!.health + ")" SB.appendln(unitString) } - return SB.toString() + return SB.toString().trim() } fun hasViewableResource(civInfo: CivilizationInfo): Boolean { diff --git a/core/src/com/unciv/ui/utils/CameraStageBaseScreen.kt b/core/src/com/unciv/ui/utils/CameraStageBaseScreen.kt index 06c3041b74..57c7ad7929 100644 --- a/core/src/com/unciv/ui/utils/CameraStageBaseScreen.kt +++ b/core/src/com/unciv/ui/utils/CameraStageBaseScreen.kt @@ -26,7 +26,7 @@ open class CameraStageBaseScreen : Screen { private var isTutorialShowing = false init { - stage = Stage(ExtendViewport(1500f, 900f), batch)// FitViewport(1000,600) + stage = Stage(ExtendViewport(1000f, 600f), batch)// FitViewport(1000,600) Gdx.input.inputProcessor = stage } diff --git a/core/src/com/unciv/ui/worldscreen/TileInfoTable.kt b/core/src/com/unciv/ui/worldscreen/TileInfoTable.kt index ba5ab845c7..28a1c40b8e 100644 --- a/core/src/com/unciv/ui/worldscreen/TileInfoTable.kt +++ b/core/src/com/unciv/ui/worldscreen/TileInfoTable.kt @@ -8,31 +8,36 @@ import com.unciv.ui.utils.CameraStageBaseScreen import com.unciv.ui.utils.ImageGetter class TileInfoTable(private val worldScreen: WorldScreen) : Table() { + init{ + skin = CameraStageBaseScreen.skin + } internal fun updateTileTable(tile: TileInfo) { clearChildren() val civInfo = worldScreen.civInfo - val stats = tile.getTileStats(civInfo) pad(20f) columnDefaults(0).padRight(10f) - val skin = CameraStageBaseScreen.skin - if (civInfo.exploredTiles.contains(tile.position)) { + add(getStatsTable(tile)).pad(20f) add(Label(tile.toString(), skin)).colspan(2) - row() - - - for (entry in stats.toHashMap().filterNot { it.value == 0f }) { - add(ImageGetter.getStatIcon(entry.key.toString())).align(Align.right) - add(Label(entry.value.toInt().toString(), skin)).align(Align.left) - row() - } } pack() setPosition(worldScreen.stage.width - 10f - width, 10f) } + + fun getStatsTable(tile: TileInfo):Table{ + val table=Table() + + + for (entry in tile.getTileStats(worldScreen.civInfo).toHashMap().filterNot { it.value == 0f }) { + table.add(ImageGetter.getStatIcon(entry.key.toString())).align(Align.right) + table.add(Label(entry.value.toInt().toString(), skin)).align(Align.left) + table.row() + } + return table + } }