[sanguoforciv4] r347 committed - 0.302: 修正：修正“劝降”按钮不隐藏的Bug...

[codesite...@google.com]

Revision: 347
Author: TongShen.Martin
Date: Sun Sep 27 18:36:06 2009
Log: 0.302: 修正：修正“劝降”按钮不隐藏的Bug
修正“widget already registered”信息
新增内容：增加部分弹出式帮助文字
图像：增加兵科晋升按钮和单位军团状态图标（koap）

0.302: fix: fix a bug that the persuade button will not disappear
fix widget already registered message
new content: add several advisor help popups when player has accomplished
certain actions (koap)
art: add 'increase unit combat level' promotion button and unit legion
status overlays
http://code.google.com/p/sanguoforciv4/source/detail?r=347

Added:
/trunk/The History of Three
Kingdoms/Assets/Art/interface/Heroes/intelligence.dds
/trunk/The History of Three
Kingdoms/Assets/Art/interface/Heroes/leadership.dds
/trunk/The History of Three
Kingdoms/Assets/Art/interface/Heroes/medallion_canmove_core.dds
/trunk/The History of Three
Kingdoms/Assets/Art/interface/Heroes/medallion_canmove_guardian.dds
/trunk/The History of Three
Kingdoms/Assets/Art/interface/Heroes/medallion_canmove_inj_core.dds
/trunk/The History of Three
Kingdoms/Assets/Art/interface/Heroes/medallion_canmove_inj_guardian.dds
/trunk/The History of Three
Kingdoms/Assets/Art/interface/Heroes/medallion_canmove_inj_marshal.dds
/trunk/The History of Three
Kingdoms/Assets/Art/interface/Heroes/medallion_canmove_inj_normal.dds
/trunk/The History of Three
Kingdoms/Assets/Art/interface/Heroes/medallion_canmove_marshal.dds
/trunk/The History of Three
Kingdoms/Assets/Art/interface/Heroes/medallion_canmove_normal.dds
/trunk/The History of Three
Kingdoms/Assets/Art/interface/Heroes/medallion_cantmove_core.dds
/trunk/The History of Three
Kingdoms/Assets/Art/interface/Heroes/medallion_cantmove_guardian.dds
/trunk/The History of Three
Kingdoms/Assets/Art/interface/Heroes/medallion_cantmove_inj_core.dds
/trunk/The History of Three
Kingdoms/Assets/Art/interface/Heroes/medallion_cantmove_inj_guardian.dds
/trunk/The History of Three
Kingdoms/Assets/Art/interface/Heroes/medallion_cantmove_inj_marshal.dds
/trunk/The History of Three
Kingdoms/Assets/Art/interface/Heroes/medallion_cantmove_inj_normal.dds
/trunk/The History of Three
Kingdoms/Assets/Art/interface/Heroes/medallion_cantmove_marshal.dds
/trunk/The History of Three
Kingdoms/Assets/Art/interface/Heroes/medallion_cantmove_normal.dds
/trunk/The History of Three
Kingdoms/Assets/Art/interface/Heroes/medallion_fortify_core.dds
/trunk/The History of Three
Kingdoms/Assets/Art/interface/Heroes/medallion_fortify_guardian.dds
/trunk/The History of Three
Kingdoms/Assets/Art/interface/Heroes/medallion_fortify_inj_core.dds
/trunk/The History of Three
Kingdoms/Assets/Art/interface/Heroes/medallion_fortify_inj_guardian.dds
/trunk/The History of Three
Kingdoms/Assets/Art/interface/Heroes/medallion_fortify_inj_marshal.dds
/trunk/The History of Three
Kingdoms/Assets/Art/interface/Heroes/medallion_fortify_inj_normal.dds
/trunk/The History of Three
Kingdoms/Assets/Art/interface/Heroes/medallion_fortify_marshal.dds
/trunk/The History of Three
Kingdoms/Assets/Art/interface/Heroes/medallion_fortify_normal.dds
/trunk/The History of Three
Kingdoms/Assets/Art/interface/Heroes/medallion_hasmoved_core.dds
/trunk/The History of Three
Kingdoms/Assets/Art/interface/Heroes/medallion_hasmoved_guardian.dds
/trunk/The History of Three
Kingdoms/Assets/Art/interface/Heroes/medallion_hasmoved_inj_core.dds
/trunk/The History of Three
Kingdoms/Assets/Art/interface/Heroes/medallion_hasmoved_inj_guardian.dds
/trunk/The History of Three
Kingdoms/Assets/Art/interface/Heroes/medallion_hasmoved_inj_marshal.dds
/trunk/The History of Three
Kingdoms/Assets/Art/interface/Heroes/medallion_hasmoved_inj_normal.dds
/trunk/The History of Three
Kingdoms/Assets/Art/interface/Heroes/medallion_hasmoved_marshal.dds
/trunk/The History of Three
Kingdoms/Assets/Art/interface/Heroes/medallion_hasmoved_normal.dds
/trunk/The History of Three Kingdoms/Assets/Art/interface/Heroes/might.dds
/trunk/The History of Three
Kingdoms/Assets/Art/interface/Heroes/politics.dds
/trunk/The History of Three
Kingdoms/Assets/Art/interface/buttons/Promotions/Unit Combat Level.dds
Modified:
/trunk/The History of Three Kingdoms/Assets/Python/BUG/WidgetUtil.py
/trunk/The History of Three Kingdoms/Assets/Python/CvAdvisorUtils.py
/trunk/The History of Three Kingdoms/Assets/Python/CvSanguoEventManager.py
/trunk/The History of Three
Kingdoms/Assets/Python/EntryPoints/CvSanguoInterface.py
/trunk/The History of Three
Kingdoms/Assets/Python/EntryPoints/CvScreensInterface.py
/trunk/The History of Three Kingdoms/Assets/Python/Screens/CvHeroAdvisor.py
/trunk/The History of Three
Kingdoms/Assets/Python/Screens/CvMainInterface.py
/trunk/The History of Three Kingdoms/Assets/Python/pyWB/CvWBDesc.py
/trunk/The History of Three
Kingdoms/Assets/XML/Art/CIV4ArtDefines_Interface.xml
/trunk/The History of Three
Kingdoms/Assets/XML/Sanguo/Civ4SurrenderInfos.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_New.xml
/trunk/The History of Three
Kingdoms/Assets/XML/Units/CIV4PromotionInfos.xml
/trunk/The History of Three Kingdoms/CvGameCoreDLL/CvCity.cpp
/trunk/The History of Three Kingdoms/CvGameCoreDLL/CvEnums.h
/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/CvPlayer.cpp
/trunk/The History of Three Kingdoms/CvGameCoreDLL/CvPlayer.h
/trunk/The History of Three Kingdoms/CvGameCoreDLL/CvPlayerAI.cpp
/trunk/The History of Three Kingdoms/CvGameCoreDLL/CvSelectionGroup.cpp
/trunk/The History of Three Kingdoms/CvGameCoreDLL/CvTeamAI.cpp
/trunk/The History of Three Kingdoms/CvGameCoreDLL/CvUnit.cpp
/trunk/The History of Three Kingdoms/CvGameCoreDLL/CvUnitAI.cpp
/trunk/The History of Three Kingdoms/CvGameCoreDLL/CyEnumsInterface.cpp
/trunk/The History of Three Kingdoms/CvGameCoreDLL/CyGame.cpp
/trunk/The History of Three Kingdoms/CvGameCoreDLL/CyGame.h
/trunk/The History of Three Kingdoms/CvGameCoreDLL/CyGameInterface.cpp
/trunk/The History of Three Kingdoms/CvGameCoreDLL/CyPlayer.cpp
/trunk/The History of Three Kingdoms/CvGameCoreDLL/CyPlayer.h
/trunk/The History of Three Kingdoms/CvGameCoreDLL/CyPlayerInterface2.cpp
/trunk/The History of Three Kingdoms/Documents/changelog.txt
/trunk/The History of Three Kingdoms/Documents/changelog_en.txt

=======================================
--- /dev/null
+++ /trunk/The History of Three
Kingdoms/Assets/Art/interface/Heroes/intelligence.dds Sun Sep 27 18:36:06
2009
Binary file, no diff available.
=======================================
--- /dev/null
+++ /trunk/The History of Three
Kingdoms/Assets/Art/interface/Heroes/leadership.dds Sun Sep 27 18:36:06 2009
Binary file, no diff available.
=======================================
--- /dev/null
+++ /trunk/The History of Three
Kingdoms/Assets/Art/interface/Heroes/medallion_canmove_core.dds Sun Sep 27
18:36:06 2009
@@ -0,0 +1,6 @@
+DDS |

DXT3 ! ¨WVV 0 Ћ6? UÕ•

