From 4985d077afd307cae3228809b2fb030b93dfbcf5 Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Sat, 1 Aug 2020 23:13:59 +0300 Subject: [PATCH] Resolved #2914 - Can no longer exploit but to 'skip' promotions --- core/src/com/unciv/logic/civilization/PolicyManager.kt | 2 +- .../com/unciv/ui/pickerscreens/GreatPersonPickerScreen.kt | 2 +- core/src/com/unciv/ui/pickerscreens/PromotionPickerScreen.kt | 5 ++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/core/src/com/unciv/logic/civilization/PolicyManager.kt b/core/src/com/unciv/logic/civilization/PolicyManager.kt index 17336b34f7..197a00d0c3 100644 --- a/core/src/com/unciv/logic/civilization/PolicyManager.kt +++ b/core/src/com/unciv/logic/civilization/PolicyManager.kt @@ -133,7 +133,7 @@ class PolicyManager { "Free [] appears" -> { val unitName = effect.getPlaceholderParameters()[0] if (hasCapital && (unitName != Constants.settler || !civInfo.isOneCityChallenger())) - civInfo.placeUnitNearTile(civInfo.getCapital().location, unitName) + civInfo.addUnit(unitName, civInfo.getCapital()) } "Gain a free policy" -> freePolicies++ "Empire enters golden age" -> diff --git a/core/src/com/unciv/ui/pickerscreens/GreatPersonPickerScreen.kt b/core/src/com/unciv/ui/pickerscreens/GreatPersonPickerScreen.kt index fad22e1934..3a36b5b4bd 100644 --- a/core/src/com/unciv/ui/pickerscreens/GreatPersonPickerScreen.kt +++ b/core/src/com/unciv/ui/pickerscreens/GreatPersonPickerScreen.kt @@ -39,7 +39,7 @@ class GreatPersonPickerScreen(val civInfo:CivilizationInfo) : PickerScreen() { } rightSideButton.onClick(UncivSound.Choir) { - civInfo.placeUnitNearTile(civInfo.cities[0].location, theChosenOne!!.name) + civInfo.addUnit(theChosenOne!!.name, civInfo.getCapital()) civInfo.greatPeople.freeGreatPeople-- UncivGame.Current.setWorldScreen() } diff --git a/core/src/com/unciv/ui/pickerscreens/PromotionPickerScreen.kt b/core/src/com/unciv/ui/pickerscreens/PromotionPickerScreen.kt index 4a8b0bf963..5117fd4ff9 100644 --- a/core/src/com/unciv/ui/pickerscreens/PromotionPickerScreen.kt +++ b/core/src/com/unciv/ui/pickerscreens/PromotionPickerScreen.kt @@ -59,12 +59,11 @@ class PromotionPickerScreen(val unit: MapUnit) : PickerScreen() { selectPromotionButton.add(promotion.name.toLabel()).pad(10f).padRight(20f) selectPromotionButton.touchable = Touchable.enabled selectPromotionButton.onClick { - selectedPromotion = promotion - rightSideButton.setText(promotion.name.tr()) if(canBePromoted && isPromotionAvailable && !unitHasPromotion && canChangeState) rightSideButton.enable() else rightSideButton.disable() - + selectedPromotion = promotion + rightSideButton.setText(promotion.name.tr()) descriptionLabel.setText(promotion.getDescription(promotionsForUnitType)) }