Change save promotion from unitType to just baseUnit #12960
Conversation
…of running away Settler unit will now settle on best tile in dangerous Tiles without escort instead of running away.
with "Founds a new puppet city" in "uniques" of an unit in Units.json. Making it so you can now settle a puppet city.
Emandac
changed the title
|
|
||
| var cityUnitTypePromotions = HashMap<String, UnitPromotions>() | ||
| var cityUnitPromotions = HashMap<String, UnitPromotions>() |
There was a problem hiding this comment.
REMOVE the City part! For the third time...
Should be called unitToPromotions
… civ This was a unique type that the Zulu have in civ 5
| @@ -188,6 +188,8 @@ enum class UniqueType( | |||
| // 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), | |||
|
|
|||
| ExperienceForPromotionModifier("[relativeAmount]% Experience required for promotions",UniqueTarget.Global,UniqueTarget.FollowerBelief), | |||
There was a problem hiding this comment.
We call it "XP"
Also, how exactly is this a follower belief?
There was a problem hiding this comment.
To allow modders a follower Belief with this unique
There was a problem hiding this comment.
Follower beliefs are for things that affect cities
This won't work as a follower belief
I assume you haven't tried it? If you have and it works, there's something freaky going on
There was a problem hiding this comment.
Ah, I am just going to remove it then 😅
There was a problem hiding this comment.
We call it "XP" Also, how exactly is this a follower belief?
The game is not fully consistent on this actually, it's
"Experience" in UniqueType.UnitStartingExperience
"Xp" in UniqueType.CityStateGiftedUnitsStartWithXp
"XP" in the other uniques
There was a problem hiding this comment.
It should be XP everywhere
UnitStartingExperience needs to be renamed
There was a problem hiding this comment.
Nah CityStateGiftedUnitsStartWithXp also has "XP" in the text, only the unitstarting is bad
| fun xpForNextPromotion(): Int { | ||
| // reduce or hieghter the xp for next promotion. | ||
| for (unique in unit.civ.getMatchingUniques(UniqueType.XPForPromotionModifier)) { | ||
| return Math.round(((numberOfPromotions + 1) * 10) * unique.params[0].toPercent()) | ||
| } | ||
| return (numberOfPromotions + 1) * 10 | ||
| } | ||
|
|
||
|
|
||
| /** @return the XP points needed to "buy" the next [count] promotions. */ | ||
| fun xpForNextNPromotions(count: Int) = (1..count).sumOf { (numberOfPromotions + it) * 10 } | ||
| fun xpForNextNPromotions(count: Int): Int { | ||
| // reduce or hieghter the xp for next promotion. | ||
| for (unique in unit.civ.getMatchingUniques(UniqueType.XPForPromotionModifier)) { | ||
| return Math.round(((1..count).sumOf { (numberOfPromotions + it) * 10 } * unique.params[0].toPercent())) | ||
| } | ||
| return (1..count).sumOf { (numberOfPromotions + it) * 10 } | ||
| } |
There was a problem hiding this comment.
How about we deal with this in a different PR. I don't like the duploication - we should have just "costOfPromotion(existingPromotions: Int)" and the "next N" should use that function
There was a problem hiding this comment.
The function would be something like this ?
for (unique in unit.civ.getMatchingUniques(UniqueType.XPForPromotionModifier)) {
return Math.round((existingPromotions * unique.params[0].toPercent()))
}
| @@ -188,6 +188,8 @@ enum class UniqueType( | |||
| // 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), | |||
|
|
|||
| XPForPromotionModifier("[relativeAmount]% Experience required for promotions",UniqueTarget.Global,UniqueTarget.FollowerBelief), | |||
There was a problem hiding this comment.
You didn't actually change the text here -_-
|
This is a classic example of why different issues should be in different PRs, mixing them makes the whole thing take longer and be more confusing :) |
|
Agreed :d |
|
Why is my build failing I only change that bit of text :( |
|
So now i create a new PR branch for promotion XP modifier or |
|
Whichever you want |
|
I think i will just let this PR get merge before doing anything else 😅 |
This change comes from me messing around with save promotion in promotion picker and finding weird edge cases.
Like there could be a unit in the unitType that has promotion by default when it is build that the other unit don't have,
So when saving that unit promotion, it could cause the other unit with the same unitType to have the promotion that the unit shouldn't have.
By making it BaseUnit instead of UnitType avoid units using saved promotion having promotion that they shouldn't have.
I am also really sorry that i didn't caught this edge case Pre-PR.