[sanguoforciv4 commit] r76 - in trunk/Sanguo Rand: . Assets/XML/Civilizations Assets/XML/Text SDK files

0 views
Skip to first unread message

codesite...@google.com

unread,
Nov 23, 2008, 7:50:19 AM11/23/08
to sanguom...@googlegroups.com
Author: tongshen.martin
Date: Sun Nov 23 04:49:22 2008
New Revision: 76

Modified:
trunk/Sanguo Rand/Assets/XML/Civilizations/CIV4CivilizationsSchema.xml
trunk/Sanguo Rand/Assets/XML/Civilizations/CIV4TraitInfos.xml
trunk/Sanguo Rand/Assets/XML/Text/SanguoText_Help.xml
trunk/Sanguo Rand/SDK files/CvInfos.cpp
trunk/Sanguo Rand/SDK files/CvInfos.h
trunk/Sanguo Rand/SDK files/CvUnit.cpp
trunk/Sanguo Rand/SDK files/CyInfoInterface3.cpp
trunk/Sanguo Rand/changelog.txt

Log:
0.057:实现了公孙瓒军的势力特性TRAIT_HORSE_ARCHER

Modified: trunk/Sanguo
Rand/Assets/XML/Civilizations/CIV4CivilizationsSchema.xml
==============================================================================
--- trunk/Sanguo Rand/Assets/XML/Civilizations/CIV4CivilizationsSchema.xml
(original)
+++ trunk/Sanguo Rand/Assets/XML/Civilizations/CIV4CivilizationsSchema.xml
Sun Nov 23 04:49:22 2008
@@ -364,6 +364,8 @@
<ElementType name="PeakYieldChanges" content="eltOnly">
<element type="iYield" minOccurs="0" maxOccurs="*"/>
</ElementType>
+ <!-- Gongsun Zan, TRAIT_HORSE_ARCHER -->
+ <ElementType name="IgnoreBuildingDefenseCombatType" content="textOnly"/>
<!-- Liu Chong, TRAIT_ENGINEERING -->
<ElementType name="iFreeFirstStrikes" content="textOnly" dt:type="int"/>
<ElementType name="FreeFirstStrikesUnitClass" content="eltOnly">
@@ -407,6 +409,8 @@
<element type="bFamous"/>
<element type="PeaceCommerceModifiers"/>
<element type="PeakYieldChanges"/>
+ <!-- Gongsun Zan, TRAIT_HORSE_ARCHER -->
+ <element type="IgnoreBuildingDefenseCombatType"/>
<!-- Liu Chong, TRAIT_ENGINEERING -->
<element type="FreeFirstStrikesUnitClasses" minOccurs="0" maxOccurs="*"/>
<!-- Sanguo Mod Civilization Trait, end -->

