AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-29 15:01:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

Resolved #2914 - Can no longer exploit but to 'skip' promotions

Browse Source
This commit is contained in:
Yair Morgenstern 2020-08-01 23:13:59 +03:00
parent b4708b05b3
commit 4985d077af
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/com/unciv/logic/civilization/PolicyManager.kt
View File

@ -133,7 +133,7 @@ class PolicyManager {
"Free [] appears" -> { "Free [] appears" -> {
val unitName = effect.getPlaceholderParameters()[0] val unitName = effect.getPlaceholderParameters()[0]
if (hasCapital && (unitName != Constants.settler || !civInfo.isOneCityChallenger())) if (hasCapital && (unitName != Constants.settler || !civInfo.isOneCityChallenger()))
civInfo.placeUnitNearTile(civInfo.getCapital().location, unitName) civInfo.addUnit(unitName, civInfo.getCapital())
} }
"Gain a free policy" -> freePolicies++ "Gain a free policy" -> freePolicies++
"Empire enters golden age" -> "Empire enters golden age" ->

2
core/src/com/unciv/ui/pickerscreens/GreatPersonPickerScreen.kt
View File

@ -39,7 +39,7 @@ class GreatPersonPickerScreen(val civInfo:CivilizationInfo) : PickerScreen() {
} }
rightSideButton.onClick(UncivSound.Choir) { rightSideButton.onClick(UncivSound.Choir) {
civInfo.placeUnitNearTile(civInfo.cities[0].location, theChosenOne!!.name) civInfo.addUnit(theChosenOne!!.name, civInfo.getCapital())
civInfo.greatPeople.freeGreatPeople-- civInfo.greatPeople.freeGreatPeople--
UncivGame.Current.setWorldScreen() UncivGame.Current.setWorldScreen()
} }

5
core/src/com/unciv/ui/pickerscreens/PromotionPickerScreen.kt
View File

@ -59,12 +59,11 @@ class PromotionPickerScreen(val unit: MapUnit) : PickerScreen() {
selectPromotionButton.add(promotion.name.toLabel()).pad(10f).padRight(20f) selectPromotionButton.add(promotion.name.toLabel()).pad(10f).padRight(20f)
selectPromotionButton.touchable = Touchable.enabled selectPromotionButton.touchable = Touchable.enabled
selectPromotionButton.onClick { selectPromotionButton.onClick {
selectedPromotion = promotion
rightSideButton.setText(promotion.name.tr())
if(canBePromoted && isPromotionAvailable && !unitHasPromotion && canChangeState) if(canBePromoted && isPromotionAvailable && !unitHasPromotion && canChangeState)
rightSideButton.enable() rightSideButton.enable()
else rightSideButton.disable() else rightSideButton.disable()
selectedPromotion = promotion
rightSideButton.setText(promotion.name.tr())
descriptionLabel.setText(promotion.getDescription(promotionsForUnitType)) descriptionLabel.setText(promotion.getDescription(promotionsForUnitType))
} }