[sanguoforciv4] r340 committed - 0.297: 新增内容：领袖更替时若无人可替则从势力武将中选择，没有武将则自动生成随机英雄作为领袖...

2 views
Skip to first unread message

codesite...@google.com

unread,
Sep 20, 2009, 7:04:34 AM9/20/09
to sanguom...@googlegroups.com
Revision: 340
Author: TongShen.Martin
Date: Sun Sep 20 04:03:41 2009
Log: 0.297: 新增内容：领袖更替时若无人可替则从势力武将中选择，没有武将则自动
生成随机英雄作为领袖

0.297: New Content: when changing leader, if no available leaders, then
choose from faction heroes, if no heroes too, then create a new random hero
and set as leader
http://code.google.com/p/sanguoforciv4/source/detail?r=340

Modified:
/trunk/The History of Three
Kingdoms/Assets/XML/Art/CIV4ArtDefines_Leaderhead.xml
/trunk/The History of Three
Kingdoms/Assets/XML/BasicInfos/CIV4NewConceptInfos.xml
/trunk/The History of Three Kingdoms/Assets/XML/Sanguo/CIV4HeroInfos.xml
/trunk/The History of Three
Kingdoms/Assets/XML/Text/CIV4GameText_Civilopedia_Sanguo_Concepts.xml
/trunk/The History of Three
Kingdoms/Assets/XML/Text/CIV4GameText_Sanguo_Hero.xml
/trunk/The History of Three Kingdoms/CvGameCoreDLL/CvGame.cpp
/trunk/The History of Three Kingdoms/CvGameCoreDLL/CvGame.h
/trunk/The History of Three Kingdoms/CvGameCoreDLL/CvInfos.cpp
/trunk/The History of Three Kingdoms/CvGameCoreDLL/CvInfos.h
/trunk/The History of Three Kingdoms/CvGameCoreDLL/CvPlayer.cpp
/trunk/The History of Three Kingdoms/CvGameCoreDLL/CvUnit.cpp
/trunk/The History of Three Kingdoms/Documents/changelog.txt
/trunk/The History of Three Kingdoms/Documents/changelog_en.txt