Modified: trunk/Sanguo Rand/Assets/XML/Civilizations/CIV4TraitInfos.xml
==============================================================================
--- trunk/Sanguo Rand/Assets/XML/Civilizations/CIV4TraitInfos.xml (original)
+++ trunk/Sanguo Rand/Assets/XML/Civilizations/CIV4TraitInfos.xml Sun Nov
23 04:49:22 2008
@@ -35,6 +35,7 @@
<bFamous>0</bFamous>
<PeaceCommerceModifiers/>
<PeakYieldChanges/>
+ <IgnoreBuildingDefenseCombatType/>
<FreeFirstStrikesUnitClasses/>
</TraitInfo>
<TraitInfo>
@@ -80,6 +81,7 @@
<bFamous>0</bFamous>
<PeaceCommerceModifiers/>
<PeakYieldChanges/>
+ <IgnoreBuildingDefenseCombatType/>
</TraitInfo>
<TraitInfo>
<Type>TRAIT_SPIRITUAL</Type>
@@ -110,6 +112,7 @@
<bFamous>0</bFamous>
<PeaceCommerceModifiers/>
<PeakYieldChanges/>
+ <IgnoreBuildingDefenseCombatType/>
</TraitInfo>
<TraitInfo>
<Type>TRAIT_EXPANSIVE</Type>
@@ -140,6 +143,7 @@
<bFamous>0</bFamous>
<PeaceCommerceModifiers/>
<PeakYieldChanges/>
+ <IgnoreBuildingDefenseCombatType/>
</TraitInfo>
<TraitInfo>
<Type>TRAIT_INDUSTRIOUS</Type>
@@ -170,6 +174,7 @@
<bFamous>0</bFamous>
<PeaceCommerceModifiers/>
<PeakYieldChanges/>
+ <IgnoreBuildingDefenseCombatType/>
</TraitInfo>
<TraitInfo>
<Type>TRAIT_CREATIVE</Type>
@@ -204,6 +209,7 @@
<bFamous>0</bFamous>
<PeaceCommerceModifiers/>
<PeakYieldChanges/>
+ <IgnoreBuildingDefenseCombatType/>
</TraitInfo>
<TraitInfo>
<Type>TRAIT_FINANCIAL</Type>
@@ -238,6 +244,7 @@
<bFamous>0</bFamous>
<PeaceCommerceModifiers/>
<PeakYieldChanges/>
+ <IgnoreBuildingDefenseCombatType/>
</TraitInfo>
<TraitInfo>
<Type>TRAIT_ORGANIZED</Type>
@@ -268,6 +275,7 @@
<bFamous>0</bFamous>
<PeaceCommerceModifiers/>
<PeakYieldChanges/>
+ <IgnoreBuildingDefenseCombatType/>
</TraitInfo>
<TraitInfo>
<Type>TRAIT_CHARISMATIC</Type>
@@ -298,6 +306,7 @@
<bFamous>0</bFamous>
<PeaceCommerceModifiers/>
<PeakYieldChanges/>
+ <IgnoreBuildingDefenseCombatType/>
</TraitInfo>
<TraitInfo>
<Type>TRAIT_PROTECTIVE</Type>
@@ -342,6 +351,7 @@
<bFamous>0</bFamous>
<PeaceCommerceModifiers/>
<PeakYieldChanges/>
+ <IgnoreBuildingDefenseCombatType/>
</TraitInfo>
<TraitInfo>
<Type>TRAIT_IMPERIALIST</Type>
@@ -372,6 +382,7 @@
<bFamous>0</bFamous>
<PeaceCommerceModifiers/>
<PeakYieldChanges/>
+ <IgnoreBuildingDefenseCombatType/>
</TraitInfo>
<TraitInfo>
<Type>TRAIT_AGRICULTURE</Type>
@@ -406,6 +417,7 @@
<bFamous>0</bFamous>
<PeaceCommerceModifiers/>
<PeakYieldChanges/>
+ <IgnoreBuildingDefenseCombatType/>
</TraitInfo>
<TraitInfo>
<Type>TRAIT_GREEDY</Type>
@@ -440,6 +452,7 @@
<bFamous>0</bFamous>
<PeaceCommerceModifiers/>
<PeakYieldChanges/>
+ <IgnoreBuildingDefenseCombatType/>
</TraitInfo>
<TraitInfo>
<Type>TRAIT_GENERAL</Type>
@@ -471,6 +484,7 @@
<bFamous>0</bFamous>
<PeaceCommerceModifiers/>
<PeakYieldChanges/>
+ <IgnoreBuildingDefenseCombatType/>
</TraitInfo>
<TraitInfo>
<Type>TRAIT_MANIAC</Type>
@@ -506,6 +520,7 @@
<bFamous>0</bFamous>
<PeaceCommerceModifiers/>
<PeakYieldChanges/>
+ <IgnoreBuildingDefenseCombatType/>
</TraitInfo>
<TraitInfo>
<Type>TRAIT_POET</Type>
@@ -537,6 +552,7 @@
<bFamous>0</bFamous>
<PeaceCommerceModifiers/>
<PeakYieldChanges/>
+ <IgnoreBuildingDefenseCombatType/>
</TraitInfo>
<TraitInfo>
<Type>TRAIT_IRON_WILL</Type>
@@ -568,6 +584,7 @@
<bFamous>0</bFamous>
<PeaceCommerceModifiers/>
<PeakYieldChanges/>
+ <IgnoreBuildingDefenseCombatType/>
</TraitInfo>
<TraitInfo>
<Type>TRAIT_ASPIRATION</Type>
@@ -599,6 +616,7 @@
<bFamous>0</bFamous>
<PeaceCommerceModifiers/>
<PeakYieldChanges/>
+ <IgnoreBuildingDefenseCombatType/>
</TraitInfo>
<TraitInfo>
<Type>TRAIT_FORETHOUGHT</Type>
@@ -659,6 +677,7 @@
<bFamous>0</bFamous>
<PeaceCommerceModifiers/>
<PeakYieldChanges/>
+ <IgnoreBuildingDefenseCombatType/>
</TraitInfo>
<TraitInfo>
<Type>TRAIT_AVATAR</Type>
@@ -690,6 +709,7 @@
<bFamous>0</bFamous>
<PeaceCommerceModifiers/>
<PeakYieldChanges/>
+ <IgnoreBuildingDefenseCombatType/>
</TraitInfo>
<TraitInfo>
<Type>TRAIT_WAR_GOD</Type>
@@ -721,6 +741,7 @@
<bFamous>0</bFamous>
<PeaceCommerceModifiers/>
<PeakYieldChanges/>
+ <IgnoreBuildingDefenseCombatType/>
</TraitInfo>
<TraitInfo>
<Type>TRAIT_STRONG_RIDER</Type>
@@ -752,6 +773,7 @@
<bFamous>0</bFamous>
<PeaceCommerceModifiers/>
<PeakYieldChanges/>
+ <IgnoreBuildingDefenseCombatType/>
</TraitInfo>
<TraitInfo>
<Type>TRAIT_TALENTED</Type>
@@ -834,6 +856,7 @@
<bFamous>0</bFamous>
<PeaceCommerceModifiers/>
<PeakYieldChanges/>
+ <IgnoreBuildingDefenseCombatType/>
</TraitInfo>
<TraitInfo>
<Type>TRAIT_BENEVOLENT</Type>
@@ -865,6 +888,7 @@
<bFamous>0</bFamous>
<PeaceCommerceModifiers/>
<PeakYieldChanges/>
+ <IgnoreBuildingDefenseCombatType/>
</TraitInfo>
<TraitInfo>
<Type>TRAIT_SEAFARING</Type>
@@ -907,6 +931,7 @@
<bFamous>0</bFamous>
<PeaceCommerceModifiers/>
<PeakYieldChanges/>
+ <IgnoreBuildingDefenseCombatType/>
</TraitInfo>
<TraitInfo>
<Type>TRAIT_FAMOUS</Type>
@@ -938,6 +963,7 @@
<bFamous>1</bFamous>
<PeaceCommerceModifiers/>
<PeakYieldChanges/>
+ <IgnoreBuildingDefenseCombatType/>
</TraitInfo>
<TraitInfo>
<Type>TRAIT_CULTURED</Type>
@@ -973,6 +999,7 @@
<iCommerce>100</iCommerce>
</PeaceCommerceModifiers>
<PeakYieldChanges/>
+ <IgnoreBuildingDefenseCombatType/>
</TraitInfo>
<TraitInfo>
<Type>TRAIT_GUERRILLA</Type>
@@ -1008,6 +1035,7 @@
<iYield>2</iYield>
<iYield>0</iYield>
</PeakYieldChanges>
+ <IgnoreBuildingDefenseCombatType/>
</TraitInfo>
<TraitInfo>
<Type>TRAIT_HORSE_ARCHER</Type>
@@ -1039,6 +1067,7 @@
<bFamous>0</bFamous>
<PeaceCommerceModifiers/>
<PeakYieldChanges/>
+
<IgnoreBuildingDefenseCombatType>UNITCOMBAT_MOUNTED</IgnoreBuildingDefenseCombatType>
</TraitInfo>
<TraitInfo>
<Type>TRAIT_TOUGH</Type>
@@ -1070,6 +1099,7 @@
<bFamous>0</bFamous>
<PeaceCommerceModifiers/>
<PeakYieldChanges/>
+ <IgnoreBuildingDefenseCombatType/>
</TraitInfo>
<TraitInfo>
<Type>TRAIT_QIANG_AFFINITY</Type>
@@ -1101,6 +1131,7 @@
<bFamous>0</bFamous>
<PeaceCommerceModifiers/>
<PeakYieldChanges/>
+ <IgnoreBuildingDefenseCombatType/>
</TraitInfo>
<TraitInfo>
<Type>TRAIT_TYRANT</Type>
@@ -1132,6 +1163,7 @@
<bFamous>0</bFamous>
<PeaceCommerceModifiers/>
<PeakYieldChanges/>
+ <IgnoreBuildingDefenseCombatType/>
</TraitInfo>
<TraitInfo>
<Type>TRAIT_RECLUSE</Type>
@@ -1163,6 +1195,7 @@
<bFamous>0</bFamous>
<PeaceCommerceModifiers/>
<PeakYieldChanges/>
+ <IgnoreBuildingDefenseCombatType/>
</TraitInfo>
<TraitInfo>
<Type>TRAIT_CELEBRITY</Type>
@@ -1194,6 +1227,7 @@
<bFamous>0</bFamous>
<PeaceCommerceModifiers/>
<PeakYieldChanges/>
+ <IgnoreBuildingDefenseCombatType/>
</TraitInfo>
<TraitInfo>
<Type>TRAIT_BUDDHIST</Type>
@@ -1225,6 +1259,7 @@
<bFamous>0</bFamous>
<PeaceCommerceModifiers/>
<PeakYieldChanges/>
+ <IgnoreBuildingDefenseCombatType/>
</TraitInfo>
<TraitInfo>
<Type>TRAIT_EDUCATIVE</Type>
@@ -1256,6 +1291,7 @@
<bFamous>0</bFamous>
<PeaceCommerceModifiers/>
<PeakYieldChanges/>
+ <IgnoreBuildingDefenseCombatType/>
</TraitInfo>
<TraitInfo>
<Type>TRAIT_ENGINEERING</Type>
@@ -1287,6 +1323,7 @@
<bFamous>0</bFamous>
<PeaceCommerceModifiers/>
<PeakYieldChanges/>
+ <IgnoreBuildingDefenseCombatType/>
</TraitInfo>
<TraitInfo>
<Type>TRAIT_RICE_TAOIST</Type>
@@ -1318,6 +1355,7 @@
<bFamous>0</bFamous>
<PeaceCommerceModifiers/>
<PeakYieldChanges/>
+ <IgnoreBuildingDefenseCombatType/>
</TraitInfo>
<TraitInfo>
<Type>TRAIT_FOREIGNER</Type>
@@ -1349,6 +1387,7 @@
<bFamous>0</bFamous>
<PeaceCommerceModifiers/>
<PeakYieldChanges/>
+ <IgnoreBuildingDefenseCombatType/>
</TraitInfo>
<TraitInfo>
<Type>TRAIT_SHAN_YUE</Type>
@@ -1380,6 +1419,7 @@
<bFamous>0</bFamous>
<PeaceCommerceModifiers/>
<PeakYieldChanges/>
+ <IgnoreBuildingDefenseCombatType/>
</TraitInfo>
<TraitInfo>
<Type>TRAIT_RAIDING</Type>
@@ -1411,6 +1451,7 @@
<bFamous>0</bFamous>
<PeaceCommerceModifiers/>
<PeakYieldChanges/>
+ <IgnoreBuildingDefenseCombatType/>
</TraitInfo>
<TraitInfo>
<Type>TRAIT_EMPEROR</Type>
@@ -1442,6 +1483,7 @@
<bFamous>0</bFamous>
<PeaceCommerceModifiers/>
<PeakYieldChanges/>
+ <IgnoreBuildingDefenseCombatType/>
</TraitInfo>
<TraitInfo>
<Type>TRAIT_NAN_MAN</Type>
@@ -1473,6 +1515,7 @@
<bFamous>0</bFamous>
<PeaceCommerceModifiers/>
<PeakYieldChanges/>
+ <IgnoreBuildingDefenseCombatType/>
</TraitInfo>
<TraitInfo>
<Type>TRAIT_TRADER</Type>
@@ -1504,6 +1547,7 @@
<bFamous>0</bFamous>
<PeaceCommerceModifiers/>
<PeakYieldChanges/>
+ <IgnoreBuildingDefenseCombatType/>
</TraitInfo>
<TraitInfo>
<Type>TRAIT_PEASANT</Type>
@@ -1535,6 +1579,7 @@
<bFamous>0</bFamous>
<PeaceCommerceModifiers/>
<PeakYieldChanges/>
+ <IgnoreBuildingDefenseCombatType/>
</TraitInfo>
<TraitInfo>
<Type>TRAIT_DIPLOMATIC</Type>
@@ -1566,6 +1611,7 @@
<bFamous>0</bFamous>
<PeaceCommerceModifiers/>
<PeakYieldChanges/>
+ <IgnoreBuildingDefenseCombatType/>
</TraitInfo>
<TraitInfo>
<Type>TRAIT_ENGINEERING</Type>
@@ -1597,6 +1643,7 @@
<bFamous>0</bFamous>
<PeaceCommerceModifiers/>
<PeakYieldChanges/>
+ <IgnoreBuildingDefenseCombatType/>
<FreeFirstStrikesUnitClasses>
<FreeFirstStrikesUnitClass>
<UnitClassType>UNITCLASS_WARRIOR</UnitClassType>

