From 95fd51acc54fbc48a7009bb495202538b83a579b Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Sun, 19 Apr 2020 17:17:57 +0300 Subject: [PATCH] Removed city center icon from Civ VI - it's not legally ours! --- .../Images/StatIcons/City_Center_(Civ6).png | Bin 10625 -> 0 bytes .../com/unciv/ui/cityscreen/CityTileGroup.kt | 5 +-- .../ui/worldscreen/unit/UnitActionsTable.kt | 34 +++++++++--------- 3 files changed, 20 insertions(+), 19 deletions(-) delete mode 100644 android/Images/StatIcons/City_Center_(Civ6).png diff --git a/android/Images/StatIcons/City_Center_(Civ6).png b/android/Images/StatIcons/City_Center_(Civ6).png deleted file mode 100644 index 96575ea2ef67bfd589736c5d229d018cc71eea20..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10625 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 { // Regexplaination: start with a [, take as many non-] chars as you can, until you reach a ]. @@ -38,16 +38,16 @@ class UnitActionsTable(val worldScreen: WorldScreen) : Table(){ val improvementName = Regex("""Create \[([^]]*)]""").find(unitAction)!!.groups[1]!!.value return UnitIconAndKey(ImageGetter.getImprovementIcon(improvementName), 'i') } - unitAction.startsWith("Sleep") -> return UnitIconAndKey(ImageGetter.getImage("OtherIcons/Sleep"),'f') - unitAction.startsWith("Fortify") -> return UnitIconAndKey(ImageGetter.getImage("OtherIcons/Shield").apply { color= Color.BLACK },'f') - else -> when(unitAction){ + unitAction.startsWith("Sleep") -> return UnitIconAndKey(ImageGetter.getImage("OtherIcons/Sleep"), 'f') + unitAction.startsWith("Fortify") -> return UnitIconAndKey(ImageGetter.getImage("OtherIcons/Shield").apply { color = Color.BLACK }, 'f') + else -> when (unitAction) { "Move unit" -> return UnitIconAndKey(ImageGetter.getStatIcon("Movement")) - "Stop movement"-> return UnitIconAndKey(ImageGetter.getStatIcon("Movement").apply { color= Color.RED }, '.') - "Promote" -> return UnitIconAndKey(ImageGetter.getImage("OtherIcons/Star").apply { color= Color.GOLD }, 'o') - "Construct improvement" -> return UnitIconAndKey(ImageGetter.getUnitIcon(Constants.worker),'i') + "Stop movement" -> return UnitIconAndKey(ImageGetter.getStatIcon("Movement").apply { color = Color.RED }, '.') + "Promote" -> return UnitIconAndKey(ImageGetter.getImage("OtherIcons/Star").apply { color = Color.GOLD }, 'o') + "Construct improvement" -> return UnitIconAndKey(ImageGetter.getUnitIcon(Constants.worker), 'i') "Automate" -> return UnitIconAndKey(ImageGetter.getUnitIcon("Great Engineer"), 'm') "Stop automation" -> return UnitIconAndKey(ImageGetter.getImage("OtherIcons/Stop"), 'm') - "Found city" -> return UnitIconAndKey(ImageGetter.getUnitIcon(Constants.settler),'f') + "Found city" -> return UnitIconAndKey(ImageGetter.getUnitIcon(Constants.settler), 'c') "Hurry Research" -> return UnitIconAndKey(ImageGetter.getUnitIcon("Great Scientist"), 'g') "Start Golden Age" -> return UnitIconAndKey(ImageGetter.getUnitIcon("Great Artist"), 'g') "Hurry Wonder" -> return UnitIconAndKey(ImageGetter.getUnitIcon("Great Engineer"), 'g') @@ -56,17 +56,17 @@ class UnitActionsTable(val worldScreen: WorldScreen) : Table(){ "Disband unit" -> return UnitIconAndKey(ImageGetter.getImage("OtherIcons/DisbandUnit")) "Explore" -> return UnitIconAndKey(ImageGetter.getUnitIcon("Scout"), 'x') "Stop exploration" -> return UnitIconAndKey(ImageGetter.getImage("OtherIcons/Stop"), 'x') - "Pillage" -> return UnitIconAndKey(ImageGetter.getImage("OtherIcons/Pillage"),'p') - "Construct road" -> return UnitIconAndKey(ImageGetter.getImprovementIcon("Road"),'r') + "Pillage" -> return UnitIconAndKey(ImageGetter.getImage("OtherIcons/Pillage"), 'p') + "Construct road" -> return UnitIconAndKey(ImageGetter.getImprovementIcon("Road"), 'r') else -> return UnitIconAndKey(ImageGetter.getImage("OtherIcons/Star")) } } } - fun update(unit: MapUnit?){ + fun update(unit: MapUnit?) { clear() if (unit == null) return - if(!worldScreen.isPlayersTurn) return // No actions when it's not your turn! + if (!worldScreen.isPlayersTurn) return // No actions when it's not your turn! for (button in UnitActions.getUnitActions(unit, worldScreen).map { getUnitActionButton(it) }) add(button).left().padBottom(2f).row() pack() @@ -77,7 +77,7 @@ class UnitActionsTable(val worldScreen: WorldScreen) : Table(){ val iconAndKey = getIconAnKeyForUnitAction(unitAction.title) val actionButton = Button(CameraStageBaseScreen.skin) actionButton.add(iconAndKey.Icon).size(20f).pad(5f) - val fontColor = if(unitAction.isCurrentAction) Color.YELLOW else Color.WHITE + val fontColor = if (unitAction.isCurrentAction) Color.YELLOW else Color.WHITE actionButton.add(unitAction.title.toLabel(fontColor)).pad(5f) if (iconAndKey.key != 0.toChar()) { val keyLabel = "(${iconAndKey.key.toUpperCase()})".toLabel(Color.WHITE) @@ -90,10 +90,10 @@ class UnitActionsTable(val worldScreen: WorldScreen) : Table(){ } if (unitAction.action == null) actionButton.disable() else { - actionButton.onClick(unitAction.uncivSound,action) + actionButton.onClick(unitAction.uncivSound, action) if (iconAndKey.key != 0.toChar()) worldScreen.keyPressDispatcher[iconAndKey.key] = { - thread(name="Sound") { Sounds.play(unitAction.uncivSound) } + thread(name = "Sound") { Sounds.play(unitAction.uncivSound) } action() } }