[sanguoforciv4] r349 committed - 0.304: 修正：修正英雄自然死亡的一处Bug...

[codesite...@google.com]

Revision: 349
Author: TongShen.Martin
Date: Fri Oct 2 09:08:25 2009
Log: 0.304: 修正：修正英雄自然死亡的一处Bug
修正解救英雄后状态依然为俘虏的Bug
修正游戏选项和解救英雄的丢失文字

0.304: fix: fix a bug about hero natural death
fix a bug when rescued own hero the hero is still judged as imprisoned
fix missing text with one game option and rescue hero
http://code.google.com/p/sanguoforciv4/source/detail?r=349

Modified:
/trunk/The History of Three Kingdoms/Assets/XML/Sanguo/CIV4HeroInfos.xml
/trunk/The History of Three
Kingdoms/Assets/XML/Text/CIV4GameText_Sanguo_Hero.xml
/trunk/The History of Three
Kingdoms/Assets/XML/Text/CIV4GameText_Sanguo_New.xml
/trunk/The History of Three Kingdoms/CvGameCoreDLL/CvGame.cpp
/trunk/The History of Three Kingdoms/CvGameCoreDLL/CvPlayer.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/Sanguo/CIV4HeroInfos.xml Mon Sep 21 20:53:44 2009
+++ /trunk/The History of Three
Kingdoms/Assets/XML/Sanguo/CIV4HeroInfos.xml Fri Oct 2 09:08:25 2009
@@ -3601,6 +3601,7 @@
<SurrenderType>SURRENDER_NORMAL</SurrenderType>
<iLeadership>70</iLeadership>
<iMight>60</iMight>
+ <MurdererCiv>CIVILIZATION_YUAN_SHU</MurdererCiv>
</HeroInfo>
<HeroInfo>
<Type>HERO_PANG_XI</Type>
@@ -4041,6 +4042,7 @@
<SurrenderType>SURRENDER_NORMAL</SurrenderType>
<iLeadership>80</iLeadership>
<iMight>80</iMight>
+ <MurdererCiv>CIVILIZATION_BARBARIAN</MurdererCiv>
</HeroInfo>
<HeroInfo>
<Type>HERO_ZHANG_XIU</Type>
=======================================
--- /trunk/The History of Three
Kingdoms/Assets/XML/Text/CIV4GameText_Sanguo_Hero.xml Tue Sep 29 23:51:43
2009
+++ /trunk/The History of Three
Kingdoms/Assets/XML/Text/CIV4GameText_Sanguo_Hero.xml Fri Oct 2 09:08:25
2009
Binary file, no diff available.
=======================================
--- /trunk/The History of Three
Kingdoms/Assets/XML/Text/CIV4GameText_Sanguo_New.xml Tue Sep 29 23:51:43
2009
+++ /trunk/The History of Three
Kingdoms/Assets/XML/Text/CIV4GameText_Sanguo_New.xml Fri Oct 2 09:08:25
2009
Binary file, no diff available.
=======================================
--- /trunk/The History of Three Kingdoms/CvGameCoreDLL/CvGame.cpp Tue Sep
29 23:51:43 2009
+++ /trunk/The History of Three Kingdoms/CvGameCoreDLL/CvGame.cpp Fri Oct
2 09:08:25 2009
@@ -12259,7 +12259,7 @@
CvUnit* pHeroUnit =
GET_PLAYER(ePlayer).getUnit(getHeroUnitID(eHero));
if (pHeroUnit->isCoreTroop())
{
- pHeroUnit = pHeroUnit->dismissLegion(true);
+ pHeroUnit = pHeroUnit->dismissLegion(!bKillUnit);
if (bKillUnit && pHeroUnit != NULL)
{
pHeroUnit->kill(false);
=======================================
--- /trunk/The History of Three Kingdoms/CvGameCoreDLL/CvPlayer.cpp Tue Sep
29 23:51:43 2009
+++ /trunk/The History of Three Kingdoms/CvGameCoreDLL/CvPlayer.cpp Fri
Oct 2 09:08:25 2009
@@ -4083,10 +4083,12 @@
int iX, iY;
GET_PLAYER(ePlayer).findXY(&iX, &iY);
GET_PLAYER(ePlayer).initHero(eHero, iX, iY, true);
+ GC.getGameINLINE().setHeroCapturePlayer(eHero, NO_PLAYER);
CvWString szBuffer = gDLL->getText("TXT_KEY_HERO_FREED",
GC.getHeroInfo(eHero).getDescription());
gDLL->getInterfaceIFace()->addMessage(ePlayer, false,
GC.getEVENT_MESSAGE_TIME(), szBuffer, "AS2D_POSITIVE_DINK",
MESSAGE_TYPE_INFO, GC.getHeroInfo(eHero).getButton(),
(ColorTypes)GC.getInfoTypeForString("COLOR_GREEN"), iX, iY, true, true);
if (isAlive())
{
+ szBuffer = gDLL->getText("TXT_KEY_HERO_BEEN_FREED",
GET_PLAYER(ePlayer).getCivilizationDescription(),
GC.getHeroInfo(eHero).getDescription());
gDLL->getInterfaceIFace()->addMessage(getID(), false,
GC.getEVENT_MESSAGE_TIME(), szBuffer, "AS2D_NEGATIVE_DINK",
MESSAGE_TYPE_INFO, GC.getHeroInfo(eHero).getButton(),
(ColorTypes)GC.getInfoTypeForString("COLOR_RED"), iX, iY, true, true);
}
}
=======================================
--- /trunk/The History of Three Kingdoms/Documents/changelog.txt Tue Sep 29
23:51:43 2009
+++ /trunk/The History of Three Kingdoms/Documents/changelog.txt Fri Oct 2
09:08:25 2009
@@ -1084,3 +1084,7 @@
ÏÔʾµ¤Ñô±ø½ø¹¥Ë®¾üµÄʤÂÊ
µØͼ£ºµ÷ÕûÁ˵Øͼ²¿·ÖÊÆÁ¦·Çʷʵ³õʼ±øÁ¦µÄ²ÎÊý
¹æÔòµ÷Õû£ºÌí¼ÓÁ˼¸¸öÓÎÏ·Ñ¡Ïî
+
+0.304: ÐÞÕý£ºÐÞÕýÓ¢ÐÛ×ÔÈ»ËÀÍöµÄÒ»´¦Bug
+ ÐÞÕý½â¾ÈÓ¢ÐÛºó״̬ÒÀȻΪ·ý²µÄBug
+ ÐÞÕýÓÎÏ·Ñ¡ÏîºÍ½â¾ÈÓ¢Ð۵ĶªÊ§ÎÄ×Ö
=======================================
--- /trunk/The History of Three Kingdoms/Documents/changelog_en.txt Tue Sep
29 23:51:43 2009
+++ /trunk/The History of Three Kingdoms/Documents/changelog_en.txt Fri
Oct 2 09:08:25 2009
@@ -1,3 +1,7 @@
+0.304: fix: fix a bug about hero natural death
+ fix a bug when rescued own hero the hero is still judged as imprisoned
+ fix missing text with one game option and rescue hero
+
0.303: fix: fix various small bugs
fix a few bugs in Army system
fix missing diplomacy text