Help needed with Specialist Commerce CvCity.cpp

[CaptainMidnight]

I've been trying to get some new tags to work. The tags enable civics to grant specific specialist types commerce bonuses. For example, under Free Market Merchant specialist are granted +1 and
The XML looks like this in CivicInfos.xml:

<SpecialistCommerceChanges>
		<SpecialistCommerceChange>
			<SpecialistType>SPECIALIST_MERCHANT</SpecialistType>
			<CommerceChanges>
			     <iCommerce>1</iCommerce>
			     <iCommerce>1</iCommerce>
			     <iCommerce>1</iCommerce>
			     <iCommerce>1</iCommerce>
			</CommerceChanges>
		</SpecialistCommerceChange>
	</SpecialistCommerceChanges>

I have done all the work for infos.cpp and player.cpp. The affected specialist display the change correctly when in the civic. I haven't made any changes to cvcity.cpp yet so the extra commerce is not used by the city and am unsure how to proceed. Any help would be marvelous!

This is the main things i did in the (excluding the ppaaiSpecialistCivicExtraCommerce stuff) cvplayer.cpp :

[B]// CMEDIT Civic Specialist Commerce Changes 19/08/2011[/B]
int CvPlayer::getSpecialistCivicExtraCommerce(SpecialistTypes eIndex1, CommerceTypes eIndex) const
{
	FAssertMsg(eIndex1 >= 0, "eIndex1 expected to be >= 0");
	FAssertMsg(eIndex1 < GC.getNumSpecialistInfos(), "eIndex1 expected to be < GC.getNumSpecialistInfos()");
	FAssertMsg(eIndex >= 0, "eIndex expected to be >= 0");
	FAssertMsg(eIndex < NUM_COMMERCE_TYPES, "eIndex expected to be < NUM_COMMERCE__TYPES");
	return m_ppaaiSpecialistCivicExtraCommerce [eIndex1][eIndex];
}


void CvPlayer::changeSpecialistCivicExtraCommerce(SpecialistTypes eIndex1, CommerceTypes eIndex, int iChange)
{
	FAssertMsg(eIndex1 >= 0, "eIndex1 expected to be >= 0");
	FAssertMsg(eIndex1 < GC.getNumSpecialistInfos(), "eIndex1 expected to be < GC.getNumSpecialistInfos()");
	FAssertMsg(eIndex >= 0, "eIndex expected to be >= 0");
	FAssertMsg(eIndex < NUM_COMMERCE_TYPES, "eIndex expected to be < NUM_COMMERCE_TYPES");

	if (iChange != 0)
	{
		m_ppaaiSpecialistCivicExtraCommerce[eIndex1][eIndex] = (m_ppaaiSpecialistCivicExtraCommerce[eIndex1][eIndex] + iChange);
		FAssert(m_ppaaiSpecialistCivicExtraCommerce(eIndex1, eIndex) >= 0);

		updateCommerce(eIndex);

		AI_makeAssignWorkDirty();
	}
}

[B]//CMEdit End[/B]

and also here:

changeSpecialistExtraCommerce(((CommerceTypes)iI), (GC.getCivicInfo(eCivic).getSpecialistExtraCommerce(iI) * iChange));
	}
	
	[B]// CMEDIT Civic Specialist Commerce Changes 17/08/2011[/B]
	for (iI = 0; iI < GC.getNumSpecialistInfos(); iI++)
	{
		for (iJ = 0; iJ < NUM_COMMERCE_TYPES; iJ++)
		{
			changeSpecialistCivicExtraCommerce(((SpecialistTypes)iI), ((CommerceTypes)iJ), (GC.getCivicInfo(eCivic).getSpecialistCommerceChange(iI, iJ) * iChange));
		}
	}
[B]	// CMEDIT end[/B]

	for (iI = 0; iI < GC.getNumBuildingClassInfos(); iI++)

and finally this piece

int CvPlayer::specialistCommerce(SpecialistTypes eSpecialist, CommerceTypes eCommerce) const
{
[B]// CMEDIT Civic Specialist Commerce Changes 19/08/2011[/B]
//	return (GC.getSpecialistInfo(eSpecialist).getCommerceChange(eCommerce) + getSpecialistExtraCommerce(eCommerce));
	return (GC.getSpecialistInfo(eSpecialist).getCommerceChange(eCommerce) + getSpecialistExtraCommerce(eCommerce) + getSpecialistCivicExtraCommerce (eSpecialist, eCommerce));
[B]// CMEDIT End[/B]
}

My question is how do I get this information in player.cpp to be read and used by the city. I figured this piece of code in cvcity.cpp might be significant:

int CvCity::getBaseCommerceRateTimes100(CommerceTypes eIndex) const
{
	int iBaseCommerceRate;

	iBaseCommerceRate = getCommerceFromPercent(eIndex, getYieldRate(YIELD_COMMERCE) * 100);

	iBaseCommerceRate += 100 * ((getSpecialistPopulation() + getNumGreatPeople()) * GET_PLAYER(getOwnerINLINE()).getSpecialistExtraCommerce(eIndex));
	
	iBaseCommerceRate += 100 * (getBuildingCommerce(eIndex) + getSpecialistCommerce(eIndex) + getReligionCommerce(eIndex) + getCorporationCommerce(eIndex) + GET_PLAYER(getOwnerINLINE()).getFreeCityCommerce(eIndex));

But everything I've tried hasn't worked. Any suggestions?

 

[LyTning94]

I would look at CvCity::getSpecialistCommerce(eIndex).

 

[CaptainMidnight]

Cheers LyTing94, I've got the tags working fine and the AI working too. getSpecialistCommerce was certainly part to refer to. Now I've just got to sort out the Gametextmgr which I have no idea how to do yet.

 

[CaptainMidnight]

And the gametext is done now

 

[LyTning94]

Good to hear!

 

[SaibotLieh]

This sounds quite interesting. Do you plan to release your source code when you are done?

 

[CaptainMidnight]

Yes, I'll release as a modcomp soon, including sources of course. At the moment its tangled up in my modpack. Probably best I merge it with the original unedited core files. I am also looking at a tag which changes XP for particular specialist under civics. Also gonna copy these tags to Traits and buildings.

 

[SaibotLieh]

Thanks for the release, I think this is a great addition to the civic options.

 

[Cybah]

Oh yes I really need this.

Edit: Make sure the AI will understand it.

 

[CaptainMidnight]

The AI uses it appropriately from the few test I've done so far. I've used AI code thats pretty close to the vanilla ExtraSpecialistCommerce functionality