Modified: trunk/Sanguo Rand/Assets/XML/Text/SanguoText_Help.xml
==============================================================================
--- trunk/Sanguo Rand/Assets/XML/Text/SanguoText_Help.xml (original)
+++ trunk/Sanguo Rand/Assets/XML/Text/SanguoText_Help.xml Sun Nov 23
04:49:22 2008
@@ -162,6 +162,12 @@

<Chinese>[NEWLINE][SPACE][SPACE][ICON_BULLET]����ɽ����Ӳ��1[ICON_FOOD]��2[ICON_PRODUCTION]</Chinese>
</TEXT>
<TEXT>
+ <Tag>TXT_KEY_TRAIT_HORSE_ARCHER_HELP</Tag>
+ <English>[NEWLINE][SPACE][SPACE][ICON_BULLET]Mounted Units Ignore
Building Induced City Defense</English>
+<L1 /><L2 /><L3 /><L4 />
+
<Chinese>[NEWLINE][SPACE][SPACE][ICON_BULLET]���Ӻ��Խ�������ijǷ�</Chinese>
+ </TEXT>
+ <TEXT>
<Tag>TXT_KEY_TRAIT_EDUCATIVE_HELP</Tag>
<English>[NEWLINE][SPACE][SPACE][ICON_BULLET]Free Science Buildings at
Various City Levels</English>
<L1 /><L2 /><L3 /><L4 />

