Subversion Repositories RAND

Compare Revisions

Ignore whitespace Rev 1088 → Rev 1089

/Rise of Mankind - A New Dawn/Assets/CvGameCoreDLL.dll
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/Rise of Mankind - A New Dawn/Assets/CvGameCoreDLL.dll.100civs
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/Rise of Mankind - A New Dawn/Assets/Python/Contrib/CvModName.py
2,7 → 2,7
 
modName = "Rise of Mankind: A New Dawn"
displayName = "Rise of Mankind: A New Dawn"
modVersion = "2.2 (rev1088)"
modVersion = "2.2 (rev1089)"
 
civName = "BtS"
civVersion = "3.19"
/Rise of Mankind - A New Dawn/Assets/XML/Text/CIVICS.xml
1931,22 → 1931,22
</TEXT>
<TEXT>
<Tag>TXT_KEY_CIVIC_DOMESTIC_CONNECTED_COMMERCE_MODIFIER_CITY_HELP</Tag>
<English>[ICON_BULLET]+%d1%[ICON_COMMERCE] from domestic city connections due to %s2_civic (included above)</English>
<French>[ICON_BULLET]+%d1%[ICON_COMMERCE] des connexions de la ville en raison de %s2_civic</French>
<Czech>[ICON_BULLET]+%d1%[ICON_COMMERCE] z domácích městských spojení z %s2_civic</Czech>
<Portuguese>[ICON_BULLET]+%d1%[ICON_COMMERCE] por conexões com cidades domésticas devido a %s2_civic</Portuguese>
<Brazilian>[ICON_BULLET]+%d1%[ICON_COMMERCE] por conexões com cidades domésticas devido a %s2_civic</Brazilian>
<Russian>[ICON_BULLET]+%d1%[ICON_COMMERCE] от внутренних связей города %s2_civic</Russian>
<Spanish>[ICON_BULLET]+%d1%[ICON_COMMERCE] de conexiones domésticas de ciudades gracias a %s2_civic</Spanish>
<German>[ICON_BULLET]+%d1%[ICON_COMMERCE] aus inländischen Städteverbindungen aufgrund von %s2_civic</German>
<Polish>[ICON_BULLET]+%d1%[ICON_COMMERCE] z narodowych szlaków handlowych z powodu %s2_civic.</Polish>
<Korean>[ICON_BULLET]%s2_civic 로 인해 자국 도시 연결될 때마다 +%d1%[ICON_COMMERCE]</Korean>
<Ukrainian>[ICON_BULLET]+%d1%[ICON_COMMERCE] від внутрішніх зв’язків міста %s2_civic</Ukrainian>
<Italian>[ICON_BULLET]+%d1%[ICON_COMMERCE] dalle rotte commerciali interne grazie a %s2_civic</Italian>
<Dutch>[ICON_BULLET]+%d1%[ICON_COMMERCE] van binnenlandse stedelijke verbindingen dankzij %s2_civic</Dutch>
<Turkish>[ICON_BULLET]%s2_civic sayesinde yerli şehir bağlantılarından +%d1%[ICON_COMMERCE] </Turkish>
<Hungarian>[ICON_BULLET]+%d1%[ICON_COMMERCE] hazai városi kapcsolatok után, %s2_civic miatt</Hungarian>
<ChineseSimp>[ICON_BULLET]由于采用了%s2_civic法令国内商路+%d1%商业[ICON_COMMERCE] </ChineseSimp>
<English>[ICON_BULLET]+%d1%[ICON_COMMERCE] from domestic city connections due to %s2_civic (+%d3[ICON_COMMERCE])</English>
<French>[ICON_BULLET]+%d1%[ICON_COMMERCE] des connexions de la ville en raison de %s2_civic (+%d3[ICON_COMMERCE])</French>
<Czech>[ICON_BULLET]+%d1%[ICON_COMMERCE] z domácích městských spojení z %s2_civic (+%d3[ICON_COMMERCE])</Czech>
<Portuguese>[ICON_BULLET]+%d1%[ICON_COMMERCE] por conexões com cidades domésticas devido a %s2_civic (+%d3[ICON_COMMERCE])</Portuguese>
<Brazilian>[ICON_BULLET]+%d1%[ICON_COMMERCE] por conexões com cidades domésticas devido a %s2_civic (+%d3[ICON_COMMERCE])</Brazilian>
<Russian>[ICON_BULLET]+%d1%[ICON_COMMERCE] от внутренних связей города %s2_civic (+%d3[ICON_COMMERCE])</Russian>
<Spanish>[ICON_BULLET]+%d1%[ICON_COMMERCE] de conexiones domésticas de ciudades gracias a %s2_civic (+%d3[ICON_COMMERCE])</Spanish>
<German>[ICON_BULLET]+%d1%[ICON_COMMERCE] aus inländischen Städteverbindungen aufgrund von %s2_civic (+%d3[ICON_COMMERCE])</German>
<Polish>[ICON_BULLET]+%d1%[ICON_COMMERCE] z narodowych szlaków handlowych z powodu %s2_civic (+%d3[ICON_COMMERCE])</Polish>
<Korean>[ICON_BULLET]%s2_civic 로 인해 자국 도시 연결될 때마다 +%d1%[ICON_COMMERCE] (+%d3[ICON_COMMERCE])</Korean>
<Ukrainian>[ICON_BULLET]+%d1%[ICON_COMMERCE] від внутрішніх зв’язків міста %s2_civic (+%d3[ICON_COMMERCE])</Ukrainian>
<Italian>[ICON_BULLET]+%d1%[ICON_COMMERCE] dalle rotte commerciali interne grazie a %s2_civic (+%d3[ICON_COMMERCE])</Italian>
<Dutch>[ICON_BULLET]+%d1%[ICON_COMMERCE] van binnenlandse stedelijke verbindingen dankzij %s2_civic (+%d3[ICON_COMMERCE])</Dutch>
<Turkish>[ICON_BULLET]%s2_civic sayesinde yerli şehir bağlantılarından +%d1%[ICON_COMMERCE] (+%d3[ICON_COMMERCE])</Turkish>
<Hungarian>[ICON_BULLET]+%d1%[ICON_COMMERCE] hazai városi kapcsolatok után, %s2_civic miatt (+%d3[ICON_COMMERCE])</Hungarian>
<ChineseSimp>[ICON_BULLET]由于采用了%s2_civic法令国内商路+%d1%商业[ICON_COMMERCE] (+%d3[ICON_COMMERCE])</ChineseSimp>
</TEXT>
<TEXT>
<Tag>TXT_KEY_CIVIC_DOMESTIC_CONNECTEDNESS_MODIFIER</Tag>
2436,22 → 2436,21
</TEXT>
<TEXT>
<Tag>TXT_KEY_CIVIC_FOREIGN_CONNECTED_COMMERCE_MODIFIER_CITY_HELP</Tag>
<English>[ICON_BULLET]+%d1%[ICON_COMMERCE] from foreign city connections due to %s2_civic (included above)</English>
<French>[ICON_BULLET]+%d1%[ICON_COMMERCE] des connections aux villes étrangères grâce à %s2_civic</French>
<Czech>[ICON_BULLET]+%d1%[ICON_COMMERCE] ze zahraničních městských spojení z %s2_civic</Czech>
<Portuguese>[ICON_BULLET]+%d1%[ICON_COMMERCE] por conexões com cidades estrangeiras devido a %s2_civic</Portuguese>
<Brazilian>[ICON_BULLET]+%d1%[ICON_COMMERCE] por conexões com cidades estrangeiras devido a %s2_civic</Brazilian>
<Russian>[ICON_BULLET]+%d1%[ICON_COMMERCE]
от иностранных связей города %s2_civic</Russian>
<Spanish>[ICON_BULLET]+%d1%[ICON_COMMERCE] de conexiones de ciudades extranjeras gracias a %s2_civic</Spanish>
<ChineseSimp>[ICON_BULLET]+%d1%商业[ICON_COMMERCE]国外商路连接,由于采用了%s2_civic</ChineseSimp>
<German>[ICON_BULLET]+%d1%[ICON_COMMERCE] aus ausländischen Städteverbindungen aufgrund von %s2_civic</German>
<Polish>[ICON_BULLET]+%d1%[ICON_COMMERCE] z zagranicznych szlaków handlowych z powodu %s2_civic </Polish>
<Korean>[ICON_BULLET]%s2_civic 로 인해 외국 도시 연결로부터 +%d1%[ICON_COMMERCE]</Korean>
<Ukrainian>[ICON_BULLET]+%d1%[ICON_COMMERCE] від іноземних зв’язків міста %s2_civic</Ukrainian>
<Italian>[ICON_BULLET]+%d1%[ICON_COMMERCE] dalle rotte commerciali straneri grazie a %s2_civic</Italian>
<Turkish>[ICON_BULLET]%s2_civic sayesinde yabancı şehir bağlantılarından +%d1%[ICON_COMMERCE] </Turkish>
<Hungarian>[ICON_BULLET]+%d1%[ICON_COMMERCE] idegen városi kapcsolatokból, %s2_civic miatt</Hungarian>
<English>[ICON_BULLET]+%d1%[ICON_COMMERCE] from foreign city connections due to %s2_civic (+%d3[ICON_COMMERCE])</English>
<French>[ICON_BULLET]+%d1%[ICON_COMMERCE] des connections aux villes étrangères grâce à %s2_civic (+%d3[ICON_COMMERCE])</French>
<Czech>[ICON_BULLET]+%d1%[ICON_COMMERCE] ze zahraničních městských spojení z %s2_civic (+%d3[ICON_COMMERCE])</Czech>
<Portuguese>[ICON_BULLET]+%d1%[ICON_COMMERCE] por conexões com cidades estrangeiras devido a %s2_civic (+%d3[ICON_COMMERCE])</Portuguese>
<Brazilian>[ICON_BULLET]+%d1%[ICON_COMMERCE] por conexões com cidades estrangeiras devido a %s2_civic (+%d3[ICON_COMMERCE])</Brazilian>
<Russian>[ICON_BULLET]+%d1%[ICON_COMMERCE] от иностранных связей города %s2_civic (+%d3[ICON_COMMERCE])</Russian>
<Spanish>[ICON_BULLET]+%d1%[ICON_COMMERCE] de conexiones de ciudades extranjeras gracias a %s2_civic (+%d3[ICON_COMMERCE])</Spanish>
<ChineseSimp>[ICON_BULLET]+%d1%商业[ICON_COMMERCE]国外商路连接,由于采用了%s2_civic (+%d3[ICON_COMMERCE])</ChineseSimp>
<German>[ICON_BULLET]+%d1%[ICON_COMMERCE] aus ausländischen Städteverbindungen aufgrund von %s2_civic (+%d3[ICON_COMMERCE])</German>
<Polish>[ICON_BULLET]+%d1%[ICON_COMMERCE] z zagranicznych szlaków handlowych z powodu %s2_civic (+%d3[ICON_COMMERCE])</Polish>
<Korean>[ICON_BULLET]%s2_civic 로 인해 외국 도시 연결로부터 +%d1%[ICON_COMMERCE] (+%d3[ICON_COMMERCE])</Korean>
<Ukrainian>[ICON_BULLET]+%d1%[ICON_COMMERCE] від іноземних зв’язків міста %s2_civic (+%d3[ICON_COMMERCE])</Ukrainian>
<Italian>[ICON_BULLET]+%d1%[ICON_COMMERCE] dalle rotte commerciali straneri grazie a %s2_civic (+%d3[ICON_COMMERCE])</Italian>
<Turkish>[ICON_BULLET]%s2_civic sayesinde yabancı şehir bağlantılarından +%d1%[ICON_COMMERCE] (+%d3[ICON_COMMERCE]) </Turkish>
<Hungarian>[ICON_BULLET]+%d1%[ICON_COMMERCE] idegen városi kapcsolatokból, %s2_civic miatt (+%d3[ICON_COMMERCE])</Hungarian>
</TEXT>
<TEXT>
<Tag>TXT_KEY_CIVIC_FOREIGN_CONNECTEDNESS_MODIFIER</Tag>
/Rise of Mankind - A New Dawn/Assets/XML/Text/CIVILIZATIONS.xml
7718,22 → 7718,22
</TEXT>
<TEXT>
<Tag>TXT_KEY_TRAIT_DOMESTIC_CONNECTED_COMMERCE_MODIFIER_CITY_HELP</Tag>
<English>[ICON_BULLET]+%d1%[ICON_COMMERCE] from domestic city connections due to %s2 trait</English>
<French>[ICON_BULLET] +%d1%[ICON_COMMERCE] des connexions de la ville en raison du trait %s2</French>
<Polish>[ICON_BULLET]+%d1%[ICON_COMMERCE] z narodowych szlaków handlowych z cechy: %s2 </Polish>
<Spanish>[ICON_BULLET]+%d1%[ICON_COMMERCE] de las conexiones nacionales de ciudad debido al rasgo %s2</Spanish>
<Italian>[ICON_BULLET]+%d1%[ICON_COMMERCE] dalle connessioni interne delle città a causa del tratto %s2.</Italian>
<Brazilian>[ICON_BULLET]+%d1%[ICON_COMMERCE] de conexões domésticas de cidade devido a características de %s2</Brazilian>
<German>[ICON_BULLET]+%d1%[ICON_COMMERCE] von inländischen Städteverbindungen durch %s2-Merkmal</German>
<Hungarian>[ICON_BULLET]+%d1%[ICON_COMMERCE] a hazai városokkal való kapcsolatok után a %s2 jellemvonás miatt</Hungarian>
<Portuguese>[ICON_BULLET]+%d1%[ICON_COMMERCE] de conexões domésticas de cidade devido a características de %s2</Portuguese>
<Czech>[ICON_BULLET]+%d1%[ICON_COMMERCE] z domácích městských spojení díky %s2 povaze</Czech>
<Danish>[ICON_BULLET]+%d1%[ICON_COMMERCE] fra indenrigs byforbindelser på grund af %s2 træk</Danish>
<ChineseSimp>由于 %s2 特性,从国内城市连接获取ICON_BULLET]+%d1%商业[ICON_COMMERCE] </ChineseSimp>
<Russian>[ICON_BULLET]+%d1%[ICON_COMMERCE] от внутренних связей города %s2</Russian>
<Turkish>[ICON_BULLET]+%d1%[ICON_COMMERCE] yerli şehir bağlantılarından %s2 özelliğinden</Turkish>
<Korean>[ICON_BULLET]%s2 trait 로 인해 자국 도시 연결로부터 +%d1%[ICON_COMMERCE]</Korean>
<Ukrainian>[ICON_BULLET]+%d1%[ICON_COMMERCE] з внутрішніх міжміських зв'язків від %s2 особливості</Ukrainian>
<English>[ICON_BULLET]+%d1%[ICON_COMMERCE] from domestic city connections due to %s2 trait (+%d3 [ICON_COMMERCE])</English>
<French>[ICON_BULLET] +%d1%[ICON_COMMERCE] des connexions de la ville en raison du trait %s2 (+%d3 [ICON_COMMERCE])</French>
<Polish>[ICON_BULLET]+%d1%[ICON_COMMERCE] z narodowych szlaków handlowych z cechy: %s2 (+%d3 [ICON_COMMERCE])</Polish>
<Spanish>[ICON_BULLET]+%d1%[ICON_COMMERCE] de las conexiones nacionales de ciudad debido al rasgo %s2 (+%d3 [ICON_COMMERCE])</Spanish>
<Italian>[ICON_BULLET]+%d1%[ICON_COMMERCE] dalle connessioni interne delle città a causa del tratto %s2 (+%d3 [ICON_COMMERCE])</Italian>
<Brazilian>[ICON_BULLET]+%d1%[ICON_COMMERCE] de conexões domésticas de cidade devido a características de %s2 (+%d3 [ICON_COMMERCE])</Brazilian>
<German>[ICON_BULLET]+%d1%[ICON_COMMERCE] von inländischen Städteverbindungen durch %s2-Merkmal (+%d3 [ICON_COMMERCE])</German>
<Hungarian>[ICON_BULLET]+%d1%[ICON_COMMERCE] a hazai városokkal való kapcsolatok után a %s2 jellemvonás miatt (+%d3 [ICON_COMMERCE])</Hungarian>
<Portuguese>[ICON_BULLET]+%d1%[ICON_COMMERCE] de conexões domésticas de cidade devido a características de %s2 (+%d3 [ICON_COMMERCE])</Portuguese>
<Czech>[ICON_BULLET]+%d1%[ICON_COMMERCE] z domácích městských spojení díky %s2 povaze (+%d3 [ICON_COMMERCE])</Czech>
<Danish>[ICON_BULLET]+%d1%[ICON_COMMERCE] fra indenrigs byforbindelser på grund af %s2 træk (+%d3 [ICON_COMMERCE])</Danish>
<ChineseSimp>由于 %s2 特性,从国内城市连接获取ICON_BULLET]+%d1%商业[ICON_COMMERCE] (+%d3 [ICON_COMMERCE]) </ChineseSimp>
<Russian>[ICON_BULLET]+%d1%[ICON_COMMERCE] от внутренних связей города %s2 (+%d3 [ICON_COMMERCE])</Russian>
<Turkish>[ICON_BULLET]+%d1%[ICON_COMMERCE] yerli şehir bağlantılarından %s2 özelliğinden (+%d3 [ICON_COMMERCE])</Turkish>
<Korean>[ICON_BULLET]%s2 trait 로 인해 자국 도시 연결로부터 +%d1%[ICON_COMMERCE] (+%d3 [ICON_COMMERCE])</Korean>
<Ukrainian>[ICON_BULLET]+%d1%[ICON_COMMERCE] з внутрішніх міжміських зв'язків від %s2 особливості (+%d3 [ICON_COMMERCE])</Ukrainian>
</TEXT>
<TEXT>
<Tag>TXT_KEY_TRAIT_DOMESTIC_GREAT_GENERAL_MODIFIER</Tag>
/Sources/CvGameTextMgr.cpp
23061,8 → 23061,8
int iDomesticConnectednessCommerce = eYieldType == YIELD_COMMERCE ? city.getDomesticConnectednessCommerce() : 0;
int iForeignConnectednessCommerce = eYieldType == YIELD_COMMERCE ? city.getForeignConnectednessCommerce() : 0;
int iSeizedConnectednessCommerceTimes100 = eYieldType == YIELD_COMMERCE ? city.getTotalSeizedForeignConnectednessTimes100() : 0;
int iDomesticConnectednessCommerceOriginal = iDomesticConnectednessCommerce;
int iForeignConnectednessCommerceOriginal = iForeignConnectednessCommerce;
int iDomesticConnectednessModifier = 100;
int iForeignConnectednessModifier = 100;
 
