OrionVeteran
Deity
That led to an enormous amount of links and changes. I think I have added all of them, but I am left with a problem with NMAKE:
Spoiler :
Any ideas on what I must do to resolve this?
SDK for SetHasTrait
- Thread starter OrionVeteran
- Start date
That led to an enormous amount of links and changes. I think I have added all of them, but I am left with a problem with NMAKE:
Any ideas on what I must do to resolve this?
OrionVeteran
Deity
Done and the DLL compiled. However, Now I get this error for each of the religions, when I start the mod:
Code:
Tag: TXT_KEY_RELIGION_JUDAISM_ADJECTIVE in Info class was incorrect
Current XML file is xml\GameInfo/CIV4ReligionInfo.xml...And my test mod failed to give me the INDUSTRIOUS trait, when the Wonder was built.
OrionVeteran
Deity
Here are the SDK files: Look for "FfH: Traits" for the changes.
No clue about the XML error.
As far as the SDK goes, I took a quick look through your files and didnt notice anything missing. You do have some extra stuff you dont need. You can delete everything regarding alignment and globalcounter and SpecialistTypeExtraCommerce.
As far as the SDK goes, I took a quick look through your files and didnt notice anything missing. You do have some extra stuff you dont need. You can delete everything regarding alignment and globalcounter and SpecialistTypeExtraCommerce.
OrionVeteran
Deity
OK removing alignment and globalcounter and SpecialistTypeExtraCommerce actually fixed the XML error and the DLL compiled. However, we are back to the same problem: The new Trait "ORGANIZED" fails to appear, after the python code to add the trait is executed.
The latest SDK changes are attached. What more needs to be done?
I need the new test trait (INDUSTRIOUS) and all of its effects to appear in the Leader information (Sevopeadia), just as the two default traits appear for any leader. What have I left out?
Just to clarify, the new trait wont appear in the Sevopedia (that info is pulled from the XML files), but it should show when you mouseover that player in the scoreboard (or their flag if you're playing that civ)..
OrionVeteran
Deity
In fact, the new trait appears on the Foriegn Advisor screen. So the test mod actually works. Outstanding!
Now I can change the Python code to make a selection from a list of traits the player does not have. 
Pitty that we can't get the new trait to appear in the Sevopedia. To do that we would need some sort of script to edit a temporary XML file that would contain any additional player traits and somehow appended the additions with the information contained in the CIV4TraitInfos.xml file.
God-Emperor
Deity
Way too much effort. Try doing it the easy way instead...Pitty that we can't get the new trait to appear in the Sevopedia. To do that we would need some sort of script to edit a temporary XML file that would contain any additional player traits and somehow appended the additions with the information contained in the CIV4TraitInfos.xml file.
You could just have the 'pedia leader page Python (since they are built in Python) check to see if the leader is in use in the game and if so then show the traits the leader in the game actually has instead of the ones from the LeaderHeadInfo.
You can also update the DLL's CvGameTextMgr:
arseLeaderTraits function to do the same thing, which would cover the pop-ups with the help text for the leader icons in the 'pedia (and maybe other places too).
OrionVeteran
Deity
I was about to wrap up this mod, but now you have my attention. I assume you are referring to the "placeTraits" function in the CvPediaLeader.py file. Is that correct?
God-Emperor
Deity
Sounds about right.
Since that apparently calls PareseLeaderTraits from CvGameTextMgr to get the data, just changing it there in the DLL, as mentioned in the paragraph after that one, should cover just about everything. (I had assumed that it was calling parseTraits for each individual trait, but apparently not.) In CvGameTextMgr.cpp, ParseLeaderTraits uses the leader's LeaderHeadInfo in a loop over the traits and calls parseTraits for each one that it has. It seems to me that in that loop is where you'd want to make the change.
Since that apparently calls PareseLeaderTraits from CvGameTextMgr to get the data, just changing it there in the DLL, as mentioned in the paragraph after that one, should cover just about everything. (I had assumed that it was calling parseTraits for each individual trait, but apparently not.) In CvGameTextMgr.cpp, ParseLeaderTraits uses the leader's LeaderHeadInfo in a loop over the traits and calls parseTraits for each one that it has. It seems to me that in that loop is where you'd want to make the change.
OrionVeteran
Deity
God-Emperor
Deity
What about leaders in the Civilopedia that are not in the current game? You normally show trait info for them too. That code does not look like it would do so.
It also looks like it is only checking for civilization traits (traits from the civilization info), not leader traits (traits from the leaderhead info). Normal BtS doesn't even have civilization traits.
I think what you need is an if/else check where:
If the specified leader is in the current game you check for the traits the same place you added the extras in the first place (presumably the CvPlayer) to check against the actual current traits the leader has.
Else do what the original code did (check the leader head info).
It also looks like it is only checking for civilization traits (traits from the civilization info), not leader traits (traits from the leaderhead info). Normal BtS doesn't even have civilization traits.
I think what you need is an if/else check where:
If the specified leader is in the current game you check for the traits the same place you added the extras in the first place (presumably the CvPlayer) to check against the actual current traits the leader has.
Else do what the original code did (check the leader head info).
OrionVeteran
Deity
OrionVeteran
Deity
Tholal,
Thanks to God-Emporer, the data for the appearance of a new trait in the Sevopedia, is now pulled from the CvPlayer, and not the XML. The new trait appears, as it should for any leader, who builds the National Wonder.
However, we have one more issue yet to be solved. In my test mod, I wanted proof that the effects of a new trait actually show up. So, I picked a leader that did not have the financial trait for my test. Why? Because the financial trait adds one commerce that can be easily seen on coastal plots. So it is easy to see a visible change from two
to three commerce coins. I built the wonder and verified the leaderhead shows the new financial trait. Unfortunately, the coastal plots around my city did not see a change in the commerce from two to three commerce coins. I was able to repeat this problem in two different test games. What in the SDK have we left undone?
God-Emperor
Deity
There are probably update calls you need to do.
Like CvCity::updateYield is called when you build a building in a city that changes plot yields (like the levy or Moai statues), which itself calls CvPlot::updateYield for that city's plots. Since a trait is global, you might need to call CvMap::updateYield which does them all, or at least CvPlayer::updateYield.
It looks like the specific case of the yield threshold modifiers (which is what financial uses) is done in CvPlayer::updateExtraYieldThreshold(YieldTypes eIndex). This checks all traits for the best modifier for the specified yield type and uses that one. It also calls updateYield itself.
There may be more properties that need to have things updated for them like perhaps commerce changes/modifiers and trade yield modifiers. CvPlayer has an updateCommerce function and an updateTradeRoutes function, each of which may need to be called if the trait modifies these things. On the other hand, these sorts of things might update automatically at the end of the turn - or they might not. You also need to decide what happens for things like free promotions: are they applied retroactively to all existing units? Ordinarily this is not an issue since the traits are present at the start of the game so the effects are already applied every time something happens. (The experience level modifier may make things weird - many existing units will probably suddenly be eligible for more promotions.)
I suggest looking at CvPlayer::init, which has a section that loops over the traits to apply the effects of the ones the player has (coincidentally, the specific case of the yield thresholds is not handled in this loop since the updateExtraYieldThreshold itself checks all the traits so it is called after the loop over the traits; updateMaxAnarchyTurns is also after the loop since it also already loops over all the traits). You almost certainly need to do what it does in this loop for the traits the leader has when initialized for the newly acquired trait (not all traits or you'll double the effect of most of the ones it already has, so no loop) as well as the two things after it. It may be the case that each of the functions to apply the trait's properties also calls the relevant update function when there is one, which would make things easier.
I probably should have checked the CvPlayer::init first. That paragraph may obsolete most of the stuff in the earlier paragraphs...
Like CvCity::updateYield is called when you build a building in a city that changes plot yields (like the levy or Moai statues), which itself calls CvPlot::updateYield for that city's plots. Since a trait is global, you might need to call CvMap::updateYield which does them all, or at least CvPlayer::updateYield.
It looks like the specific case of the yield threshold modifiers (which is what financial uses) is done in CvPlayer::updateExtraYieldThreshold(YieldTypes eIndex). This checks all traits for the best modifier for the specified yield type and uses that one. It also calls updateYield itself.
There may be more properties that need to have things updated for them like perhaps commerce changes/modifiers and trade yield modifiers. CvPlayer has an updateCommerce function and an updateTradeRoutes function, each of which may need to be called if the trait modifies these things. On the other hand, these sorts of things might update automatically at the end of the turn - or they might not. You also need to decide what happens for things like free promotions: are they applied retroactively to all existing units? Ordinarily this is not an issue since the traits are present at the start of the game so the effects are already applied every time something happens. (The experience level modifier may make things weird - many existing units will probably suddenly be eligible for more promotions.)
I suggest looking at CvPlayer::init, which has a section that loops over the traits to apply the effects of the ones the player has (coincidentally, the specific case of the yield thresholds is not handled in this loop since the updateExtraYieldThreshold itself checks all the traits so it is called after the loop over the traits; updateMaxAnarchyTurns is also after the loop since it also already loops over all the traits). You almost certainly need to do what it does in this loop for the traits the leader has when initialized for the newly acquired trait (not all traits or you'll double the effect of most of the ones it already has, so no loop) as well as the two things after it. It may be the case that each of the functions to apply the trait's properties also calls the relevant update function when there is one, which would make things easier.
I probably should have checked the CvPlayer::init first. That paragraph may obsolete most of the stuff in the earlier paragraphs...
OrionVeteran
Deity
I left out the following lines:
Code:
for (iI = 0; iI < NUM_YIELD_TYPES; iI++)
{
updateExtraYieldThreshold((YieldTypes)iI);
}
updateMaxAnarchyTurns();It tested good (i.e the coins showed up), after I put these lines back in. Now I think the SDK for my Traits Mod is done.
Thanks again.
OrionVeteran
Deity
For anyone who wants to be able to add or remove a trait, I have put together a new National Wonder to demonstrate the capability.
Get it Here: http://forums.civfanatics.com/downloads.php?do=file&id=18648
Get it Here: http://forums.civfanatics.com/downloads.php?do=file&id=18648
OrionVeteran
Deity
I should have posted this before. Here is a final look at the function that works:
Code:
void CvPlayer::setHasTrait(TraitTypes eTrait, bool bNewValue)
{
FAssertMsg((eTrait >= 0), "eTrait is less than zero");
int iI, iChange;
if (bNewValue)
{
iChange = 1;
}
else
{
iChange = -1;
}
if (m_pbTraits[(int)eTrait] == bNewValue)
{
return;
}
m_pbTraits[(int)eTrait] = bNewValue;
changeExtraHealth(GC.getTraitInfo(eTrait).getHealth() * iChange);
changeExtraHappiness(GC.getTraitInfo(eTrait).getHappiness() * iChange);
for (iI = 0; iI < GC.getNumBuildingInfos(); iI++)
{
changeExtraBuildingHappiness((BuildingTypes)iI, GC.getBuildingInfo((BuildingTypes)iI).getHappinessTraits((int)eTrait) * iChange);
}
changeUpkeepModifier(GC.getTraitInfo(eTrait).getUpkeepModifier() * iChange);
changeLevelExperienceModifier(GC.getTraitInfo(eTrait).getLevelExperienceModifier() * iChange);
changeGreatPeopleRateModifier(GC.getTraitInfo(eTrait).getGreatPeopleRateModifier() * iChange);
changeGreatGeneralRateModifier(GC.getTraitInfo(eTrait).getGreatGeneralRateModifier() * iChange);
changeDomesticGreatGeneralRateModifier(GC.getTraitInfo(eTrait).getDomesticGreatGeneralRateModifier() * iChange);
changeMaxGlobalBuildingProductionModifier(GC.getTraitInfo(eTrait).getMaxGlobalBuildingProductionModifier() * iChange);
changeMaxTeamBuildingProductionModifier(GC.getTraitInfo(eTrait).getMaxTeamBuildingProductionModifier() * iChange);
changeMaxPlayerBuildingProductionModifier(GC.getTraitInfo(eTrait).getMaxPlayerBuildingProductionModifier() * iChange);
for (iI = 0; iI < NUM_YIELD_TYPES; iI++)
{
changeTradeYieldModifier(((YieldTypes)iI), GC.getTraitInfo(eTrait).getTradeYieldModifier(iI) * iChange);
}
for (iI = 0; iI < NUM_COMMERCE_TYPES; iI++)
{
changeFreeCityCommerce(((CommerceTypes)iI), GC.getTraitInfo(eTrait).getCommerceChange(iI) * iChange);
changeCommerceRateModifier(((CommerceTypes)iI), GC.getTraitInfo(eTrait).getCommerceModifier(iI) * iChange);
}
for (iI = 0; iI < GC.getNumCivicOptionInfos(); iI++)
{
if (GC.getCivicOptionInfo((CivicOptionTypes) iI).getTraitNoUpkeep(int(eTrait)))
{
changeNoCivicUpkeepCount(((CivicOptionTypes)iI), iChange);
}
}
for (iI = 0; iI < NUM_YIELD_TYPES; iI++)
{
updateExtraYieldThreshold((YieldTypes)iI);
}
updateMaxAnarchyTurns();
}