Modified: trunk/Sanguo Rand/SDK files/CvInfos.cpp
==============================================================================
--- trunk/Sanguo Rand/SDK files/CvInfos.cpp (original)
+++ trunk/Sanguo Rand/SDK files/CvInfos.cpp Sun Nov 23 04:49:22 2008
@@ -16040,7 +16040,9 @@
//Liu Biao, TRAIT_CULTURED
m_paiPeaceCommerceModifier(NULL),
//Liu Zhang, TRAIT_GUERRILLA
-m_paiPeakYieldChange(NULL),
+m_paiPeakYieldChange(NULL),
+//Gongsun Zan, TRAIT_HORSE_ARCHER
+m_iIgnoreBuildingDefenseCombatType(NO_UNITCOMBAT),

// Liu Chong, TRAIT_ENGINEERING, add by nk, 11.23.08
m_paiFreeFirstStrikesUnitClass(NULL)
@@ -16089,7 +16091,7 @@
SAFE_DELETE_ARRAY(m_paiPeaceCommerceModifier);
//Liu Zhang, TRAIT_GUERRILLA
SAFE_DELETE_ARRAY(m_paiPeakYieldChange);
-
+
// Liu Chong, TRAIT_ENGINEERING, add by nk, 11.23.08
SAFE_DELETE_ARRAY(m_paiFreeFirstStrikesUnitClass);
//Sanguo Mod Civilization Trait, End
@@ -16262,6 +16264,11 @@
FAssertMsg(i < NUM_YIELD_TYPES, "Index out of bounds");
FAssertMsg(i > -1, "Index out of bounds");
return m_paiPeakYieldChange[i];
+}
+//Gongsun Zan, TRAIT_HORSE_ARCHER
+int CvTraitInfo::getIgnoreBuildingDefenseCombatType() const
+{
+ return m_iIgnoreBuildingDefenseCombatType;
}