//Added back later
iBaseProduction -= iExtraCapitalCommerce;
23092,7 → 23092,7
/* */
/************************************************************************************************/
iBuildingMod += GET_TEAM(city.getTeam()).getBuildingYieldModifier((BuildingTypes)i, eYieldType);
// valergrad bugfix - START
// valergrad bugfix (YIELD_COMMERCE commerce from buildings already included in iBaseProduction) - START
if (eYieldType != YIELD_COMMERCE)
{
iBaseProduction += GET_TEAM(city.getTeam()).getBuildingYieldChange((BuildingTypes)i, eYieldType);
23132,11 → 23132,8
CivicTypes eCivic = GET_PLAYER(city.getOwnerINLINE()).getCivics((CivicOptionTypes)iCivicOption);
if (eCivic != NO_CIVIC)
{
iDomesticConnectednessCommerce *= 100;
iDomesticConnectednessCommerce /= (100 + GC.getCivicInfo(eCivic).getDomesticConnectednessModifier());
 
iForeignConnectednessCommerce *= 100;
iForeignConnectednessCommerce /= (100 + GC.getCivicInfo(eCivic).getForeignConnectednessModifier());
iDomesticConnectednessModifier += GC.getCivicInfo(eCivic).getDomesticConnectednessModifier();
iForeignConnectednessModifier += GC.getCivicInfo(eCivic).getForeignConnectednessModifier();
}
}
 
