Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Customizable Golden Age label #13111

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Customizable Golden Age label #13111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5ae8d0d
Customizable Golden Age label
Mar 30, 2025
cad97c2
Added UniqueParameterType to pass UnitTests
Mar 30, 2025
560779f
Merge remote-tracking branch 'origin/golden_age_label' into golden_ag…
Mar 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion android/assets/jsons/Civ V - Gods & Kings/Buildings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -791,7 +791,7 @@
"happiness": 4,
"greatPersonPoints": {"Great Artist": 2},
"isWonder": true,
"uniques": ["Empire enters golden age"],
"uniques": ["Empire enters [Golden Age]"],
"requiredTech": "Architecture",
"quote": "'The Taj Mahal rises above the banks of the river like a solitary tear suspended on the cheek of time.' - Rabindranath Tagore"
},
Expand Down
4 changes: 2 additions & 2 deletions android/assets/jsons/Civ V - Gods & Kings/Policies.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@
"name": "Representation",
"uniques": [
"Each city founded increases culture cost of policies [33]% less than normal",
"Empire enters golden age"
"Empire enters [Golden Age]"
],
"requires": ["Citizenship"],
"row": 2,
Expand Down Expand Up @@ -252,7 +252,7 @@
"name": "Reformation",
"uniques": [
"[+33]% [Culture] [in all cities with a world wonder]",
"Empire enters golden age"
"Empire enters [Golden Age]"
],
"requires": ["Organized Religion"],
"row": 2,
Expand Down
6 changes: 3 additions & 3 deletions android/assets/jsons/Civ V - Gods & Kings/Units.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1583,7 +1583,7 @@
"name": "Great Artist",
"unitType": "Civilian",
"uniques": [
"Empire enters a [8]-turn Golden Age <by consuming this unit>",
"Empire enters a [8]-turn [Golden Age] <by consuming this unit>",
"Can instantly construct a [Landmark] improvement <by consuming this unit>",
"Great Person - [Culture]", "Unbuildable", "Uncapturable"],
"movement": 2
Expand Down Expand Up @@ -1632,7 +1632,7 @@
"name": "Great General",
"unitType": "Civilian",
"uniques": [
"Empire enters a [8]-turn Golden Age <by consuming this unit>",
"Empire enters a [8]-turn [Golden Age] <by consuming this unit>",
"[+15]% Strength bonus for [Military] units within [2] tiles",
"Can instantly construct a [Citadel] improvement <by consuming this unit>",
"Can be earned through combat",
Expand All @@ -1645,7 +1645,7 @@
"uniqueTo": "Mongolia",
"replaces": "Great General",
"uniques": [
"Empire enters a [8]-turn Golden Age <by consuming this unit>",
"Empire enters a [8]-turn [Golden Age] <by consuming this unit>",
"[+15]% Strength bonus for [Military] units within [2] tiles",
"All adjacent units heal [+15] HP when healing", "[+15] HP when healing",
"Can instantly construct a [Citadel] improvement <by consuming this unit>",
Expand Down
2 changes: 1 addition & 1 deletion android/assets/jsons/Civ V - Vanilla/Buildings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -665,7 +665,7 @@
"happiness": 4,
"greatPersonPoints": {"Great Artist": 2},
"isWonder": true,
"uniques": ["Empire enters golden age"],
"uniques": ["Empire enters [Golden Age]"],
"requiredTech": "Printing Press",
"quote": "'The Taj Mahal rises above the banks of the river like a solitary tear suspended on the cheek of time.' - Rabindranath Tagore"
},
Expand Down
4 changes: 2 additions & 2 deletions android/assets/jsons/Civ V - Vanilla/Policies.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
"name": "Representation",
"uniques": [
"Each city founded increases culture cost of policies [33]% less than normal",
"Empire enters golden age"
"Empire enters [Golden Age]"
],
"requires": ["Citizenship"],
"row": 2,
Expand Down Expand Up @@ -249,7 +249,7 @@
"name": "Reformation",
"uniques": [
"[+33]% [Culture] [in all cities with a world wonder]",
"Empire enters golden age"
"Empire enters [Golden Age]"
],
"requires": ["Organized Religion"],
"row": 2,
Expand Down
6 changes: 3 additions & 3 deletions android/assets/jsons/Civ V - Vanilla/Units.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1260,7 +1260,7 @@
"name": "Great Artist",
"unitType": "Civilian",
"uniques": [
"Empire enters a [8]-turn Golden Age <by consuming this unit>",
"Empire enters a [8]-turn [Golden Age] <by consuming this unit>",
"Can instantly construct a [Landmark] improvement <by consuming this unit>",
"Great Person - [Culture]", "Unbuildable", "Uncapturable"],
"movement": 2
Expand Down Expand Up @@ -1293,7 +1293,7 @@
"name": "Great General",
"unitType": "Civilian",
"uniques": [
"Empire enters a [8]-turn Golden Age <by consuming this unit>",
"Empire enters a [8]-turn [Golden Age] <by consuming this unit>",
"[+15]% Strength bonus for [Military] units within [2] tiles",
"Can instantly construct a [Citadel] improvement <by consuming this unit>",
"Can be earned through combat",
Expand All @@ -1306,7 +1306,7 @@
"uniqueTo": "Mongolia",
"replaces": "Great General",
"uniques": [
"Empire enters a [8]-turn Golden Age <by consuming this unit>",
"Empire enters a [8]-turn [Golden Age] <by consuming this unit>",
"[+15]% Strength bonus for [Military] units within [2] tiles",
"All adjacent units heal [+15] HP when healing", "[+15] HP when healing",
"Can instantly construct a [Citadel] improvement <by consuming this unit>",
Expand Down
2 changes: 1 addition & 1 deletion core/src/com/unciv/logic/city/CityStats.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -458,7 +458,7 @@ class CityStats(val city: City) {
private fun updateStatPercentBonusList(currentConstruction: IConstruction) {
val newStatsBonusTree = StatTreeNode()

newStatsBonusTree.addStats(getStatPercentBonusesFromGoldenAge(city.civ.goldenAges.isGoldenAge()),"Golden Age")
newStatsBonusTree.addStats(getStatPercentBonusesFromGoldenAge(city.civ.goldenAges.isGoldenAge()),city.civ.nation.goldenAgeName)
addStatPercentBonusesFromBuildings(newStatsBonusTree)
newStatsBonusTree.addStats(getStatPercentBonusesFromRailroad(), "Railroad")
newStatsBonusTree.addStats(getStatPercentBonusesFromPuppetCity(), "Puppet City")
Expand Down
2 changes: 1 addition & 1 deletion core/src/com/unciv/logic/civilization/managers/GoldenAgeManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ class GoldenAgeManager : IsPartOfGameInfoSerialization {

fun enterGoldenAge(unmodifiedNumberOfTurns: Int = 10) {
turnsLeftForCurrentGoldenAge += calculateGoldenAgeLength(unmodifiedNumberOfTurns)
civInfo.addNotification("You have entered a Golden Age!",
civInfo.addNotification("[${civInfo.nation.enteredGoldenAge}]!",
CivilopediaAction("Tutorial/Golden Age"),
NotificationCategory.General, "StatIcons/Happiness")
civInfo.popupAlerts.add(PopupAlert(AlertType.GoldenAge, ""))
Expand Down
2 changes: 1 addition & 1 deletion core/src/com/unciv/logic/map/tile/TileStatFunctions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ class TileStatFunctions(val tile: Tile) {

if (observingCiv != null &&
listOfStats.toStats().gold != 0f && observingCiv.goldenAges.isGoldenAge())
listOfStats.add("Golden Age" to Stats(gold = 1f))
listOfStats.add(observingCiv.nation.goldenAgeName to Stats(gold = 1f))

// To ensure that the original stats (in uniques, terrains, etc) are not modified in getTileStats, we clone them all
return listOfStats.filter { !it.second.isEmpty() }.map { it.first to it.second.clone() }
Expand Down
2 changes: 2 additions & 0 deletions core/src/com/unciv/models/ruleset/nation/Nation.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ class Nation : RulesetObject() {

var startIntroPart1 = ""
var startIntroPart2 = ""
var goldenAgeName = "Golden Age"
var enteredGoldenAge = "You have entered a Golden Age"

/* Properties present in json but not yet implemented:
var adjective = ArrayList<String>()
Expand Down
4 changes: 4 additions & 0 deletions core/src/com/unciv/models/ruleset/unique/UniqueParameterType.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -598,6 +598,10 @@ enum class UniqueParameterType(
UnitTriggerTarget("unitTriggerTarget", Constants.thisUnit, "`${Constants.thisUnit}` or `${Constants.targetUnit}`") {
override val staticKnownValues = setOf(Constants.thisUnit, Constants.targetUnit)
},

GoldenAgeName("Golden Age", "Golden Age", "Affects only the visuals. Does not impact gameplay.") {
override fun getErrorSeverity(parameterText: String, ruleset: Ruleset) = null
},

/** Mod declarative compatibility: Define Mod relations by their name. */
ModName("modFilter",
Expand Down
2 changes: 1 addition & 1 deletion core/src/com/unciv/models/ruleset/unique/UniqueTriggerActivation.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,7 @@ object UniqueTriggerActivation {

val notificationText = getNotificationText(
notification, triggerNotificationText,
"You enter a Golden Age"
"[${civInfo.nation.enteredGoldenAge}]"
)
if (notificationText != null)
civInfo.addNotification(notificationText, NotificationCategory.General, NotificationIcon.Happiness)
Expand Down
8 changes: 6 additions & 2 deletions core/src/com/unciv/models/ruleset/unique/UniqueType.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -811,8 +811,8 @@ enum class UniqueType(
OneTimeFreeUnitRuins("Free [unit] found in the ruins", UniqueTarget.Ruins), // Differs from "Free [] appears" in that it spawns near the ruins instead of in a city
OneTimeFreePolicy("Free Social Policy", UniqueTarget.Triggerable), // used in Buildings
OneTimeAmountFreePolicies("[positiveAmount] Free Social Policies", UniqueTarget.Triggerable), // Not used in Vanilla
OneTimeEnterGoldenAge("Empire enters golden age", UniqueTarget.Triggerable), // used in Policies, Buildings
OneTimeEnterGoldenAgeTurns("Empire enters a [positiveAmount]-turn Golden Age", UniqueTarget.Triggerable),
OneTimeEnterGoldenAge("Empire enters [Golden Age]", UniqueTarget.Triggerable), // used in Policies, Buildings
OneTimeEnterGoldenAgeTurns("Empire enters a [positiveAmount]-turn [Golden Age]", UniqueTarget.Triggerable),
OneTimeFreeGreatPerson("Free Great Person", UniqueTarget.Triggerable), // used in Policies, Buildings
OneTimeGainPopulation("[amount] population [cityFilter]", UniqueTarget.Triggerable), // used in CN tower
OneTimeGainPopulationRandomCity("[amount] population in a random city", UniqueTarget.Triggerable),
Expand Down Expand Up @@ -985,6 +985,10 @@ enum class UniqueType(

///////////////////////////////////////////// region 99 DEPRECATED AND REMOVED /////////////////////////////////////////////

@Deprecated("As of 4.15.20", ReplaceWith("Empire enters [Golden Age]"), DeprecationLevel.ERROR)
OneTimeEnterGoldenAgeOld("Empire enters golden age", UniqueTarget.Triggerable),
@Deprecated("As of 4.15.20", ReplaceWith("Empire enters a [positiveAmount]-turn [Golden Age]"), DeprecationLevel.ERROR)
OneTimeEnterGoldenAgeTurnsOld("Empire enters a [positiveAmount]-turn Golden Age", UniqueTarget.Triggerable),
@Deprecated("As of 4.14.6", ReplaceWith("[+100]% Strength <when defending> <when [Embarked]>"), DeprecationLevel.ERROR)
DefenceBonusWhenEmbarked("Defense bonus when embarked", UniqueTarget.Unit, UniqueTarget.Global),
@Deprecated("As of 4.13.18", ReplaceWith("Only available <when [victoryType] Victory is enabled>"), DeprecationLevel.ERROR)
Expand Down
5 changes: 3 additions & 2 deletions core/src/com/unciv/ui/screens/worldscreen/AlertPopup.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,9 +318,10 @@ class AlertPopup(
}

private fun addGoldenAge() {
addGoodSizedLabel("GOLDEN AGE")
val nation = viewingCiv.nation
addGoodSizedLabel(viewingCiv.nation.goldenAgeName.tr().uppercase())
addSeparator()
addGoodSizedLabel("Your citizens have been happy with your rule for so long that the empire enters a Golden Age!").row()
addGoodSizedLabel("Your citizens have been happy with your rule for so long that the empire enters a [${viewingCiv.nation.goldenAgeName}]!").row()
addCloseButton()
music.chooseTrack(viewingCiv.civName, MusicMood.Golden, MusicTrackChooserFlags.setSpecific)
}
Expand Down
2 changes: 1 addition & 1 deletion core/src/com/unciv/ui/screens/worldscreen/topbar/WorldScreenTopBarStats.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ internal class WorldScreenTopBarStats(topbar: WorldScreenTopBar) : ScalingTableW
val goldenAges = civInfo.goldenAges
happinessText +=
if (goldenAges.isGoldenAge())
" {GOLDEN AGE}(${goldenAges.turnsLeftForCurrentGoldenAge})".tr()
" ${civInfo.nation.goldenAgeName.tr().uppercase()}(${goldenAges.turnsLeftForCurrentGoldenAge})".tr()
else
" (${goldenAges.storedHappiness.tr()}/${goldenAges.happinessRequiredForNextGoldenAge().tr()})"
return happinessText
Expand Down
11 changes: 9 additions & 2 deletions core/src/com/unciv/ui/screens/worldscreen/unit/actions/UnitActionsFromUniques.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,11 +211,18 @@ object UnitActionsFromUniques {
if (!UnitActionModifiers.canUse(unit, unique)) continue

val baseTitle = when (unique.type) {
UniqueType.OneTimeEnterGoldenAge -> {
unique.placeholderText.fillPlaceholders(
unit.civ.nation.goldenAgeName.tr()
)
}
UniqueType.OneTimeEnterGoldenAgeTurns -> {
unique.placeholderText.fillPlaceholders(
unit.civ.goldenAges.calculateGoldenAgeLength(
unique.params[0].toInt()).tr())
}
unique.params[0].toInt()).tr(),
unit.civ.nation.goldenAgeName.tr()
)
}
UniqueType.OneTimeGainStat -> {
if (unique.hasModifier(UniqueType.ModifiedByGameSpeed)) {
val stat = unique.params[1]
Expand Down
2 changes: 2 additions & 0 deletions docs/Modders/schemas/nations.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@
"defeated": { "type": "string" },
"startIntroPart1": { "type": "string" },
"startIntroPart2": { "type": "string" },
"goldenAgeName": { "type": "string" },
"enteredGoldenAge": { "type": "string" },
Comment on lines +42 to +43
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We're against adding extra fields when things can be one via a Unique, so the correct answer here is to add a unique e.g. "Golden Age is called [comment]"

"cities": {
"type": "array",
"items": { "type": "string" },
Expand Down
Loading