// Liu Chong, TRAIT_ENGINEERING, add by nk, 11.23.08
@@ -16430,10 +16437,10 @@
gDLL->getXMLIFace()->SetToParent(pXML->GetXML());
}

- //Liu Bei, TRAIT_BENEVOLENT
+ // Liu Bei, TRAIT_BENEVOLENT
pXML->GetChildXmlValByName(&m_bBenevolent, "bBenevolent");

- //Sun Ce, TRAIT_SEAFARING
+ // Sun Ce, TRAIT_SEAFARING

pXML->SetVariableListTagPair(&m_paiTerrainExperienceModifier, "TerrainExperienceModifiers",
sizeof(GC.getTerrainInfo((TerrainTypes)0)), GC.getNumTerrainInfos());
if
(gDLL->getXMLIFace()->SetToChildByTagName(pXML->GetXML(), "GlobalSeaPlotYieldChanges"))
{
@@ -16445,9 +16452,10 @@
pXML->InitList(&m_paiGlobalSeaPlotYieldChange, NUM_YIELD_TYPES);
}

- //Yuan Shao, TRAIT_FAMOUS
+ // Yuan Shao, TRAIT_FAMOUS
pXML->GetChildXmlValByName(&m_bFamous, "bFamous");
- //Liu Biao, TRAIT_CULTURED
+
+ // Liu Biao, TRAIT_CULTURED
if
(gDLL->getXMLIFace()->SetToChildByTagName(pXML->GetXML(), "PeaceCommerceModifiers"))
{
pXML->SetCommerce(&m_paiPeaceCommerceModifier);
@@ -16457,7 +16465,8 @@
{
pXML->InitList(&m_paiPeaceCommerceModifier, NUM_COMMERCE_TYPES);
}
- //Liu Zhang, TRAIT_GUERRILLA
+
+ // Liu Zhang, TRAIT_GUERRILLA
if
(gDLL->getXMLIFace()->SetToChildByTagName(pXML->GetXML(), "PeakYieldChanges"))
{
pXML->SetYields(&m_paiPeakYieldChange);
@@ -16466,11 +16475,15 @@
else
{
pXML->InitList(&m_paiPeakYieldChange, NUM_YIELD_TYPES);
- }
-
+ }
+
+ // Gongsun Zan, TRAIT_HORSE_ARCHER
+ pXML->GetChildXmlValByName(szTextVal, "IgnoreBuildingDefenseCombatType");
+ m_iIgnoreBuildingDefenseCombatType = pXML->FindInInfoClass(szTextVal);
+
// Liu Chong, TRAIT_ENGINEERING, add by nk, 11.23.08

pXML->SetVariableListTagPair(&m_paiFreeFirstStrikesUnitClass, "FreeFirstStrikesUnitClasses",
sizeof(GC.getUnitClassInfo((UnitClassTypes)0)), GC.getNumUnitClassInfos());
- //Sanguo Mod Civilization Trait, End
+ // Sanguo Mod Civilization Trait, End
return true;
}