23145,11 → 23142,16
{
if (GET_PLAYER(city.getOwnerINLINE()).hasTrait((TraitTypes)iTrait))
{
iDomesticConnectednessCommerce *= 100;
iDomesticConnectednessCommerce /= (100 + (GC.getTraitInfo((TraitTypes)iTrait).getTradeYieldModifier(YIELD_COMMERCE) * 15));
iDomesticConnectednessModifier += GC.getTraitInfo((TraitTypes)iTrait).getTradeYieldModifier(YIELD_COMMERCE) * 15;
}
}
 
iDomesticConnectednessCommerce *= 100;
iDomesticConnectednessCommerce = (int)ceil( (double)iDomesticConnectednessCommerce / iDomesticConnectednessModifier);
 
iForeignConnectednessCommerce *= 100;
iForeignConnectednessCommerce = (int)ceil ( (double)iForeignConnectednessCommerce / iForeignConnectednessModifier) ;
 
if (0 != iExtraCapitalCommerce)
{
szBuffer.append(gDLL->getText("TXT_KEY_BUILDING_EXTRA_CAPITAL_COMMERCE_HELP", iExtraCapitalCommerce));
23166,60 → 23168,66
 
if (0 != iDomesticConnectednessCommerce)
{
szBuffer.append(gDLL->getText("TXT_KEY_BUILDING_DOMESTIC_CONNECTED_COMMERCE_CITY_HELP", iDomesticConnectednessCommerceOriginal));
szBuffer.append(gDLL->getText("TXT_KEY_BUILDING_DOMESTIC_CONNECTED_COMMERCE_CITY_HELP", iDomesticConnectednessCommerce));
szBuffer.append(NEWLINE);
iBaseProduction += iDomesticConnectednessCommerceOriginal;
iBaseProduction += iDomesticConnectednessCommerce;
}
 
if (0 != iForeignConnectednessCommerce)
{
szBuffer.append(gDLL->getText("TXT_KEY_BUILDING_FOREIGN_CONNECTED_COMMERCE_CITY_HELP", iForeignConnectednessCommerceOriginal));
szBuffer.append(gDLL->getText("TXT_KEY_BUILDING_FOREIGN_CONNECTED_COMMERCE_CITY_HELP", iForeignConnectednessCommerce));
szBuffer.append(NEWLINE);
iBaseProduction += iForeignConnectednessCommerceOriginal;
iBaseProduction += iForeignConnectednessCommerce;
}
 
for (int iCivicOption = 0; iCivicOption < GC.getNumCivicOptionInfos(); iCivicOption++)
if (0 != iDomesticConnectednessCommerce)
{
CivicTypes eCivic = GET_PLAYER(city.getOwnerINLINE()).getCivics((CivicOptionTypes)iCivicOption);
if ((eCivic != NO_CIVIC && GC.getCivicInfo(eCivic).getDomesticConnectednessModifier() != 0) && (0 != iDomesticConnectednessCommerce))
for (int iCivicOption = 0; iCivicOption < GC.getNumCivicOptionInfos(); iCivicOption++)
{
szBuffer.append(gDLL->getText("TXT_KEY_CIVIC_DOMESTIC_CONNECTED_COMMERCE_MODIFIER_CITY_HELP", GC.getCivicInfo(eCivic).getDomesticConnectednessModifier(), GC.getCivicInfo(eCivic).getDescription()));
szBuffer.append(NEWLINE);
 
iDomesticConnectednessCommerce *= (100 + GC.getCivicInfo(eCivic).getDomesticConnectednessModifier());
iDomesticConnectednessCommerce /= 100;
CivicTypes eCivic = GET_PLAYER(city.getOwnerINLINE()).getCivics((CivicOptionTypes)iCivicOption);
if (eCivic != NO_CIVIC && GC.getCivicInfo(eCivic).getDomesticConnectednessModifier() != 0)
{
int iCivicExtra = iDomesticConnectednessCommerce * GC.getCivicInfo(eCivic).getDomesticConnectednessModifier() / 100;
szBuffer.append(gDLL->getText("TXT_KEY_CIVIC_DOMESTIC_CONNECTED_COMMERCE_MODIFIER_CITY_HELP", GC.getCivicInfo(eCivic).getDomesticConnectednessModifier(), GC.getCivicInfo(eCivic).getDescription(), iCivicExtra));
szBuffer.append(NEWLINE);
iBaseProduction += iCivicExtra;
}
}
}
}
 
