diff --git a/changelog.md b/changelog.md index 383d5acaed..3530d56abc 100644 --- a/changelog.md +++ b/changelog.md @@ -1,31 +1,22 @@ ## 4.6.1 -Added parameter type for stockpiled resources specifically +All game object images shown in text! -Fix "Instantly consumes [amount] [resource]" - -Arbitrary images in font!!! - -'Display' options organized into subcatagories - kudos @Ouaz +'Display' options subcatagorized - kudos @Ouaz By WhoIsJohannes: -- Show a highlight for the tile that seems most suitable to found a cit… -- Show replay after 50 turns, but only the discovered part of it. -- Charts improvements -- Highlight non-available wonders in tech picker +- highlight suitable city-founding tiles +- Show replay after 50 turns +- Charts improvements By SomeTroglodyte: -- Fix startBias regional assignments -- Victory screen and victory detection use VictoryData -- Close immediate win loophole (playing alone) -- Fix incorrect relationship level comparison -- Fix map editor resource label wrapped to about 1 char width +- Fix startBias regional assignments +- Victory detection improvements +- Fix map editor resource label -Make new "notifications" option translatable - By Ouaz +AbsoluteUnits - Turtle Ship, Ship of the Line, Sea Beggar - By letstalkaboutdune -AbsoluteUnits - Turtle Ship, Ship of the Line, Sea Beggar - By letstalkaboutdune - -Fix issue - By MioBestWaifu +AI: Military units w/ Civilian uniques Automation - By MioBestWaifu ## 4.6.0 diff --git a/core/src/com/unciv/ui/screens/cityscreen/CityConstructionsTable.kt b/core/src/com/unciv/ui/screens/cityscreen/CityConstructionsTable.kt index 6a06d7af5a..36432e2766 100644 --- a/core/src/com/unciv/ui/screens/cityscreen/CityConstructionsTable.kt +++ b/core/src/com/unciv/ui/screens/cityscreen/CityConstructionsTable.kt @@ -579,13 +579,13 @@ class CityConstructionsTable(private val cityScreen: CityScreen) { ) { if (!isConstructionPurchaseShown(construction, stat)) return val city = cityScreen.city - val constructionBuyCost = construction.getStatBuyCost(city, stat)!! - if (!isConstructionPurchaseAllowed(construction, stat, constructionBuyCost)) return + val constructionStatBuyCost = construction.getStatBuyCost(city, stat)!! + if (!isConstructionPurchaseAllowed(construction, stat, constructionStatBuyCost)) return cityScreen.closeAllPopups() val purchasePrompt = "Currently you have [${city.getStatReserve(stat)}] [${stat.name}].".tr() + "\n\n" + - "Would you like to purchase [${construction.name}] for [$constructionBuyCost] [${stat.character}]?".tr() + "Would you like to purchase [${construction.name}] for [$constructionStatBuyCost] [${stat.character}]?".tr() ConfirmPopup( cityScreen, purchasePrompt, diff --git a/docs/Modders/uniques.md b/docs/Modders/uniques.md index 996773cc70..6d718d85af 100644 --- a/docs/Modders/uniques.md +++ b/docs/Modders/uniques.md @@ -74,13 +74,13 @@ Simple unique parameters are explained by mouseover. Complex parameters are expl ??? example "Triggers voting for the Diplomatic Victory" Applicable to: Triggerable -??? example "Instantly consumes [amount] [resource]" - Example: "Instantly consumes [3] [Iron]" +??? example "Instantly consumes [amount] [stockpiledResource]" + Example: "Instantly consumes [3] [StockpiledResource]" Applicable to: Triggerable -??? example "Instantly provides [amount] [resource]" - Example: "Instantly provides [3] [Iron]" +??? example "Instantly provides [amount] [stockpiledResource]" + Example: "Instantly provides [3] [StockpiledResource]" Applicable to: Triggerable @@ -924,8 +924,8 @@ Simple unique parameters are explained by mouseover. Complex parameters are expl Applicable to: Building, Unit, Improvement -??? example "Costs [amount] [resource]" - Example: "Costs [3] [Iron]" +??? example "Costs [amount] [stockpiledResource]" + Example: "Costs [3] [StockpiledResource]" Applicable to: Building, Unit, Improvement @@ -2055,6 +2055,7 @@ Simple unique parameters are explained by mouseover. Complex parameters are expl *[specialist]: The name of any specialist. *[stat]: This is one of the 7 major stats in the game - `Gold`, `Science`, `Production`, `Food`, `Happiness`, `Culture` and `Faith`. Note that the stat names need to be capitalized! *[stats]: For example: `+2 Production, +3 Food`. Note that the stat names need to be capitalized! +*[stockpiledResource]: The name of any stockpiled. *[tech]: The name of any tech. *[tileFilter]: Anything that can be used either in an improvementFilter or in a terrainFilter can be used here, plus 'unimproved' *[victoryType]: The name of any victory type: 'Neutral', 'Cultural', 'Diplomatic', 'Domination', 'Scientific', 'Time' \ No newline at end of file