Modified: trunk/Sanguo Rand/SDK files/CvInfos.h
==============================================================================
--- trunk/Sanguo Rand/SDK files/CvInfos.h (original)
+++ trunk/Sanguo Rand/SDK files/CvInfos.h Sun Nov 23 04:49:22 2008
@@ -4178,26 +4178,34 @@

//Sanguo Mod Civilization Trait, Start, by poyuzhe 11.20.08
//Cao Cao, TRAIT_TALENTED
- DllExport int getSpecialistYieldChange(int i, int j) const;
+ int getSpecialistYieldChange(int i, int j) const;
int* getSpecialistYieldChangeArray(int i) const;

- DllExport int getSpecialistCommerceChange(int i, int j) const;
+ int getSpecialistCommerceChange(int i, int j) const;
int* getSpecialistCommerceChangeArray(int i) const;
+
//Liu Bei, TRAIT_BENEVOLENT
- DllExport bool isBenevolent() const;
+ bool isBenevolent() const;
+
//Sun Ce, TRAIT_SEAFARING
- DllExport int getTerrainExperienceModifier(int i) const;
- DllExport int getGlobalSeaPlotYieldChange(int i) const;
+ int getTerrainExperienceModifier(int i) const;
+ int getGlobalSeaPlotYieldChange(int i) const;
+
//Yuan Shao, TRAIT_FAMOUS
- DllExport bool isFamous() const;
+ bool isFamous() const;
+
//Liu Biao, TRAIT_CULTURED
- DllExport int getPeaceCommerceModifier(int i) const;
+ int getPeaceCommerceModifier(int i) const;
+
//Liu Zhang, TRAIT_GUERRILLA
- DllExport int getPeakYieldChange(int i) const;
-
+ int getPeakYieldChange(int i) const;
+
+ //Gongsun Zan, TRAIT_HORSE_ARCHER
+ int getIgnoreBuildingDefenseCombatType() const;
+
// Liu Chong, TRAIT_ENGINEERING, add by nk, 11.23.08
int getNumFreeFirstStrikesUnitClass(int i) const; // Exposed to Python
-
+
//Sanguo Mod Civilization Trait, end