//apply trait modifiers
for (int iTrait = 0; iTrait < GC.getNumTraitInfos(); iTrait++)
{
if (GET_PLAYER(city.getOwnerINLINE()).hasTrait((TraitTypes)iTrait))
if (0 != iDomesticConnectednessCommerce)
{
for (int iTrait = 0; iTrait < GC.getNumTraitInfos(); iTrait++)
{
if (GC.getTraitInfo((TraitTypes)iTrait).getTradeYieldModifier(YIELD_COMMERCE) != 0)
if (GET_PLAYER(city.getOwnerINLINE()).hasTrait((TraitTypes)iTrait))
{
szBuffer.append(gDLL->getText("TXT_KEY_TRAIT_DOMESTIC_CONNECTED_COMMERCE_MODIFIER_CITY_HELP", (GC.getTraitInfo((TraitTypes)iTrait).getTradeYieldModifier(YIELD_COMMERCE) * 15), GC.getTraitInfo((TraitTypes)iTrait).getDescription()));
szBuffer.append(NEWLINE);
iDomesticConnectednessCommerce *= (100 + (GC.getTraitInfo((TraitTypes)iTrait).getTradeYieldModifier(YIELD_COMMERCE) * 15));
iDomesticConnectednessCommerce /= 100;
if (GC.getTraitInfo((TraitTypes)iTrait).getTradeYieldModifier(YIELD_COMMERCE) != 0)
{
int iTraitExtra = iDomesticConnectednessCommerce * GC.getTraitInfo((TraitTypes)iTrait).getTradeYieldModifier(YIELD_COMMERCE) * 15 / 100;
szBuffer.append(gDLL->getText("TXT_KEY_TRAIT_DOMESTIC_CONNECTED_COMMERCE_MODIFIER_CITY_HELP", (GC.getTraitInfo((TraitTypes)iTrait).getTradeYieldModifier(YIELD_COMMERCE) * 15), GC.getTraitInfo((TraitTypes)iTrait).getDescription(), iTraitExtra));
szBuffer.append(NEWLINE);
iBaseProduction += iTraitExtra;
}
}
}
}
 
 
for (int iCivicOption = 0; iCivicOption < GC.getNumCivicOptionInfos(); iCivicOption++)
if (0 != iForeignConnectednessCommerce)
{
CivicTypes eCivic = GET_PLAYER(city.getOwnerINLINE()).getCivics((CivicOptionTypes)iCivicOption);
if ((eCivic != NO_CIVIC && GC.getCivicInfo(eCivic).getForeignConnectednessModifier() != 0) && (0 != iForeignConnectednessCommerce))
for (int iCivicOption = 0; iCivicOption < GC.getNumCivicOptionInfos(); iCivicOption++)
{
szBuffer.append(gDLL->getText("TXT_KEY_CIVIC_FOREIGN_CONNECTED_COMMERCE_MODIFIER_CITY_HELP", GC.getCivicInfo(eCivic).getForeignConnectednessModifier(), GC.getCivicInfo(eCivic).getDescription()));
szBuffer.append(NEWLINE);
 
iForeignConnectednessCommerce *= (100 + GC.getCivicInfo(eCivic).getForeignConnectednessModifier());
iForeignConnectednessCommerce /= 100;
CivicTypes eCivic = GET_PLAYER(city.getOwnerINLINE()).getCivics((CivicOptionTypes)iCivicOption);
if (eCivic != NO_CIVIC && GC.getCivicInfo(eCivic).getForeignConnectednessModifier() != 0)
{
int iCivicExtra = iForeignConnectednessCommerce * GC.getCivicInfo(eCivic).getForeignConnectednessModifier() / 100;
szBuffer.append(gDLL->getText("TXT_KEY_CIVIC_FOREIGN_CONNECTED_COMMERCE_MODIFIER_CITY_HELP", GC.getCivicInfo(eCivic).getForeignConnectednessModifier(), GC.getCivicInfo(eCivic).getDescription(), iCivicExtra));
szBuffer.append(NEWLINE);
iBaseProduction += iCivicExtra;
}
}
}
 
if (0 != iSeizedConnectednessCommerceTimes100)
{
CvWString szSeized = CvWString::format(L"-%d.%02d", iSeizedConnectednessCommerceTimes100 / 100, iSeizedConnectednessCommerceTimes100 % 100);
/Sources/CvPlayerAI.cpp
20547,7 → 20547,11
int iIdealPercent;
int iGoldTarget;
int iLoop = 0;
 
if (isHuman())
{
verifyGoldCommercePercent();
return;
}
FAssertMsg(!isHuman(), "isHuman did not return false as expected");
 
/************************************************************************************************/