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

chore: rename "experience" with "XP" for unified naming

Browse Source
This commit is contained in:
yairm210 2025-02-18 23:34:25 +02:00
parent 86522371b9
commit 4973488b2e
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/com/unciv/logic/automation/city/ConstructionAutomation.kt
View File

@ -313,7 +313,8 @@ class ConstructionAutomation(val cityConstructions: CityConstructions) {
value += warModifier * building.cityHealth.toFloat() / city.getMaxHealth() * personality.inverseModifierFocus(PersonalityValue.Aggressive, .3f) value += warModifier * building.cityHealth.toFloat() / city.getMaxHealth() * personality.inverseModifierFocus(PersonalityValue.Aggressive, .3f)
value += warModifier * building.cityStrength.toFloat() / (city.getStrength() + 3) * personality.inverseModifierFocus(PersonalityValue.Aggressive, .3f) // The + 3 here is to reduce the priority of building walls immedietly value += warModifier * building.cityStrength.toFloat() / (city.getStrength() + 3) * personality.inverseModifierFocus(PersonalityValue.Aggressive, .3f) // The + 3 here is to reduce the priority of building walls immedietly
for (experienceUnique in building.getMatchingUniques(UniqueType.UnitStartingExperience, cityState)) { for (experienceUnique in building.getMatchingUniques(UniqueType.UnitStartingExperience, cityState)
+ building.getMatchingUniques(UniqueType.UnitStartingExperienceOld, cityState)) {
var modifier = experienceUnique.params[1].toFloat() / 5 var modifier = experienceUnique.params[1].toFloat() / 5
modifier *= if (cityIsOverAverageProduction) 1f else 0.2f // You shouldn't be cranking out units anytime soon modifier *= if (cityIsOverAverageProduction) 1f else 0.2f // You shouldn't be cranking out units anytime soon
modifier *= personality.modifierFocus(PersonalityValue.Military, 0.3f) modifier *= personality.modifierFocus(PersonalityValue.Military, 0.3f)

5
core/src/com/unciv/models/ruleset/unique/UniqueType.kt
View File

@ -183,7 +183,10 @@ enum class UniqueType(
EnemyUnitsSpendExtraMovement("Enemy [mapUnitFilter] units must spend [amount] extra movement points when inside your territory", UniqueTarget.Global), EnemyUnitsSpendExtraMovement("Enemy [mapUnitFilter] units must spend [amount] extra movement points when inside your territory", UniqueTarget.Global),
/// Unit Abilities /// Unit Abilities
UnitStartingExperience("New [baseUnitFilter] units start with [amount] Experience [cityFilter]", UniqueTarget.Global, UniqueTarget.FollowerBelief),
UnitStartingExperience("New [baseUnitFilter] units start with [amount] XP [cityFilter]", UniqueTarget.Global, UniqueTarget.FollowerBelief),
@Deprecated("As of 4.15.11", ReplaceWith("New [baseUnitFilter] units start with [amount] XP [cityFilter]"))
UnitStartingExperienceOld("New [baseUnitFilter] units start with [amount] Experience [cityFilter]", UniqueTarget.Global, UniqueTarget.FollowerBelief),
UnitStartingPromotions("All newly-trained [baseUnitFilter] units [cityFilter] receive the [promotion] promotion", UniqueTarget.Global, UniqueTarget.FollowerBelief), UnitStartingPromotions("All newly-trained [baseUnitFilter] units [cityFilter] receive the [promotion] promotion", UniqueTarget.Global, UniqueTarget.FollowerBelief),
// Todo: Lowercase the 'U' of 'Units' in this unique // Todo: Lowercase the 'U' of 'Units' in this unique
CityHealingUnits("[mapUnitFilter] Units adjacent to this city heal [amount] HP per turn when healing", UniqueTarget.Global, UniqueTarget.FollowerBelief), CityHealingUnits("[mapUnitFilter] Units adjacent to this city heal [amount] HP per turn when healing", UniqueTarget.Global, UniqueTarget.FollowerBelief),

2
core/src/com/unciv/models/ruleset/unit/BaseUnit.kt
View File

@ -374,7 +374,7 @@ class BaseUnit : RulesetObject(), INonPerpetualConstruction {
var XP = 0 var XP = 0
for (unique in for (unique in
cityConstructions.city.getMatchingUniques(UniqueType.UnitStartingExperience) (cityConstructions.city.getMatchingUniques(UniqueType.UnitStartingExperience) + cityConstructions.city.getMatchingUniques(UniqueType.UnitStartingExperienceOld))
.filter { cityConstructions.city.matchesFilter(it.params[2]) } .filter { cityConstructions.city.matchesFilter(it.params[2]) }
) { ) {
if (unit.matchesFilter(unique.params[0])) if (unit.matchesFilter(unique.params[0]))