=======================================
--- /trunk/The History of Three
Kingdoms/Assets/XML/Art/CIV4ArtDefines_Leaderhead.xml Thu Aug 6 13:50:39
2009
+++ /trunk/The History of Three
Kingdoms/Assets/XML/Art/CIV4ArtDefines_Leaderhead.xml Sun Sep 20 04:03:41
2009
@@ -15,422 +15,6 @@
<BackgroundKFM>art/LeaderHeads/Sid/sid_BG.kfm</BackgroundKFM>
</LeaderheadArtInfo>
<LeaderheadArtInfo>
- <Type>ART_DEF_LEADER_ALEXANDER</Type>
-
<Button>,Art/interface/LeaderHeads/Btn_LH_Greece_Alexander.dds,Art/Interface/Buttons/Actions_Builds_LeaderHeads_Specialists_Atlas.dds,1,11</Button>
- <NIF>art/LeaderHeads/Alexander_the _Great/alexander.nif</NIF>
- <KFM>art/LeaderHeads/Alexander_the _Great/alexander.kfm</KFM>
- <NoShaderNIF>art/LeaderHeads/Alexander_the
_Great/alexander_noshader.nif</NoShaderNIF>
- <BackgroundKFM>art/LeaderHeads/Alexander_the
_Great/alexander_BG.kfm</BackgroundKFM>
- </LeaderheadArtInfo>
- <LeaderheadArtInfo>
- <Type>ART_DEF_LEADER_ASOKA</Type>
-
<Button>,Art/interface/LeaderHeads/Btn_LH_India_Asoka.dds,Art/Interface/Buttons/Actions_Builds_LeaderHeads_Specialists_Atlas.dds,7,12</Button>
- <NIF>art/LeaderHeads/Asoka/asoka.nif</NIF>
- <KFM>art/LeaderHeads/Asoka/asoka.kfm</KFM>
- <NoShaderNIF>art/LeaderHeads/Asoka/asoka_noshader.nif</NoShaderNIF>
- <BackgroundKFM>art/LeaderHeads/Asoka/Asoka_BG.kfm</BackgroundKFM>
- </LeaderheadArtInfo>
- <LeaderheadArtInfo>
- <Type>ART_DEF_LEADER_BISMARCK</Type>
-
<Button>,Art/interface/LeaderHeads/Btn_LH_Germany_Bismark.dds,Art/Interface/Buttons/Actions_Builds_LeaderHeads_Specialists_Atlas.dds,5,13</Button>
- <NIF>art/LeaderHeads/Bismarck/bismarck.nif</NIF>
- <KFM>art/LeaderHeads/Bismarck/bismarck.kfm</KFM>
-
<NoShaderNIF>art/LeaderHeads/Bismarck/bismarck_noshader.nif</NoShaderNIF>
- <BackgroundKFM>art/LeaderHeads/Bismarck/bismarck_bg.kfm</BackgroundKFM>
- </LeaderheadArtInfo>
- <LeaderheadArtInfo>
- <Type>ART_DEF_LEADER_CATHERINE</Type>
-
<Button>,Art/interface/LeaderHeads/Btn_LH_Russia_Catherine.dds,Art/Interface/Buttons/Actions_Builds_LeaderHeads_Specialists_Atlas.dds,8,12</Button>
- <NIF>art/LeaderHeads/catherine/catherine.nif</NIF>
- <KFM>art/LeaderHeads/catherine/catherine.kfm</KFM>
-
<NoShaderNIF>art/LeaderHeads/catherine/catherine_noshader.nif</NoShaderNIF>
-
<BackgroundKFM>art/LeaderHeads/catherine/Catherine_BG.kfm</BackgroundKFM>
- </LeaderheadArtInfo>
- <LeaderheadArtInfo>
- <Type>ART_DEF_LEADER_CYRUS</Type>
-
<Button>,Art/interface/LeaderHeads/Btn_LH_Persia_Cyrus.dds,Art/Interface/Buttons/Actions_Builds_LeaderHeads_Specialists_Atlas.dds,1,13</Button>
- <NIF>art/LeaderHeads/Cyrus/Cyrus.nif</NIF>
- <KFM>art/LeaderHeads/Cyrus/Cyrus.kfm</KFM>
- <NoShaderNIF>art/LeaderHeads/Cyrus/cyrus_noshader.nif</NoShaderNIF>
- <BackgroundKFM>art/LeaderHeads/Cyrus/Cyrus_BG.kfm</BackgroundKFM>
- </LeaderheadArtInfo>
- <LeaderheadArtInfo>
- <Type>ART_DEF_LEADER_ELIZABETH</Type>
-
<Button>,Art/interface/LeaderHeads/Btn_LH_England_ElizabethI.dds,Art/Interface/Buttons/Actions_Builds_LeaderHeads_Specialists_Atlas.dds,8,10</Button>
- <NIF>art/LeaderHeads/Elizabeth/elizabeth.nif</NIF>
- <KFM>art/LeaderHeads/Elizabeth/elizabeth.kfm</KFM>
-
<NoShaderNIF>art/LeaderHeads/Elizabeth/elizabeth_noshader.nif</NoShaderNIF>
-
<BackgroundKFM>art/LeaderHeads/Elizabeth/elizabeth_BG.kfm</BackgroundKFM>
- </LeaderheadArtInfo>
- <LeaderheadArtInfo>
- <Type>ART_DEF_LEADER_FRANKLIN_ROOSEVELT</Type>
-
<Button>,Art/interface/LeaderHeads/Btn_LH_America_Roosevelt.dds,Art/Interface/Buttons/Actions_Builds_LeaderHeads_Specialists_Atlas.dds,2,12</Button>
- <NIF>art/LeaderHeads/FDR/fdr.nif</NIF>
- <KFM>art/LeaderHeads/FDR/fdr.kfm</KFM>
- <NoShaderNIF>art/LeaderHeads/FDR/fdr_noshader.nif</NoShaderNIF>
- <BackgroundKFM>art/LeaderHeads/FDR/fdr_BG.kfm</BackgroundKFM>
- </LeaderheadArtInfo>
- <LeaderheadArtInfo>
- <Type>ART_DEF_LEADER_FREDERICK</Type>
-
<Button>,Art/interface/LeaderHeads/Btn_LH_Germany_Frederick.dds,Art/Interface/Buttons/Actions_Builds_LeaderHeads_Specialists_Atlas.dds,8,11</Button>
- <NIF>art/LeaderHeads/Frederick_the_Great/frederick_the_great.nif</NIF>
- <KFM>art/LeaderHeads/Frederick_the_Great/frederick_the_great.kfm</KFM>
-
<NoShaderNIF>art/LeaderHeads/Frederick_the_Great/frederick_the_great_noshader.nif</NoShaderNIF>
-
<BackgroundKFM>art/LeaderHeads/Frederick_the_Great/frederick_the_great_BG.kfm</BackgroundKFM>
- </LeaderheadArtInfo>
- <LeaderheadArtInfo>
- <Type>ART_DEF_LEADER_GANDHI</Type>
-
<Button>,Art/interface/LeaderHeads/Btn_LH_India_Gandhi.dds,Art/Interface/Buttons/Actions_Builds_LeaderHeads_Specialists_Atlas.dds,4,11</Button>
- <NIF>art/LeaderHeads/Gandhi/Gandhi.nif</NIF>
- <KFM>art/LeaderHeads/Gandhi/Gandhi.kfm</KFM>
- <NoShaderNIF>art/LeaderHeads/Gandhi/Gandhi_noshader.nif</NoShaderNIF>
- <BackgroundKFM>art/LeaderHeads/Gandhi/Gandhi_BG.kfm</BackgroundKFM>
- </LeaderheadArtInfo>
- <LeaderheadArtInfo>
- <Type>ART_DEF_LEADER_GENGHIS_KHAN</Type>
-
<Button>,Art/interface/LeaderHeads/Btn_LH_Mongol_Genghis.dds,Art/Interface/Buttons/Actions_Builds_LeaderHeads_Specialists_Atlas.dds,6,12</Button>
- <NIF>art/LeaderHeads/Genghis_Khan/genghis_khan.nif</NIF>
- <KFM>art/LeaderHeads/Genghis_Khan/genghis_khan.kfm</KFM>
-
<NoShaderNIF>art/LeaderHeads/Genghis_Khan/genghis_khan_noshader.nif</NoShaderNIF>
-
<BackgroundKFM>art/LeaderHeads/Genghis_Khan/Genghis_Khan_BG.kfm</BackgroundKFM>
- </LeaderheadArtInfo>
- <LeaderheadArtInfo>
- <Type>ART_DEF_LEADER_HATSHEPSUT</Type>
-
<Button>,Art/interface/LeaderHeads/Btn_LH_Egypt_Hatshepsut.dds,Art/Interface/Buttons/Actions_Builds_LeaderHeads_Specialists_Atlas.dds,3,11</Button>
- <NIF>art/LeaderHeads/Hatshepsut/hatshepsut.nif</NIF>
- <KFM>art/LeaderHeads/Hatshepsut/hatshepsut.kfm</KFM>
-
<NoShaderNIF>art/LeaderHeads/Hatshepsut/hatshepsut_noshader.nif</NoShaderNIF>
-
<BackgroundKFM>art/LeaderHeads/Hatshepsut/hatshepsut_BG.kfm</BackgroundKFM>
- </LeaderheadArtInfo>
- <LeaderheadArtInfo>
- <Type>ART_DEF_LEADER_HUAYNA_CAPAC</Type>
-
<Button>,Art/interface/LeaderHeads/Btn_LH_Inca_HuaynaCapac.dds,Art/Interface/Buttons/Actions_Builds_LeaderHeads_Specialists_Atlas.dds,2,13</Button>
- <NIF>art/LeaderHeads/Huayna_Capac/huayna_capac.nif</NIF>
- <KFM>art/LeaderHeads/Huayna_Capac/huayna_capac.kfm</KFM>
-
<NoShaderNIF>art/LeaderHeads/Huayna_Capac/huayna_capac_noshader.nif</NoShaderNIF>
-
<BackgroundKFM>art/LeaderHeads/Huayna_Capac/huayna_capac_BG.kfm</BackgroundKFM>
- </LeaderheadArtInfo>
- <LeaderheadArtInfo>
- <Type>ART_DEF_LEADER_ISABELLA</Type>
-
<Button>,Art/interface/LeaderHeads/Btn_LH_Spain_Isabella.dds,Art/Interface/Buttons/Actions_Builds_LeaderHeads_Specialists_Atlas.dds,1,12</Button>
- <NIF>art/LeaderHeads/Isabella/isabella.nif</NIF>
- <KFM>art/LeaderHeads/Isabella/isabella.kfm</KFM>
-
<NoShaderNIF>art/LeaderHeads/Isabella/isabella_noshader.nif</NoShaderNIF>
- <BackgroundKFM>art/LeaderHeads/Isabella/Isabella_BG.kfm</BackgroundKFM>
- </LeaderheadArtInfo>
- <LeaderheadArtInfo>
- <Type>ART_DEF_LEADER_CAESAR</Type>
-
<Button>,Art/interface/LeaderHeads/Btn_LH_Rome_JuliusCaesar.dds,Art/Interface/Buttons/Actions_Builds_LeaderHeads_Specialists_Atlas.dds,2,11</Button>
- <NIF>art/Leaderheads/Julius_Caesar/Julius_Caesar.nif</NIF>
- <KFM>art/Leaderheads/Julius_Caesar/Julius_Caesar.kfm</KFM>
-
<NoShaderNIF>art/Leaderheads/Julius_Caesar/julius_caesar_noshader.nif</NoShaderNIF>
-
<BackgroundKFM>art/LeaderHeads/Julius_Caesar/Julius_Caesar_BG.kfm</BackgroundKFM>
- </LeaderheadArtInfo>
- <LeaderheadArtInfo>
- <Type>ART_DEF_LEADER_KUBLAI_KHAN</Type>
-
<Button>,Art/interface/LeaderHeads/Btn_LH_China_ShihHuangTi.dds,Art/Interface/Buttons/Actions_Builds_LeaderHeads_Specialists_Atlas.dds,3,13</Button>
- <NIF>art/LeaderHeads/Qin_Shi_Huang/qin_shi_huang.nif</NIF>
- <KFM>art/LeaderHeads/Qin_Shi_Huang/qin_shi_huang.kfm</KFM>
-
<NoShaderNIF>art/LeaderHeads/Qin_Shi_Huang/qin_shi_huang_noshader.nif</NoShaderNIF>
-
<BackgroundKFM>art/LeaderHeads/Kublai_Khan/Kublai_Khan_BG.kfm</BackgroundKFM>
- </LeaderheadArtInfo>
- <LeaderheadArtInfo>
- <Type>ART_DEF_LEADER_LOUIS_XIV</Type>
-
<Button>,Art/interface/LeaderHeads/Btn_LH_France_LouisXIV.dds,Art/Interface/Buttons/Actions_Builds_LeaderHeads_Specialists_Atlas.dds,5,11</Button>
- <NIF>art/LeaderHeads/Louis_XIV/louis_xiv.nif</NIF>
- <KFM>art/LeaderHeads/Louis_XIV/louis_xiv.kfm</KFM>
-
<NoShaderNIF>art/LeaderHeads/Louis_XIV/louis_xiv_noshader.nif</NoShaderNIF>
-
<BackgroundKFM>art/LeaderHeads/Louis_XIV/louis_xiv_BG.kfm</BackgroundKFM>
- </LeaderheadArtInfo>
- <LeaderheadArtInfo>
- <Type>ART_DEF_LEADER_MANSA_MUSA</Type>
-
<Button>,Art/interface/LeaderHeads/Btn_LH_Mali_MansaMusa.dds,Art/Interface/Buttons/Actions_Builds_LeaderHeads_Specialists_Atlas.dds,7,13</Button>
- <NIF>art/LeaderHeads/Mansa_Musa/mansa_musa.nif</NIF>
- <KFM>art/LeaderHeads/Mansa_Musa/mansa_musa.kfm</KFM>
-
<NoShaderNIF>art/LeaderHeads/Mansa_Musa/mansa_musa_noshader.nif</NoShaderNIF>
-
<BackgroundKFM>art/LeaderHeads/Mansa_Musa/Mansa_Musa_BG.kfm</BackgroundKFM>
- </LeaderheadArtInfo>
- <LeaderheadArtInfo>
- <Type>ART_DEF_LEADER_CHINESE_LEADER</Type>
-
<Button>,Art/interface/LeaderHeads/Btn_LH_China_MaoZedong.dds,Art/Interface/Buttons/Actions_Builds_LeaderHeads_Specialists_Atlas.dds,7,11</Button>
- <NIF>art/LeaderHeads/Mao/Mao_tse_tung.nif</NIF>
- <KFM>art/LeaderHeads/Mao/Mao_tse_tung.kfm</KFM>
- <NoShaderNIF>art/LeaderHeads/Mao/mao_tse_tung_noshader.nif</NoShaderNIF>
- <BackgroundKFM>art/LeaderHeads/Mao/Mao_tse_tung_BG.kfm</BackgroundKFM>
- </LeaderheadArtInfo>
- <LeaderheadArtInfo>
- <Type>ART_DEF_LEADER_MONTEZUMA</Type>
-
<Button>,Art/interface/LeaderHeads/Btn_LH_Aztec_Montezuma.dds,Art/Interface/Buttons/Actions_Builds_LeaderHeads_Specialists_Atlas.dds,6,10</Button>
- <NIF>art/LeaderHeads/Montezuma/montezuma.nif</NIF>
- <KFM>art/LeaderHeads/Montezuma/montezuma.kfm</KFM>
-
<NoShaderNIF>art/LeaderHeads/Montezuma/montezuma_noshader.nif</NoShaderNIF>
-
<BackgroundKFM>art/LeaderHeads/Montezuma/montezuma_BG.kfm</BackgroundKFM>
- </LeaderheadArtInfo>
- <LeaderheadArtInfo>
- <Type>ART_DEF_LEADER_NAPOLEON</Type>
-
<Button>,Art/interface/LeaderHeads/Btn_LH_France_Napoleon.dds,Art/Interface/Buttons/Actions_Builds_LeaderHeads_Specialists_Atlas.dds,3,12</Button>
- <NIF>art/LeaderHeads/Napoleon/napoleon.nif</NIF>
- <KFM>art/LeaderHeads/Napoleon/napoleon.kfm</KFM>
-
<NoShaderNIF>art/LeaderHeads/Napoleon/napoleon_noshader.nif</NoShaderNIF>
- <BackgroundKFM>art/LeaderHeads/Napoleon/napoleon_BG.kfm</BackgroundKFM>
- </LeaderheadArtInfo>
- <LeaderheadArtInfo>
- <Type>ART_DEF_LEADER_PETER</Type>
-
<Button>,Art/interface/LeaderHeads/Btn_LH_Russia_Peter.dds,Art/Interface/Buttons/Actions_Builds_LeaderHeads_Specialists_Atlas.dds,5,10</Button>
- <NIF>art/Leaderheads/Peter_the_Great/peter.nif</NIF>
- <KFM>art/Leaderheads/Peter_the_Great/peter.kfm</KFM>
-
<NoShaderNIF>art/Leaderheads/Peter_the_Great/peter_noshader.nif</NoShaderNIF>
-
<BackgroundKFM>art/LeaderHeads/Peter_the_Great/peter_BG.kfm</BackgroundKFM>
- </LeaderheadArtInfo>
- <LeaderheadArtInfo>
- <Type>ART_DEF_LEADER_QIN_SHI_HUANG</Type>
-
<Button>,Art/interface/LeaderHeads/Btn_LH_Mongol_Kublai.dds,Art/Interface/Buttons/Actions_Builds_LeaderHeads_Specialists_Atlas.dds,4,13</Button>
- <NIF>art/LeaderHeads/Kublai_Khan/kublai_khan.nif</NIF>
- <KFM>art/LeaderHeads/Kublai_Khan/kublai_khan.kfm</KFM>
-
<NoShaderNIF>art/LeaderHeads/Kublai_Khan/kublai_khan_noshader.nif</NoShaderNIF>
-
<BackgroundKFM>art/LeaderHeads/Qin_Shi_Huang/qin_shi_huang_BG.kfm</BackgroundKFM>
- </LeaderheadArtInfo>
- <LeaderheadArtInfo>
- <Type>ART_DEF_LEADER_SALADIN</Type>
-
<Button>,Art/interface/LeaderHeads/Btn_LH_Arabia_Saladin.dds,Art/Interface/Buttons/Actions_Builds_LeaderHeads_Specialists_Atlas.dds,6,11</Button>
- <NIF>art/LeaderHeads/Saladin/saladin.nif</NIF>
- <KFM>art/LeaderHeads/Saladin/saladin.kfm</KFM>
- <NoShaderNIF>art/LeaderHeads/Saladin/saladin_noshader.nif</NoShaderNIF>
- <BackgroundKFM>art/LeaderHeads/Saladin/saladin_BG.kfm</BackgroundKFM>
- </LeaderheadArtInfo>
- <LeaderheadArtInfo>
- <Type>ART_DEF_LEADER_TOKUGAWA</Type>
-
<Button>,Art/interface/LeaderHeads/Btn_LH_Japan_Tokugawa.dds,Art/Interface/Buttons/Actions_Builds_LeaderHeads_Specialists_Atlas.dds,4,12</Button>
- <NIF>art/LeaderHeads/Tokugawa/tokugawa.nif</NIF>
- <KFM>art/LeaderHeads/Tokugawa/tokugawa.kfm</KFM>
-
<NoShaderNIF>art/LeaderHeads/Tokugawa/tokugawa_noshader.nif</NoShaderNIF>
- <BackgroundKFM>art/LeaderHeads/Tokugawa/tokugawa_BG.kfm</BackgroundKFM>
- </LeaderheadArtInfo>
- <LeaderheadArtInfo>
- <Type>ART_DEF_LEADER_VICTORIA</Type>
-
<Button>,Art/interface/LeaderHeads/Btn_LH_England_Victoria.dds,Art/Interface/Buttons/Actions_Builds_LeaderHeads_Specialists_Atlas.dds,6,13</Button>
- <NIF>art/LeaderHeads/Victoria/victoria.nif</NIF>
- <KFM>art/LeaderHeads/Victoria/victoria.kfm</KFM>
-
<NoShaderNIF>art/LeaderHeads/Victoria/victoria_noshader.nif</NoShaderNIF>
- <BackgroundKFM>art/LeaderHeads/Victoria/Victoria_BG.kfm</BackgroundKFM>
- </LeaderheadArtInfo>
- <LeaderheadArtInfo>
- <Type>ART_DEF_LEADER_WASHINGTON</Type>
-
<Button>,Art/interface/LeaderHeads/Btn_LH_America_Washington.dds,Art/Interface/Buttons/Actions_Builds_LeaderHeads_Specialists_Atlas.dds,5,12</Button>
- <NIF>art/LeaderHeads/Washington/george_washington.nif</NIF>
- <KFM>art/LeaderHeads/Washington/george_washington.kfm</KFM>
-
<NoShaderNIF>art/LeaderHeads/Washington/george_washington_noshader.nif</NoShaderNIF>
-
<BackgroundKFM>art/LeaderHeads/Washington/Washington_BG.kfm</BackgroundKFM>
- </LeaderheadArtInfo>
- <LeaderheadArtInfo>
- <Type>ART_DEF_LEADER_CHURCHILL</Type>
-
<Button>,Art/interface/LeaderHeads/Btn_LH_America_Washington.dds,Art/Interface/Buttons/Warlords_Atlas_2.dds,1,7</Button>
- <NIF>art/LeaderHeads/WinstonChurchill/winston_churchill.nif</NIF>
- <KFM>art/LeaderHeads/WinstonChurchill/winston_churchill.kfm</KFM>
-
<NoShaderNIF>art/LeaderHeads/WinstonChurchill/winston_churchill_noshader.nif</NoShaderNIF>
-
<BackgroundKFM>art/LeaderHeads/WinstonChurchill/winston_churchill_BG.kfm</BackgroundKFM>
- </LeaderheadArtInfo>
- <LeaderheadArtInfo>
- <Type>ART_DEF_LEADER_AUGUSTUS</Type>
-
<Button>,Art/interface/LeaderHeads/Btn_LH_America_Washington.dds,Art/Interface/Buttons/Warlords_Atlas_2.dds,2,7</Button>
- <NIF>art/LeaderHeads/Augustus_Caesar/augustus_caesar.nif</NIF>
- <KFM>art/LeaderHeads/Augustus_Caesar/augustus_caesar.kfm</KFM>
-
<NoShaderNIF>art/LeaderHeads/Augustus_Caesar/augustus_caesar_noshader.nif</NoShaderNIF>
-
<BackgroundKFM>art/LeaderHeads/Augustus_Caesar/augustus_caesar_BG.kfm</BackgroundKFM>
- </LeaderheadArtInfo>
- <LeaderheadArtInfo>
- <Type>ART_DEF_LEADER_STALIN</Type>
-
<Button>,Art/interface/LeaderHeads/Btn_LH_America_Washington.dds,Art/Interface/Buttons/Warlords_Atlas_2.dds,1,8</Button>
- <NIF>art/LeaderHeads/Stalin/josef_stalin.nif</NIF>
- <KFM>art/LeaderHeads/Stalin/josef_stalin.kfm</KFM>
-
<NoShaderNIF>art/LeaderHeads/Stalin/josef_stalin_noshader.nif</NoShaderNIF>
-
<BackgroundKFM>art/LeaderHeads/Stalin/josef_stalin_BG.kfm</BackgroundKFM>
- </LeaderheadArtInfo>
- <LeaderheadArtInfo>
- <Type>ART_DEF_LEADER_SHAKA</Type>
-
<Button>,Art/interface/LeaderHeads/Btn_LH_America_Washington.dds,Art/Interface/Buttons/Warlords_Atlas_2.dds,3,7</Button>
- <NIF>art/LeaderHeads/Shaka/shaka.nif</NIF>
- <KFM>art/LeaderHeads/Shaka/shaka.kfm</KFM>
- <NoShaderNIF>art/LeaderHeads/Shaka/shaka_noshader.nif</NoShaderNIF>
- <BackgroundKFM>art/LeaderHeads/Shaka/shaka_BG.kfm</BackgroundKFM>
- </LeaderheadArtInfo>
- <LeaderheadArtInfo>
- <Type>ART_DEF_LEADER_BRENNUS</Type>
-
<Button>,Art/interface/LeaderHeads/Btn_LH_America_Washington.dds,Art/Interface/Buttons/Warlords_Atlas_2.dds,5,7</Button>
- <NIF>art/LeaderHeads/Brennus/brennus.nif</NIF>
- <KFM>art/LeaderHeads/Brennus/brennus.kfm</KFM>
- <NoShaderNIF>art/LeaderHeads/Brennus/brennus_noshader.nif</NoShaderNIF>
- <BackgroundKFM>art/LeaderHeads/Brennus/brennus_BG.kfm</BackgroundKFM>
- </LeaderheadArtInfo>
- <LeaderheadArtInfo>
- <Type>ART_DEF_LEADER_HANNIBAL</Type>
-
<Button>,Art/interface/LeaderHeads/Btn_LH_America_Washington.dds,Art/Interface/Buttons/Warlords_Atlas_2.dds,4,7</Button>
- <NIF>art/LeaderHeads/Hannibal/hannibal.nif</NIF>
- <KFM>art/LeaderHeads/Hannibal/hannibal.kfm</KFM>
-
<NoShaderNIF>art/LeaderHeads/Hannibal/hannibal_noshader.nif</NoShaderNIF>
- <BackgroundKFM>art/LeaderHeads/Hannibal/hannibal_BG.kfm</BackgroundKFM>
- </LeaderheadArtInfo>
- <LeaderheadArtInfo>
- <Type>ART_DEF_LEADER_RAMESSES</Type>
-
<Button>,Art/interface/LeaderHeads/Btn_LH_America_Washington.dds,Art/Interface/Buttons/Warlords_Atlas_2.dds,6,7</Button>
- <NIF>art/LeaderHeads/RamassesII/ramassesii.nif</NIF>
- <KFM>art/LeaderHeads/RamassesII/ramassesii.kfm</KFM>
-
<NoShaderNIF>art/LeaderHeads/RamassesII/ramassesii_noshader.nif</NoShaderNIF>
-
<BackgroundKFM>art/LeaderHeads/RamassesII/ramassesii_BG.kfm</BackgroundKFM>
- </LeaderheadArtInfo>
- <LeaderheadArtInfo>
- <Type>ART_DEF_LEADER_RAGNAR</Type>
-
<Button>,Art/interface/LeaderHeads/Btn_LH_America_Washington.dds,Art/Interface/Buttons/Warlords_Atlas_2.dds,7,7</Button>
- <NIF>art/LeaderHeads/RagnarLodbrok/ragnar_lodbrok.nif</NIF>
- <KFM>art/LeaderHeads/RagnarLodbrok/ragnar_lodbrok.kfm</KFM>
-
<NoShaderNIF>art/LeaderHeads/RagnarLodbrok/ragnar_lodbrok_noshader.nif</NoShaderNIF>
-
<BackgroundKFM>art/LeaderHeads/RagnarLodbrok/Ragnar_BG.kfm</BackgroundKFM>
- </LeaderheadArtInfo>
- <LeaderheadArtInfo>
- <Type>ART_DEF_LEADER_WANGKON</Type>
-
<Button>,Art/interface/LeaderHeads/Btn_LH_America_Washington.dds,Art/Interface/Buttons/Warlords_Atlas_2.dds,8,7</Button>
- <NIF>art/LeaderHeads/WangKon/wang_kon.nif</NIF>
- <KFM>art/LeaderHeads/WangKon/wang_kon.kfm</KFM>
- <NoShaderNIF>art/LeaderHeads/WangKon/wang_kon_noshader.nif</NoShaderNIF>
- <BackgroundKFM>art/LeaderHeads/WangKon/Wang_Kon_BG.kfm</BackgroundKFM>
- </LeaderheadArtInfo>
- <LeaderheadArtInfo>
- <Type>ART_DEF_LEADER_MEHMED</Type>
-
<Button>,Art/interface/LeaderHeads/Btn_LH_America_Washington.dds,Art/Interface/Buttons/Warlords_Atlas_2.dds,2,8</Button>
- <NIF>art/LeaderHeads/MehmedII/mehmed.nif</NIF>
- <KFM>art/LeaderHeads/MehmedII/mehmed.kfm</KFM>
- <NoShaderNIF>art/LeaderHeads/MehmedII/mehmed_noshader.nif</NoShaderNIF>
- <BackgroundKFM>art/LeaderHeads/MehmedII/MehmedII_BG.kfm</BackgroundKFM>
- </LeaderheadArtInfo>
- <LeaderheadArtInfo>
- <Type>ART_DEF_LEADER_LINCOLN</Type>
-
<Button>,Art/interface/LeaderHeads/Btn_LH_America_Washington.dds,Art/Interface/Buttons/Beyond_the_Sword_Atlas.dds,1,1</Button>
- <NIF>art/LeaderHeads/Abraham Lincoln/Abraham Lincoln.nif</NIF>
- <KFM>art/LeaderHeads/Abraham Lincoln/Abraham Lincoln.kfm</KFM>
- <NoShaderNIF>art/LeaderHeads/Abraham
Lincoln/Abraham_Lincoln_NONSHADER.nif</NoShaderNIF>
- <BackgroundKFM>art/LeaderHeads/Abraham Lincoln/Abraham
Lincoln_BG.kfm</BackgroundKFM>
- </LeaderheadArtInfo>
- <LeaderheadArtInfo>
- <Type>ART_DEF_LEADER_CHARLEMAGNE</Type>
-
<Button>,Art/interface/LeaderHeads/Btn_LH_Mongol_Genghis.dds,Art/Interface/Buttons/Beyond_the_Sword_Atlas.dds,2,1</Button>
- <NIF>art/LeaderHeads/Charlemagne/Charlemagne.nif</NIF>
- <KFM>art/LeaderHeads/Charlemagne/Charlemagne.kfm</KFM>
-
<NoShaderNIF>art/LeaderHeads/Charlemagne/Charlemagne_NONSHADER.nif</NoShaderNIF>
-
<BackgroundKFM>art/LeaderHeads/Charlemagne/Charlemagne_BG.kfm</BackgroundKFM>
- </LeaderheadArtInfo>
- <LeaderheadArtInfo>
- <Type>ART_DEF_LEADER_DE_GAULLE</Type>
-
<Button>,Art/interface/LeaderHeads/Btn_LH_France_Napoleon.dds,Art/Interface/Buttons/Beyond_the_Sword_Atlas.dds,3,1</Button>
- <NIF>art/LeaderHeads/Charles De Gaulle/Charles De Gaulle.nif</NIF>
- <KFM>art/LeaderHeads/Charles De Gaulle/Charles De Gaulle.kfm</KFM>
- <NoShaderNIF>art/LeaderHeads/Charles De Gaulle/Charles De
Gaulle_NONSHADER.nif</NoShaderNIF>
- <BackgroundKFM>art/LeaderHeads/Charles De Gaulle/Charles De
Gaulle_BG.kfm</BackgroundKFM>
- </LeaderheadArtInfo>
- <LeaderheadArtInfo>
- <Type>ART_DEF_LEADER_DARIUS</Type>
-
<Button>,Art/interface/LeaderHeads/Btn_LH_Persia_Cyrus.dds,Art/Interface/Buttons/Beyond_the_Sword_Atlas.dds,4,1</Button>
- <NIF>art/LeaderHeads/Darius/Darius.nif</NIF>
- <KFM>art/LeaderHeads/Darius/Darius.kfm</KFM>
- <NoShaderNIF>art/LeaderHeads/Darius/Darius_NONSHADER.nif</NoShaderNIF>
- <BackgroundKFM>art/LeaderHeads/Darius/Darius_BG.kfm</BackgroundKFM>
- </LeaderheadArtInfo>
- <LeaderheadArtInfo>
- <Type>ART_DEF_LEADER_GILGAMESH</Type>
-
<Button>,Art/interface/LeaderHeads/Btn_LH_Persia_Cyrus.dds,Art/Interface/Buttons/Beyond_the_Sword_Atlas.dds,5,1</Button>
- <NIF>art/LeaderHeads/Gilgamesh/Gilgamesh.nif</NIF>
- <KFM>art/LeaderHeads/Gilgamesh/Gilgamesh.kfm</KFM>
-
<NoShaderNIF>art/LeaderHeads/Gilgamesh/Gilgamesh_NONSHADER.nif</NoShaderNIF>
-
<BackgroundKFM>art/LeaderHeads/Gilgamesh/Gilgamesh_Backgrnd.kfm</BackgroundKFM>
- </LeaderheadArtInfo>
- <LeaderheadArtInfo>
- <Type>ART_DEF_LEADER_HAMMURABI</Type>
-
<Button>,Art/interface/LeaderHeads/Btn_LH_Persia_Cyrus.dds,Art/Interface/Buttons/Beyond_the_Sword_Atlas.dds,6,1</Button>
- <NIF>art/LeaderHeads/Hammurabi/Hammurabi.nif</NIF>
- <KFM>art/LeaderHeads/Hammurabi/Hammurabi.kfm</KFM>
-
<NoShaderNIF>art/LeaderHeads/Hammurabi/Hammurabi_NONSHADER.nif</NoShaderNIF>
-
<BackgroundKFM>art/LeaderHeads/Hammurabi/Hammurabi_Backgrnd.kfm</BackgroundKFM>
- </LeaderheadArtInfo>
- <LeaderheadArtInfo>
- <Type>ART_DEF_LEADER_JOAO</Type>
-
<Button>,Art/interface/LeaderHeads/Btn_LH_Russia_Peter.dds,Art/Interface/Buttons/Beyond_the_Sword_Atlas.dds,7,1</Button>
- <NIF>art/Leaderheads/John II/John II.nif</NIF>
- <KFM>art/Leaderheads/John II/John II.kfm</KFM>
- <NoShaderNIF>art/Leaderheads/John II/John_II_NONSHADER.nif</NoShaderNIF>
- <BackgroundKFM>art/LeaderHeads/John II/JohnII_BG.kfm</BackgroundKFM>
- </LeaderheadArtInfo>
- <LeaderheadArtInfo>
- <Type>ART_DEF_LEADER_JUSTINIAN</Type>
-
<Button>,Art/interface/LeaderHeads/Btn_LH_America_Washington.dds,Art/Interface/Buttons/Beyond_the_Sword_Atlas.dds,8,1</Button>
- <NIF>art/LeaderHeads/Justinian/Justinian.nif</NIF>
- <KFM>art/LeaderHeads/Justinian/Justinian.kfm</KFM>
-
<NoShaderNIF>art/LeaderHeads/Justinian/Justinian_NONSHADER.nif</NoShaderNIF>
-
<BackgroundKFM>art/LeaderHeads/Justinian/Justinian_Background.kfm</BackgroundKFM>
- </LeaderheadArtInfo>
- <LeaderheadArtInfo>
- <Type>ART_DEF_LEADER_PACAL</Type>
-
<Button>,Art/interface/LeaderHeads/Btn_LH_Inca_HuaynaCapac.dds,Art/Interface/Buttons/Beyond_the_Sword_Atlas.dds,1,2</Button>
- <NIF>art/LeaderHeads/Pacal/Pacal.nif</NIF>
- <KFM>art/LeaderHeads/Pacal/Pacal.kfm</KFM>
- <NoShaderNIF>art/LeaderHeads/Pacal/Pacal_NONSHADER.nif</NoShaderNIF>
- <BackgroundKFM>art/LeaderHeads/Pacal/Pacal_BG.kfm</BackgroundKFM>
- </LeaderheadArtInfo>
- <LeaderheadArtInfo>
- <Type>ART_DEF_LEADER_PERICLES</Type>
-
<Button>,Art/interface/LeaderHeads/Btn_LH_Greece_Alexander.dds,Art/Interface/Buttons/Beyond_the_Sword_Atlas.dds,2,2</Button>
- <NIF>art/LeaderHeads/Pericles/Pericles.nif</NIF>
- <KFM>art/LeaderHeads/Pericles/Pericles.kfm</KFM>
-
<NoShaderNIF>art/LeaderHeads/Pericles/Pericles_NONSHADER.nif</NoShaderNIF>
- <BackgroundKFM>art/LeaderHeads/Pericles/Pericles_BG.kfm</BackgroundKFM>
- </LeaderheadArtInfo>
- <LeaderheadArtInfo>
- <Type>ART_DEF_LEADER_SITTING_BULL</Type>
-
<Button>,Art/interface/LeaderHeads/Btn_LH_Aztec_Montezuma.dds,Art/Interface/Buttons/Beyond_the_Sword_Atlas.dds,3,2</Button>
- <NIF>art/LeaderHeads/Sitting Bull/Sitting Bull.nif</NIF>
- <KFM>art/LeaderHeads/Sitting Bull/Sitting Bull.kfm</KFM>
- <NoShaderNIF>art/LeaderHeads/Sitting
Bull/Sitting_Bull_NONSHADER.nif</NoShaderNIF>
- <BackgroundKFM>art/LeaderHeads/Sitting Bull/Sitting
Bull_BG.kfm</BackgroundKFM>
- </LeaderheadArtInfo>
- <LeaderheadArtInfo>
- <Type>ART_DEF_LEADER_SULEIMAN</Type>
-
<Button>,Art/interface/LeaderHeads/Btn_LH_America_Washington.dds,Art/Interface/Buttons/Beyond_the_Sword_Atlas.dds,4,2</Button>
- <NIF>art/LeaderHeads/Suleiman/Suleiman.nif</NIF>
- <KFM>art/LeaderHeads/Suleiman/Suleiman.kfm</KFM>
-
<NoShaderNIF>art/LeaderHeads/Suleiman/Suleiman_NONSHADER.nif</NoShaderNIF>
- <BackgroundKFM>art/LeaderHeads/Suleiman/Suleiman_BG.kfm</BackgroundKFM>
- </LeaderheadArtInfo>
- <LeaderheadArtInfo>
- <Type>ART_DEF_LEADER_SURYAVARMAN</Type>
-
<Button>,Art/interface/LeaderHeads/Btn_LH_China_ShihHuangTi.dds,Art/Interface/Buttons/Beyond_the_Sword_Atlas.dds,5,2</Button>
- <NIF>art/LeaderHeads/Suryavarman/Suryavarman.nif</NIF>
- <KFM>art/LeaderHeads/Suryavarman/Suryavarman.kfm</KFM>
-
<NoShaderNIF>art/LeaderHeads/Suryavarman/Suryaverman_NONSHADER.nif</NoShaderNIF>
-
<BackgroundKFM>art/LeaderHeads/Suryavarman/Suryavarman_BG.kfm</BackgroundKFM>
- </LeaderheadArtInfo>
- <LeaderheadArtInfo>
- <Type>ART_DEF_LEADER_BOUDICA</Type>
-
<Button>,Art/interface/LeaderHeads/Btn_LH_England_ElizabethI.dds,Art/Interface/Buttons/Beyond_the_Sword_Atlas.dds,6,2</Button>
- <NIF>art/LeaderHeads/Boudica/Boudica.nif</NIF>
- <KFM>art/LeaderHeads/Boudica/Boudica.kfm</KFM>
- <NoShaderNIF>art/LeaderHeads/Boudica/Boudica_NONSHADER.nif</NoShaderNIF>
- <BackgroundKFM>art/LeaderHeads/Boudica/Boudica_BG.kfm</BackgroundKFM>
- </LeaderheadArtInfo>
- <LeaderheadArtInfo>
- <Type>ART_DEF_LEADER_WILLEM_VAN_ORANJE</Type>
-
<Button>,Art/interface/LeaderHeads/Btn_LH_America_Washington.dds,Art/Interface/Buttons/Beyond_the_Sword_Atlas.dds,7,2</Button>
- <NIF>art/LeaderHeads/Willem van Oranje/Willem van Oranje.nif</NIF>
- <KFM>art/LeaderHeads/Willem van Oranje/Willem van Oranje.kfm</KFM>
- <NoShaderNIF>art/LeaderHeads/Willem van
Oranje/Willem_van_Oranje_NONSHADER.nif</NoShaderNIF>
- <BackgroundKFM>art/LeaderHeads/Willem van Oranje/Willem van
Oranje_BG.kfm</BackgroundKFM>
- </LeaderheadArtInfo>
- <LeaderheadArtInfo>
- <Type>ART_DEF_LEADER_ZARA_YAQOB</Type>
-
<Button>,Art/interface/LeaderHeads/Btn_LH_Mali_MansaMusa.dds,Art/Interface/Buttons/Beyond_the_Sword_Atlas.dds,8,2</Button>
- <NIF>art/LeaderHeads/Zara Yaqob/Zara Yaqob.nif</NIF>
- <KFM>art/LeaderHeads/Zara Yaqob/Zara Yaqob.kfm</KFM>
- <NoShaderNIF>art/LeaderHeads/Zara
Yaqob/Zara_Yaqob_NONSHADER.nif</NoShaderNIF>
- <BackgroundKFM>art/LeaderHeads/Zara Yaqob/Zara
Yaqob_BG.kfm</BackgroundKFM>
- </LeaderheadArtInfo>
- <LeaderheadArtInfo>
<Type>ART_DEF_LEADER_CAO_CAO</Type>
<Button>art/LeaderHeads/CAO_CAO.dds</Button>
<NIF>art/Interface/LeaderHeads/CAO_CAO.dds</NIF>
=======================================
--- /trunk/The History of Three
Kingdoms/Assets/XML/BasicInfos/CIV4NewConceptInfos.xml Tue Aug 11 09:33:16
2009
+++ /trunk/The History of Three
Kingdoms/Assets/XML/BasicInfos/CIV4NewConceptInfos.xml Sun Sep 20 04:03:41
2009
@@ -77,6 +77,11 @@
<Description>TXT_KEY_CONCEPT_CITY_PERK</Description>
<Civilopedia>TXT_KEY_CONCEPT_CITY_PERK_PEDIA</Civilopedia>
</NewConceptInfo>
+ <NewConceptInfo>
+ <Type>CONCEPT_ARMY</Type>
+ <Description>TXT_KEY_CONCEPT_ARMY</Description>
+ <Civilopedia>TXT_KEY_CONCEPT_ARMY_PEDIA</Civilopedia>
+ </NewConceptInfo>
<!-- Shortcut Infos -->
<NewConceptInfo>
<Type>CONCEPT_SHORTCUTS_ADVISORS</Type>
=======================================
--- /trunk/The History of Three
Kingdoms/Assets/XML/Sanguo/CIV4HeroInfos.xml Fri Sep 18 07:27:23 2009
+++ /trunk/The History of Three
Kingdoms/Assets/XML/Sanguo/CIV4HeroInfos.xml Sun Sep 20 04:03:41 2009
@@ -144,8 +144,8 @@
<iVitality>10</iVitality>
<iHistoricalDieYear>220</iHistoricalDieYear>
<SurrenderType>SURRENDER_GUAN_YU</SurrenderType>
- <iLeadership>80</iLeadership>
- <iMight>80</iMight>
+ <iLeadership>90</iLeadership>
+ <iMight>90</iMight>
<MurdererCiv>CIVILIZATION_SUN_CE</MurdererCiv>
<bNineTransformation>1</bNineTransformation>
</HeroInfo>
@@ -279,8 +279,8 @@
<iVitality>8</iVitality>
<iHistoricalDieYear>221</iHistoricalDieYear>
<SurrenderType>SURRENDER_INDOMITABLE</SurrenderType>
- <iLeadership>80</iLeadership>
- <iMight>80</iMight>
+ <iLeadership>70</iLeadership>
+ <iMight>95</iMight>
<MurdererCiv>CIVILIZATION_SUN_CE</MurdererCiv>
</HeroInfo>
<HeroInfo>
@@ -422,7 +422,7 @@
<iHistoricalDieYear>220</iHistoricalDieYear>
<SurrenderType>SURRENDER_INDOMITABLE</SurrenderType>
<iLeadership>80</iLeadership>
- <iMight>80</iMight>
+ <iMight>90</iMight>
</HeroInfo>
<HeroInfo>
<Type>HERO_XIAHOU_YUAN</Type>
@@ -550,8 +550,8 @@
<iVitality>5</iVitality>
<iHistoricalDieYear>219</iHistoricalDieYear>
<SurrenderType>SURRENDER_INDOMITABLE</SurrenderType>
- <iLeadership>80</iLeadership>
- <iMight>80</iMight>
+ <iLeadership>85</iLeadership>
+ <iMight>90</iMight>
<MurdererCiv>CIVILIZATION_LIU_BEI</MurdererCiv>
</HeroInfo>
<HeroInfo>
@@ -684,8 +684,8 @@
<iVitality>4</iVitality>
<iHistoricalDieYear>207</iHistoricalDieYear>
<SurrenderType>SURRENDER_NORMAL</SurrenderType>
- <iLeadership>80</iLeadership>
- <iMight>80</iMight>
+ <iLeadership>70</iLeadership>
+ <iMight>90</iMight>
</HeroInfo>
<HeroInfo>
<Type>HERO_GAN_NING</Type>
@@ -825,8 +825,8 @@
<iVitality>6</iVitality>
<iHistoricalDieYear>222</iHistoricalDieYear>
<SurrenderType>SURRENDER_POWER</SurrenderType>
- <iLeadership>80</iLeadership>
- <iMight>80</iMight>
+ <iLeadership>70</iLeadership>
+ <iMight>95</iMight>
</HeroInfo>
<HeroInfo>
<Type>HERO_ZHANG_LIAO</Type>
@@ -966,8 +966,8 @@
<iVitality>10</iVitality>
<iHistoricalDieYear>222</iHistoricalDieYear>
<SurrenderType>SURRENDER_NORMAL</SurrenderType>
- <iLeadership>80</iLeadership>
- <iMight>80</iMight>
+ <iLeadership>90</iLeadership>
+ <iMight>90</iMight>
</HeroInfo>
<HeroInfo>
<Type>HERO_ZHAO_YUN</Type>
@@ -1111,8 +1111,8 @@
<iVitality>20</iVitality>
<iHistoricalDieYear>229</iHistoricalDieYear>
<SurrenderType>SURRENDER_NORMAL</SurrenderType>
- <iLeadership>80</iLeadership>
- <iMight>80</iMight>
+ <iLeadership>70</iLeadership>
+ <iMight>95</iMight>
</HeroInfo>
<HeroInfo>
<Type>HERO_HUANG_ZHONG</Type>
@@ -1229,7 +1229,7 @@
<iHistoricalDieYear>220</iHistoricalDieYear>
<SurrenderType>SURRENDER_NORMAL</SurrenderType>
<iLeadership>80</iLeadership>
- <iMight>80</iMight>
+ <iMight>90</iMight>
</HeroInfo>
<HeroInfo>
<Type>HERO_ZHANG_REN</Type>
@@ -1353,8 +1353,8 @@
<iVitality>3</iVitality>
<iHistoricalDieYear>214</iHistoricalDieYear>
<SurrenderType>SURRENDER_SUICIDE</SurrenderType>
- <iLeadership>80</iLeadership>
- <iMight>80</iMight>
+ <iLeadership>75</iLeadership>
+ <iMight>75</iMight>
<MurdererCiv>CIVILIZATION_LIU_BEI</MurdererCiv>
</HeroInfo>
<HeroInfo>
@@ -1495,7 +1495,7 @@
<iVitality>7</iVitality>
<iHistoricalDieYear>231</iHistoricalDieYear>
<SurrenderType>SURRENDER_NORMAL</SurrenderType>
- <iLeadership>80</iLeadership>
+ <iLeadership>90</iLeadership>
<iMight>80</iMight>
<MurdererCiv>CIVILIZATION_LIU_BEI</MurdererCiv>
</HeroInfo>
@@ -1608,8 +1608,8 @@
<iVitality>5</iVitality>
<iHistoricalDieYear>218</iHistoricalDieYear>
<SurrenderType>SURRENDER_NORMAL</SurrenderType>
- <iLeadership>80</iLeadership>
- <iMight>80</iMight>
+ <iLeadership>85</iLeadership>
+ <iMight>70</iMight>
</HeroInfo>
<HeroInfo>
<Type>HERO_GAO_SHUN</Type>
@@ -1717,8 +1717,8 @@
<iVitality>4</iVitality>
<iHistoricalDieYear>198</iHistoricalDieYear>
<SurrenderType>SURRENDER_SUICIDE</SurrenderType>
- <iLeadership>80</iLeadership>
- <iMight>80</iMight>
+ <iLeadership>90</iLeadership>
+ <iMight>70</iMight>
<MurdererCiv>CIVILIZATION_CAO_CAO</MurdererCiv>
</HeroInfo>
<HeroInfo>
@@ -1819,8 +1819,8 @@
<iVitality>3</iVitality>
<iHistoricalDieYear>200</iHistoricalDieYear>
<SurrenderType>SURRENDER_EASY</SurrenderType>
- <iLeadership>80</iLeadership>
- <iMight>80</iMight>
+ <iLeadership>60</iLeadership>
+ <iMight>85</iMight>
</HeroInfo>
<HeroInfo>
<Type>HERO_PANG_DE</Type>
@@ -1956,8 +1956,8 @@
<iVitality>3</iVitality>
<iHistoricalDieYear>219</iHistoricalDieYear>
<SurrenderType>SURRENDER_PANG_DE</SurrenderType>
- <iLeadership>80</iLeadership>
- <iMight>80</iMight>
+ <iLeadership>60</iLeadership>
+ <iMight>90</iMight>
<MurdererCiv>CIVILIZATION_LIU_BEI</MurdererCiv>
</HeroInfo>
<HeroInfo>
@@ -2071,7 +2071,7 @@
<iHistoricalDieYear>220</iHistoricalDieYear>
<SurrenderType>SURRENDER_NORMAL</SurrenderType>
<iLeadership>80</iLeadership>
- <iMight>80</iMight>
+ <iMight>70</iMight>
</HeroInfo>
<HeroInfo>
<Type>HERO_GAO_LAN</Type>
@@ -2183,8 +2183,8 @@
<iVitality>10</iVitality>
<iHistoricalDieYear>202</iHistoricalDieYear>
<SurrenderType>SURRENDER_NORMAL</SurrenderType>
- <iLeadership>80</iLeadership>
- <iMight>80</iMight>
+ <iLeadership>85</iLeadership>
+ <iMight>75</iMight>
</HeroInfo>
<HeroInfo>
<Type>HERO_WEN_PIN</Type>
@@ -2429,8 +2429,8 @@
<iVitality>4</iVitality>
<iHistoricalDieYear>200</iHistoricalDieYear>
<SurrenderType>SURRENDER_NORMAL</SurrenderType>
- <iLeadership>80</iLeadership>
- <iMight>80</iMight>
+ <iLeadership>100</iLeadership>
+ <iMight>95</iMight>
<MurdererCiv>CIVILIZATION_WANG_LANG</MurdererCiv>
<Family>CIVILIZATION_SUN_CE</Family>
</HeroInfo>
@@ -2576,8 +2576,8 @@
<iVitality>7</iVitality>
<iHistoricalDieYear>198</iHistoricalDieYear>
<SurrenderType>SURRENDER_EASY</SurrenderType>
- <iLeadership>80</iLeadership>
- <iMight>80</iMight>
+ <iLeadership>85</iLeadership>
+ <iMight>100</iMight>
<MurdererCiv>CIVILIZATION_CAO_CAO</MurdererCiv>
</HeroInfo>
<HeroInfo>
@@ -2711,7 +2711,7 @@
<iHistoricalDieYear>222</iHistoricalDieYear>
<SurrenderType>SURRENDER_POWER</SurrenderType>
<iLeadership>80</iLeadership>
- <iMight>80</iMight>
+ <iMight>95</iMight>
<MurdererCiv>CIVILIZATION_CAO_CAO</MurdererCiv>
<Family>CIVILIZATION_MA_TENG</Family>
</HeroInfo>
@@ -2914,8 +2914,8 @@
<iVitality>8</iVitality>
<iHistoricalDieYear>198</iHistoricalDieYear>
<SurrenderType>SURRENDER_EASY</SurrenderType>
- <iLeadership>80</iLeadership>
- <iMight>80</iMight>
+ <iLeadership>70</iLeadership>
+ <iMight>70</iMight>
<MurdererCiv>CIVILIZATION_CAO_CAO</MurdererCiv>
</HeroInfo>
<HeroInfo>
@@ -3033,7 +3033,7 @@
<iHistoricalDieYear>200</iHistoricalDieYear>
<SurrenderType>SURRENDER_NORMAL</SurrenderType>
<iLeadership>80</iLeadership>
- <iMight>80</iMight>
+ <iMight>90</iMight>
<MurdererCiv>CIVILIZATION_CAO_CAO</MurdererCiv>
</HeroInfo>
<HeroInfo>
@@ -3147,7 +3147,7 @@
<iHistoricalDieYear>200</iHistoricalDieYear>
<SurrenderType>SURRENDER_NORMAL</SurrenderType>
<iLeadership>80</iLeadership>
- <iMight>80</iMight>
+ <iMight>90</iMight>
<MurdererCiv>CIVILIZATION_CAO_CAO</MurdererCiv>
</HeroInfo>
<HeroInfo>
@@ -3405,8 +3405,8 @@
<iVitality>12</iVitality>
<iHistoricalDieYear>227</iHistoricalDieYear>
<SurrenderType>SURRENDER_NORMAL</SurrenderType>
- <iLeadership>80</iLeadership>
- <iMight>80</iMight>
+ <iLeadership>90</iLeadership>
+ <iMight>90</iMight>
</HeroInfo>
<HeroInfo>
<Type>HERO_LIU_YI</Type>
@@ -3502,8 +3502,8 @@
<iVitality>10</iVitality>
<iHistoricalDieYear>215</iHistoricalDieYear>
<SurrenderType>SURRENDER_EASY</SurrenderType>
- <iLeadership>80</iLeadership>
- <iMight>80</iMight>
+ <iLeadership>60</iLeadership>
+ <iMight>60</iMight>
</HeroInfo>
<HeroInfo>
<Type>HERO_LUO_JUN</Type>
@@ -3599,8 +3599,8 @@
<iVitality>8</iVitality>
<iHistoricalDieYear>196</iHistoricalDieYear>
<SurrenderType>SURRENDER_NORMAL</SurrenderType>
- <iLeadership>80</iLeadership>
- <iMight>80</iMight>
+ <iLeadership>70</iLeadership>
+ <iMight>60</iMight>
</HeroInfo>
<HeroInfo>
<Type>HERO_PANG_XI</Type>
@@ -3704,8 +3704,8 @@
<iVitality>10</iVitality>
<iHistoricalDieYear>230</iHistoricalDieYear>
<SurrenderType>SURRENDER_EASY</SurrenderType>
- <iLeadership>80</iLeadership>
- <iMight>80</iMight>
+ <iLeadership>70</iLeadership>
+ <iMight>60</iMight>
</HeroInfo>
<HeroInfo>
<Type>HERO_MENG_HUO</Type>
@@ -3810,7 +3810,7 @@
<iHistoricalDieYear>253</iHistoricalDieYear>
<SurrenderType>SURRENDER_MENG_HUO</SurrenderType>
<iLeadership>80</iLeadership>
- <iMight>80</iMight>
+ <iMight>85</iMight>
</HeroInfo>
<HeroInfo>
<Type>HERO_ZANG_BA</Type>
@@ -4036,7 +4036,7 @@
</UnitPromotions>
<Portrait>Art\interface\Heroes\Zhang_Yang_1.dds</Portrait>
<Button>Art/LeaderHeads/Zhang_Yang.dds</Button>
- <iVitality>8</iVitality>
+ <iVitality>0</iVitality>
<iHistoricalDieYear>199</iHistoricalDieYear>
<SurrenderType>SURRENDER_NORMAL</SurrenderType>
<iLeadership>80</iLeadership>
@@ -4257,8 +4257,8 @@
<iVitality>15</iVitality>
<iHistoricalDieYear>219</iHistoricalDieYear>
<SurrenderType>SURRENDER_EASY</SurrenderType>
- <iLeadership>80</iLeadership>
- <iMight>80</iMight>
+ <iLeadership>60</iLeadership>
+ <iMight>60</iMight>
</HeroInfo>
<HeroInfo>
<Type>HERO_ZHANG_YAN</Type>
@@ -4471,7 +4471,7 @@
<iVitality>4</iVitality>
<iHistoricalDieYear>215</iHistoricalDieYear>
<SurrenderType>SURRENDER_NORMAL</SurrenderType>
- <iLeadership>80</iLeadership>
+ <iLeadership>75</iLeadership>
<iMight>80</iMight>
</HeroInfo>
<HeroInfo>
@@ -4584,7 +4584,7 @@
<iVitality>8</iVitality>
<iHistoricalDieYear>212</iHistoricalDieYear>
<SurrenderType>SURRENDER_NORMAL</SurrenderType>
- <iLeadership>80</iLeadership>
+ <iLeadership>85</iLeadership>
<iMight>80</iMight>
<MurdererCiv>CIVILIZATION_CAO_CAO</MurdererCiv>
</HeroInfo>
@@ -4811,8 +4811,8 @@
<iVitality>3</iVitality>
<iHistoricalDieYear>187</iHistoricalDieYear>
<SurrenderType>SURRENDER_NORMAL</SurrenderType>
- <iLeadership>80</iLeadership>
- <iMight>80</iMight>
+ <iLeadership>90</iLeadership>
+ <iMight>70</iMight>
</HeroInfo>
<HeroInfo>
<Type>HERO_ZHANG_LIANG</Type>
@@ -4921,7 +4921,7 @@
<iHistoricalDieYear>187</iHistoricalDieYear>
<SurrenderType>SURRENDER_NORMAL</SurrenderType>
<iLeadership>80</iLeadership>
- <iMight>80</iMight>
+ <iMight>85</iMight>
</HeroInfo>
<HeroInfo>
<Type>HERO_GONGSUN_ZAN</Type>
@@ -5045,8 +5045,8 @@
<iVitality>4</iVitality>
<iHistoricalDieYear>199</iHistoricalDieYear>
<SurrenderType>SURRENDER_NORMAL</SurrenderType>
- <iLeadership>80</iLeadership>
- <iMight>80</iMight>
+ <iLeadership>85</iLeadership>
+ <iMight>85</iMight>
<MurdererCiv>CIVILIZATION_YUAN_SHAO</MurdererCiv>
</HeroInfo>
<HeroInfo>
@@ -5163,8 +5163,8 @@
<iVitality>10</iVitality>
<iHistoricalDieYear>223</iHistoricalDieYear>
<SurrenderType>SURRENDER_NORMAL</SurrenderType>
- <iLeadership>80</iLeadership>
- <iMight>80</iMight>
+ <iLeadership>85</iLeadership>
+ <iMight>85</iMight>
</HeroInfo>
<HeroInfo>
<Type>HERO_YU_JIN</Type>
@@ -5280,7 +5280,7 @@
<iVitality>12</iVitality>
<iHistoricalDieYear>221</iHistoricalDieYear>
<SurrenderType>SURRENDER_EASY</SurrenderType>
- <iLeadership>80</iLeadership>
+ <iLeadership>85</iLeadership>
<iMight>80</iMight>
</HeroInfo>
<HeroInfo>
@@ -5393,8 +5393,8 @@
<iVitality>5</iVitality>
<iHistoricalDieYear>197</iHistoricalDieYear>
<SurrenderType>SURRENDER_SUICIDE</SurrenderType>
- <iLeadership>80</iLeadership>
- <iMight>80</iMight>
+ <iLeadership>70</iLeadership>
+ <iMight>95</iMight>
</HeroInfo>
<HeroInfo>
<Type>HERO_XU_CHU</Type>
@@ -5510,8 +5510,8 @@
<iVitality>15</iVitality>
<iHistoricalDieYear>232</iHistoricalDieYear>
<SurrenderType>SURRENDER_SUICIDE</SurrenderType>
- <iLeadership>80</iLeadership>
- <iMight>80</iMight>
+ <iLeadership>70</iLeadership>
+ <iMight>95</iMight>
</HeroInfo>
<HeroInfo>
<Type>HERO_CAO_CAO</Type>
@@ -5643,8 +5643,8 @@
<iVitality>15</iVitality>
<iHistoricalDieYear>220</iHistoricalDieYear>
<SurrenderType>SURRENDER_POWER</SurrenderType>
- <iLeadership>80</iLeadership>
- <iMight>80</iMight>
+ <iLeadership>100</iLeadership>
+ <iMight>75</iMight>
<bNineTransformation>1</bNineTransformation>
</HeroInfo>
<HeroInfo>
@@ -5773,7 +5773,7 @@
<iVitality>6</iVitality>
<iHistoricalDieYear>220</iHistoricalDieYear>
<SurrenderType>SURRENDER_NORMAL</SurrenderType>
- <iLeadership>80</iLeadership>
+ <iLeadership>90</iLeadership>
<iMight>80</iMight>
</HeroInfo>
<HeroInfo>
@@ -5878,8 +5878,8 @@
<iVitality>10</iVitality>
<iHistoricalDieYear>230</iHistoricalDieYear>
<SurrenderType>SURRENDER_NORMAL</SurrenderType>
- <iLeadership>80</iLeadership>
- <iMight>80</iMight>
+ <iLeadership>75</iLeadership>
+ <iMight>85</iMight>
</HeroInfo>
<HeroInfo>
<Type>HERO_SUN_QUAN</Type>
@@ -5996,7 +5996,7 @@
<iHistoricalDieYear>252</iHistoricalDieYear>
<SurrenderType>SURRENDER_POWER</SurrenderType>
<iLeadership>80</iLeadership>
- <iMight>80</iMight>
+ <iMight>70</iMight>
<Family>CIVILIZATION_SUN_CE</Family>
</HeroInfo>
<HeroInfo>
@@ -6129,8 +6129,8 @@
<iVitality>10</iVitality>
<iHistoricalDieYear>234</iHistoricalDieYear>
<SurrenderType>SURRENDER_POWER</SurrenderType>
- <iLeadership>80</iLeadership>
- <iMight>80</iMight>
+ <iLeadership>90</iLeadership>
+ <iMight>90</iMight>
</HeroInfo>
<HeroInfo>
<Type>HERO_MA_DAI</Type>
@@ -6255,7 +6255,7 @@
<iHistoricalDieYear>240</iHistoricalDieYear>
<SurrenderType>SURRENDER_NORMAL</SurrenderType>
<iLeadership>80</iLeadership>
- <iMight>80</iMight>
+ <iMight>85</iMight>
<Family>CIVILIZATION_MA_TENG</Family>
</HeroInfo>
<HeroInfo>
@@ -6368,7 +6368,7 @@
<iVitality>10</iVitality>
<iHistoricalDieYear>230</iHistoricalDieYear>
<SurrenderType>SURRENDER_INDOMITABLE</SurrenderType>
- <iLeadership>80</iLeadership>
+ <iLeadership>70</iLeadership>
<iMight>80</iMight>
</HeroInfo>
<HeroInfo>
@@ -6473,8 +6473,8 @@
<iVitality>10</iVitality>
<iHistoricalDieYear>223</iHistoricalDieYear>
<SurrenderType>SURRENDER_EASY</SurrenderType>
- <iLeadership>80</iLeadership>
- <iMight>80</iMight>
+ <iLeadership>70</iLeadership>
+ <iMight>75</iMight>
</HeroInfo>
<HeroInfo>
<Type>HERO_JU_YI</Type>
@@ -6590,7 +6590,7 @@
<iVitality>3</iVitality>
<iHistoricalDieYear>195</iHistoricalDieYear>
<SurrenderType>SURRENDER_NORMAL</SurrenderType>
- <iLeadership>80</iLeadership>
+ <iLeadership>85</iLeadership>
<iMight>80</iMight>
</HeroInfo>
</HeroInfos>
=======================================
--- /trunk/The History of Three
Kingdoms/Assets/XML/Text/CIV4GameText_Civilopedia_Sanguo_Concepts.xml Tue
Sep 15 08:01:36 2009
+++ /trunk/The History of Three
Kingdoms/Assets/XML/Text/CIV4GameText_Civilopedia_Sanguo_Concepts.xml Sun
Sep 20 04:03:41 2009
Binary file, no diff available.
=======================================
--- /trunk/The History of Three
Kingdoms/Assets/XML/Text/CIV4GameText_Sanguo_Hero.xml Sat Sep 19 05:22:49
2009
+++ /trunk/The History of Three
Kingdoms/Assets/XML/Text/CIV4GameText_Sanguo_Hero.xml Sun Sep 20 04:03:41
2009
Binary file, no diff available.
=======================================
--- /trunk/The History of Three Kingdoms/CvGameCoreDLL/CvGame.cpp Sat Sep
19 05:22:49 2009
+++ /trunk/The History of Three Kingdoms/CvGameCoreDLL/CvGame.cpp Sun Sep
20 04:03:41 2009
@@ -483,8 +483,15 @@
// Uninit class
uninit();