DllExport bool read(CvXMLLoadUtility* pXML);
@@ -4244,7 +4252,9 @@
int* m_paiPeaceCommerceModifier;
//Liu Zhang, TRAIT_GUERRILLA
int* m_paiPeakYieldChange;
-
+ //Gongsun Zan, TRAIT_HORSE_ARCHER
+ int m_iIgnoreBuildingDefenseCombatType;
+
// Liu Chong, TRAIT_ENGINEERING, add by nk, 11.23.08
int* m_paiFreeFirstStrikesUnitClass;
//Sanguo Mod Civilization Trait, End

Modified: trunk/Sanguo Rand/SDK files/CvUnit.cpp
==============================================================================
--- trunk/Sanguo Rand/SDK files/CvUnit.cpp (original)
+++ trunk/Sanguo Rand/SDK files/CvUnit.cpp Sun Nov 23 04:49:22 2008
@@ -182,7 +182,7 @@
}
}
}
-
+
//Sanguo Mod Civilization Trait, start, Liu Chong, TRAIT_ENGINEERING,
add by nk, 11.23.08
changeExtraFirstStrikes(GC.getTraitInfo((TraitTypes)
iI).getNumFreeFirstStrikesUnitClass(getUnitClassType()));
//Sanguo Mod Civilization Trait, end
@@ -8423,6 +8423,21 @@

bool CvUnit::ignoreBuildingDefense() const
{
+ // Sanguo Mod Civilization Trait, start, by poyuzhe 11.23.08
+ // Gongsun Zan, TRAIT_HORSE_ARCHER
+ int iI;
+ UnitCombatTypes eUnitCombat = getUnitCombatType();
+ for (iI = 0; iI < GC.getNumTraitInfos(); iI++)
+ {
+ if (GET_PLAYER(getOwnerINLINE()).hasTrait((TraitTypes)iI))
+ {
+ if (eUnitCombat ==
(UnitCombatTypes)(GC.getTraitInfo((TraitTypes)iI).getIgnoreBuildingDefenseCombatType()))
+ {
+ return true;
+ }
+ }
+ }
+ // Sanguo Mod Civilization Trait, end
return m_pUnitInfo->isIgnoreBuildingDefense();
}


Modified: trunk/Sanguo Rand/SDK files/CyInfoInterface3.cpp
==============================================================================
--- trunk/Sanguo Rand/SDK files/CyInfoInterface3.cpp (original)
+++ trunk/Sanguo Rand/SDK files/CyInfoInterface3.cpp Sun Nov 23 04:49:22
2008
@@ -311,7 +311,9 @@
.def("getPeaceCommerceModifier",
&CvTraitInfo::getPeaceCommerceModifier, "int (int i)")
//Liu Zhang, TRAIT_GUERRILLA
.def("getPeakYieldChanges", &CvTraitInfo::getPeakYieldChange, "int
(int i)")
-
+ //Gongsun Zan, TRAIT_HORSE_ARCHER
+ .def("getIgnoreBuildingDefenseCombatType",
&CvTraitInfo::getIgnoreBuildingDefenseCombatType, "int ()")
+
// Liu Chong, TRAIT_ENGINEERING, add by nk, 11.23.08
.def("getNumFreeFirstStrikesUnitClass",
&CvTraitInfo::getNumFreeFirstStrikesUnitClass, "int (int i)")
//Sanguo Mod Civilization Trait, end

Modified: trunk/Sanguo Rand/changelog.txt
==============================================================================
--- trunk/Sanguo Rand/changelog.txt (original)
+++ trunk/Sanguo Rand/changelog.txt Sun Nov 23 04:49:22 2008
@@ -166,4 +166,6 @@

0.055:ʵ������谾���������TRAIT_GUERRILLA

-0.056:ʵ����������������TRAIT_ENGINEERING
\ No newline at end of file
+0.056:ʵ����������������TRAIT_ENGINEERING
+
+0.057:ʵ���˹���趾���������TRAIT_HORSE_ARCHER
\ No newline at end of file
Reply all
Reply to author
Forward
0 new messages