+ Å ? UWVT ! *Õ•• ¤«Rþf'? UU«
+ ô ùªþÿÿŠO 5%
+ O Ÿ ï»ÿÿ„' \X  »Jï&A ? UUêxÞþþÿúÿôÿzt_ ëUUÿÿÿÿÿÿÿÿÒ A UVÔ¶ÿÿÿÿÿÿÿÿ î  êjêïíÿïÿ¯ÿOø[8 `^UU€ÿ û   ] U• ×ÿÿÿÿÿÿ¤ýB 4 `\WUÿÿÿÿÿïßJÂ
+3 %ÕUÿ ¿
+ ( Z UVT×
=======================================
--- /dev/null
+++ /trunk/The History of Three
Kingdoms/Assets/Art/interface/Heroes/medallion_canmove_guardian.dds Sun Sep
27 18:36:06 2009
@@ -0,0 +1,8 @@
+DDS |

DXT3 € û€ÿ Œ= U ¤ýÿÿÿÿÿÿ:
+Ÿ ¨ž ßJÿÿÿÿÿÿ3f êþVT ¿ ÿ ßZ> UT[eôÿúÿýÿÿÿß@k?*
+ÿZÿÿÿÿÿÿÿÿŠO 5%
+ ÿÿÿÿÿÿÿÿ„' \X  ÿOÿ¯ÿßÿÿˆ
+; ÕÕÀpÿÿýÿúÿôÿ—;
+^VWÿÿÿÿÿÿÿÿB
+ âÿÿÿÿÿÿÿÿ  jjêÿÿÿßÿ¯ÿOë* ÔÕ•Õ€ÿ û   L4= ]µ Õÿÿÿÿÿÿ¤ý" `\W ÿÿÿÿÿïßJ¢ 4 %Õýÿ ¿
+ ¦3: e^TW
=======================================
--- /dev/null
+++ /trunk/The History of Three
Kingdoms/Assets/Art/interface/Heroes/medallion_canmove_inj_core.dds Sun Sep
27 18:36:06 2009
@@ -0,0 +1,9 @@
+DDS |

DXT3 ! ¨WVV 0 д: ÿÕ•

+ 0 ÿWVT ! *Õ•• ¤«Rþq" WW ô ùªþÿÿïS? 5%
+ O Ÿ ï»ÿÿ¬" \X »Jï&- ÕÕàøÞþþÿúÿôÿ
+|> €ªUUÿÿÿÿÿÿÿÿÊ ªáúÿÿÿÿÿÿÿÿ#
+´  ªjêïíÿïÿ¯ÿO
+[7 BZUU€ÿ û  
+ Ö ¨ÿÿÿÿÿÿ¤ý§ 3 x^UUÿÿÿÿÿïßJç 3 5ÕUÿ ¿
+
+ •—Ö*
=======================================
--- /dev/null
+++ /trunk/The History of Three
Kingdoms/Assets/Art/interface/Heroes/medallion_canmove_inj_guardian.dds Sun
Sep 27 18:36:06 2009
@@ -0,0 +1,6 @@
+DDS |

DXT3 € û€ÿ Œ= U ¤ýÿÿÿÿÿÿ Œ}  Þ•ßJÿÿÿÿÿÿý{|
Àª×W ¿ ÿ ßZ> UT[eôÿúÿýÿÿÿºk¹ bx¨¾ÿÿÿÿÿÿÿÿïS? 5%
+ ÿÿÿÿÿÿÿÿ¬" \X ÿOÿ¯ÿßÿÿ/" •  øÿÿýÿúÿôÿ
+:
+ ˜\TVÿÿÿÿÿÿÿÿÉ ï ©áúÿÿÿÿÿÿÿÿ!
+´ ¨jjêÿÿÿßÿ¯ÿOï9 ו •€ÿ û   4:< Qå Uÿÿÿÿÿÿ¤ý " `\WâÿÿÿÿÿïßJê 4 5Õ‹ÿ ¿
+ í1: ESTU
=======================================
--- /dev/null
+++ /trunk/The History of Three
Kingdoms/Assets/Art/interface/Heroes/medallion_canmove_inj_marshal.dds Sun
Sep 27 18:36:06 2009
Binary file, no diff available.
=======================================
--- /dev/null
+++ /trunk/The History of Three
Kingdoms/Assets/Art/interface/Heroes/medallion_canmove_inj_normal.dds Sun
Sep 27 18:36:06 2009
@@ -0,0 +1,15 @@
+DDS |

DXT3 0 â–t
+ UUµ% 33ÿÿÔt
+ UUª 33ÿÿsl
+ UUª€
+ í
+ UUVT â â á ÁëC= %µµÕÿÿÿÿÿÿÿÿn;I
+¨WUUÿÿÿÿÿÿÿÿ#Ç À
+
+ 
+ TTTVîþþÿúÿôÿÝs> €ªUUÿÿÿÿÿÿÿÿ(
+X ­ÿÿÿÿÿÿÿÿ
+, Ààx^îîÿïÿ¯ÿO½s b^UU€ÿ û €
+ ¸p@ ÿÿÿÿÿÿ¤ýà %Õ_õÿÿÿÿÿÿßJB Xׯzÿ ¿
+ 6
+
=======================================
--- /dev/null
+++ /trunk/The History of Three
Kingdoms/Assets/Art/interface/Heroes/medallion_canmove_marshal.dds Sun Sep
27 18:36:06 2009
Binary file, no diff available.
=======================================
--- /dev/null
+++ /trunk/The History of Three
Kingdoms/Assets/Art/interface/Heroes/medallion_canmove_normal.dds Sun Sep
27 18:36:06 2009
Binary file, no diff available.
=======================================
--- /dev/null
+++ /trunk/The History of Three
Kingdoms/Assets/Art/interface/Heroes/medallion_cantmove_core.dds Sun Sep 27
18:36:06 2009
@@ -0,0 +1,5 @@
+DDS |

DXT3 ! ¨WVV 0 ЋÑ? UÕ•

+ $Ø? UWVT ! *Õ•• ¤«Rþ ñ_ UU«
+ ô ùªþÿÿIò 5%
+ O Ÿ ï»ÿÿÃø \X  »Jï&`è_ UUêxÞþþÿúÿôÿü‹> €ªUUÿÿÿÿÿÿÿÿ@ð²X ãÿÿÿÿÿÿÿÿ ÐnX€hjÊïíÿïÿ¯ÿOûr7 BZUU€ÿ û   Mp] U• ×ÿÿÿÿÿÿ¤ý!Ð4 `\WUÿÿÿÿÿïßJ À3 %ÕUÿ ¿
+ &hZ UVTW
=======================================
--- /dev/null
+++ /trunk/The History of Three
Kingdoms/Assets/Art/interface/Heroes/medallion_cantmove_guardian.dds Sun
Sep 27 18:36:06 2009
@@ -0,0 +1,5 @@
+DDS |

DXT3 € û€ÿ Œ= U ¤ýÿÿÿÿÿÿ\œU@ à^UßJÿÿÿÿÿÿx› 8À©ÖW ¿ ÿ ßZ> UT[eôÿúÿýÿÿÿƒð_JUUë
+ÿÿÿÿÿÿÿÿIú? 5%
+ ÿÿÿÿÿÿÿÿÃø \X  ÿOÿ¯ÿßÿÿ¡ð| ÕÕêxÿÿýÿúÿôÿÜI
+ ˜\TVÿÿÿÿÿÿÿÿað40 ¢ÿÿÿÿÿÿÿÿ è@ jjêÿÿÿßÿ¯ÿOÎI ו •€ÿ û   Ðy< Yå Uÿÿÿÿÿÿ¤ýAÐt `\W]ÿÿÿÿÿïßJ À’
5ÕUÿ ¿
+ «a E[TU
=======================================
--- /dev/null
+++ /trunk/The History of Three
Kingdoms/Assets/Art/interface/Heroes/medallion_cantmove_inj_core.dds Sun
Sep 27 18:36:06 2009
@@ -0,0 +1,4 @@
+DDS |

DXT3 ! ¨WVV 0 ÐÐa ÿÕ•

+ ËP? ÿWVT ! *Õ•• ¤«RþmY WW / ô ùªþÿÿŠŠ 5%
+ O Ÿ ï»ÿÿ` V^¨¨ »Jï&ÉP? ÕÕàøÞþþÿúÿôÿýƒ= ÀªUUÿÿÿÿÿÿÿÿKa"@ ü{\ÿÿÿÿÿÿÿÿB@ö( @À€ïíÿïÿ¯ÿO¾s7 c^UU€ÿ û   û( V–רÿÿÿÿÿÿ¤ý‚P4 `\WUÿÿÿÿÿïßJAH3
5ÕUÿ ¿
+ ¿ 5½
=======================================
--- /dev/null
+++ /trunk/The History of Three
Kingdoms/Assets/Art/interface/Heroes/medallion_cantmove_inj_guardian.dds
Sun Sep 27 18:36:06 2009
@@ -0,0 +1,6 @@
+DDS |

DXT3 € û€ÿ Œ= U ¤ýÿÿÿÿÿÿ~”[  ÞÕßJÿÿÿÿÿÿÿ{y À«ÕU ¿ ÿ ßZ> UT[eôÿúÿýÿÿÿÿ{Ó8cXþVÿÿÿÿÿÿÿÿŠŠ 5%
+ ÿÿÿÿÿÿÿÿ` V^¨¨ÿOÿ¯ÿßÿÿkQ • ¸Úÿÿýÿúÿôÿ
+B
+ Ø\TVÿÿÿÿÿÿÿÿeq&8 ýy^ÿÿÿÿÿÿÿÿB@4 @@€ÿÿÿßÿ¯ÿOïA ו •€ÿ û   µA
+ QÍ5Uÿÿÿÿÿÿ¤ýGQ x^WâÿÿÿÿÿïßJªQ ýõU‹ÿ ¿
+ Œ9 ES\U
=======================================
--- /dev/null
+++ /trunk/The History of Three
Kingdoms/Assets/Art/interface/Heroes/medallion_cantmove_inj_marshal.dds Sun
Sep 27 18:36:06 2009
@@ -0,0 +1,8 @@
+DDS |

DXT3 û ÿþƒ= U• ‰¤ýÿÿÿÿÿÿØ‹¾  ž5ßJÿÿÿÿÿÿùjz `«ÕV ¿ ÿ
+)
+ UT\Ëõÿúÿþÿÿÿ Zs( 0ÐXÿÿÿÿÿÿÿÿ0¬
+r
+ ‰}ÿÿÿÿÿÿÿÿK‚D@¸€\WÿOÿ¯ÿßÿÿ#i â^WUÿÿýÿúÿõÿ'‚y ß å}ÿÿÿÿÿÿÿÿç‰#0ø^UUÿÿÿÿÿÿÿÿ@0
+.^ÿÿÿßÿ¯ÿOC@ WTxà ÿ û € -
+ cõÕUÿÿÿÿÿÿ¤ýD8 % µÿÿÿÿÿÿßJ" \Ôü~ÿ ¿
+ ÃXVU
=======================================
--- /dev/null
+++ /trunk/The History of Three
Kingdoms/Assets/Art/interface/Heroes/medallion_cantmove_inj_normal.dds Sun
Sep 27 18:36:06 2009
Binary file, no diff available.
=======================================
--- /dev/null
+++ /trunk/The History of Three
Kingdoms/Assets/Art/interface/Heroes/medallion_cantmove_marshal.dds Sun Sep
27 18:36:06 2009
Binary file, no diff available.
=======================================
--- /dev/null
+++ /trunk/The History of Three
Kingdoms/Assets/Art/interface/Heroes/medallion_cantmove_normal.dds Sun Sep
27 18:36:06 2009
Binary file, no diff available.
=======================================
--- /dev/null
+++ /trunk/The History of Three
Kingdoms/Assets/Art/interface/Heroes/medallion_fortify_core.dds Sun Sep 27
18:36:06 2009
@@ -0,0 +1,5 @@
+DDS |

DXT3 ! ¨WVV 0 кµ? UÕ•

+ ™µ? UWVT ! *Õ•• ¤«Rþ9Î? UU«
+ ô ùªþÿÿšÖ 5%
+ O Ÿ ï»ÿÿYÎ \X  »Jï&öÅ? UUêxÞþþÿúÿôÿ>„^ «UUÿÿÿÿÿÿÿÿ7Î8J ƒ¡ãÿÿÿÿÿÿÿÿѽ·9 êjêïíÿïÿ¯ÿO¼{8 `^UU€ÿ û   öb] U• ×ÿÿÿÿÿÿ¤ýT­4 `\WUÿÿÿÿÿïßJÓœ3 %ÕUÿ ¿
+ B ×ÔÔ¾
=======================================
--- /dev/null
+++ /trunk/The History of Three
Kingdoms/Assets/Art/interface/Heroes/medallion_fortify_guardian.dds Sun Sep
27 18:36:06 2009
@@ -0,0 +1,4 @@
+DDS |

DXT3 € û€ÿ Œ= U ¤ýÿÿÿÿÿÿþ¤Ÿ ¨ž ßJÿÿÿÿÿÿ¼µŸ êþVT ¿ ÿ ßZ> UT[eôÿúÿýÿÿÿÛ½ÿ {^¢ ÿÿÿÿÿÿÿÿšÖ 5%
+ ÿÿÿÿÿÿÿÿYÎ \X  ÿOÿ¯ÿßÿÿöÅ ÕÕêxÿÿýÿúÿôÿ\k
+^VWÿÿÿÿÿÿÿÿ Ƹ9 âÿÿÿÿÿÿÿÿѽ·9 jjêÿÿÿßÿ¯ÿO B Ô• •€ÿ û   vs< Yµ Õÿÿÿÿÿÿ¤ý4­4 `\W ÿÿÿÿÿïßJÓœ3 %Õýÿ ¿
+ Nk: e^TW
=======================================
--- /dev/null
+++ /trunk/The History of Three
Kingdoms/Assets/Art/interface/Heroes/medallion_fortify_inj_core.dds Sun Sep
27 18:36:06 2009
@@ -0,0 +1,5 @@
+DDS |

DXT3 ! ¨WVV 0 ÐU„? UÕ•

+ ò{? UWVT ! *Õ•• ¤«Rþòœ? UU«- ô ùªþÿÿ5¥ 5%
+ O Ÿ ï»ÿÿ’Œ \X  »Jï&Sc? UUÀpÞþþÿúÿôÿý{> ªUUÿÿÿÿÿÿÿÿpŒt) ‚¡âÿÿÿÿÿÿÿÿê{U) êjêïíÿïÿ¯ÿOÝ{7 b^UU€ÿ û   ¸1
+ × ¾ÿÿÿÿÿÿ¤ý®s4 `\WUÿÿÿÿÿïßJNk3 %ÕUÿ ¿
+ Ø9 ÕÖÔ¾
=======================================
--- /dev/null
+++ /trunk/The History of Three
Kingdoms/Assets/Art/interface/Heroes/medallion_fortify_inj_guardian.dds Sun
Sep 27 18:36:06 2009
@@ -0,0 +1,8 @@
+DDS |

DXT3 € û€ÿ Œ= U ¤ýÿÿÿÿÿÿ ”  ž ßJÿÿÿÿÿÿü{_ ÀªÖT ¿ ÿ ßZ> UT[eôÿúÿýÿÿÿú{ âx
+ÿÿÿÿÿÿÿÿ5¥ 5%
+ ÿÿÿÿÿÿÿÿ’Œ \X  ÿOÿ¯ÿßÿÿ2c
+ Õ•€ðÿÿýÿúÿôÿ<B>
+\TVÿÿÿÿÿÿÿÿ Œó9 áóÿÿÿÿÿÿÿÿ
+|5! jjêÿÿÿßÿ¯ÿOð9 Ô• •€ÿ û   c
+ Y¥ Õÿÿÿÿÿÿ¤ý s `\WûÿÿÿÿÿïßJMc %Õïÿ ¿
+ ¬Z: e[TW
=======================================
--- /dev/null
+++ /trunk/The History of Three
Kingdoms/Assets/Art/interface/Heroes/medallion_fortify_inj_marshal.dds Sun
Sep 27 18:36:06 2009
Binary file, no diff available.
=======================================
--- /dev/null
+++ /trunk/The History of Three
Kingdoms/Assets/Art/interface/Heroes/medallion_fortify_inj_normal.dds Sun
Sep 27 18:36:06 2009
Binary file, no diff available.
=======================================
--- /dev/null
+++ /trunk/The History of Three
Kingdoms/Assets/Art/interface/Heroes/medallion_fortify_marshal.dds Sun Sep
27 18:36:06 2009
Binary file, no diff available.
=======================================
--- /dev/null
+++ /trunk/The History of Three
Kingdoms/Assets/Art/interface/Heroes/medallion_fortify_normal.dds Sun Sep
27 18:36:06 2009
Binary file, no diff available.
=======================================
--- /dev/null
+++ /trunk/The History of Three
Kingdoms/Assets/Art/interface/Heroes/medallion_hasmoved_core.dds Sun Sep 27
18:36:06 2009
@@ -0,0 +1,5 @@
+DDS |

DXT3 ! ¨WVV 0 Ð Ö? UÕ•

+ §Þ? UWVT ! *Õ•• ¤«Rþg÷? UU«
+ ô ùªþÿÿ‹÷ 5%
+ O Ÿ ï»ÿÿ†ÿ \X  »Jï&Cï? UUêxÞþþÿúÿôÿ÷½_ *ÿUUÿÿÿÿÿÿÿÿC÷ÒZ ãÿÿÿÿÿÿÿÿ ïðA êjêïíÿïÿ¯ÿOù{8 `^UU€ÿ û   Žs] U• ×ÿÿÿÿÿÿ¤ýCÖ4 `\WUÿÿÿÿÿïßJÃÅ3 %ÕUÿ ¿
+ *kZ UVT×
=======================================
--- /dev/null
+++ /trunk/The History of Three
Kingdoms/Assets/Art/interface/Heroes/medallion_hasmoved_guardian.dds Sun
Sep 27 18:36:06 2009
@@ -0,0 +1,3 @@
+DDS |

DXT3 € û€ÿ Œ= U ¤ýÿÿÿÿÿÿ¸Þß «ú— ßJÿÿÿÿÿÿ4Î êþVT ¿ ÿ ßZ> UT[eôÿúÿýÿÿÿl÷ß _ª ÿÿÿÿÿÿÿÿ‹÷ 5%
+ ÿÿÿÿÿÿÿÿ†ÿ \X  ÿOÿ¯ÿßÿÿŠ½; ÕÕÀpÿÿýÿúÿôÿ‘”? WWWÿÿÿÿÿÿÿÿD÷ B âÿÿÿÿÿÿÿÿ ï B jjêÿÿÿßÿ¯ÿO c ÔÕ•Õ€ÿ û   MŒ= ]µ Õÿÿÿÿÿÿ¤ý$Ö `\W ÿÿÿÿÿïßJ¤½4 %Õýÿ ¿
+ „: u^TW
=======================================
--- /dev/null
+++ /trunk/The History of Three
Kingdoms/Assets/Art/interface/Heroes/medallion_hasmoved_inj_core.dds Sun
Sep 27 18:36:06 2009
@@ -0,0 +1,6 @@
+DDS |

DXT3 ! ¨WVV 0 ЫÃ? UÕ•

+ Ë? UWVT ! *Õ•• ¤«RþÅÛ_ UU«
+ ô ùªþÿÿ‰ä 5%
+ O Ÿ ï»ÿÿ£ã \X  »Jï&¨¢? UUÀpÞþþÿúÿôÿû‹? ªUUÿÿÿÿÿÿÿÿ ë­a ƒáóÿÿÿÿÿÿÿÿ Ó9 êjêïíÿïÿ¯ÿO»ƒ7 b^UU€ÿ û   ”I
+ W ¾ÿÿÿÿÿÿ¤ýáÂ4 `\WUÿÿÿÿÿïßJ€²3 %ÕUÿ ¿
+ QI ×ÔÔ¾
=======================================
--- /dev/null
+++ /trunk/The History of Three
Kingdoms/Assets/Art/interface/Heroes/medallion_hasmoved_inj_guardian.dds
Sun Sep 27 18:36:06 2009
@@ -0,0 +1,4 @@
+DDS |

DXT3 € û€ÿ Œ= U ¤ýÿÿÿÿÿÿ{œŸ  ž ßJÿÿÿÿÿÿØ“_ ÀªÖT ¿ ÿ ßZ> UT[eôÿúÿýÿÿÿŒä {^ª/ÿÿÿÿÿÿÿÿ‰ä 5%
+ ÿÿÿÿÿÿÿÿ£ã \X  ÿOÿ¯ÿßÿÿ Û< ÕÕêxÿÿýÿúÿôÿ R>
+\TVÿÿÿÿÿÿÿÿaÛò8 âÿÿÿÿÿÿÿÿ Óì8 jjêÿÿÿßÿ¯ÿOÎI Ô• •€ÿ û   î‚< Yõ Uÿÿÿÿÿÿ¤ý »U `\W ÿÿÿÿÿïßJ‚¢5 %Õïÿ ¿
+ Gj eZTW
=======================================
--- /dev/null
+++ /trunk/The History of Three
Kingdoms/Assets/Art/interface/Heroes/medallion_hasmoved_inj_marshal.dds Sun
Sep 27 18:36:06 2009
Binary file, no diff available.
=======================================
--- /dev/null
+++ /trunk/The History of Three
Kingdoms/Assets/Art/interface/Heroes/medallion_hasmoved_inj_normal.dds Sun
Sep 27 18:36:06 2009
Binary file, no diff available.
=======================================
--- /dev/null
+++ /trunk/The History of Three
Kingdoms/Assets/Art/interface/Heroes/medallion_hasmoved_marshal.dds Sun Sep
27 18:36:06 2009
Binary file, no diff available.
=======================================
--- /dev/null
+++ /trunk/The History of Three
Kingdoms/Assets/Art/interface/Heroes/medallion_hasmoved_normal.dds Sun Sep
27 18:36:06 2009
Binary file, no diff available.
=======================================
--- /dev/null
+++ /trunk/The History of Three
Kingdoms/Assets/Art/interface/Heroes/might.dds Sun Sep 27 18:36:06 2009
Binary file, no diff available.
=======================================
--- /dev/null
+++ /trunk/The History of Three
Kingdoms/Assets/Art/interface/Heroes/politics.dds Sun Sep 27 18:36:06 2009
Binary file, no diff available.
=======================================
--- /dev/null
+++ /trunk/The History of Three
Kingdoms/Assets/Art/interface/buttons/Promotions/Unit Combat Level.dds Sun
Sep 27 18:36:06 2009
Binary file, no diff available.
=======================================
--- /trunk/The History of Three Kingdoms/Assets/Python/BUG/WidgetUtil.py
Fri Sep 25 08:21:08 2009
+++ /trunk/The History of Three Kingdoms/Assets/Python/BUG/WidgetUtil.py
Sun Sep 27 18:36:06 2009
@@ -105,7 +105,7 @@
Do not call this function as it is used internally by the registration
functions above.
"""
if widget in g_widgetHelp:
- BugUtil.warn("WidgetTypes %d help already registered", widget)
+ BugUtil.debug("WidgetTypes %d help already registered", widget)
#### Sanguo Mod dynamic widget help, start, by poyuzhe 09.25.09
g_widgetHelp[widget] = func
#### Sanguo Mod dynamic widget help, end
=======================================
--- /trunk/The History of Three Kingdoms/Assets/Python/CvAdvisorUtils.py
Tue Dec 23 20:32:53 2008
+++ /trunk/The History of Three Kingdoms/Assets/Python/CvAdvisorUtils.py
Sun Sep 27 18:36:06 2009
@@ -260,6 +260,24 @@

popupInfo.addPythonButton(localText.getText("TXT_KEY_FEAT_ACCOMPLISHED_MORE",
()), "")
popupInfo.addPopup(pCity.getOwner())

+ if (not
gc.getPlayer(pCity.getOwner()).isFeatAccomplished(FeatTypes.FEAT_BUILD_CITY_WONDER)):
+
+ if (gc.getBuildingInfo(iBuildingType).isCityWonder()):
+
+
gc.getPlayer(pCity.getOwner()).setFeatAccomplished(FeatTypes.FEAT_BUILD_CITY_WONDER,
True)
+
+ if (featPopup(pCity.getOwner()) and (gc.getGame().getStartYear() ==
gc.getDefineINT("START_YEAR"))):
+ popupInfo = CyPopupInfo()
+ popupInfo.setButtonPopupType(ButtonPopupTypes.BUTTONPOPUP_PYTHON)
+ popupInfo.setData1(FeatTypes.FEAT_BUILD_CITY_WONDER)
+ popupInfo.setData2(pCity.getID())
+ popupInfo.setText(localText.getText("TXT_KEY_FEAT_BUILD_CITY_WONDER",
(gc.getBuildingInfo(iBuildingType).getTextKey(), pCity.getNameKey(), )))
+
popupInfo.setOnClickedPythonCallback("featAccomplishedOnClickedCallback")
+ popupInfo.setOnFocusPythonCallback("featAccomplishedOnFocusCallback")
+
popupInfo.addPythonButton(localText.getText("TXT_KEY_FEAT_ACCOMPLISHED_OK",
()), "")
+
popupInfo.addPythonButton(localText.getText("TXT_KEY_FEAT_ACCOMPLISHED_MORE",
()), "")
+ popupInfo.addPopup(pCity.getOwner())
+
def endTurnFeats(iPlayer):

lRealPopulation = gc.getPlayer(iPlayer).getRealPopulation()
@@ -1013,3 +1031,86 @@

popupInfo.addPythonButton(localText.getText("TXT_KEY_POPUP_DEMAND_EXAMINE",
()), "")
popupInfo.addPopup(iPlayer)
g_iAdvisorNags += 1
+
+
+#### Sanguo Mod Tutorial, start, by poyuzhe 09.27.09
+def unitCreatedFeats(iPlayer, iUnitID):
+ popupInfo = CyPopupInfo()
+ popupInfo.setButtonPopupType(ButtonPopupTypes.BUTTONPOPUP_PYTHON)
+ popupInfo.setData1(FeatTypes.FEAT_CAPTURE_EMPEROR)
+ popupInfo.setData2(iPlayer)
+ popupInfo.setData3(iUnitID)
+ popupInfo.setText(localText.getText("TXT_KEY_FEAT_CAPTURE_EMPEROR", ()))
+ popupInfo.setOnClickedPythonCallback("featAccomplishedOnClickedCallback")
+ popupInfo.setOnFocusPythonCallback("featAccomplishedOnFocusCallback")
+
popupInfo.addPythonButton(localText.getText("TXT_KEY_FEAT_ACCOMPLISHED_OK",
()), "")
+
popupInfo.addPythonButton(localText.getText("TXT_KEY_FEAT_ACCOMPLISHED_MORE",
()), "")
+ popupInfo.addPopup(iPlayer)
+
+
+def captureHeroFeat(iPlayer, iHero):
+ popupInfo = CyPopupInfo()
+ popupInfo.setButtonPopupType(ButtonPopupTypes.BUTTONPOPUP_PYTHON)
+ popupInfo.setData1(FeatTypes.FEAT_CAPTURE_HERO)
+ popupInfo.setData2(iPlayer)
+ popupInfo.setData3(iHero)
+ popupInfo.setText(localText.getText("TXT_KEY_FEAT_CAPTURE_HERO",
(gc.getHeroInfo(iHero).getDescription(),)))
+ popupInfo.setOnClickedPythonCallback("featAccomplishedOnClickedCallback")
+ popupInfo.setOnFocusPythonCallback("featAccomplishedOnFocusCallback")
+
popupInfo.addPythonButton(localText.getText("TXT_KEY_FEAT_ACCOMPLISHED_OK",
()), "")
+
popupInfo.addPythonButton(localText.getText("TXT_KEY_FEAT_ACCOMPLISHED_MORE",
()), "")
+ popupInfo.addPopup(iPlayer)
+
+def formLegionFeat(iPlayer, iHero):
+ popupInfo = CyPopupInfo()
+ popupInfo.setButtonPopupType(ButtonPopupTypes.BUTTONPOPUP_PYTHON)
+ popupInfo.setData1(FeatTypes.FEAT_FORM_LEGION)
+ popupInfo.setData2(iPlayer)
+ popupInfo.setData3(iHero)
+ popupInfo.setText(localText.getText("TXT_KEY_FEAT_FORM_LEGION",
(gc.getHeroInfo(iHero).getDescription(),)))
+ popupInfo.setOnClickedPythonCallback("featAccomplishedOnClickedCallback")
+ popupInfo.setOnFocusPythonCallback("featAccomplishedOnFocusCallback")
+
popupInfo.addPythonButton(localText.getText("TXT_KEY_FEAT_ACCOMPLISHED_OK",
()), "")
+
popupInfo.addPythonButton(localText.getText("TXT_KEY_FEAT_ACCOMPLISHED_MORE",
()), "")
+ popupInfo.addPopup(iPlayer)
+
+def formAdvancedLegionFeat(iPlayer, iHero):
+ popupInfo = CyPopupInfo()
+ popupInfo.setButtonPopupType(ButtonPopupTypes.BUTTONPOPUP_PYTHON)
+ popupInfo.setData1(FeatTypes.FEAT_FORM_ADVANCED_LEGION)
+ popupInfo.setData2(iPlayer)
+ popupInfo.setData3(iHero)
+ popupInfo.setText(localText.getText("TXT_KEY_FEAT_FORM_ADVANCED_LEGION",
(gc.getHeroInfo(iHero).getDescription(),)))
+ popupInfo.setOnClickedPythonCallback("featAccomplishedOnClickedCallback")
+ popupInfo.setOnFocusPythonCallback("featAccomplishedOnFocusCallback")
+
popupInfo.addPythonButton(localText.getText("TXT_KEY_FEAT_ACCOMPLISHED_OK",
()), "")
+
popupInfo.addPythonButton(localText.getText("TXT_KEY_FEAT_ACCOMPLISHED_MORE",
()), "")
+ popupInfo.addPopup(iPlayer)
+
+def createRandomHeroFeat(iPlayer, iHero):
+ popupInfo = CyPopupInfo()
+ popupInfo.setButtonPopupType(ButtonPopupTypes.BUTTONPOPUP_PYTHON)
+ popupInfo.setData1(FeatTypes.FEAT_CREATE_RANDOM_HERO)
+ popupInfo.setData2(iPlayer)
+ popupInfo.setData3(iHero)
+ popupInfo.setText(localText.getText("TXT_KEY_FEAT_CREATE_RANDOM_HERO",
(gc.getHeroInfo(iHero).getDescription(),)))
+ popupInfo.setOnClickedPythonCallback("featAccomplishedOnClickedCallback")
+ popupInfo.setOnFocusPythonCallback("featAccomplishedOnFocusCallback")
+
popupInfo.addPythonButton(localText.getText("TXT_KEY_FEAT_ACCOMPLISHED_OK",
()), "")
+
popupInfo.addPythonButton(localText.getText("TXT_KEY_FEAT_ACCOMPLISHED_MORE",
()), "")
+ popupInfo.addPopup(iPlayer)
+
+def gainCityPerkFeat(iPlayer, iCity, iCityPerk):
+ popupInfo = CyPopupInfo()
+ popupInfo.setButtonPopupType(ButtonPopupTypes.BUTTONPOPUP_PYTHON)
+ popupInfo.setData1(FeatTypes.FEAT_GAIN_CITY_PERK)
+ popupInfo.setData2(iPlayer)
+ popupInfo.setData3(iCity)
+ popupInfo.setFlags(iCityPerk)
+ popupInfo.setText(localText.getText("TXT_KEY_FEAT_GAIN_CITY_PERK",
(gc.getPlayer(iPlayer).getCity(iCity).getNameKey(),
gc.getCityPerkInfo(iCityPerk).getDescription())))
+ popupInfo.setOnClickedPythonCallback("featAccomplishedOnClickedCallback")
+ popupInfo.setOnFocusPythonCallback("featAccomplishedOnFocusCallback")
+
popupInfo.addPythonButton(localText.getText("TXT_KEY_FEAT_ACCOMPLISHED_OK",
()), "")
+
popupInfo.addPythonButton(localText.getText("TXT_KEY_FEAT_ACCOMPLISHED_MORE",
()), "")
+ popupInfo.addPopup(iPlayer)
+#### Sanguo Mod Tutorial, end
=======================================
--- /trunk/The History of Three
Kingdoms/Assets/Python/CvSanguoEventManager.py Fri Sep 25 08:21:08 2009
+++ /trunk/The History of Three
Kingdoms/Assets/Python/CvSanguoEventManager.py Sun Sep 27 18:36:06 2009
@@ -326,7 +326,7 @@

pShip1.setHasPromotion(gc.getInfoTypeForString("PROMOTION_SOUTHERNOR"),
True)

pShip2.setHasPromotion(gc.getInfoTypeForString("PROMOTION_SOUTHERNOR"),
True)

pShip3.setHasPromotion(gc.getInfoTypeForString("PROMOTION_SOUTHERNOR"),
True)
- pHero = barbPlayer.initUnit(gc.getHeroInfo(eGanNing).getUnitType(),
pLoopPlot.getX(), pLoopPlot.getY(), UnitAITypes.UNITAI_HERO,
DirectionTypes.DIRECTION_SOUTH)
+ pHero = barbPlayer.initHero(eGanNing, pLoopPlot.getX(),
pLoopPlot.getY(), True)
gc.getGame().addHeroLegionMember(eGanNing, pShip1.getID())
gc.getGame().addHeroLegionMember(eGanNing, pShip2.getID())
gc.getGame().addHeroLegionMember(eGanNing, pShip3.getID())
@@ -352,12 +352,7 @@
if pUnit1 and pUnit2:

pUnit1.setHasPromotion(gc.getInfoTypeForString("PROMOTION_NORTHERNOR"),
True)

pUnit2.setHasPromotion(gc.getInfoTypeForString("PROMOTION_NORTHERNOR"),
True)
- pHero = barbPlayer.initUnit(gc.getHeroInfo(eZangBa).getUnitType(),
pLoopPlot.getX(), pLoopPlot.getY(), UnitAITypes.UNITAI_HERO,
DirectionTypes.DIRECTION_SOUTH)
- pHero.setHeroType(eZangBa)
- if gc.getGame().getHeroDebutStatus(eZangBa) !=
gc.getBARBARIAN_PLAYER():
- gc.getGame().setHeroDebutStatus(eZangBa, gc.getBARBARIAN_PLAYER())
- barbPlayer.changeHeroMaintenance(eZangBa, True, False, 0)
- gc.getGame().setHeroUnitID(eZangBa, pHero.getID())
+ pHero = barbPlayer.initHero(eZangBa, pLoopPlot.getX(),
pLoopPlot.getY(), True)
gc.getGame().addHeroLegionMember(eZangBa, pUnit1.getID())
pHero.formLegion(False, False)

@@ -382,7 +377,7 @@

pUnit1.setHasPromotion(gc.getInfoTypeForString("PROMOTION_SOUTHWESTERNOR"),
True)

pUnit2.setHasPromotion(gc.getInfoTypeForString("PROMOTION_SOUTHWESTERNOR"),
True)

pUnit3.setHasPromotion(gc.getInfoTypeForString("PROMOTION_SOUTHWESTERNOR"),
True)
- pHero = barbPlayer.initUnit(gc.getHeroInfo(eMengHuo).getUnitType(),
pLoopPlot.getX(), pLoopPlot.getY(), UnitAITypes.UNITAI_HERO,
DirectionTypes.DIRECTION_SOUTH)
+ pHero = barbPlayer.initHero(eMengHuo, pLoopPlot.getX(),
pLoopPlot.getY(), True)
gc.getGame().addHeroLegionMember(eMengHuo, pUnit1.getID())
pHero.formLegion(False, False)

=======================================
--- /trunk/The History of Three
Kingdoms/Assets/Python/EntryPoints/CvSanguoInterface.py Sat Sep 19 05:22:49
2009
+++ /trunk/The History of Three
Kingdoms/Assets/Python/EntryPoints/CvSanguoInterface.py Sun Sep 27 18:36:06
2009
@@ -4,6 +4,7 @@
## Author: stmartin aka. poyuzhe
from CvPythonExtensions import *
import CvUtil
+import CvAdvisorUtils

gc = CyGlobalContext()

@@ -169,4 +170,21 @@
def doAICreateRandomHero(argsList):
CyMessageControl().sendModNetMessage(11, argsList[0], argsList[1],
argsList[2], -1)

-
+
+def doUnitCreatedFeat(argsList):
+ CvAdvisorUtils.unitCreatedFeats(argsList[0], argsList[1])
+
+def doCaptureHeroFeat(argsList):
+ CvAdvisorUtils.captureHeroFeat(argsList[0], argsList[1])
+
+def doFormLegionFeat(argsList):
+ CvAdvisorUtils.formLegionFeat(argsList[0], argsList[1])
+
+def doFormAdvancedLegionFeat(argsList):
+ CvAdvisorUtils.formAdvancedLegionFeat(argsList[0], argsList[1])
+
+def doCreateRandomHeroFeat(argsList):
+ CvAdvisorUtils.createRandomHeroFeat(argsList[0], argsList[1])
+
+def doGainCityPerkFeat(argsList):
+ CvAdvisorUtils.gainCityPerkFeat(argsList[0], argsList[1],
argsList[2])
=======================================
--- /trunk/The History of Three
Kingdoms/Assets/Python/EntryPoints/CvScreensInterface.py Sat Sep 19
05:22:49 2009
+++ /trunk/The History of Three
Kingdoms/Assets/Python/EntryPoints/CvScreensInterface.py Sun Sep 27
18:36:06 2009
@@ -60,6 +60,8 @@
import BugCore
AdvisorOpt = BugCore.game.Advisors
TechWindowOpt = BugCore.game.TechWindow
+gc = CyGlobalContext()
+localText = CyTranslator()
# BUG - Options - end

g_bIsScreenActive = -1
@@ -1164,6 +1166,24 @@
showInfoScreen([1, 0])
elif iData1 == FeatTypes.FEAT_CORPORATION_ENABLED:
showCorporationScreen()
+ #### Sanguo Mod Tutorial, start, by poyuzhe 09.27.09
+ elif (iData1 == FeatTypes.FEAT_CAPTURE_EMPEROR):
+
pediaShowHistorical([CivilopediaPageTypes.CIVILOPEDIA_PAGE_CONCEPT_NEW,
gc.getInfoTypeForString("CONCEPT_EMPEROR")])
+ elif (iData1 == FeatTypes.FEAT_CAPTURE_HERO):
+ showCorporationScreen([2])
+ elif (iData1 == FeatTypes.FEAT_FORM_LEGION):
+
pediaShowHistorical([CivilopediaPageTypes.CIVILOPEDIA_PAGE_CONCEPT_NEW,
gc.getInfoTypeForString("CONCEPT_LEGION")])
+ elif (iData1 == FeatTypes.FEAT_FORM_ADVANCED_LEGION):
+
pediaShowHistorical([CivilopediaPageTypes.CIVILOPEDIA_PAGE_CONCEPT_NEW,
gc.getInfoTypeForString("CONCEPT_ARMY")])
+ elif (iData1 == FeatTypes.FEAT_CREATE_RANDOM_HERO):
+
pediaShowHistorical([CivilopediaPageTypes.CIVILOPEDIA_PAGE_CONCEPT_NEW,
gc.getInfoTypeForString("CONCEPT_RANDOM_HERO")])
+ elif (iData1 == FeatTypes.FEAT_BUILD_CITY_WONDER):
+
pediaShowHistorical([CivilopediaPageTypes.CIVILOPEDIA_PAGE_CONCEPT_NEW,
gc.getInfoTypeForString("CONCEPT_CITY_WONDER")])
+ elif (iData1 == FeatTypes.FEAT_GAIN_CITY_PERK):
+ player = gc.getPlayer(iData2)
+ city = player.getCity(iData3)
+ CyInterface().selectCity(city, False)
+ #### Sanguo Mod Tutorial, end

def featAccomplishedOnFocusCallback(argsList):
iData1 = argsList[0]
@@ -1177,6 +1197,18 @@
CyInterface().playGeneralSound("AS2D_FEAT_ACCOMPLISHED")
if ((iData1 >= FeatTypes.FEAT_UNITCOMBAT_ARCHER) and (iData1 <=
FeatTypes.FEAT_FOOD_CONNECTED)):
CyInterface().lookAtCityOffset(iData2)
+ #### Sanguo Mod Tutorial, start, by poyuzhe 09.27.09
+ elif (iData1 == FeatTypes.FEAT_CAPTURE_EMPEROR):
+ player = gc.getPlayer(iData2)
+ unit = player.getUnit(iData3)
+ CyCamera().LookAtUnit(unit)
+## elif (iData1 == FeatTypes.FEAT_FORM_LEGION or iData1 ==
FeatTypes.FEAT_FORM_ADVANCED_LEGION or iData1 ==
FeatTypes.FEAT_CREATE_RANDOM_HERO):
+## player = gc.getPlayer(iData2)
+## unit = player.getUnit(gc.getGame().getHeroUnitID(iData3))
+## CyCamera().LookAtUnit(unit)
+ elif (iData1 == FeatTypes.FEAT_BUILD_CITY_WONDER or iData1 ==
FeatTypes.FEAT_GAIN_CITY_PERK):
+ CyInterface().lookAtCityOffset(iData2)
+ #### Sanguo Mod Tutorial, end

return 0

=======================================
--- /trunk/The History of Three
Kingdoms/Assets/Python/Screens/CvHeroAdvisor.py Fri Sep 25 08:21:08 2009
+++ /trunk/The History of Three
Kingdoms/Assets/Python/Screens/CvHeroAdvisor.py Sun Sep 27 18:36:06 2009
@@ -910,7 +910,7 @@
screen.setButtonGFC( "Persuade",
localText.getText("TXT_KEY_SCREEN_PERSUADE", ()), "", iLeft + iInsideGap,
iTop + 2, 76, 30, self.PersuadeWidget, -1, -1,
ButtonStyles.BUTTON_STYLE_STANDARD )
screen.setActivation( "Persuade",
ActivationTypes.ACTIVATE_MIMICPARENTFOCUS )
else:
- screen.deleteWidget( "Persuades" )
+ screen.deleteWidget( "Persuade" )

screen.setButtonGFC( "Execute",
localText.getText("TXT_KEY_SCREEN_EXECUTE", ()), "", iLeft + 76 +
iInsideGap * 2, iTop + 2, 76, 30, self.ExecuteWidget, -1, -1,
ButtonStyles.BUTTON_STYLE_STANDARD )
screen.setActivation( "Execute",
ActivationTypes.ACTIVATE_MIMICPARENTFOCUS )
@@ -921,6 +921,8 @@
if gc.getPlayer(self.iActiveLeader).canContact(iPlayer):
screen.setButtonGFC( "Trade", localText.getText("TXT_KEY_SCREEN_TRADE",
()), "", iLeft + 76 * 3 + iInsideGap * 4, iTop + 2, 76, 30,
WidgetTypes.WIDGET_CONTACT_CIV, iPlayer, -1,
ButtonStyles.BUTTON_STYLE_STANDARD )
screen.setActivation( "Trade",
ActivationTypes.ACTIVATE_MIMICPARENTFOCUS )
+ else:
+ screen.deleteWidget( "Trade" )

szText = ""
iPlayer = gc.getGame().getHeroDebutStatus(iHero)
=======================================
--- /trunk/The History of Three
Kingdoms/Assets/Python/Screens/CvMainInterface.py Fri Sep 25 08:21:08 2009
+++ /trunk/The History of Three
Kingdoms/Assets/Python/Screens/CvMainInterface.py Sun Sep 27 18:36:06 2009
@@ -1407,13 +1407,25 @@
#### Sanguo Mod Hero, start, added by poyuzhe 01.18.09
## if (iLeaderPromo != -1 and pLoopUnit.isHasPromotion(iLeaderPromo)):
if pLoopUnit.getLegionHero() != -1:
- if pLoopUnit.getHeroType() == pLoopUnit.getLegionHero():
- if gc.getHeroInfo(pLoopUnit.getHeroType()).getLeaderType() !=
gc.getPlayer(pLoopUnit.getOwner()).getLeaderType():
- szDotState += "_GG"
- else:
- szDotState += "_LEADER"
- else:
- szDotState += "_HERO"
+ if pLoopUnit.getLeaderHero() == -1:
+ if pLoopUnit.getHeroType() ==
pLoopUnit.getLegionHero():
+ if
gc.getHeroInfo(pLoopUnit.getHeroType()).getLeaderType() !=
gc.getPlayer(pLoopUnit.getOwner()).getLeaderType():
+ szDotState += "_GG"
+ else:
+ szDotState
+= "_LEADER"
+ else:
+ szDotState += "_HERO"
+ else:
+ if pLoopUnit.getHeroType() == -1:
+ szDotState += "_NORMAL"
+ else:
+ if
pLoopUnit.isLeaderTroop():
+ if
gc.getHeroInfo(pLoopUnit.getLeaderHero()).getLeaderType() ==
gc.getPlayer(pLoopUnit.getOwner()).getLeaderType():
+ szDotState
+= "_MARSHAL"
+ else:
+ szDotState
+= "_GUARDIAN"
+ else:
+ szDotState
+= "_CORE"
xSize = 16
ySize = 16
xOffset = -3
=======================================
--- /trunk/The History of Three Kingdoms/Assets/Python/pyWB/CvWBDesc.py Sat
Sep 19 05:22:49 2009
+++ /trunk/The History of Three Kingdoms/Assets/Python/pyWB/CvWBDesc.py Sun
Sep 27 18:36:06 2009
@@ -102,10 +102,16 @@
self.szDescription = ""
self.szModPath = ""
self.iRandom = 0
+ #### Sanguo Mod Tutorial, start, by poyuzhe 09.27.09
+ self.iTutorialID = -1
+ #### Sanguo Mod Tutorial, end

def apply(self):
"after reading, apply the game data"
gc.getGame().setStartYear(self.iStartYear)
+ #### Sanguo Mod Tutorial, start, by poyuzhe 09.27.09
+ gc.getGame().setTutorialID(self.iTutorialID)
+ #### Sanguo Mod Tutorial, end

def write(self, f):
"write out game data"
@@ -144,6 +150,11 @@
f.write("\tStartYear=%d\n" %(gc.getGame().getStartYear(),))
f.write("\tDescription=%s\n" % (self.szDescription,))
f.write("\tModPath=%s\n" % (self.szModPath,))
+
+ #### Sanguo Mod Tutorial, start, by poyuzhe 09.27.09
+ f.write("\tTutorialID=%d\n" % (gc.getGame().getTutorialID(),))
+ #### Sanguo Mod Tutorial, end
+
f.write("EndGame\n")

def read(self, f):
@@ -238,6 +249,12 @@
self.iRandom = int(v)
continue

+ #### Sanguo Mod Tutorial, start, by poyuzhe 09.27.09
+ v =
parser.findTokenValue(toks, "TutorialID")
+ if v!=-1:
+ self.iTutorialID = int(v)
+ #### Sanguo Mod Tutorial, end
+
if parser.findTokenValue(toks, "EndGame") != -1:
break

@@ -760,6 +777,18 @@
gc.getGame().setHeroDebutStatus(self.iHeroType, self.owner)
player.changeHeroMaintenance(self.iHeroType, True, False, 0)
gc.getGame().setHeroUnitID(self.iHeroType, hero.getID())
+ elif gc.getUnitInfo(unitTypeNum).isHero():
+ listHeroType = []
+ for i in
range(gc.getNumHeroInfos()):
+ if gc.getHeroInfo(i).getUnitType() == unitTypeNum:
+ listHeroType.append(i)
+
+ if len(listHeroType) == 1:
+
unit.setHeroType(listHeroType[0])
+ if
gc.getGame().getHeroDebutStatus(listHeroType[0]) != self.owner:
+ gc.getGame().setHeroDebutStatus(listHeroType[0], self.owner)
+ player.changeHeroMaintenance(listHeroType[0], True, False, 0)
+ gc.getGame().setHeroUnitID(listHeroType[0], unit.getID())

# CyUnit() has no attribute 'setHeroType'
# if self.iHeroType != -1:
=======================================
--- /trunk/The History of Three
Kingdoms/Assets/XML/Art/CIV4ArtDefines_Interface.xml Tue Aug 25 06:46:25
2009
+++ /trunk/The History of Three
Kingdoms/Assets/XML/Art/CIV4ArtDefines_Interface.xml Sun Sep 27 18:36:06
2009
@@ -1685,6 +1685,23 @@
<Type>HERO_MEMBER_UNIT</Type>
<Path>Art/interface/Heroes/member_unit.dds</Path>
</InterfaceArtInfo>
+ <InterfaceArtInfo>
+ <Type>HERO_LEADERSHIP</Type>
+ <Path>Art/interface/Heroes/leadership.dds</Path>
+ </InterfaceArtInfo>
+ <InterfaceArtInfo>
+ <Type>HERO_MIGHT</Type>
+ <Path>Art/interface/Heroes/might.dds</Path>
+ </InterfaceArtInfo>
+ <InterfaceArtInfo>
+ <Type>HERO_INTELLIGENCE</Type>
+ <Path>Art/interface/Heroes/intelligence.dds</Path>
+ </InterfaceArtInfo>
+ <InterfaceArtInfo>
+ <Type>HERO_</Type>
+ <Path>Art/interface/Heroes/member_unit.dds</Path>
+ </InterfaceArtInfo>
+
<InterfaceArtInfo>
<Type>OVERLAY_MOVE_HERO</Type>
<Path>Art/interface/Heroes/Medallion_canmove_HERO.dds</Path>
@@ -1749,6 +1766,134 @@
<Type>OVERLAY_FORTIFY_INJURED_LEADER</Type>
<Path>Art/interface/Heroes/medallion_fortify_injured_LEADER.dds</Path>
</InterfaceArtInfo>
+ <InterfaceArtInfo>
+ <Type>OVERLAY_MOVE_NORMAL</Type>
+ <Path>Art/interface/Heroes/Medallion_canmove_NORMAL.dds</Path>
+ </InterfaceArtInfo>
+ <InterfaceArtInfo>
+ <Type>OVERLAY_HASMOVED_NORMAL</Type>
+ <Path>Art/interface/Heroes/medallion_hasmoved_NORMAL.dds</Path>
+ </InterfaceArtInfo>
+ <InterfaceArtInfo>
+ <Type>OVERLAY_NOMOVE_NORMAL</Type>
+ <Path>Art/interface/Heroes/medallion_cantmove_NORMAL.dds</Path>
+ </InterfaceArtInfo>
+ <InterfaceArtInfo>
+ <Type>OVERLAY_FORTIFY_NORMAL</Type>
+ <Path>Art/interface/Heroes/medallion_fortify_NORMAL.dds</Path>
+ </InterfaceArtInfo>
+ <InterfaceArtInfo>
+ <Type>OVERLAY_MOVE_INJURED_NORMAL</Type>
+ <Path>Art/interface/Heroes/Medallion_canmove_injured_NORMAL.dds</Path>
+ </InterfaceArtInfo>
+ <InterfaceArtInfo>
+ <Type>OVERLAY_HASMOVED_INJURED_NORMAL</Type>
+ <Path>Art/interface/Heroes/medallion_hasmoved_injured_NORMAL.dds</Path>
+ </InterfaceArtInfo>
+ <InterfaceArtInfo>
+ <Type>OVERLAY_NOMOVE_INJURED_NORMAL</Type>
+ <Path>Art/interface/Heroes/medallion_cantmove_injured_NORMAL.dds</Path>
+ </InterfaceArtInfo>
+ <InterfaceArtInfo>
+ <Type>OVERLAY_FORTIFY_INJURED_NORMAL</Type>
+ <Path>Art/interface/Heroes/medallion_fortify_injured_NORMAL.dds</Path>
+ </InterfaceArtInfo>
+ <InterfaceArtInfo>
+ <Type>OVERLAY_MOVE_CORE</Type>
+ <Path>Art/interface/Heroes/Medallion_canmove_CORE.dds</Path>
+ </InterfaceArtInfo>
+ <InterfaceArtInfo>
+ <Type>OVERLAY_HASMOVED_CORE</Type>
+ <Path>Art/interface/Heroes/medallion_hasmoved_CORE.dds</Path>
+ </InterfaceArtInfo>
+ <InterfaceArtInfo>
+ <Type>OVERLAY_NOMOVE_CORE</Type>
+ <Path>Art/interface/Heroes/medallion_cantmove_CORE.dds</Path>
+ </InterfaceArtInfo>
+ <InterfaceArtInfo>
+ <Type>OVERLAY_FORTIFY_CORE</Type>
+ <Path>Art/interface/Heroes/medallion_fortify_CORE.dds</Path>
+ </InterfaceArtInfo>
+ <InterfaceArtInfo>
+ <Type>OVERLAY_MOVE_INJURED_CORE</Type>
+ <Path>Art/interface/Heroes/Medallion_canmove_injured_CORE.dds</Path>
+ </InterfaceArtInfo>
+ <InterfaceArtInfo>
+ <Type>OVERLAY_HASMOVED_INJURED_CORE</Type>
+ <Path>Art/interface/Heroes/medallion_hasmoved_injured_CORE.dds</Path>
+ </InterfaceArtInfo>
+ <InterfaceArtInfo>
+ <Type>OVERLAY_NOMOVE_INJURED_CORE</Type>
+ <Path>Art/interface/Heroes/medallion_cantmove_injured_CORE.dds</Path>
+ </InterfaceArtInfo>
+ <InterfaceArtInfo>
+ <Type>OVERLAY_FORTIFY_INJURED_CORE</Type>
+ <Path>Art/interface/Heroes/medallion_fortify_injured_CORE.dds</Path>
+ </InterfaceArtInfo>
+ <InterfaceArtInfo>
+ <Type>OVERLAY_MOVE_GUARDIAN</Type>
+ <Path>Art/interface/Heroes/Medallion_canmove_GUARDIAN.dds</Path>
+ </InterfaceArtInfo>
+ <InterfaceArtInfo>
+ <Type>OVERLAY_HASMOVED_GUARDIAN</Type>
+ <Path>Art/interface/Heroes/medallion_hasmoved_GUARDIAN.dds</Path>
+ </InterfaceArtInfo>
+ <InterfaceArtInfo>
+ <Type>OVERLAY_NOMOVE_GUARDIAN</Type>
+ <Path>Art/interface/Heroes/medallion_cantmove_GUARDIAN.dds</Path>
+ </InterfaceArtInfo>
+ <InterfaceArtInfo>
+ <Type>OVERLAY_FORTIFY_GUARDIAN</Type>
+ <Path>Art/interface/Heroes/medallion_fortify_GUARDIAN.dds</Path>
+ </InterfaceArtInfo>
+ <InterfaceArtInfo>
+ <Type>OVERLAY_MOVE_INJURED_GUARDIAN</Type>
+ <Path>Art/interface/Heroes/Medallion_canmove_injured_GUARDIAN.dds</Path>
+ </InterfaceArtInfo>
+ <InterfaceArtInfo>
+ <Type>OVERLAY_HASMOVED_INJURED_GUARDIAN</Type>
+
<Path>Art/interface/Heroes/medallion_hasmoved_injured_GUARDIAN.dds</Path>
+ </InterfaceArtInfo>
+ <InterfaceArtInfo>
+ <Type>OVERLAY_NOMOVE_INJURED_GUARDIAN</Type>
+
<Path>Art/interface/Heroes/medallion_cantmove_injured_GUARDIAN.dds</Path>
+ </InterfaceArtInfo>
+ <InterfaceArtInfo>
+ <Type>OVERLAY_FORTIFY_INJURED_GUARDIAN</Type>
+ <Path>Art/interface/Heroes/medallion_fortify_injured_GUARDIAN.dds</Path>
+ </InterfaceArtInfo>
+ <InterfaceArtInfo>
+ <Type>OVERLAY_MOVE_MARSHAL</Type>
+ <Path>Art/interface/Heroes/Medallion_canmove_MARSHAL.dds</Path>
+ </InterfaceArtInfo>
+ <InterfaceArtInfo>
+ <Type>OVERLAY_HASMOVED_MARSHAL</Type>
+ <Path>Art/interface/Heroes/medallion_hasmoved_MARSHAL.dds</Path>
+ </InterfaceArtInfo>
+ <InterfaceArtInfo>
+ <Type>OVERLAY_NOMOVE_MARSHAL</Type>
+ <Path>Art/interface/Heroes/medallion_cantmove_MARSHAL.dds</Path>
+ </InterfaceArtInfo>
+ <InterfaceArtInfo>
+ <Type>OVERLAY_FORTIFY_MARSHAL</Type>
+ <Path>Art/interface/Heroes/medallion_fortify_MARSHAL.dds</Path>
+ </InterfaceArtInfo>
+ <InterfaceArtInfo>
+ <Type>OVERLAY_MOVE_INJURED_MARSHAL</Type>
+ <Path>Art/interface/Heroes/Medallion_canmove_injured_MARSHAL.dds</Path>
+ </InterfaceArtInfo>
+ <InterfaceArtInfo>
+ <Type>OVERLAY_HASMOVED_INJURED_MARSHAL</Type>
+ <Path>Art/interface/Heroes/medallion_hasmoved_injured_MARSHAL.dds</Path>
+ </InterfaceArtInfo>
+ <InterfaceArtInfo>
+ <Type>OVERLAY_NOMOVE_INJURED_MARSHAL</Type>
+ <Path>Art/interface/Heroes/medallion_cantmove_injured_MARSHAL.dds</Path>
+ </InterfaceArtInfo>
+ <InterfaceArtInfo>
+ <Type>OVERLAY_FORTIFY_INJURED_MARSHAL</Type>
+ <Path>Art/interface/Heroes/medallion_fortify_injured_MARSHAL.dds</Path>
+ </InterfaceArtInfo>

</InterfaceArtInfos>
</Civ4ArtDefines>
=======================================
--- /trunk/The History of Three
Kingdoms/Assets/XML/Sanguo/Civ4SurrenderInfos.xml Wed Sep 16 15:33:47 2009
+++ /trunk/The History of Three
Kingdoms/Assets/XML/Sanguo/Civ4SurrenderInfos.xml Sun Sep 27 18:36:06 2009
@@ -80,7 +80,7 @@
<OnlySurrenderToFaction>CIVILIZATION_LIU_BEI</OnlySurrenderToFaction>
<NeverSurrenderToLeader>NONE</NeverSurrenderToLeader>
<NeverSurrenderToFaction>NONE</NeverSurrenderToFaction>
- <PythonCallback>doGuanYuSurrender</PythonCallback>
+ <PythonCallback>NONE</PythonCallback>
<PythonWillSurrender>NONE</PythonWillSurrender>
<iRandomWeight>0</iRandomWeight>
</SurrenderInfo>
=======================================
--- /trunk/The History of Three
Kingdoms/Assets/XML/Text/CIV4GameText_Civilopedia_Sanguo_Concepts.xml Thu
Sep 24 10:17:15 2009
+++ /trunk/The History of Three
Kingdoms/Assets/XML/Text/CIV4GameText_Civilopedia_Sanguo_Concepts.xml Sun
Sep 27 18:36:06 2009
Binary file, no diff available.
=======================================
--- /trunk/The History of Three
Kingdoms/Assets/XML/Text/CIV4GameText_Sanguo_New.xml Thu Sep 24 10:17:15
2009
+++ /trunk/The History of Three
Kingdoms/Assets/XML/Text/CIV4GameText_Sanguo_New.xml Sun Sep 27 18:36:06
2009
Binary file, no diff available.
=======================================
--- /trunk/The History of Three
Kingdoms/Assets/XML/Units/CIV4PromotionInfos.xml Sat Sep 19 05:22:49 2009
+++ /trunk/The History of Three
Kingdoms/Assets/XML/Units/CIV4PromotionInfos.xml Sun Sep 27 18:36:06 2009
@@ -1606,8 +1606,7 @@
<bUnitCombat>1</bUnitCombat>
</UnitCombat>
</UnitCombats>
- <HotKey/>
- <Button>Art/Interface/Buttons/Promotions/meleeup.dds</Button>
+ <Button>Art/Interface/Buttons/Promotions/Unit Combat Level.dds</Button>
<bHero>1</bHero>
<iHeroUnitCombatLevelChange>1</iHeroUnitCombatLevelChange>
</PromotionInfo>
=======================================
***Additional files exist in this changeset.***