- // Sanguo Mod Hero, start, added by poyuzhe 08.10.09
- while(m_paNewHeroes.size() > 0)
+ // Sanguo Mod Hero, start, added by poyuzhe 08.10.09
+ while(m_paNewLeaders.size() > 0)
+ {
+ GC.getLeaderHeadInfo().pop_back();
+ GC.setInfoTypeFromString(m_paNewLeaders.back()->getType(), -1);
+ m_paNewLeaders.pop_back();
+ }
+
+ while(m_paNewHeroes.size() > 0)
{
GC.getHeroInfo().pop_back();
GC.setInfoTypeFromString(m_paNewHeroes.back()->getType(), -1);
@@ -663,8 +670,6 @@
FAssertMsg(0 < GC.getNumHeroInfos(), "GC.getNumHeroInfos() is not
greater than zero but it is used to allocate memory in CvGame::reset");
FAssertMsg((int)m_ppaiHeroUnitCombatLevel.size() == 0, "about to leak
memory, CvGame::m_ppaiHeroUnitCombatLevel");
FAssertMsg((int)m_ppaiHeroPromotionStatus.size() == 0, "about to leak
memory, CvGame::m_ppaiHeroPromotionStatus");
- //m_ppaiHeroUnitCombatLevel = new int*[GC.getNumHeroInfos()];
- //m_ppaiHeroPromotionStatus = new int*[GC.getNumHeroInfos()];
for (iI = 0; iI < GC.getNumHeroInfos(); iI++)
{
int iJ;
@@ -685,6 +690,7 @@

// Sanguo Mod Hero, start, added by poyuzhe 01.16.09
m_mapHeroes.clear();
+ m_paNewLeaders.clear();
m_paNewHeroes.clear();
// Sanguo Mod Hero, end

@@ -6469,6 +6475,45 @@
{
if (getHeroDebutStatus((HeroTypes)iI) >= 0)
{
+ if (getHeroCapturePlayer((HeroTypes)iI) != NO_PLAYER)
+ {
+ if (getSorenRandNum(1000, "hero break out") <
GC.getHeroInfo((HeroTypes)iI).getMight())
+ {
+ CvPlayer& kPlayer =
GET_PLAYER((PlayerTypes)getHeroDebutStatus((HeroTypes)iI));
+ if (kPlayer.isAlive())
+ {
+ CvWString szBuffer =
gDLL->getText("TXT_KEY_HERO_BREAK_OUT",
GC.getHeroInfo((HeroTypes)iI).getDescription());
+
gDLL->getInterfaceIFace()->addMessage(getHeroCapturePlayer((HeroTypes)iI),
false, GC.getEVENT_MESSAGE_TIME(), szBuffer, "AS2D_NEGATIVE_DINK",
MESSAGE_TYPE_INFO);
+ szBuffer = gDLL->getText("TXT_KEY_HERO_RUN_BACK",
GC.getHeroInfo((HeroTypes)iI).getDescription());
+
gDLL->getInterfaceIFace()->addMessage(((PlayerTypes)getHeroDebutStatus((HeroTypes)iI)),
false, GC.getEVENT_MESSAGE_TIME(), szBuffer, "AS2D_POSITIVE_DINK",
MESSAGE_TYPE_INFO);
+
+ setHeroCapturePlayer((HeroTypes)iI, NO_PLAYER);
+ int iX,iY;
+
+ CvCity* pCity = kPlayer.getCapitalCity();
+ if (NULL != pCity)
+ {
+ iX = pCity->getX_INLINE();
+ iY = pCity->getY_INLINE();
+ }
+ else
+ {
+ int iLoop;
+ CvUnit* pUnit = kPlayer.firstUnit(&iLoop);
+ FAssert (pUnit != NULL);
+ iX = pUnit->getX_INLINE();
+ iY = pUnit->getY_INLINE();
+ }
+
+ CvUnit* pHero =
kPlayer.initUnit((UnitTypes)GC.getHeroInfo((HeroTypes)iI).getUnitType(),
iX, iY);
+ pHero->setHeroType((HeroTypes)iI);
+ setHeroUnitID((HeroTypes)iI, pHero->getID());
+ kPlayer.changeHeroMaintenance((HeroTypes)iI, true,
false, 0);
+ }
+ }
+
+ m_mapHeroes[(HeroTypes)iI].m_iSurrenderRand =
getSorenRandNum(100, "recalculate surrender rand");
+ }
if (getHeroExperience((HeroTypes)iI) < (fTotalExperience /
GC.getNumHeroInfos()))
{
if (getSorenRandNum(100, "Hero Random Experience Gain") < 25)
@@ -8243,6 +8288,20 @@
{
pStream->Read(GC.getNumPromotionInfos(), m_ppaiHeroPromotionStatus[iI]);
}
+
+ {
+ int iSize;
+ m_paNewLeaders.clear();
+ pStream->Read(&iSize);
+ for (int i = 0; i < iSize; ++i)
+ {
+ CvLeaderHeadInfo* pNewLeaderHeadInfo = new CvLeaderHeadInfo;
+ pNewLeaderHeadInfo->read(pStream);
+ m_paNewLeaders.push_back(pNewLeaderHeadInfo);
+ GC.getLeaderHeadInfo().push_back(pNewLeaderHeadInfo);
+ GC.setInfoTypeFromString(pNewLeaderHeadInfo->getType(),
GC.getLeaderHeadInfo().size() - 1);
+ }
+ }

{
int iSize;
@@ -8456,6 +8515,16 @@
{
pStream->Write(GC.getNumPromotionInfos(), m_ppaiHeroPromotionStatus[iI]);
}
+
+ {
+ int iSize = m_paNewLeaders.size();
+ pStream->Write(iSize);
+ std::vector<CvLeaderHeadInfo*>::iterator it;
+ for (it = m_paNewLeaders.begin(); it != m_paNewLeaders.end(); ++it)
+ {
+ (*it)->write(pStream);
+ }
+ }

{
int iSize = m_mapHeroes.size();
@@ -11614,7 +11683,7 @@

CvHeroMap::iterator iter = m_mapHeroes.find(eHero);
FAssert (iter != m_mapHeroes.end());
- if (iter->second.m_iSurrenderRand == -1 ||
getSorenRandNum(200, "recalculate surrender rand") < 2)
+ if (iter->second.m_iSurrenderRand == -1)
{
iter->second.m_iSurrenderRand = getSorenRandNum(100, "hero surrender
rand");
}
@@ -11691,4 +11760,65 @@
{
m_mapHeroes[eHero].aLegionMemberBackUpList.clear();
}
+
+LeaderHeadTypes CvGame::createRandomLeader(PlayerTypes ePlayer, HeroTypes
eHero)
+{
+ CvLeaderHeadInfo* pNewLeaderHeadInfo = new CvLeaderHeadInfo;
+ FAssert (pNewLeaderHeadInfo != NULL);
+ FAssert (GET_PLAYER(ePlayer).isAlive());
+ FAssert (eHero > -1 && eHero < GC.getNumHeroInfos());
+
+ pNewLeaderHeadInfo->setRandom(true);
+
+ // find the random portrait
+ // set portrait, button, civilopedia, strategy, help
+ CvString szBuffer, szTempBuffer;
+ CvWString szBuffer1;
+ szBuffer.Format("LEADERHEAD_RANDOM_%d", (int)m_paNewLeaders.size() + 1);
+ pNewLeaderHeadInfo->setType(szBuffer);
+
+ pNewLeaderHeadInfo->setText(GC.getHeroInfo(eHero).getText());
+
pNewLeaderHeadInfo->setCivilopedia(GC.getHeroInfo(eHero).getCivilopedia());
+ pNewLeaderHeadInfo->setStrategy(GC.getHeroInfo(eHero).getStrategy());
+
+ pNewLeaderHeadInfo->setButton(GC.getHeroInfo(eHero).getButton());
+ pNewLeaderHeadInfo->setLeaderHead(GC.getHeroInfo(eHero).getPortrait());
+
+
pNewLeaderHeadInfo->setFavoriteReligion(GC.getHeroInfo(eHero).getBelief());
+
pNewLeaderHeadInfo->setHasTrait(getSorenRandNum(GC.getNumTraitInfos(), "pick
random trait"), true); // HoTK ToDo
+
pNewLeaderHeadInfo->setHasTrait(getSorenRandNum(GC.getNumTraitInfos(), "pick
random trait"), true);
+
+ m_paNewLeaders.push_back(pNewLeaderHeadInfo);
+
+ // Add to info vector
+ int iIndex = -1;
+ if (NULL != pNewLeaderHeadInfo->getType())
+ {
+ iIndex = GC.getInfoTypeForString(pNewLeaderHeadInfo->getType(), true);
+ }
+
+ FAssert (-1 == iIndex);
+
+ if (-1 == iIndex)
+ {
+ GC.getLeaderHeadInfo().push_back(pNewLeaderHeadInfo);
+ if (NULL != pNewLeaderHeadInfo->getType())
+ {
+ GC.setInfoTypeFromString(pNewLeaderHeadInfo->getType(),
(int)GC.getLeaderHeadInfo().size() - 1); // add type to global info type
hash map
+ }
+ }
+ else
+ {
+ SAFE_DELETE((GC.getLeaderHeadInfo())[iIndex]);
+ (GC.getLeaderHeadInfo())[iIndex] = pNewLeaderHeadInfo;
+ }
+
+ iIndex = GC.getInfoTypeForString(pNewLeaderHeadInfo->getType());
+
+ GC.getHeroInfo(eHero).setLeaderType(iIndex);
+
+
GC.getCivilizationInfo(GET_PLAYER(ePlayer).getCivilizationType()).pushNewLeader(iIndex);
+
+ return (LeaderHeadTypes)iIndex;
+}
// Sanguo Mod Hero, end
=======================================
--- /trunk/The History of Three Kingdoms/CvGameCoreDLL/CvGame.h Sat Sep 19
05:22:49 2009
+++ /trunk/The History of Three Kingdoms/CvGameCoreDLL/CvGame.h Sun Sep 20
04:03:41 2009
@@ -634,6 +634,8 @@
int getHeroCapacity(HeroTypes eHero, bool bOverwrite = false,
HeroTypes eOverwriteHero = NO_HERO) const; // Exposed to Python
int getHeroExperienceNeededForNextCapacity(HeroTypes eHero)
const; // Exposed to Python
void swapHeroLegionList(HeroTypes eHero);
+
+ LeaderHeadTypes createRandomLeader(PlayerTypes ePlayer, HeroTypes
eHero);
// Sanguo Mod Hero, end

protected:
@@ -735,6 +737,7 @@
std::vector<int*> m_ppaiHeroPromotionStatus;
CvHeroMap m_mapHeroes;
std::vector<CvHeroInfo*> m_paNewHeroes;
+ std::vector<CvLeaderHeadInfo*> m_paNewLeaders;
// Sanguo Mod Hero, end

// CACHE: cache frequently used values
=======================================
--- /trunk/The History of Three Kingdoms/CvGameCoreDLL/CvInfos.cpp Sat Sep
19 05:22:49 2009
+++ /trunk/The History of Three Kingdoms/CvGameCoreDLL/CvInfos.cpp Sun Sep
20 04:03:41 2009
@@ -10334,6 +10334,31 @@
{
m_iDerivativeCiv = iCiv;
}
+
+// Sanguo Mod random hero, start, by poyuzhe 09.19.09
+void CvCivilizationInfo::pushNewLeader(int i)
+{
+ std::vector<bool> aTempList;
+ int iCount = 0;
+ for (int iI = 0; iI < GC.getNumLeaderHeadInfos() - 1; iI++)
+ {
+ aTempList.push_back(m_piLeaders[iI]);
+ if (m_piLeaders[iI] > 0)
+ {
+ iCount++;
+ }
+ }
+ SAFE_DELETE_ARRAY(m_piLeaders);
+ m_piLeaders = new int[GC.getNumLeaderHeadInfos()];
+ for (int iI = 0; iI < GC.getNumLeaderHeadInfos() - 1; iI++)
+ {
+ m_piLeaders[iI] = aTempList[iI];
+ }
+ m_piLeaders[i] = iCount + 1;
+ aTempList.clear();
+}
+
+// Sanguo Mod random hero, end

void CvCivilizationInfo::read(FDataStreamBase* stream)
{
@@ -14843,6 +14868,8 @@
// Sanguo Mod Hero, end
// Sanguo Mod start, trade prisoner, by poyuzhe 09.11.09
m_iReleaseHeroRefuseAttitudeThreshold(NO_ATTITUDE),
+// random leader, 09.20.09
+m_bRandom(false),
// Sanguo Mod end
m_pbTraits(NULL),
m_piFlavorValue(NULL),
@@ -14886,16 +14913,25 @@

const TCHAR* CvLeaderHeadInfo::getButton() const
{
- const CvArtInfoLeaderhead * pLeaderheadArtInfo;
- pLeaderheadArtInfo = getArtInfo();
- if (pLeaderheadArtInfo != NULL)
- {
- return pLeaderheadArtInfo->getButton();
- }
- else
- {
- return NULL;
- }
+ // Sanguo Mod random leader, start, by poyuzhe 09.20.09
+ if (!isRandom())
+ {
+ const CvArtInfoLeaderhead * pLeaderheadArtInfo;
+ pLeaderheadArtInfo = getArtInfo();
+ if (pLeaderheadArtInfo != NULL)
+ {
+ return pLeaderheadArtInfo->getButton();
+ }
+ else
+ {
+ return NULL;
+ }
+ }
+ else
+ {
+ return m_szButton;
+ }
+ // Sanguo Mod random leader, end
}

int CvLeaderHeadInfo::getWonderConstructRand() const
@@ -15292,7 +15328,7 @@

const TCHAR* CvLeaderHeadInfo::getArtDefineTag() const
{
- return m_szArtDefineTag;
+ return m_szArtDefineTag;
}

void CvLeaderHeadInfo::setArtDefineTag(const TCHAR* szVal)
@@ -15317,6 +15353,70 @@
{
return m_iReleaseHeroRefuseAttitudeThreshold;
}
+
+// random leader, 09.20.09
+bool CvLeaderHeadInfo::isRandom() const
+{
+ return m_bRandom;
+}
+
+void CvLeaderHeadInfo::setRandom(bool bNewValue)
+{
+ m_bRandom = bNewValue;
+}
+
+void CvLeaderHeadInfo::setType(const TCHAR* szType)
+{
+ m_szType = szType;
+}
+
+void CvLeaderHeadInfo::setButton(const TCHAR* szButton)
+{
+ m_szButton = szButton;
+}
+
+void CvLeaderHeadInfo::setText(const wchar* szText)
+{
+ m_szTextKey = szText;
+}
+
+void CvLeaderHeadInfo::setCivilopedia(const wchar* szCivilopedia)
+{
+ m_szCivilopediaKey = szCivilopedia;
+}
+
+void CvLeaderHeadInfo::setStrategy(const wchar* szStrategy)
+{
+ m_szStrategyKey = szStrategy;
+}
+
+void CvLeaderHeadInfo::setLeaderHead(const TCHAR* szLeaderHead)
+{
+ m_szPortrait = szLeaderHead;
+}
+
+void CvLeaderHeadInfo::setFavoriteReligion(int i)
+{
+ m_iFavoriteReligion = i;
+}
+
+void CvLeaderHeadInfo::setHasTrait(int i, bool bNewValue)
+{
+ if (m_pbTraits)
+ {
+ m_pbTraits[i] = bNewValue;
+ }
+ else
+ {
+ m_pbTraits = new bool[GC.getNumTraitInfos()];
+ for (int iI = 0; iI < GC.getNumTraitInfos(); iI++)
+ {
+ m_pbTraits[iI] = false;
+ }
+ m_pbTraits[i] = bNewValue;
+ }
+}
+
// Sanguo Mod end

// Arrays
@@ -15414,7 +15514,10 @@

const TCHAR* CvLeaderHeadInfo::getLeaderHead() const
{
- const CvArtInfoLeaderhead * pLeaderheadArtInfo;
+ // Sanguo Mod random leader, start, by poyuzhe 09.20.09
+ if (!isRandom())
+ {
+ const CvArtInfoLeaderhead * pLeaderheadArtInfo;
pLeaderheadArtInfo = getArtInfo();
if (pLeaderheadArtInfo != NULL)
{
@@ -15424,6 +15527,12 @@
{
return NULL;
}
+ }
+ else
+ {
+ return m_szPortrait;
+ }
+ // Sanguo Mod random leader, end
}

void CvLeaderHeadInfo::read(FDataStreamBase* stream)
@@ -15698,7 +15807,18 @@

const CvArtInfoLeaderhead* CvLeaderHeadInfo::getArtInfo() const
{
- return ARTFILEMGR.getLeaderheadArtInfo( getArtDefineTag());
+ // Sanguo Mod random leader, start, by poyuzhe 09.20.09
+ if (!isRandom())
+ {
+ return ARTFILEMGR.getLeaderheadArtInfo( getArtDefineTag());
+ }
+ else
+ {
+ CvArtInfoLeaderhead* pArtInfo = new CvArtInfoLeaderhead;
+ pArtInfo->setNIF(m_szPortrait);
+ return pArtInfo;
+ }
+ // Sanguo Mod random leader, end
}

bool CvLeaderHeadInfo::read(CvXMLLoadUtility* pXML)
@@ -20784,6 +20904,34 @@
FAssertMsg(j > -1, "Index out of bounds");
return m_pResponses[i].m_paszDiplomacyText[j];
}
+
+// Sanguo Mod random leader, start, by poyuzhe 09.20.09
+void CvDiplomacyTextInfo::Response::reInitLeaderHead()
+{
+ std::vector<bool> aTempList;
+ for (int iI = 0; iI < GC.getNumLeaderHeadInfos(); iI++)
+ {
+ if(!GC.getLeaderHeadInfo((LeaderHeadTypes)iI).isRandom())
+ {
+ aTempList.push_back(m_pbLeaderHeadTypes[iI]);
+ }
+ }
+ SAFE_DELETE_ARRAY(m_pbLeaderHeadTypes);
+ m_pbLeaderHeadTypes = new bool[GC.getNumLeaderHeadInfos()];
+ for (int iI = 0; iI < GC.getNumLeaderHeadInfos(); iI++)
+ {
+ if((int)aTempList.size() > iI)
+ {
+ m_pbLeaderHeadTypes[iI] = aTempList[iI];
+ }
+ else
+ {
+ m_pbLeaderHeadTypes[iI] = false;
+ }
+ }
+ aTempList.clear();
+}
+// Sanguo Mod random leader, end

void CvDiplomacyTextInfo::Response::read(FDataStreamBase* stream)
{
@@ -20815,6 +20963,9 @@
stream->Write(m_iNumDiplomacyText);

stream->Write(GC.getNumCivilizationInfos(), m_pbCivilizationTypes);
+ // Sanguo Mod random leader, start, by poyuzhe 09.20.09
+ reInitLeaderHead();
+ // Sanguo Mod random leader, end
stream->Write(GC.getNumLeaderHeadInfos(), m_pbLeaderHeadTypes);
stream->Write(NUM_ATTITUDE_TYPES, m_pbAttitudeTypes);
stream->Write(NUM_DIPLOMACYPOWER_TYPES, m_pbDiplomacyPowerTypes);
@@ -24932,6 +25083,11 @@
{
FAssertMsg(i < GC.getNumLeaderRelationInfos(), "Index out of bounds");
FAssertMsg(i > -1, "Index out of bounds");
+ // random leader exception
+ if (GC.getLeaderHeadInfo((LeaderHeadTypes)i).isRandom())
+ {
+ return 0;
+ }
return m_paiLeaderAttitudeChange ? m_paiLeaderAttitudeChange[i] : -1;
}

@@ -25050,6 +25206,11 @@
{
return m_iLeaderType;
}
+
+void CvHeroInfo::setLeaderType(int i)
+{
+ m_iLeaderType = i;
+}

int CvHeroInfo::getStartingYear() const
{
=======================================
--- /trunk/The History of Three Kingdoms/CvGameCoreDLL/CvInfos.h Sat Sep 19
05:22:49 2009
+++ /trunk/The History of Three Kingdoms/CvGameCoreDLL/CvInfos.h Sun Sep 20
04:03:41 2009
@@ -2416,6 +2416,10 @@
int getDefaultHeroUnitType() const;
// Sanguo Mod Hero, end

+ // Sanguo Mod random hero, start, by poyuzhe 09.19.09
+ void pushNewLeader(int i);
+ // Sanguo Mod random hero, end
+
DllExport bool isCivilizationFreeBuildingClass(int i) const; //
Exposed to Python
DllExport bool isCivilizationFreeTechs(int i) const; // Exposed to
Python
DllExport bool isCivilizationDisableTechs(int i) const; // Exposed to
Python
@@ -3843,6 +3847,19 @@
int getReleaseHeroRefuseAttitudeThreshold() const;
// Sanguo Mod end

+ // Sanguo Mod random leader, start, by poyuzhe 09.20.09
+ bool isRandom() const;
+ void setRandom(bool bNewValue);
+ void setType(const TCHAR* szType);
+ void setButton(const TCHAR* szButton);
+ void setText(const wchar* szText);
+ void setCivilopedia(const wchar* szCivilopedia);
+ void setStrategy(const wchar* szStrategy);
+ void setLeaderHead(const TCHAR* szLeaderHead);
+ void setFavoriteReligion(int i);
+ void setHasTrait(int i, bool bNewValue);
+ // Sanguo Mod random leader, end
+
// Arrays

bool hasTrait(int i) const; // Exposed to Python
@@ -3962,6 +3979,8 @@

// Sanguo Mod start, trade prisoner, by poyuzhe 09.11.09
int m_iReleaseHeroRefuseAttitudeThreshold;
+ bool m_bRandom;
+ CvString m_szPortrait;
// Sanguo Mod end

// Arrays
@@ -5900,6 +5919,10 @@
SAFE_DELETE_ARRAY(m_pbDiplomacyPowerTypes);
SAFE_DELETE_ARRAY(m_paszDiplomacyText);
}
+
+ // Sanguo Mod random leader, start, by poyuzhe 09.20.09
+ void reInitLeaderHead();
+ // Sanguo Mod random leader, end

void read(FDataStreamBase* stream);
void write(FDataStreamBase* stream);
@@ -6951,6 +6974,7 @@
int getUnitType() const;
void setUnitType(int i);
int getLeaderType() const;
+ void setLeaderType(int i);
int getStartingYear() const;
void setStartingYear(int i);
int getBelief() const;
=======================================
--- /trunk/The History of Three Kingdoms/CvGameCoreDLL/CvPlayer.cpp Sat Sep
19 05:22:49 2009
+++ /trunk/The History of Three Kingdoms/CvGameCoreDLL/CvPlayer.cpp Sun Sep
20 04:03:41 2009
@@ -343,7 +343,7 @@
// Sanguo Mod Official Belief, start, by poyuzhe 12.01.08
for (iI = 0; iI < GC.getNumLeaderRelationInfos(); iI++)
{
- if
((LeaderHeadTypes)(GC.getLeaderRelationInfo((LeaderRelationTypes)iI).getLeaderType())
== getPersonalityType())
+ if
((LeaderHeadTypes)(GC.getLeaderRelationInfo((LeaderRelationTypes)iI).getLeaderType())
== getLeaderType())
{
for (int iJ = 0; iJ < GC.getNumLeaderHeadInfos(); iJ++)
{
@@ -1359,7 +1359,10 @@
int iBestValue;
int iI, iJ;

- if (GC.getGameINLINE().isOption(GAMEOPTION_RANDOM_PERSONALITIES))
+ // Sanguo Mod random leader, start, by poyuzhe 09.20.09
+ //if (GC.getGameINLINE().isOption(GAMEOPTION_RANDOM_PERSONALITIES))
+ if (GC.getGameINLINE().isOption(GAMEOPTION_RANDOM_PERSONALITIES) ||
GC.getLeaderHeadInfo(getLeaderType()).isRandom())
+ // Sanguo Mod random leader, end
{
if (!isBarbarian())
{
@@ -1368,8 +1371,11 @@

for (iI = 0; iI < GC.getNumLeaderHeadInfos(); iI++)
{
- if (iI != GC.getDefineINT("BARBARIAN_LEADER")) // XXX minor civ???
- {
+ // Sanguo Mod random leader, start, by poyuzhe 09.20.09
+ //if (iI != GC.getDefineINT("BARBARIAN_LEADER")) // XXX
minor civ???
+ if (iI != GC.getDefineINT("BARBARIAN_LEADER")
&& !GC.getLeaderHeadInfo((LeaderHeadTypes)iI).isRandom())
+ // Sanguo Mod random leader, end
+ {
iValue = (1 + GC.getGameINLINE().getSorenRandNum(10000, "Choosing
Personality"));

for (iJ = 0; iJ < MAX_CIV_PLAYERS; iJ++)
=======================================
--- /trunk/The History of Three Kingdoms/CvGameCoreDLL/CvUnit.cpp Sat Sep
19 05:22:49 2009
+++ /trunk/The History of Three Kingdoms/CvGameCoreDLL/CvUnit.cpp Sun Sep
20 04:03:41 2009
@@ -18153,6 +18153,60 @@
}
}
}
+
+ if (eNewLeader == NO_LEADER)
+ {
+ HeroTypes eBestHero = NO_HERO;
+ int iValue = 0;
+ int iBestValue = 0;
+ for (int iI = 0; iI < GC.getNumHeroInfos(); iI++)
+ {
+ if (GC.getGameINLINE().getHeroDebutStatus((HeroTypes)iI)
== getOwnerINLINE())
+ {
+ if
(GC.getGameINLINE().getHeroCapturePlayer((HeroTypes)iI) == NO_PLAYER)
+ {
+ if (GC.getHeroInfo((HeroTypes)iI).getLeaderType()
== NO_LEADER)
+ {
+ iValue =
GC.getGameINLINE().getHeroLevel((HeroTypes)iI) * 10;
+ iValue *= 100 +
GC.getHeroInfo((HeroTypes)iI).getCivilizationLoyalty(getOwnerINLINE());
+ iValue /= 100;
+ if (iValue > iBestValue)
+ {
+ iBestValue = iValue;
+ eBestHero = (HeroTypes)iI;
+ }
+ }
+ }
+ }
+ }
+
+ if (eBestHero != NO_HERO)
+ {
+ eNewLeader =
GC.getGameINLINE().createRandomLeader(getOwnerINLINE(), eBestHero);
+ }
+ }
+
+ if (eNewLeader == NO_LEADER)
+ {
+ CvCity* pCity = GET_PLAYER(getOwnerINLINE()).getCapitalCity();
+ int iX, iY;
+
+ if (pCity != NULL)
+ {
+ iX = pCity->getX_INLINE();
+ iY = pCity->getY_INLINE();
+ }
+ else //HoTK ToDo: this may cause problem when the new hero is
born on a very dangerous plot
+ {
+ iX = getX_INLINE();
+ iY = getY_INLINE();
+ }
+
+ HeroTypes eHero =
GC.getGameINLINE().createRandomHero(getOwnerINLINE(), iX, iY);
+ eNewLeader =
GC.getGameINLINE().createRandomLeader(getOwnerINLINE(), eHero);
+ }
+
+ FAssert (eNewLeader != NO_LEADER);

if (eNewLeader != NO_LEADER)
{
@@ -18187,7 +18241,7 @@
}
}
}
- else
+ else // This code should never execute
{
GET_PLAYER(getOwnerINLINE()).changeLeader((LeaderHeadTypes)0);
int iBestValue = 0, iValue;
=======================================
--- /trunk/The History of Three Kingdoms/Documents/changelog.txt Sat Sep 19
05:22:49 2009
+++ /trunk/The History of Three Kingdoms/Documents/changelog.txt Sun Sep 20
04:03:41 2009
@@ -1023,3 +1023,5 @@
0.295: ÐÂÔöÄÚÈÝ£ºÌí¼Ó¼¯Ížüϵͳ

0.296: ÐÂÔöÄÚÈÝ£ºÑ¡Ôñ´´½¨Ëæ»úÓ¢ÐÛʱÌṩ²¿·Ö¶¨ÖÆÑ¡Ïî
+
+0.297:
ÐÂÔöÄÚÈÝ£ºÁìÐä¸üÌæʱÈôÎÞÈË¿ÉÌæÔò´ÓÊÆÁ¦Î佫ÖÐÑ¡Ôñ£¬Ã»ÓÐÎ佫Ôò×Ô¶¯Éú³ÉËæ»úÓ¢ÐÛ×÷ΪÁìÐä
=======================================
--- /trunk/The History of Three Kingdoms/Documents/changelog_en.txt Sat Sep
19 05:22:49 2009
+++ /trunk/The History of Three Kingdoms/Documents/changelog_en.txt Sun Sep
20 04:03:41 2009
@@ -1,3 +1,5 @@
+0.297: New Content: when changing leader, if no available leaders, then
choose from faction heroes, if no heroes too, then create a new random hero
and set as leader
+
0.296: New Content: add customization options when creating random hero

0.295: New Content: add Army system
Reply all
Reply to author
Forward
0 new messages