[sanguoforciv4] r350 committed - 0.305: 修正：修正几个CTD...

1 view

Skip to first unread message

codesite...@google.com

unread,

Oct 7, 2009, 11:42:53 PM10/7/09

to sanguom...@googlegroups.com

Revision: 350
Author: TongShen.Martin
Date: Wed Oct 7 20:41:24 2009
Log: 0.305: 修正：修正几个CTD
修正集团军中普通英雄无法正常获得亲卫队晋升的Bug

0.305: fix: fix few CTDs
fix a bug a non-guardian member hero in an Army cannot acquire core
troop promotion as usual.
http://code.google.com/p/sanguoforciv4/source/detail?r=350

Modified:
/trunk/The History of Three
Kingdoms/Assets/Python/Screens/CvCreateChampionScreen.py
/trunk/The History of Three Kingdoms/Assets/Python/Screens/CvHeroAdvisor.py
/trunk/The History of Three Kingdoms/Assets/XML/Sanguo/CIV4HeroInfos.xml
/trunk/The History of Three Kingdoms/Assets/XML/Text/Advanced Combat Odds
Options.xml
/trunk/The History of Three Kingdoms/Assets/XML/Text/AutoSave Options.xml
/trunk/The History of Three Kingdoms/Assets/XML/Text/BUG_CIV4GameText.xml
/trunk/The History of Three Kingdoms/Assets/XML/Text/BULL Actions
Options.xml
/trunk/The History of Three Kingdoms/Assets/XML/Text/BULL City Bar
Options.xml
/trunk/The History of Three Kingdoms/Assets/XML/Text/BULL Misc Hovers
Options.xml
/trunk/The History of Three
Kingdoms/Assets/XML/Text/CIV4GameText_AIAutoPlay.xml
/trunk/The History of Three
Kingdoms/Assets/XML/Text/CIV4GameText_Civilopedia_Sanguo_Leaders.xml
/trunk/The History of Three
Kingdoms/Assets/XML/Text/CIV4GameText_Sanguo_Changed.xml
/trunk/The History of Three
Kingdoms/Assets/XML/Text/CIV4GameText_Sanguo_Events.xml
/trunk/The History of Three
Kingdoms/Assets/XML/Text/CIV4GameText_Sanguo_Wonder.xml
/trunk/The History of Three
Kingdoms/Assets/XML/Text/CIV4PlotListEnhancementsInfo.xml
/trunk/The History of Three Kingdoms/Assets/XML/Text/Civ4GameText_DCM.xml
/trunk/The History of Three
Kingdoms/Assets/XML/Text/CvAIAutoPlay_CIV4GameTextInfos.xml
/trunk/The History of Three
Kingdoms/Assets/XML/Text/EventSigns_CIV4GameText.xml
/trunk/The History of Three
Kingdoms/Assets/XML/Text/Full_of_Resources_text.xml
/trunk/The History of Three Kingdoms/Assets/XML/Text/MapFinder Options.xml
/trunk/The History of Three
Kingdoms/Assets/XML/Text/MapFinder_CIV4GameText.xml
/trunk/The History of Three
Kingdoms/Assets/XML/Text/MoreCiv4lerts_CIV4GameText.xml
/trunk/The History of Three
Kingdoms/Assets/XML/Text/Sevopedia_CIV4GameText.xml
/trunk/The History of Three
Kingdoms/Assets/XML/Text/Shortcuts_CIV4GameText.xml
/trunk/The History of Three Kingdoms/CvGameCoreDLL/CvCity.cpp
/trunk/The History of Three Kingdoms/CvGameCoreDLL/CvGame.cpp
/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/Python/Screens/CvCreateChampionScreen.py Tue Sep 29
23:51:43 2009
+++ /trunk/The History of Three
Kingdoms/Assets/Python/Screens/CvCreateChampionScreen.py Wed Oct 7
20:41:24 2009
@@ -301,6 +301,20 @@
def drawRandomHeroChoice(self):
screen = self.getScreen()

+ screen.deleteWidget("Stats")
+ screen.deleteWidget("PortraitPanel")
+ screen.deleteWidget("Portrait")
+ screen.deleteWidget("CivPanel")
+ screen.deleteWidget("UnitCombatLevel")
+ screen.deleteWidget("BeliefPanel")
+ screen.deleteWidget("HelpPanel")
+ screen.deleteWidget("HistoryPanel")
+ screen.deleteWidget("CurrentPromotionPanel")
+ screen.deleteWidget("PotentialPromotionPanel")
+ screen.deleteWidget("HistoryText")
+ screen.deleteWidget("CurrentPromotionList")
+ screen.deleteWidget("PotentialPromotionList")
+
panelName = "Concept"
screen.addPanel(panelName,
localText.getText("TXT_KEY_CREATE_RANDOM_HERO", ()), "", True, True,
self.X_UNIT_PANE, self.Y_UNIT_PANE, 650, 300,
PanelStyles.PANEL_STYLE_BLUE50)
szText =
gc.getNewConceptInfo(gc.getInfoTypeForString("CONCEPT_RANDOM_HERO")).getCivilopedia()
=======================================
--- /trunk/The History of Three
Kingdoms/Assets/Python/Screens/CvHeroAdvisor.py Tue Sep 29 23:51:43 2009
+++ /trunk/The History of Three
Kingdoms/Assets/Python/Screens/CvHeroAdvisor.py Wed Oct 7 20:41:24 2009
@@ -240,7 +240,7 @@
self.Y_LINK = self.H_SCREEN - 42
self.Y_BOTTOM_PANEL = self.H_SCREEN - 55

- self.X_HERO_PANE = self.X_SCREEN + 5
+ self.X_HERO_PANE = 5
self.W_HERO_PANE = 130
self.H_HERO_PANE = self.H_SCREEN - 170
self.Y_HERO_PANE = 110 #self.Y_SCREEN + 50
@@ -299,7 +299,7 @@

self.X_HISTORY_PANE = self.X_SPECIAL_PANE + self.W_SPECIAL_PANE + 10
self.Y_HISTORY_PANE = self.Y_SPECIAL_PANE
- self.W_HISTORY_PANE = self.X_SCREEN + self.W_SCREEN -
self.X_HISTORY_PANE - 20
+ self.W_HISTORY_PANE = self.W_SCREEN - self.X_HISTORY_PANE - 20
self.H_HISTORY_PANE = self.Y_HERO_PANE + self.H_HERO_PANE -
self.Y_HISTORY_PANE

self.PrisonerHeroes = []
=======================================
--- /trunk/The History of Three
Kingdoms/Assets/XML/Sanguo/CIV4HeroInfos.xml Fri Oct 2 09:08:25 2009
+++ /trunk/The History of Three
Kingdoms/Assets/XML/Sanguo/CIV4HeroInfos.xml Wed Oct 7 20:41:24 2009
@@ -5397,6 +5397,7 @@
<SurrenderType>SURRENDER_SUICIDE</SurrenderType>
<iLeadership>70</iLeadership>
<iMight>95</iMight>
+ <MurdererCiv>CIVILIZATION_SHAN_YUE</MurdererCiv>
</HeroInfo>
<HeroInfo>
<Type>HERO_XU_CHU</Type>
=======================================
--- /trunk/The History of Three Kingdoms/Assets/XML/Text/Advanced Combat
Odds Options.xml Tue Aug 25 06:46:25 2009
+++ /trunk/The History of Three Kingdoms/Assets/XML/Text/Advanced Combat
Odds Options.xml Wed Oct 7 20:41:24 2009
@@ -11,7 +11,7 @@
<English>Advanced Combat Odds</English>
<L1>Advanced Combat Odds</L1>
<L2>Erweiterte Siegchancen</L2>
- <L3>Probabilità di Combattimento Avanzate</L3>
+ <L3>Probabilit?di Combattimento Avanzate</L3>
<L4>Advanced Combat Odds</L4>
<Chinese>Õ½¶·Ê¤ÂÊÏêÏ¸·Ö½â</Chinese>
</TEXT>
@@ -20,7 +20,7 @@
<English>When checked, allows you to change the level of detail
displayed in the combat odds calculations when hovering over an attack move
using PieceOfMind's ACO.</English>
<L1>When checked, allows you to change the level of detail displayed in
the combat odds calculations when hovering over an attack move using
PieceOfMind's ACO.</L1>
<L2>Erlaubt die Anpassung des Detailgrads der Informationen, die bei der
Berechnung der Siegchancen angezeigt werden, wenn der Mauszeiger für einen
Angriff über eine feindliche Einheit bewegt wird (verwendet
PieceOfMind's "Advanced Combat Odds"-Mos)</L2>
- <L3>Quando è selezionato, consente di variare il livello di dettaglio
mostrato per il calcolo delle Probabilità di Combattimento quando si
posiziona il cursore per un movimento offensivo (utilizza il Mod "Advanced
Combat Odds" di PieceOfMind).</L3>
+ <L3>Quando ?selezionato, consente di variare il livello di dettaglio
mostrato per il calcolo delle Probabilit?di Combattimento quando si
posiziona il cursore per un movimento offensivo (utilizza il Mod "Advanced
Combat Odds" di PieceOfMind).</L3>
<L4>When checked, allows you to change the level of detail displayed in
the combat odds calculations when hovering over an attack move using
PieceOfMind's ACO.</L4>
<Chinese>When checked, allows you to change the level of detail
displayed in the combat odds calculations when hovering over an attack move
using PieceOfMind's ACO.</Chinese>
</TEXT>
@@ -38,7 +38,7 @@
<English>When checked, shows debugging information in the combat odds
calculations.</English>
<L1>When checked, shows debugging information in the combat odds
calculations.</L1>
<L2>Zeigt Debug-Information bei der Berechnung der Siegchancen an</L2>
- <L3>Quando è selezionato, mostra le informazioni di debug nel calcolo
delle Probabilità di Combattimento.</L3>
+ <L3>Quando ?selezionato, mostra le informazioni di debug nel calcolo
delle Probabilit?di Combattimento.</L3>
<L4>When checked, shows debugging information in the combat odds
calculations.</L4>
<Chinese>When checked, shows debugging information in the combat odds
calculations.</Chinese>
</TEXT>
@@ -56,7 +56,7 @@
<English>Specifies the level of detail to show in the combat odds
calculations.</English>
<L1>Specifies the level of detail to show in the combat odds
calculations.</L1>
<L2>Bestimmt, mit welchem Detailgrad die Siegchancen angezeigt werden
sollen</L2>
- <L3>Specifica il livello di dettaglio che deve essere utilizzato per la
visualizzazione delle Probabilità di Combattimento.</L3>
+ <L3>Specifica il livello di dettaglio che deve essere utilizzato per la
visualizzazione delle Probabilit?di Combattimento.</L3>
<L4>Specifies the level of detail to show in the combat odds
calculations.</L4>
<Chinese>Specifies the level of detail to show in the combat odds
calculations.</Chinese>
</TEXT>
=======================================
--- /trunk/The History of Three Kingdoms/Assets/XML/Text/AutoSave
Options.xml Tue Aug 25 06:46:25 2009
+++ /trunk/The History of Three Kingdoms/Assets/XML/Text/AutoSave
Options.xml Wed Oct 7 20:41:24 2009
@@ -20,7 +20,7 @@
<English>When checked, a saved game is created after (re)generating the
map.</English>
<L1>When checked, a saved game is created after (re)generating the
map.</L1>
<L2>Erzeugt einen Spielstand, wenn eine Karte (neu-)erstellt wurde</L2>
- <L3>Quando è selezionato, viene creato un salvataggio dopo la
rigenerazione della mappa.</L3>
+ <L3>Quando ?selezionato, viene creato un salvataggio dopo la
rigenerazione della mappa.</L3>
<L4>When checked, a saved game is created after (re)generating the
map.</L4>
<Chinese>When checked, a saved game is created after (re)generating the
map.</Chinese>
</TEXT>
@@ -38,7 +38,7 @@
<English>When checked, a saved game is created when the game is
won/lost.</English>
<L1>When checked, a saved game is created when the game is won/lost.</L1>
<L2>Erzeugt einen Spielstand, wenn eine Partie gewonnen/verloren
wird</L2>
- <L3>Quando è selezionato, viene creato un salvataggio quando viene
vinta/persa la partita.</L3>
+ <L3>Quando ?selezionato, viene creato un salvataggio quando viene
vinta/persa la partita.</L3>
<L4>When checked, a saved game is created when the game is won/lost.</L4>
<Chinese>When checked, a saved game is created when the game is
won/lost.</Chinese>
</TEXT>
@@ -55,8 +55,8 @@
<Tag>TXT_KEY_BUG_OPT_AUTOSAVE__CREATEEXITSAVE_HOVER</Tag>
<English>When checked, a saved game is created when you exit using the
menu's EXIT TO DESKTOP or EXIT TO MENU commands. [COLOR_YELLOW]The game is
not saved automatically if you press ALT + F4.[COLOR_REVERT]</English>
<L1>When checked, a saved game is created when you exit using the menu's
EXIT TO DESKTOP or EXIT TO MENU commands. [COLOR_YELLOW]The game is not
saved automatically if you press ALT + F4.[COLOR_REVERT]</L1>
- <L2>Erzeugt einen Spielstand, wenn eine Partie über die
Menübefehle "Programm beenden" oder "Zurück zum Hauptmenü" verlassen wird
([COLOR_YELLOW]Es wird nicht automatisch gespeichert, wenn das Spiel über
die Tastenkombination [ALT + F4] verlassen wird[COLOR_REVERT])</L2>
- <L3>Quando è selezionato, viene creato un salvataggio quando si esce dal
gioco utilizzando le opzioni del menù "Ritorna al desktop" o "ritorna al
menù principale". [COLOR_YELLOW]La partita non viene salvata
automaticamente se si preme la combinazione di tasti 'ALT +
F4'.[COLOR_REVERT]</L3>
+ <L2>Erzeugt einen Spielstand, wenn eine Partie über die
Menübefehle "Programm beenden" oder "Zurück zum Hauptmen? verlassen wird
([COLOR_YELLOW]Es wird nicht automatisch gespeichert, wenn das Spiel über
die Tastenkombination [ALT + F4] verlassen wird[COLOR_REVERT])</L2>
+ <L3>Quando ?selezionato, viene creato un salvataggio quando si esce dal
gioco utilizzando le opzioni del men?"Ritorna al desktop" o "ritorna al
men?principale". [COLOR_YELLOW]La partita non viene salvata automaticamente
se si preme la combinazione di tasti 'ALT + F4'.[COLOR_REVERT]</L3>
<L4>When checked, a saved game is created when you exit using the menu's
EXIT TO DESKTOP or EXIT TO MENU commands. [COLOR_YELLOW]The game is not
saved automatically if you press ALT + F4.[COLOR_REVERT]</L4>
<Chinese>When checked, a saved game is created when you exit using the
menu's EXIT TO DESKTOP or EXIT TO MENU commands. [COLOR_YELLOW]The game is
not saved automatically if you press ALT + F4.[COLOR_REVERT]</Chinese>
</TEXT>
@@ -74,7 +74,7 @@
<English>When checked, your player name is used for the saved game name
along with the turn year. Otherwise the name is a concatenation of 3-letter
versions of Leader Name, Difficulty, Map Size, Map Type, Speed, Era, Year,
Climate and Sea Level. This setting does not affect MapFinder
saves.</English>
<L1>When checked, your player name is used for the saved game name along
with the turn year. Otherwise the name is a concatenation of 3-letter
versions of Leader Name, Difficulty, Map Size, Map Type, Speed, Era, Year,
Climate and Sea Level. This setting does not affect MapFinder saves.</L1>
<L2>Verwendet den Spielername zusammen mit dem Spieljahr als Name des
Spielstands. Ansonsten besteht der Name aus Dreibuchstabenabkürzungen des
Namens des Oberhaupts, des Schwierigkeitsgrades, der Kartengröße, des
Kartentyps, der Geschwindigkeit, der Epoche, des Spieljahres, des Klimas
und der Meereshöhe (diese Option hat keinen Einfluss auf
MapFinder-Spielstände)</L2>
- <L3>Quando è selezionato, per il nome del file di salvataggio viene
utilizzato il tuo nome giocatore insieme all'anno del turno corrente.
Altrimenti, il nome del file è una stringa costituita dalle abbreviazioni
triletterali del nome del Leader, del livello di difficoltà, della
dimensione della Mappa, del tipo di Mappa, della velocità, dell'Era,
dell'anno, del clima e del livello marino. Questa impostazione non
influenza i salvataggi di MapFinder.</L3>
+ <L3>Quando ?selezionato, per il nome del file di salvataggio viene
utilizzato il tuo nome giocatore insieme all'anno del turno corrente.
Altrimenti, il nome del file ?una stringa costituita dalle abbreviazioni
triletterali del nome del Leader, del livello di difficolt? della
dimensione della Mappa, del tipo di Mappa, della velocit? dell'Era,
dell'anno, del clima e del livello marino. Questa impostazione non
influenza i salvataggi di MapFinder.</L3>
<L4>When checked, your player name is used for the saved game name along
with the turn year. Otherwise the name is a concatenation of 3-letter
versions of Leader Name, Difficulty, Map Size, Map Type, Speed, Era, Year,
Climate and Sea Level. This setting does not affect MapFinder saves.</L4>
<Chinese>When checked, your player name is used for the saved game name
along with the turn year. Otherwise the name is a concatenation of 3-letter
versions of Leader Name, Difficulty, Map Size, Map Type, Speed, Era, Year,
Climate and Sea Level. This setting does not affect MapFinder
saves.</Chinese>
</TEXT>
=======================================
--- /trunk/The History of Three
Kingdoms/Assets/XML/Text/BUG_CIV4GameText.xml Thu Sep 24 10:17:15 2009
+++ /trunk/The History of Three
Kingdoms/Assets/XML/Text/BUG_CIV4GameText.xml Wed Oct 7 20:41:24 2009
@@ -1085,7 +1085,7 @@
<Tag>TXT_KEY_REMIND_NEXT_TURN_PROMPT</Tag>
<English>Show reminder again next turn?</English>
<L1>Remontrer le rappel au prochain tour?</L1>
- <L2>Erinnerung nächste Runde erneut anzeigen?</L2>
+ <L2>Erinnerung n?chste Runde erneut anzeigen?</L2>
<L3>Mostrare nuovamente il promemoria il prossimo turno?</L3>
<L4>Show reminder again next turn?</L4>
<Chinese>Show reminder again next turn?</Chinese>
@@ -1111,7 +1111,7 @@
<L1>Puissance</L1>
<L2>Macht</L2>
<L3>Energia</L3>
- <L4>Energía</L4>
+ <L4>Energ¨ªa</L4>
<Chinese>¾üÊÂÊµÁ¦</Chinese>
</TEXT>

@@ -1426,12 +1426,12 @@
</TEXT>
<TEXT>
<Tag>TXT_KEY_BUG_FINANCIAL_ADVISOR_BUILDING_COUNT_AVERAGE</Tag>
- <English>(%d1 × %s2[ICON_GOLD])</English>
- <L1>(%d1 × %s2[ICON_GOLD])</L1>
- <L2>(%d1 × %s2[ICON_GOLD])</L2>
- <L3>(%d1 × %s2[ICON_GOLD])</L3>
- <L4>(%d1 × %s2[ICON_GOLD])</L4>
- <Chinese>(%d1 × %s2[ICON_GOLD])</Chinese>
+ <English>(%d1 ¡Á %s2[ICON_GOLD])</English>
+ <L1>(%d1 ¡Á %s2[ICON_GOLD])</L1>
+ <L2>(%d1 ¡Á %s2[ICON_GOLD])</L2>
+ <L3>(%d1 ¡Á %s2[ICON_GOLD])</L3>
+ <L4>(%d1 ¡Á %s2[ICON_GOLD])</L4>
+ <Chinese>(%d1 ¡Á %s2[ICON_GOLD])</Chinese>
</TEXT>




@@ -27,7 +27,7 @@
<Tag>TXT_KEY_AIAUTOPLAY_CIV_DIED</Tag>
<English>Your civ has died.[NEWLINE]Would you like to lead another
civ?[NEWLINE]</English>
<L1>Votre civilisation est morte.[NEWLINE]Voulez-vous diriger une autre
civilisation ?[NEWLINE]</L1>
- <L2>Während der Automatisierung wurde Ihre Zivilisation
zerstört.[NEWLINE]Welches Volk wollt Ihr nun
anführen?[NEWLINE]</L2>
+ <L2>W?hrend der Automatisierung wurde Ihre Zivilisation
zerst?rt.[NEWLINE]Welches Volk wollt Ihr nun anf¨¹hren?[NEWLINE]</L2>
<L3>Your civ has died.[NEWLINE]Would you like to lead another
civ?[NEWLINE]</L3>
<L4>Tu civilización ha muerto.[NEWLINE]¿Le gustaría dirigir otra
civilización?[NEWLINE]</L4>
<Chinese>Your civ has died.[NEWLINE]Would you like to lead another
civ?[NEWLINE]</Chinese>
@@ -90,7 +90,7 @@
<Tag>TXT_KEY_AIAUTOPLAY_AUTOMATION</Tag>
<English>Choose type of automation</English>
<L1>Choisissez le type d'automatisation</L1>
- <L2>Wählt die Art der Automatisierung</L2>
+ <L2>W?hlt die Art der Automatisierung</L2>
<L3>Choose type of automation</L3>
<L4>Elige tipo de automatización</L4>
<Chinese>Choose type of automation</Chinese>
@@ -108,7 +108,7 @@
<Tag>TXT_KEY_AIAUTOPLAY_LIMIT_DIPLO</Tag>
<English>Limit diplomacy changes</English>
<L1>Limiter des changements de diplomatie</L1>
- <L2>Diplomatieänderungen begrenzen</L2>
+ <L2>Diplomatie?nderungen begrenzen</L2>
<L3>Limit diplomacy changes</L3>
<L4>Limitar cambios de la diplomacia</L4>
<Chinese>Limit diplomacy changes</Chinese>
@@ -125,8 +125,8 @@
<TEXT>
<Tag>TXT_KEY_AIAUTOPLAY_UNIT</Tag>
<English>Automate unit moves only (not fully tested)</English>
- <L1>Déplacement des unités seulement (Pas encore testé à fond)</L1>
- <L2>Nur Einheitenzüge automatisieren (noch nicht vollständig
getestet)</L2>
+ <L1>Déplacement des unités seulement (Pas encore test??fond)</L1>
+ <L2>Nur Einheitenz¨¹ge automatisieren (noch nicht vollst?ndig
getestet)</L2>
<L3>Automate unit moves only (not fully tested)</L3>
<L4>La unidad automatizada se mueve solo (sin terminar de probar)</L4>
<Chinese>Automate unit moves only (not fully tested)</Chinese>
@@ -135,9 +135,9 @@
<Tag>TXT_KEY_AIAUTOPLAY_DEBUG</Tag>
<English>Debug Mode (will reveal entire world!!!)</English>
<L1>Mode Debug (Révellera la carte du monde !!!)</L1>
- <L2>Debug-Modus (Enthüllt die komplette Karte!!!)</L2>
+ <L2>Debug-Modus (Enth¨¹llt die komplette Karte!!!)</L2>
<L3>Debug Mode (will reveal entire world!!!)</L3>
- <L4>Modo Debug (¡¡¡Revelará el mundo entero!!!)</L4>
+ <L4>Modo Debug (¡¡¡Revelar?el mundo entero!!!)</L4>
<Chinese>Debug Mode (will reveal entire world!!!)</Chinese>
</TEXT>
<TEXT>
@@ -161,8 +161,8 @@
<TEXT>
<Tag>TXT_KEY_AIAUTOPLAY_USURPATOR</Tag>
<English>Terrible news:[NEWLINE][NEWLINE]Coniving rivals have overthrown
you in a coup![NEWLINE]A little to much "Let them eat cake"
perhaps?</English>
- <L1>Terrible nouvelle :[NEWLINE][NEWLINE]Vos amis politiques se sont
révélés être vos rivaux et vous ont destitué ![NEWLINE]Peut-être leur
avez-vous un peu trop fait confiance ?</L1>
- <L2>Erschreckende Neuigkeiten:[NEWLINE][NEWLINE]Ein Usurpator hat Euch
entmachtet![NEWLINE]Vielleicht habt Ihr ein wenig zu oft die Zügel
schleifen lassen?</L2>
+ <L1>Terrible nouvelle :[NEWLINE][NEWLINE]Vos amis politiques se sont
révélés être vos rivaux et vous ont destitu?![NEWLINE]Peut-être leur
avez-vous un peu trop fait confiance ?</L1>
+ <L2>Erschreckende Neuigkeiten:[NEWLINE][NEWLINE]Ein Usurpator hat Euch
entmachtet![NEWLINE]Vielleicht habt Ihr ein wenig zu oft die Z¨¹gel
schleifen lassen?</L2>
<L3>Terrible news:[NEWLINE][NEWLINE]Coniving rivals have overthrown you
in a coup![NEWLINE]A little to much "Let them eat cake" perhaps?</L3>
<L4>Terribles noticias:[NEWLINE][NEWLINE]¡Conspiradores han dado un
golpe de estado![NEWLINE]¿Puede que a lo mejor hayas sido demasiado
permisivo?</L4>
<Chinese>Terrible news:[NEWLINE][NEWLINE]Coniving rivals have overthrown
you in a coup![NEWLINE]A little to much "Let them eat cake"
perhaps?</Chinese>
@@ -170,8 +170,8 @@
<TEXT>
<Tag>TXT_KEY_AIAUTOPLAY_GOOD_NEWS</Tag>
<English>[NEWLINE][NEWLINE]However, there is good news![NEWLINE]Mystical
advisors report that you will be reincarnated and return to power in %d
turns.[NEWLINE][NEWLINE]In the meantime, you can only hope your successor
proves worthy.</English>
- <L1>[NEWLINE][NEWLINE]Toutefois, il y a une bonne nouvelle ![NEWLINE]Les
astrologues prédisent votre réincarnation et votre retour au pouvoir
dans %d tours.[NEWLINE][NEWLINE]En attendant, vous n'avez plus qu'à espérer
que votre successeur agira correctement.</L1>
- <L2>[NEWLINE][NEWLINE]Aber es gibt auch eine gute
Neuigkeit![NEWLINE]Sterndeuter sagen Euch voraus, dass Ihr in %d Runden die
Macht zurückerlangt.[NEWLINE][NEWLINE]In der Zwischenzeit könnt
Ihr nur hoffen, dass der neue Herrscher sich als würdig erweist.</L2>
+ <L1>[NEWLINE][NEWLINE]Toutefois, il y a une bonne nouvelle ![NEWLINE]Les
astrologues prédisent votre réincarnation et votre retour au pouvoir
dans %d tours.[NEWLINE][NEWLINE]En attendant, vous n'avez plus qu'?espérer
que votre successeur agira correctement.</L1>
+ <L2>[NEWLINE][NEWLINE]Aber es gibt auch eine gute
Neuigkeit![NEWLINE]Sterndeuter sagen Euch voraus, dass Ihr in %d Runden die
Macht zur¨¹ckerlangt.[NEWLINE][NEWLINE]In der Zwischenzeit k?nnt Ihr nur
hoffen, dass der neue Herrscher sich als w¨¹rdig erweist.</L2>
<L3>[NEWLINE][NEWLINE]However, there is good news![NEWLINE]Mystical
advisors report that you will be reincarnated and return to power in %d
turns.[NEWLINE][NEWLINE]In the meantime, you can only hope your successor
proves worthy.</L3>
<L4>[NEWLINE][NEWLINE]¡No obstante, también hay buenas
noticias![NEWLINE]Los astrólogos vaticinaron vuestra reencarnación y
retorno al poder en %d turnos.[NEWLINE][NEWLINE]Mientras tanto, solo podeis
esperar que vuestro sucesor este a la altura.</L4>
<Chinese>[NEWLINE][NEWLINE]However, there is good news![NEWLINE]Mystical
advisors report that you will be reincarnated and return to power in %d
turns.[NEWLINE][NEWLINE]In the meantime, you can only hope your successor
proves worthy.</Chinese>
=======================================
--- /trunk/The History of Three
Kingdoms/Assets/XML/Text/CIV4GameText_Civilopedia_Sanguo_Leaders.xml Wed
Mar 11 21:20:47 2009
+++ /trunk/The History of Three
Kingdoms/Assets/XML/Text/CIV4GameText_Civilopedia_Sanguo_Leaders.xml Wed
Oct 7 20:41:24 2009
Binary file, no diff available.
=======================================
--- /trunk/The History of Three
Kingdoms/Assets/XML/Text/CIV4GameText_Sanguo_Changed.xml Fri Sep 25
08:21:08 2009
+++ /trunk/The History of Three
Kingdoms/Assets/XML/Text/CIV4GameText_Sanguo_Changed.xml Wed Oct 7
20:41:24 2009
@@ -1022,7 +1022,7 @@
<L1>Les espions ne sont pas disponibles, et des points d'espionnage sont
convertis en culture</L1>
<L2>Spione sind nicht vorhanden und Spionage-Punkte werden in Kultur
umgewandelt</L2>
<L3>Le spie non sono disponibili ed i punti di spionaggio sono
convertiti in coltura</L3>
- <L4>Los espías no estén disponibles, y los puntos del
espionaje se convierten en cultura</L4>
+ <L4>Los esp¨ªas no est¨¦n disponibles, y los puntos del espionaje se
convierten en cultura</L4>
<Chinese>ÎÞ·¨½¨Ôì¼äµý£¨Ï¸×÷£©£¬¼äµýµãÊý×ª»¯ÎªÎÄ»¯µãÊý</Chinese>
</TEXT>
<TEXT>
=======================================
--- /trunk/The History of Three
Kingdoms/Assets/XML/Text/CIV4GameText_Sanguo_Events.xml Mon Aug 17 09:05:04
2009
+++ /trunk/The History of Three
Kingdoms/Assets/XML/Text/CIV4GameText_Sanguo_Events.xml Wed Oct 7 20:41:24
2009
Binary file, no diff available.
=======================================
--- /trunk/The History of Three
Kingdoms/Assets/XML/Text/CIV4GameText_Sanguo_Wonder.xml Tue Aug 25 06:46:25
2009
+++ /trunk/The History of Three
Kingdoms/Assets/XML/Text/CIV4GameText_Sanguo_Wonder.xml Wed Oct 7 20:41:24
2009
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="GB2312"?>



=======================================
--- /trunk/The History of Three
Kingdoms/Assets/XML/Text/CIV4PlotListEnhancementsInfo.xml Thu Aug 27
07:08:21 2009
+++ /trunk/The History of Three
Kingdoms/Assets/XML/Text/CIV4PlotListEnhancementsInfo.xml Wed Oct 7
20:41:24 2009
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="GB2312"?>



=======================================
--- /trunk/The History of Three
Kingdoms/Assets/XML/Text/Civ4GameText_DCM.xml Wed Mar 4 16:00:54 2009
+++ /trunk/The History of Three
Kingdoms/Assets/XML/Text/Civ4GameText_DCM.xml Wed Oct 7 20:41:24 2009
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="GB2312"?>



=======================================
--- /trunk/The History of Three
Kingdoms/Assets/XML/Text/CvAIAutoPlay_CIV4GameTextInfos.xml Tue Aug 25
06:46:25 2009
+++ /trunk/The History of Three
Kingdoms/Assets/XML/Text/CvAIAutoPlay_CIV4GameTextInfos.xml Wed Oct 7
20:41:24 2009
@@ -100,7 +100,7 @@
<Tag>TXT_KEY_AIAUTOPLAY_AUTOMATION</Tag>
<English>Choose type of automation</English>
<L1>Choose type of automation</L1>
- <L2>Wählt die Art der Automatisierung</L2>
+ <L2>W?hlt die Art der Automatisierung</L2>
<L3>Choose type of automation</L3>
<L4>Choose type of automation</L4>
<Chinese>Ñ¡Ôñµ¥Î»×Ô¶¯ÐÐ¶¯ÀàÐÍ</Chinese>
@@ -118,7 +118,7 @@
<Tag>TXT_KEY_AIAUTOPLAY_UNIT</Tag>
<English>Automate unit moves only (not fully tested)</English>
<L1>Automate unit moves only (not fully tested)</L1>
- <L2>Nur Einheitenz¨¹ge automatisieren (noch nicht vollständig
getestet)</L2>
+ <L2>Nur Einheitenz¨¹ge automatisieren (noch nicht vollst?ndig
getestet)</L2>
<L3>Automate unit moves only (not fully tested)</L3>
<L4>Automate unit moves only (not fully tested)</L4>
<Chinese>½öÈÃAI¿ØÖÆµ¥Î»µÄÒÆ¶¯£¨ÉÐÎ´¾¹ýÈ«Ãæ²âÊÔ£©</Chinese>
=======================================
--- /trunk/The History of Three
Kingdoms/Assets/XML/Text/EventSigns_CIV4GameText.xml Mon Mar 16 16:07:23
2009
+++ /trunk/The History of Three
Kingdoms/Assets/XML/Text/EventSigns_CIV4GameText.xml Wed Oct 7 20:41:24
2009
@@ -93,7 +93,7 @@
<TEXT>
<Tag>TXT_KEY_SIGN_EVENT_SALTPETER_1</Tag>
<English>saltpeter</English>
- <L1>salpêtre</L1>
+ <L1>salp¨ºtre</L1>
<L2>Salpeter</L2>
<L3>salnitro</L3>
<L4>salitre</L4>
@@ -102,7 +102,7 @@
<TEXT>
<Tag>TXT_KEY_SIGN_EVENT_CLUNKER_COAL_1</Tag>
<English>impurities</English>
- <L1>impuretés</L1>
+ <L1>impuret¨¦s</L1>
<L2>Verunreinigungen</L2>
<L3>impurezze</L3>
<L4>impurezas</L4>
@@ -111,7 +111,7 @@
<TEXT>
<Tag>TXT_KEY_SIGN_EVENT_SOUR_CRUDE_1</Tag>
<English>impurities</English>
- <L1>impuretés</L1>
+ <L1>impuret¨¦s</L1>
<L2>Verunreinigungen</L2>
<L3>impurezze</L3>
<L4>impurezas</L4>
@@ -138,10 +138,10 @@
<TEXT>
<Tag>TXT_KEY_SIGN_EVENT_TIN_1</Tag>
<English>Tin</English>
- <L1>étain</L1>
+ <L1>¨¦tain</L1>
<L2>Zinn</L2>
<L3>stagno</L3>
- <L4>estaño</L4>
+ <L4>esta?o</L4>
<Chinese>Îý¿ó</Chinese>
</TEXT>
<TEXT>
@@ -165,7 +165,7 @@
<TEXT>
<Tag>TXT_KEY_SIGN_EVENT_FORTY_THIEVES_1</Tag>
<English>local legend</English>
- <L1>légende locale</L1>
+ <L1>l¨¦gende locale</L1>
<L2>örtliche Legende</L2>
<L3>leggenda locale</L3>
<L4>leyenda local</L4>
=======================================
--- /trunk/The History of Three
Kingdoms/Assets/XML/Text/Full_of_Resources_text.xml Mon Aug 10 10:31:42 2009
+++ /trunk/The History of Three
Kingdoms/Assets/XML/Text/Full_of_Resources_text.xml Wed Oct 7 20:41:24 2009
@@ -18,7 +18,7 @@
<L2/>
<L3/>
<L4/>
- <Chinese>FoR 选项 :</Chinese>
+ <Chinese>FoR Ñ¡Ïî :</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_BUTTON_SEL0_BTS</Tag>
@@ -27,7 +27,7 @@
<L2/>
<L3/>
<L4/>
-
<Chinese>想呼出选项界面,</Chinese>
+ <Chinese>Ïëºô³öÑ¡Ïî½çÃæ,</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_BUTTON_SEL1_BTS</Tag>
@@ -36,7 +36,7 @@
<L2/>
<L3/>
<L4/>
-
<Chinese>选另一个未被选中的就得了</Chinese>
+ <Chinese>Ñ¡ÁíÒ»¸öÎ´±»Ñ¡ÖÐµÄ¾ÍµÃÁË</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_BUTTON_SEL0_VANILLA</Tag>
@@ -117,7 +117,7 @@
<L2/>
<L3/>
<L4/>
- <Chinese>请输入文件名.</Chinese>
+ <Chinese>ÇëÊäÈëÎÄ¼þÃû.</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_CHANGE_FILE_NAME</Tag>
@@ -144,7 +144,7 @@
<L2/>
<L3/>
<L4/>
- <Chinese>关于 :</Chinese>
+ <Chinese>¹ØÓÚ :</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_MAPS</Tag>
@@ -153,7 +153,7 @@
<L2/>
<L3/>
<L4/>
- <Chinese>地图 :</Chinese>
+ <Chinese>µØÍ¼ :</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_TERRAIN</Tag>
@@ -162,7 +162,7 @@
<L2/>
<L3/>
<L4/>
- <Chinese>地形 :</Chinese>
+ <Chinese>µØÐÎ :</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_RESOURCES</Tag>
@@ -171,7 +171,7 @@
<L2/>
<L3/>
<L4/>
- <Chinese>资源 :</Chinese>
+ <Chinese>×ÊÔ´ :</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_STARTLOC</Tag>
@@ -180,7 +180,7 @@
<L2/>
<L3/>
<L4/>
- <Chinese>开始位置 :</Chinese>
+ <Chinese>¿ªÊ¼Î»ÖÃ :</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_GAME_OPTIONS</Tag>
@@ -189,7 +189,7 @@
<L2/>
<L3/>
<L4/>
- <Chinese>游戏选项 :</Chinese>
+ <Chinese>ÓÎÏ·Ñ¡Ïî :</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_RESET</Tag>
@@ -198,7 +198,7 @@
<L2/>
<L3/>
<L4/>
- <Chinese>重置</Chinese>
+ <Chinese>ÖØÖÃ</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_RESET_ALL</Tag>
@@ -207,7 +207,7 @@
<L2/>
<L3/>
<L4/>
- <Chinese>重置所有</Chinese>
+ <Chinese>ÖØÖÃËùÓÐ</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_REFRESH</Tag>
@@ -216,7 +216,7 @@
<L2/>
<L3/>
<L4/>
- <Chinese>检查</Chinese>
+ <Chinese>¼ì²é</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_REFRESH_TIP</Tag>
@@ -225,7 +225,7 @@
<L2/>
<L3/>
<L4/>
-
<Chinese>这个按钮是用来检查你输入的值是否有效.</Chinese>
+ <Chinese>Õâ¸ö°´Å¥ÊÇÓÃÀ´¼ì²éÄãÊäÈëµÄÖµÊÇ·ñÓÐÐ§.</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_RESET_TABLE</Tag>
@@ -234,7 +234,7 @@
<L2/>
<L3/>
<L4/>
- <Chinese>重置当前面板</Chinese>
+ <Chinese>ÖØÖÃµ±Ç°Ãæ°å</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_LOAD_FILE</Tag>
@@ -243,7 +243,7 @@
<L2/>
<L3/>
<L4/>
- <Chinese>读取配置文件</Chinese>
+ <Chinese>¶ÁÈ¡ÅäÖÃÎÄ¼þ</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_SAVE_FILE</Tag>
@@ -252,7 +252,7 @@
<L2/>
<L3/>
<L4/>
- <Chinese>保存配置文件</Chinese>
+ <Chinese>±£´æÅäÖÃÎÄ¼þ</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_EXIT0</Tag>
@@ -261,7 +261,7 @@
<L2/>
<L3/>
<L4/>
- <Chinese>退出</Chinese>
+ <Chinese>ÍË³ö</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_EXIT</Tag>
@@ -270,7 +270,7 @@
<L2/>
<L3/>
<L4/>
- <Chinese>保存并退出</Chinese>
+ <Chinese>±£´æ²¢ÍË³ö</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_MAPS_WRAP</Tag>
@@ -279,7 +279,7 @@
<L2/>
<L3/>
<L4/>
- <Chinese>地图环绕 :</Chinese>
+ <Chinese>µØÍ¼»·ÈÆ :</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_MAPS_WRAP_SEL0</Tag>
@@ -288,7 +288,7 @@
<L2/>
<L3/>
<L4/>
- <Chinese>平面</Chinese>
+ <Chinese>Æ½Ãæ</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_MAPS_WRAP_SEL1</Tag>
@@ -297,7 +297,7 @@
<L2/>
<L3/>
<L4/>
- <Chinese>柱面</Chinese>
+ <Chinese>ÖùÃæ</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_MAPS_WRAP_SEL2</Tag>
@@ -306,7 +306,7 @@
<L2/>
<L3/>
<L4/>
- <Chinese>环面</Chinese>
+ <Chinese>»·Ãæ</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_MAPS_START</Tag>
@@ -315,7 +315,7 @@
<L2/>
<L3/>
<L4/>
- <Chinese>开始 :</Chinese>
+ <Chinese>¿ªÊ¼ :</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_MAPS_START_SEL0</Tag>
@@ -324,7 +324,7 @@
<L2/>
<L3/>
<L4/>
- <Chinese>海岸</Chinese>
+ <Chinese>º£°¶</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_MAPS_START_SEL1</Tag>
@@ -333,7 +333,7 @@
<L2/>
<L3/>
<L4/>
- <Chinese>内陆</Chinese>
+ <Chinese>ÄÚÂ½</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_MAPS_WATER_PERCENT</Tag>
@@ -342,7 +342,7 @@
<L2/>
<L3/>
<L4/>
- <Chinese>水 百分比 :</Chinese>
+ <Chinese>Ë® °Ù·Ö±È :</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_VALUE</Tag>
@@ -351,7 +351,7 @@
<L2/>
<L3/>
<L4/>
- <Chinese>固定值</Chinese>
+ <Chinese>¹Ì¶¨Öµ</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_RANDOM</Tag>
@@ -360,7 +360,7 @@
<L2/>
<L3/>
<L4/>
- <Chinese>随机</Chinese>
+ <Chinese>Ëæ»ú</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_BETWEEN</Tag>
@@ -369,7 +369,7 @@
<L2/>
<L3/>
<L4/>
- <Chinese> 从</Chinese>
+ <Chinese> ´Ó</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_AND</Tag>
@@ -378,7 +378,7 @@
<L2/>
<L3/>
<L4/>
- <Chinese>到</Chinese>
+ <Chinese>µ½</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_MAPS_ARCHI_LANDMASS</Tag>
@@ -387,7 +387,7 @@
<L2/>
<L3/>
<L4/>
- <Chinese>陆地类型 :</Chinese>
+ <Chinese>Â½µØÀàÐÍ :</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_MAPS_ARCHI_LANDMASS_SEL0</Tag>
@@ -396,7 +396,7 @@
<L2/>
<L3/>
<L4/>
- <Chinese>蛇形陆地</Chinese>
+ <Chinese>ÉßÐÎÂ½µØ</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_MAPS_ARCHI_LANDMASS_SEL1</Tag>
@@ -405,7 +405,7 @@
<L2/>
<L3/>
<L4/>
- <Chinese>群岛</Chinese>
+ <Chinese>Èºµº</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_MAPS_ARCHI_LANDMASS_SEL2</Tag>
@@ -414,7 +414,7 @@
<L2/>
<L3/>
<L4/>
- <Chinese>微小岛屿</Chinese>
+ <Chinese>Î¢Ð¡µºÓì</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_MAPS_CC_NB_CONTINENTS</Tag>
@@ -423,7 +423,7 @@
<L2/>
<L3/>
<L4/>
- <Chinese>大陆数量 :</Chinese>
+ <Chinese>´óÂ½ÊýÁ¿ :</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_MAPS_CC_NB_CONTINENTS_SEL0</Tag>
@@ -432,7 +432,7 @@
<L2/>
<L3/>
<L4/>
- <Chinese>随机</Chinese>
+ <Chinese>Ëæ»ú</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_MAPS_CC_NB_CONTINENTS_SEL1</Tag>
@@ -441,7 +441,7 @@
<L2/>
<L3/>
<L4/>
- <Chinese>每组队 1 片(最多
6)</Chinese>
+ <Chinese>Ã¿×é¶Ó 1 Æ¬(×î¶à 6)</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_MAPS_CC_NB_CONTINENTS_SEL2</Tag>
@@ -495,7 +495,7 @@
<L2/>
<L3/>
<L4/>
- <Chinese>玩家地域 :</Chinese>
+ <Chinese>Íæ¼ÒµØÓò :</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_MAPS_AREAS_PER_PLAYER_SEL0</Tag>
@@ -504,7 +504,7 @@
<L2/>
<L3/>
<L4/>
- <Chinese>每玩家 1 片</Chinese>
+ <Chinese>Ã¿Íæ¼Ò 1 Æ¬</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_MAPS_AREAS_PER_PLAYER_SEL1</Tag>
@@ -513,7 +513,7 @@
<L2/>
<L3/>
<L4/>
- <Chinese>每玩家 2 片 (最多 10
个玩家</Chinese>
+ <Chinese>Ã¿Íæ¼Ò 2 Æ¬ (×î¶à 10 ¸öÍæ¼Ò</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_MAPS_LAND_SHAPE</Tag>
@@ -522,7 +522,7 @@
<L2/>
<L3/>
<L4/>
- <Chinese>陆地形状 :</Chinese>
+ <Chinese>Â½µØÐÎ×´ :</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_MAPS_LAND_SHAPE_SEL0</Tag>
@@ -531,7 +531,7 @@
<L2/>
<L3/>
<L4/>
- <Chinese>中等</Chinese>
+ <Chinese>ÖÐµÈ</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_MAPS_LAND_SHAPE_SEL1</Tag>
@@ -540,7 +540,7 @@
<L2/>
<L3/>
<L4/>
- <Chinese>压缩</Chinese>
+ <Chinese>Ñ¹Ëõ</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_MAPS_LAND_SHAPE_SEL2</Tag>
@@ -549,7 +549,7 @@
<L2/>
<L3/>
<L4/>
- <Chinese>稳固</Chinese>
+ <Chinese>ÎÈ¹Ì</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_MAPS_NEUTRAL_TERRITORY</Tag>
@@ -558,7 +558,7 @@
<L2/>
<L3/>
<L4/>
- <Chinese>中立领土 :</Chinese>
+ <Chinese>ÖÐÁ¢ÁìÍÁ :</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_MAPS_NEUTRAL_TERRITORY_SEL0</Tag>
@@ -567,7 +567,7 @@
<L2/>
<L3/>
<L4/>
- <Chinese>混杂</Chinese>
+ <Chinese>»ìÔÓ</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_MAPS_NEUTRAL_TERRITORY_SEL1</Tag>
@@ -576,7 +576,7 @@
<L2/>
<L3/>
<L4/>
- <Chinese>压缩</Chinese>
+ <Chinese>Ñ¹Ëõ</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_MAPS_NEUTRAL_TERRITORY_SEL2</Tag>
@@ -585,7 +585,7 @@
<L2/>
<L3/>
<L4/>
- <Chinese>中等</Chinese>
+ <Chinese>ÖÐµÈ</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_MAPS_NEUTRAL_TERRITORY_SEL3</Tag>
@@ -594,7 +594,7 @@
<L2/>
<L3/>
<L4/>
- <Chinese>岛屿</Chinese>
+ <Chinese>µºÓì</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_MAPS_ISTHMUS_WIDTH</Tag>
@@ -603,7 +603,7 @@
<L2/>
<L3/>
<L4/>
- <Chinese>地峡宽度 :</Chinese>
+ <Chinese>µØÏ¿¿í¶È :</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_MAPS_ISTHMUS_WIDTH_SEL0</Tag>
@@ -612,7 +612,7 @@
<L2/>
<L3/>
<L4/>
- <Chinese>1 个地块</Chinese>
+ <Chinese>1 ¸öµØ¿é</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_MAPS_ISTHMUS_WIDTH_SEL1</Tag>
@@ -621,7 +621,7 @@
<L2/>
<L3/>
<L4/>
- <Chinese>2 个地块</Chinese>
+ <Chinese>2 ¸öµØ¿é</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_MAPS_ISTHMUS_WIDTH_SEL2</Tag>
@@ -630,7 +630,7 @@
<L2/>
<L3/>
<L4/>
- <Chinese>3 个地块</Chinese>
+ <Chinese>3 ¸öµØ¿é</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_MAPS_LARGE_ISLANDS</Tag>
@@ -639,7 +639,7 @@
<L2/>
<L3/>
<L4/>
- <Chinese>大岛数量 :</Chinese>
+ <Chinese>´óµºÊýÁ¿ :</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_MAPS_LARGE_ISLANDS_SEL0</Tag>
@@ -648,7 +648,7 @@
<L2/>
<L3/>
<L4/>
- <Chinese>每玩家 1 片</Chinese>
+ <Chinese>Ã¿Íæ¼Ò 1 Æ¬</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_MAPS_LARGE_ISLANDS_SEL1</Tag>
@@ -657,7 +657,7 @@
<L2/>
<L3/>
<L4/>
- <Chinese>附加</Chinese>
+ <Chinese>¸½¼Ó</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_MAPS_LARGE_ISLANDS_SEL2</Tag>
@@ -666,7 +666,7 @@
<L2/>
<L3/>
<L4/>
- <Chinese>部分附加</Chinese>
+ <Chinese>²¿·Ö¸½¼Ó</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_MAPS_TINY_ISLANDS</Tag>
@@ -675,7 +675,7 @@
<L2/>
<L3/>
<L4/>
- <Chinese>小岛数量 :</Chinese>
+ <Chinese>Ð¡µºÊýÁ¿ :</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_MAPS_TINY_ISLANDS_SEL0</Tag>
@@ -684,7 +684,7 @@
<L2/>
<L3/>
<L4/>
- <Chinese>无小岛</Chinese>
+ <Chinese>ÎÞÐ¡µº</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_MAPS_TINY_ISLANDS_SEL1</Tag>
@@ -693,7 +693,7 @@
<L2/>
<L3/>
<L4/>
- <Chinese>少量小岛</Chinese>
+ <Chinese>ÉÙÁ¿Ð¡µº</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_MAPS_TINY_ISLANDS_SEL2</Tag>
@@ -702,7 +702,7 @@
<L2/>
<L3/>
<L4/>
- <Chinese>多个小岛</Chinese>
+ <Chinese>¶à¸öÐ¡µº</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_MAPS_TINY_ISLANDS_SEL3</Tag>
@@ -711,7 +711,7 @@
<L2/>
<L3/>
<L4/>
- <Chinese>许多小岛</Chinese>
+ <Chinese>Ðí¶àÐ¡µº</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_MAPS_LAKES_SIZE</Tag>
@@ -720,7 +720,7 @@
<L2/>
<L3/>
<L4/>
- <Chinese>湖泊大小 :</Chinese>
+ <Chinese>ºþ²´´óÐ¡ :</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_MAPS_LAKES_SIZE_SEL0</Tag>
@@ -729,7 +729,7 @@
<L2/>
<L3/>
<L4/>
- <Chinese>标准 ( 大湖 )</Chinese>
+ <Chinese>±ê×¼ ( ´óºþ )</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_MAPS_LAKES_SIZE_SEL1</Tag>
@@ -738,7 +738,7 @@
<L2/>
<L3/>
<L4/>
- <Chinese>中型</Chinese>
+ <Chinese>ÖÐÐÍ</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_MAPS_LAKES_SIZE_SEL2</Tag>
@@ -747,7 +747,7 @@
<L2/>
<L3/>
<L4/>
- <Chinese>小型</Chinese>
+ <Chinese>Ð¡ÐÍ</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_MAPS_LAKES_SIZE_SEL3</Tag>
@@ -756,7 +756,7 @@
<L2/>
<L3/>
<L4/>
- <Chinese>微型</Chinese>
+ <Chinese>Î¢ÐÍ</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_MAPS_MAZE_WIDTH</Tag>
@@ -765,7 +765,7 @@
<L2/>
<L3/>
<L4/>
- <Chinese>曲径宽度 :</Chinese>
+ <Chinese>Çú¾¶¿í¶È :</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_MAPS_MAZE_WIDTH_SEL0</Tag>
@@ -774,7 +774,7 @@
<L2/>
<L3/>
<L4/>
- <Chinese>1 个地块</Chinese>
+ <Chinese>1 ¸öµØ¿é</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_MAPS_MAZE_WIDTH_SEL1</Tag>
@@ -783,7 +783,7 @@
<L2/>
<L3/>
<L4/>
- <Chinese>2 个地块</Chinese>
+ <Chinese>2 ¸öµØ¿é</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_MAPS_MAZE_WIDTH_SEL2</Tag>
@@ -792,7 +792,7 @@
<L2/>
<L3/>
<L4/>
- <Chinese>3 个地块</Chinese>
+ <Chinese>3 ¸öµØ¿é</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_MAPS_MAZE_WIDTH_SEL3</Tag>
@@ -801,7 +801,7 @@
<L2/>
<L3/>
<L4/>
- <Chinese>4 个地块</Chinese>
+ <Chinese>4 ¸öµØ¿é</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_MAPS_MAZE_WIDTH_SEL4</Tag>
@@ -810,7 +810,7 @@
<L2/>
<L3/>
<L4/>
- <Chinese>5 个地块</Chinese>
+ <Chinese>5 ¸öµØ¿é</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_MAPS_SHORELINE</Tag>
@@ -819,7 +819,7 @@
<L2/>
<L3/>
<L4/>
- <Chinese>海岸线 :</Chinese>
+ <Chinese>º£°¶Ïß :</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_MAPS_SHORELINE_SEL0</Tag>
@@ -828,7 +828,7 @@
<L2/>
<L3/>
<L4/>
- <Chinese>随机</Chinese>
+ <Chinese>Ëæ»ú</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_MAPS_SHORELINE_SEL1</Tag>
@@ -837,7 +837,7 @@
<L2/>
<L3/>
<L4/>
- <Chinese>中等</Chinese>
+ <Chinese>ÖÐµÈ</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_MAPS_SHORELINE_SEL2</Tag>
@@ -846,7 +846,7 @@
<L2/>
<L3/>
<L4/>
- <Chinese>压缩</Chinese>
+ <Chinese>Ñ¹Ëõ</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_MAPS_SHORELINE_SEL3</Tag>
@@ -855,7 +855,7 @@
<L2/>
<L3/>
<L4/>
- <Chinese>稳固</Chinese>
+ <Chinese>ÎÈ¹Ì</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_MAPS_START_TERRA</Tag>
@@ -864,7 +864,7 @@
<L2/>
<L3/>
<L4/>
- <Chinese>开始 :</Chinese>
+ <Chinese>¿ªÊ¼ :</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_MAPS_START_TERRA_SEL0</Tag>
@@ -873,7 +873,7 @@
<L2/>
<L3/>
<L4/>
- <Chinese>海岸</Chinese>
+ <Chinese>º£°¶</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_MAPS_START_TERRA_SEL1</Tag>
@@ -882,7 +882,7 @@
<L2/>
<L3/>
<L4/>
- <Chinese>内陆</Chinese>
+ <Chinese>ÄÚÂ½</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_MAPS_START_TERRA_SEL2</Tag>
@@ -891,7 +891,7 @@
<L2/>
<L3/>
<L4/>
-
<Chinese>所有在同一大陆</Chinese>
+ <Chinese>ËùÓÐÔÚÍ¬Ò»´óÂ½</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_MAPS_RING_WIDTH</Tag>
@@ -900,7 +900,7 @@
<L2/>
<L3/>
<L4/>
- <Chinese>轮辋宽度 :</Chinese>
+ <Chinese>ÂÖéþ¿í¶È :</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_MAPS_RING_WIDTH_SEL0</Tag>
@@ -909,7 +909,7 @@
<L2/>
<L3/>
<L4/>
- <Chinese>1 个地块</Chinese>
+ <Chinese>1 ¸öµØ¿é</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_MAPS_RING_WIDTH_SEL1</Tag>
@@ -918,7 +918,7 @@
<L2/>
<L3/>
<L4/>
- <Chinese>2 个地块</Chinese>
+ <Chinese>2 ¸öµØ¿é</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_MAPS_RING_WIDTH_SEL2</Tag>
@@ -927,7 +927,7 @@
<L2/>
<L3/>
<L4/>
- <Chinese>3 个地块</Chinese>
+ <Chinese>3 ¸öµØ¿é</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_MAPS_SPOKE_WIDTH</Tag>
@@ -936,7 +936,7 @@
<L2/>
<L3/>
<L4/>
- <Chinese>轮辐宽度 :</Chinese>
+ <Chinese>ÂÖ·ø¿í¶È :</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_MAPS_SPOKE_WIDTH_SEL0</Tag>
@@ -945,7 +945,7 @@
<L2/>
<L3/>
<L4/>
- <Chinese>1 个地块</Chinese>
+ <Chinese>1 ¸öµØ¿é</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_MAPS_SPOKE_WIDTH_SEL1</Tag>
@@ -954,7 +954,7 @@
<L2/>
<L3/>
<L4/>
- <Chinese>2 个地块</Chinese>
+ <Chinese>2 ¸öµØ¿é</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_MAPS_SPOKE_WIDTH_SEL2</Tag>
@@ -963,7 +963,7 @@
<L2/>
<L3/>
<L4/>
- <Chinese>3 个地块</Chinese>
+ <Chinese>3 ¸öµØ¿é</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_MAPS_CONTINENTS_SIZE</Tag>
@@ -972,7 +972,7 @@
<L2/>
<L3/>
<L4/>
- <Chinese>大洲大小 :</Chinese>
+ <Chinese>´óÖÞ´óÐ¡ :</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_MAPS_CONTINENTS_SIZE_SEL0</Tag>
@@ -981,7 +981,7 @@
<L2/>
<L3/>
<L4/>
- <Chinese>大片陆地</Chinese>
+ <Chinese>´óÆ¬Â½µØ</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_MAPS_CONTINENTS_SIZE_SEL1</Tag>
@@ -990,7 +990,7 @@
<L2/>
<L3/>
<L4/>
- <Chinese>正常陆地</Chinese>
+ <Chinese>Õý³£Â½µØ</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_MAPS_CONTINENTS_SIZE_SEL2</Tag>
@@ -999,7 +999,7 @@
<L2/>
<L3/>
<L4/>
- <Chinese>蛇形陆地</Chinese>
+ <Chinese>ÉßÐÎÂ½µØ</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_MAPS_ISLANDS_SIZE</Tag>
@@ -1008,7 +1008,7 @@
<L2/>
<L3/>
<L4/>
- <Chinese>岛屿大小 :</Chinese>
+ <Chinese>µºÓì´óÐ¡ :</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_MAPS_ISLANDS_SIZE_SEL0</Tag>
@@ -1017,7 +1017,7 @@
<L2/>
<L3/>
<L4/>
- <Chinese>岛屿</Chinese>
+ <Chinese>µºÓì</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_MAPS_ISLANDS_SIZE_SEL1</Tag>
@@ -1026,7 +1026,7 @@
<L2/>
<L3/>
<L4/>
- <Chinese>微小岛屿</Chinese>
+ <Chinese>Î¢Ð¡µºÓì</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_MAPS_ISLAND_OVERLAP</Tag>
@@ -1035,7 +1035,7 @@
<L2/>
<L3/>
<L4/>
- <Chinese>重叠岛屿 :</Chinese>
+ <Chinese>ÖØµþµºÓì :</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_MAPS_ISLAND_OVERLAP_SEL0</Tag>
@@ -1044,7 +1044,7 @@
<L2/>
<L3/>
<L4/>
- <Chinese>独立岛屿</Chinese>
+ <Chinese>¶ÀÁ¢µºÓì</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_MAPS_ISLAND_OVERLAP_SEL1</Tag>
@@ -1053,7 +1053,7 @@
<L2/>
<L3/>
<L4/>
- <Chinese>混合岛屿</Chinese>
+ <Chinese>»ìºÏµºÓì</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_MAPS_HEM_CONTINENTS_SIZE</Tag>
@@ -1062,7 +1062,7 @@
<L2/>
<L3/>
<L4/>
- <Chinese>大洲大小 :</Chinese>
+ <Chinese>´óÖÞ´óÐ¡ :</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_MAPS_HEM_CONTINENTS_SIZE_SEL0</Tag>
@@ -1071,7 +1071,7 @@
<L2/>
<L3/>
<L4/>
- <Chinese>大片陆地</Chinese>
+ <Chinese>´óÆ¬Â½µØ</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_MAPS_HEM_CONTINENTS_SIZE_SEL1</Tag>
@@ -1080,7 +1080,7 @@
<L2/>
<L3/>
<L4/>
- <Chinese>正常陆地</Chinese>
+ <Chinese>Õý³£Â½µØ</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_MAPS_HEM_CONTINENTS_SIZE_SEL2</Tag>
@@ -1089,7 +1089,7 @@
<L2/>
<L3/>
<L4/>
- <Chinese>蛇形陆地</Chinese>
+ <Chinese>ÉßÐÎÂ½µØ</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_MAPS_HEM_CONTINENTS_SIZE_SEL3</Tag>
@@ -1098,7 +1098,7 @@
<L2/>
<L3/>
<L4/>
- <Chinese>混杂</Chinese>
+ <Chinese>»ìÔÓ</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_MAPS_HEM_NB_CONTINENTS</Tag>
@@ -1107,7 +1107,7 @@
<L2/>
<L3/>
<L4/>
- <Chinese>大陆数量 :</Chinese>
+ <Chinese>´óÂ½ÊýÁ¿ :</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_MAPS_HEM_NB_CONTINENTS_SEL0</Tag>
@@ -1161,7 +1161,7 @@
<L2/>
<L3/>
<L4/>
- <Chinese>大洲大小 :</Chinese>
+ <Chinese>´óÖÞ´óÐ¡ :</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_MAPS_MAS_CONTINENTS_SIZE_SEL0</Tag>
@@ -1170,7 +1170,7 @@
<L2/>
<L3/>
<L4/>
- <Chinese>正常陆地</Chinese>
+ <Chinese>Õý³£Â½µØ</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_MAPS_MAS_CONTINENTS_SIZE_SEL1</Tag>
@@ -1179,7 +1179,7 @@
<L2/>
<L3/>
<L4/>
- <Chinese>无法预料</Chinese>
+ <Chinese>ÎÞ·¨Ô¤ÁÏ</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_MAPS_MAS_CONTINENTS_SIZE_SEL2</Tag>
@@ -1188,7 +1188,7 @@
<L2/>
<L3/>
<L4/>
- <Chinese>蛇形陆地</Chinese>
+ <Chinese>ÉßÐÎÂ½µØ</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_MAPS_MAS_CONTINENTS_SIZE_SEL3</Tag>
***The diff for this file has been truncated for email.***
=======================================
--- /trunk/The History of Three Kingdoms/Assets/XML/Text/MapFinder
Options.xml Thu Aug 27 23:53:03 2009
+++ /trunk/The History of Three Kingdoms/Assets/XML/Text/MapFinder
Options.xml Wed Oct 7 20:41:24 2009
@@ -20,7 +20,7 @@
<English>When checked, the shortcut keys for regenerating the map (ALT +
G) and starting/stopping MapFinder (ALT + CTRL + G) are active.</English>
<L1>When checked, the shortcut keys for regenerating the map (ALT + G)
and starting/stopping MapFinder (ALT + CTRL + G) are active.</L1>
<L2>Aktiviert die Tastenkombinationen, um eine Karte neu erstellen zu
lassen ([ALT + G]) und den MapFinder zu starten/stoppen ([STRG + ALT +
G])</L2>
- <L3>quando è selezionato, sono attive le scorciatoie da tastiera per
rigenerare la mappa (ALT + G) e per lanciare/fermare MapFinder (ALT + CTRL
+ G).</L3>
+ <L3>quando ?selezionato, sono attive le scorciatoie da tastiera per
rigenerare la mappa (ALT + G) e per lanciare/fermare MapFinder (ALT + CTRL
+ G).</L3>
<L4>When checked, the shortcut keys for regenerating the map (ALT + G)
and starting/stopping MapFinder (ALT + CTRL + G) are active.</L4>
<Chinese>When checked, the shortcut keys for regenerating the map (ALT +
G) and starting/stopping MapFinder (ALT + CTRL + G) are active.</Chinese>
</TEXT>
@@ -76,7 +76,7 @@
<English>Enter the number of seconds to delay before the map is
regenerated each time through the MapFinder cycle (default value is
0.0).</English>
<L1>Enter the number of seconds to delay before the map is regenerated
each time through the MapFinder cycle (default value is 0.0).</L1>
<L2>Eingabe der Anzahl von Sekunden, die gewartet werden soll, bevor
eine Karte während eines MapFinder-Durchlaufs neu erstellt wird (der
Standardwert ist 0.0)</L2>
- <L3>Inserisci il numero di secondi di attesa prima che la mappa venga
rigenerata dal ciclo di MapFinder (il valore di default è 0.0).</L3>
+ <L3>Inserisci il numero di secondi di attesa prima che la mappa venga
rigenerata dal ciclo di MapFinder (il valore di default ?0.0).</L3>
<L4>Enter the number of seconds to delay before the map is regenerated
each time through the MapFinder cycle (default value is 0.0).</L4>
<Chinese>Enter the number of seconds to delay before the map is
regenerated each time through the MapFinder cycle (default value is
0.0).</Chinese>
</TEXT>
@@ -94,7 +94,7 @@
<English>Enter the number of seconds to pause before starting the next
MapFinder cycle when a map fails to pass the rules and is skipped (default
value is 0.25).</English>
<L1>Enter the number of seconds to pause before starting the next
MapFinder cycle when a map fails to pass the rules and is skipped (default
value is 0.25).</L1>
<L2>Eingabe der Anzahl von Sekunden, die gewartet werden soll, bevor der
nächste MapFinder-Durchlauf gestartet wird, wenn eine Karte die Regeln
nicht erfüllt und übersprungen wird (der Standardwert ist 0.25)</L2>
- <L3>Inserisci il numero di secondi di attesa prima di dare inizio al
successivo ciclo di MapFinder quando una mappa non soddisfa le regole (il
valore di default è 0.25).</L3>
+ <L3>Inserisci il numero di secondi di attesa prima di dare inizio al
successivo ciclo di MapFinder quando una mappa non soddisfa le regole (il
valore di default ?0.25).</L3>
<L4>Enter the number of seconds to pause before starting the next
MapFinder cycle when a map fails to pass the rules and is skipped (default
value is 0.25).</L4>
<Chinese>Enter the number of seconds to pause before starting the next
MapFinder cycle when a map fails to pass the rules and is skipped (default
value is 0.25).</Chinese>
</TEXT>
@@ -112,7 +112,7 @@
<English>Enter the number of seconds to pause before taking the
screenshot and saving the map when it passes the rules. Note that there may
be an enforced minimum to allow time for the fog of war to recover
previously-revealed tiles before taking the screenshot (default value is
2.0).</English>
<L1>Enter the number of seconds to pause before taking the screenshot
and saving the map when it passes the rules. Note that there may be an
enforced minimum to allow time for the fog of war to recover
previously-revealed tiles before taking the screenshot (default value is
2.0).</L1>
<L2>Eingabe der Anzahl von Sekunden, die gewartet werden soll, bevor ein
Screenshot erstellt und eine Karte gespeichert wird, wenn sie die Regeln
erfüllt. Es sollte beachtet werden, dass möglicherweise ein erzwungener
Minimalwert existiert, um zuvor enthüllte Geländefelder wieder mit dem
Nebel des Krieges zu bedecken, bevor ein Screenshot erstellt wird (der
Standardwert ist 2.0)</L2>
- <L3>Inserisci il numero di secondi di attesa prima di catturare la
schermata e salvare la mappa quando questa soddisfa le regole. Si noti che
può essere necessario del tempo perchè la fog-of-war ritorni allo stato
originario prima di catturare la schermata (il valore di default è
2.0).</L3>
+ <L3>Inserisci il numero di secondi di attesa prima di catturare la
schermata e salvare la mappa quando questa soddisfa le regole. Si noti che
pu?essere necessario del tempo perch?la fog-of-war ritorni allo stato
originario prima di catturare la schermata (il valore di default ?2.0).</L3>
<L4>Enter the number of seconds to pause before taking the screenshot
and saving the map when it passes the rules. Note that there may be an
enforced minimum to allow time for the fog of war to recover
previously-revealed tiles before taking the screenshot (default value is
2.0).</L4>
<Chinese>Enter the number of seconds to pause before taking the
screenshot and saving the map when it passes the rules. Note that there may
be an enforced minimum to allow time for the fog of war to recover
previously-revealed tiles before taking the screenshot (default value is
2.0).</Chinese>
</TEXT>
@@ -131,7 +131,7 @@
<English>Enter the maximum number of times MapFinder will regenerate the
map before stopping automatically (default value is 1000).</English>
<L1>Enter the maximum number of times MapFinder will regenerate the map
before stopping automatically (default value is 1000).</L1>
<L2>Eingabe der maximalen Anzahl von Neuerstellungen einer Karte, bevor
MapFinder automatisch stoppt (der Standardwert ist 1000)</L2>
- <L3>Inserire il massimo numero di volte che MapFinder deve rigenerare la
mappa prima di fermarsi automaticamente (il valore di default è 1000).</L3>
+ <L3>Inserire il massimo numero di volte che MapFinder deve rigenerare la
mappa prima di fermarsi automaticamente (il valore di default ?1000).</L3>
<L4>Enter the maximum number of times MapFinder will regenerate the map
before stopping automatically (default value is 1000).</L4>
<Chinese>Enter the maximum number of times MapFinder will regenerate the
map before stopping automatically (default value is 1000).</Chinese>
</TEXT>
@@ -149,7 +149,7 @@
<English>Enter the maximum number of times MapFinder will save the map
before stopping automatically (default value is 1000).</English>
<L1>Enter the maximum number of times MapFinder will save the map before
stopping automatically (default value is 1000).</L1>
<L2>Eingabe der maximalen Anzahl von Speicherungen einer Karte, bevor
MapFinder automatisch stoppt (der Standardwert ist 1000)</L2>
- <L3>Inserire il massimo numero di volte che MapFinder deve salvare la
mappa prima di fermarsi automaticamente (il valore di default è 1000)</L3>
+ <L3>Inserire il massimo numero di volte che MapFinder deve salvare la
mappa prima di fermarsi automaticamente (il valore di default ?1000)</L3>
<L4>Enter the maximum number of times MapFinder will save the map before
stopping automatically (default value is 1000).</L4>
<Chinese>Enter the maximum number of times MapFinder will save the map
before stopping automatically (default value is 1000).</Chinese>
</TEXT>
=======================================
--- /trunk/The History of Three
Kingdoms/Assets/XML/Text/MapFinder_CIV4GameText.xml Tue Aug 25 06:46:25 2009
+++ /trunk/The History of Three
Kingdoms/Assets/XML/Text/MapFinder_CIV4GameText.xml Wed Oct 7 20:41:24 2009
@@ -21,8 +21,8 @@
<Tag>TXT_KEY_MAPFINDER_CANNOT_REGENERATE</Tag>
<English>[COLOR_WARNING_TEXT]MapFinder cannot regenerate the
map[COLOR_REVERT][NEWLINE]Exit to the main menu, start a new game, and try
again.</English>
<L1>[COLOR_WARNING_TEXT]MapFinder cannot regenerate the
map[COLOR_REVERT][NEWLINE]Exit to the main menu, start a new game, and try
again.</L1>
- <L2>[COLOR_WARNING_TEXT]MapFinder: Neuerstellung der Karte nicht
möglich[COLOR_REVERT][NEWLINE]Gehen Sie zurück zum Hauptmenü, beginnen Sie
eine neue Partie und versuchen Sie es erneut.</L2>
- <L3>[COLOR_WARNING_TEXT]MapFinder non può rigenerare la
mappa[COLOR_REVERT][NEWLINE]Esci al menù principale, inizia una nuova
partita e riprova.</L3>
+ <L2>[COLOR_WARNING_TEXT]MapFinder: Neuerstellung der Karte nicht
möglich[COLOR_REVERT][NEWLINE]Gehen Sie zurück zum Hauptmen? beginnen Sie
eine neue Partie und versuchen Sie es erneut.</L2>
+ <L3>[COLOR_WARNING_TEXT]MapFinder non pu?rigenerare la
mappa[COLOR_REVERT][NEWLINE]Esci al men?principale, inizia una nuova
partita e riprova.</L3>
<L4>[COLOR_WARNING_TEXT]MapFinder cannot regenerate the
map[COLOR_REVERT][NEWLINE]Exit to the main menu, start a new game, and try
again.</L4>
<Chinese>[COLOR_WARNING_TEXT]MapFinder cannot regenerate the
map[COLOR_REVERT][NEWLINE]Exit to the main menu, start a new game, and try
again.</Chinese>
</TEXT>
@@ -30,8 +30,8 @@
<Tag>TXT_KEY_MAPFINDER_REGENERATE_FAILED</Tag>
<English>[COLOR_WARNING_TEXT]MapFinder failed to regenerate the
map[COLOR_REVERT][NEWLINE]Exit to the main menu, start a new game, and try
again.</English>
<L1>[COLOR_WARNING_TEXT]MapFinder failed to regenerate the
map[COLOR_REVERT][NEWLINE]Exit to the main menu, start a new game, and try
again.</L1>
- <L2>[COLOR_WARNING_TEXT]MapFinder: Neuerstellung der Karte
fehlgeschlagen[COLOR_REVERT][NEWLINE]Gehen Sie zurück zum Hauptmenü,
beginnen Sie eine neue Partie und versuchen Sie es erneut.</L2>
- <L3>[COLOR_WARNING_TEXT]MapFinder non è riuscito a rigenerare la
mappa[COLOR_REVERT][NEWLINE]Esci al menù principale, inizia una nuova
partita e riprova.</L3>
+ <L2>[COLOR_WARNING_TEXT]MapFinder: Neuerstellung der Karte
fehlgeschlagen[COLOR_REVERT][NEWLINE]Gehen Sie zurück zum Hauptmen?
beginnen Sie eine neue Partie und versuchen Sie es erneut.</L2>
+ <L3>[COLOR_WARNING_TEXT]MapFinder non ?riuscito a rigenerare la
mappa[COLOR_REVERT][NEWLINE]Esci al men?principale, inizia una nuova
partita e riprova.</L3>
<L4>[COLOR_WARNING_TEXT]MapFinder failed to regenerate the
map[COLOR_REVERT][NEWLINE]Exit to the main menu, start a new game, and try
again.</L4>
<Chinese>[COLOR_WARNING_TEXT]MapFinder failed to regenerate the
map[COLOR_REVERT][NEWLINE]Exit to the main menu, start a new game, and try
again.</Chinese>
</TEXT>
@@ -40,7 +40,7 @@
<English>[COLOR_NEGATIVE_TEXT]MapFinder path is
invalid: %s1[COLOR_REVERT]</English>
<L1>[COLOR_NEGATIVE_TEXT]MapFinder path is
invalid: %s1[COLOR_REVERT]</L1>
<L2>[COLOR_NEGATIVE_TEXT]MapFinder-Dateipfad ist
ungültig: %s1[COLOR_REVERT]</L2>
- <L3>[COLOR_NEGATIVE_TEXT]Il percorso di MapFinder non è
valido: %s1[COLOR_REVERT]</L3>
+ <L3>[COLOR_NEGATIVE_TEXT]Il percorso di MapFinder
non ?valido: %s1[COLOR_REVERT]</L3>
<L4>[COLOR_NEGATIVE_TEXT]MapFinder path is
invalid: %s1[COLOR_REVERT]</L4>
<Chinese>[COLOR_NEGATIVE_TEXT]MapFinder path is
invalid: %s1[COLOR_REVERT]</Chinese>
</TEXT>
@@ -49,7 +49,7 @@
<English>[COLOR_NEGATIVE_TEXT]MapFinder system file not
found: %s1[COLOR_REVERT]</English>
<L1>[COLOR_NEGATIVE_TEXT]MapFinder system file not
found: %s1[COLOR_REVERT]</L1>
<L2>[COLOR_NEGATIVE_TEXT]MapFinder-Systemdatei nicht
gefunden: %s1[COLOR_REVERT]</L2>
- <L3>[COLOR_NEGATIVE_TEXT]Il file di sistema di MapFinder non è stato
trovato: %s1[COLOR_REVERT]</L3>
+ <L3>[COLOR_NEGATIVE_TEXT]Il file di sistema di MapFinder non ?stato
trovato: %s1[COLOR_REVERT]</L3>
<L4>[COLOR_NEGATIVE_TEXT]MapFinder system file not
found: %s1[COLOR_REVERT]</L4>
<Chinese>[COLOR_NEGATIVE_TEXT]MapFinder system file not
found: %s1[COLOR_REVERT]</Chinese>
</TEXT>
@@ -58,7 +58,7 @@
<English>[COLOR_NEGATIVE_TEXT]MapFinder rule file not
found: %s1[COLOR_REVERT]</English>
<L1>[COLOR_NEGATIVE_TEXT]MapFinder rule file not
found: %s1[COLOR_REVERT]</L1>
<L2>[COLOR_NEGATIVE_TEXT]MapFinder-Regeldatei nicht
gefunden: %s1[COLOR_REVERT]</L2>
- <L3>[COLOR_NEGATIVE_TEXT]Il file delle regole di MapFinder non è stato
trovato: %s1[COLOR_REVERT]</L3>
+ <L3>[COLOR_NEGATIVE_TEXT]Il file delle regole di MapFinder non ?stato
trovato: %s1[COLOR_REVERT]</L3>
<L4>[COLOR_NEGATIVE_TEXT]MapFinder rule file not
found: %s1[COLOR_REVERT]</L4>
<Chinese>[COLOR_NEGATIVE_TEXT]MapFinder rule file not
found: %s1[COLOR_REVERT]</Chinese>
</TEXT>
@@ -67,7 +67,7 @@
<English>[COLOR_NEGATIVE_TEXT]MapFinder save file path is
invalid: %s1[COLOR_REVERT]</English>
<L1>[COLOR_NEGATIVE_TEXT]MapFinder save file path is
invalid: %s1[COLOR_REVERT]</L1>
<L2>[COLOR_NEGATIVE_TEXT]MapFinder-Dateipfad ist
ungültig: %s1[COLOR_REVERT]</L2>
- <L3>[COLOR_NEGATIVE_TEXT]Il percorso di MapFinder non è
valido: %s1[COLOR_REVERT]</L3>
+ <L3>[COLOR_NEGATIVE_TEXT]Il percorso di MapFinder
non ?valido: %s1[COLOR_REVERT]</L3>
<L4>[COLOR_NEGATIVE_TEXT]MapFinder save file path is
invalid: %s1[COLOR_REVERT]</L4>
<Chinese>[COLOR_NEGATIVE_TEXT]MapFinder save file path is
invalid: %s1[COLOR_REVERT]</Chinese>
</TEXT>
=======================================
--- /trunk/The History of Three
Kingdoms/Assets/XML/Text/MoreCiv4lerts_CIV4GameText.xml Thu Mar 12 07:48:58
2009
+++ /trunk/The History of Three
Kingdoms/Assets/XML/Text/MoreCiv4lerts_CIV4GameText.xml Wed Oct 7 20:41:24
2009
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="GB2312"?>
<Civ4GameText xmlns="http://www.firaxis.com">


@@ -114,7 +114,7 @@
<L2>[COLOR_TECH_TEXT]Wird kapitulieren: %s1[COLOR_REVERT]</L2>
<L3>[COLOR_TECH_TEXT]Capitoler? %s1[COLOR_REVERT]</L3>
<L4>[COLOR_TECH_TEXT]Will Capitulate: %s1[COLOR_REVERT]</L4>
- <Chinese>[COLOR_TECH_TEXT]Ô¸ÒâÍ·Ïñ£º%s1[COLOR_REVERT]</Chinese>
+ <Chinese>[COLOR_TECH_TEXT]Ô¸ÒâÍ¶½µ£º%s1[COLOR_REVERT]</Chinese>
</TEXT>
<TEXT>
<Tag>TXT_KEY_MORECIV4LERTS_PEACE_TREATY</Tag>
=======================================
--- /trunk/The History of Three
Kingdoms/Assets/XML/Text/Sevopedia_CIV4GameText.xml Thu Sep 24 10:17:15 2009
+++ /trunk/The History of Three
Kingdoms/Assets/XML/Text/Sevopedia_CIV4GameText.xml Wed Oct 7 20:41:24 2009
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="GB2312"?>



@@ -91,7 +91,7 @@
<L1>Doctrine et Religion Préférée</L1>
<L2>Bevorzugte Staatsform und Religion</L2>
<L3>Forme di governo e Religioni preferite</L3>
- <L4>Principio y religión favoritos</L4>
+ <L4>Principio y religi¨®n favoritos</L4>
<Chinese>Æ«ºÃÕþÌåºÍÐÅÄî</Chinese>
</TEXT>
<TEXT>
=======================================
--- /trunk/The History of Three
Kingdoms/Assets/XML/Text/Shortcuts_CIV4GameText.xml Wed Mar 4 16:00:54 2009
+++ /trunk/The History of Three
Kingdoms/Assets/XML/Text/Shortcuts_CIV4GameText.xml Wed Oct 7 20:41:24 2009
Binary file, no diff available.
=======================================
--- /trunk/The History of Three Kingdoms/CvGameCoreDLL/CvCity.cpp Sun Sep
27 18:36:06 2009
+++ /trunk/The History of Three Kingdoms/CvGameCoreDLL/CvCity.cpp Wed Oct
7 20:41:24 2009
@@ -11857,6 +11857,10 @@
}
}
}
+ else if (pPlot->isCity())
+ {
+ return true;
+ }
}
}
}
=======================================
--- /trunk/The History of Three Kingdoms/CvGameCoreDLL/CvGame.cpp Fri Oct
2 09:08:25 2009
+++ /trunk/The History of Three Kingdoms/CvGameCoreDLL/CvGame.cpp Wed Oct
7 20:41:24 2009
@@ -10220,14 +10220,11 @@
// note that in rare cases this could be a nine transformation
promotion: a hero who has nine transformation as innate ability
if (iNewValue == 1 || m_ppaiHeroPromotionStatus[eHero][ePromotion] == 1)
{
- if (pCore->isLeaderTroop())
- {
- if (getHeroPromotionStatus(pCore->getLeaderHero(), ePromotion) != 1)
- {
- pCore->setHasPromotion(ePromotion, iNewValue == 1 ? true : false);
- }
- m_ppaiHeroPromotionStatus[eHero][ePromotion] = iNewValue;
- }
+ if (!pCore->isLeaderTroop() ||
getHeroPromotionStatus(pCore->getLeaderHero(), ePromotion) != 1)
+ {
+ pCore->setHasPromotion(ePromotion, iNewValue == 1 ? true : false);
+ }
+ m_ppaiHeroPromotionStatus[eHero][ePromotion] = iNewValue;
}
else if (iNewValue == 2 || m_ppaiHeroPromotionStatus[eHero][ePromotion]
== 2)
{
@@ -11312,6 +11309,11 @@
CvHeroInfo* pNewHeroInfo = new CvHeroInfo;
FAssert (pNewHeroInfo != NULL);
FAssert (GET_PLAYER(ePlayer).isAlive());
+
+ if (!GET_PLAYER(ePlayer).isAlive())
+ {
+ return NO_HERO;
+ }

pNewHeroInfo->setRandom(true);

@@ -12051,7 +12053,7 @@

PlayerTypes ePlayer = (PlayerTypes)getHeroDebutStatus(eHero);

- if (ePlayer != NO_PLAYER)
+ if (ePlayer >= 0)
{
setHeroDebutStatus(eHero, -3);
GET_PLAYER(ePlayer).recalculateGreatGeneralThreshold();
@@ -12143,8 +12145,11 @@
}

HeroTypes eHero = createRandomHero(ePlayer, iX, iY);
- eNewLeader = createRandomLeader(ePlayer, eHero);
- }
+ if (eHero != NO_HERO)
+ {
+ eNewLeader = createRandomLeader(ePlayer, eHero);
+ }
+ }

FAssert (eNewLeader != NO_LEADER);

=======================================
--- /trunk/The History of Three Kingdoms/CvGameCoreDLL/CvPlayer.cpp Fri
Oct 2 09:08:25 2009
+++ /trunk/The History of Three Kingdoms/CvGameCoreDLL/CvPlayer.cpp Wed
Oct 7 20:41:24 2009
@@ -3882,6 +3882,11 @@
{
return false;
}
+
+ if (GC.getGameINLINE().getHeroCapturePlayer(eHero) != NO_PLAYER)
+ {
+ return false;
+ }

if (getGold() < (bDiscount ? getRecruitHeroGold(eHero) / 2 :
getRecruitHeroGold(eHero)))
{
@@ -3978,7 +3983,7 @@
{
CvWString szBuffer = gDLL->getText("TXT_KEY_HERO_PERSUADED",
GC.getHeroInfo(eHero).getDescription());
gDLL->getInterfaceIFace()->addMessage(getID(), false,
GC.getEVENT_MESSAGE_TIME(), szBuffer, "AS2D_UNIT_GREATPEOPLE",
MESSAGE_TYPE_MAJOR_EVENT, GC.getHeroInfo(eHero).getButton(),
(ColorTypes)GC.getInfoTypeForString("COLOR_UNIT_TEXT"), iX, iY, true, true);
- if (GET_PLAYER(ePlayer).isAlive())
+ if (ePlayer >= 0 && GET_PLAYER(ePlayer).isAlive())
{
szBuffer = gDLL->getText("TXT_KEY_HERO_BETRAYED",
GC.getHeroInfo(eHero).getDescription(), getCivilizationDescription());
gDLL->getInterfaceIFace()->addMessage(ePlayer, false,
GC.getEVENT_MESSAGE_TIME(), szBuffer,
GC.getEraInfo(GC.getGameINLINE().getCurrentEra()).getAudioUnitDefeatScript(),
MESSAGE_TYPE_INFO, GC.getHeroInfo(eHero).getButton(),
(ColorTypes)GC.getInfoTypeForString("COLOR_WARNING_TEXT"));
@@ -11715,7 +11720,7 @@
// break;
// }
// }
- if (!isHuman())
+ if (!isHuman() && isAlive())
{
int iRandOffset = 0;
std::vector<HeroTypes> OwnFactionHeroIDs;
@@ -11828,7 +11833,7 @@
}
setCombatExperience(getCombatExperience() - iExperienceThreshold);
}
- else
+ else if (isAlive())
{
// If the human player is not currently active, do not show create
champion screen, it would be out of sync
//if (GC.getGameINLINE().getActivePlayer() == getID())
=======================================
--- /trunk/The History of Three Kingdoms/CvGameCoreDLL/CvUnit.cpp Tue Sep
29 23:51:43 2009
+++ /trunk/The History of Three Kingdoms/CvGameCoreDLL/CvUnit.cpp Wed Oct
7 20:41:24 2009
@@ -1207,7 +1207,7 @@
GC.getGameINLINE().doHeroDeath(getHeroType(), true);
return;
}
- if (//!GC.getGameINLINE().isOption(GAMEOPTION_NO_HERO_DEATH_FROM_AGE) &&
+ if (!GC.getGameINLINE().isOption(GAMEOPTION_NO_HERO_DEATH_FROM_AGE) &&
GC.getGameINLINE().getGameTurnYear() >
GC.getHeroInfo(getHeroType()).getHistoricalDieYear())
{
if (GC.getHeroInfo(getHeroType()).getMurdererCiv() == NO_CIVILIZATION |
| GC.getGameINLINE().getGameTurnYear() >
GC.getHeroInfo(getHeroType()).getStartingYear() +
(GC.getGameINLINE().isOption(GAMEOPTION_HIGH_HERO_DEATH_CHANCE) ? 35 : 45))
@@ -16549,63 +16549,63 @@
}
}

- if (iConvertWarlordChance > 0)
- {
- if (pLoser->getHeroType() == NO_HERO &&
pLoser->getLeaderUnitType() != NO_UNIT)
- {
- if (GC.getGameINLINE().getSorenRandNum(100, "Convert Warlord") <
iConvertWarlordChance)
- {
- CvUnit* pWarlord =
GET_PLAYER(getOwnerINLINE()).initUnit(pLoser->getLeaderUnitType(),
getX_INLINE(), getY_INLINE());
- if (pWarlord != NULL)
- {
-
GC.getGameINLINE().removeGreatPersonBornName(pWarlord->getNameNoDesc());
- CvWString szOldName = pLoser->getNameNoDesc();
- if (GC.getGameINLINE().isGreatPersonBorn(szOldName))
- {
- pWarlord->setName(szOldName);
- }
- if (isHuman())
- {
- szBuffer = gDLL->getText("TXT_KEY_WARLORD_CONVERTED",
GC.getHeroInfo(getLegionHero()).getDescription(),
pLoser->getNameNoDesc().GetCString());
- gDLL->getInterfaceIFace()->addMessage(getOwnerINLINE(), true,
GC.getEVENT_MESSAGE_TIME(), szBuffer, "AS2D_UNIT_GREATPEOPLE",
MESSAGE_TYPE_INFO, GC.getHeroInfo(getLegionHero()).getButton(),
(ColorTypes)GC.getInfoTypeForString("COLOR_GREEN"), getX_INLINE(),
getY_INLINE(), true, true);
- }
- if (pLoser->isHuman())
- {
- szBuffer = gDLL->getText("TXT_KEY_WARLORD_BETRAYED",
pLoser->getNameNoDesc().GetCString(),
GC.getHeroInfo(getLegionHero()).getDescription());
- gDLL->getInterfaceIFace()->addMessage(pLoser->getOwnerINLINE(),
true, GC.getEVENT_MESSAGE_TIME(), szBuffer, "AS2D_CITYRAZED",
MESSAGE_TYPE_INFO, GC.getHeroInfo(getLegionHero()).getButton(),
(ColorTypes)GC.getInfoTypeForString("COLOR_RED"), pLoser->getX_INLINE(),
pLoser->getY_INLINE(), true, true);
- }
- }
- }
- else
- {
- CvCity* pLoserCapital =
GET_PLAYER(pLoser->getOwnerINLINE()).getCapitalCity();
- if (pLoserCapital != NULL
&& !pLoser->atPlot(pLoserCapital->plot()))
- {
- CvUnit* pWarlord =
GET_PLAYER(pLoser->getOwnerINLINE()).initUnit(pLoser->getLeaderUnitType(),
pLoserCapital->getX_INLINE(), pLoserCapital->getY_INLINE());
- if (pWarlord != NULL)
- {
-
GC.getGameINLINE().removeGreatPersonBornName(pWarlord->getNameNoDesc());
- CvWString szOldName = pLoser->getNameNoDesc();
- if (GC.getGameINLINE().isGreatPersonBorn(szOldName))
- {
- pWarlord->setName(szOldName);
- }
-
- if (isHuman())
- {
- szBuffer = gDLL->getText("TXT_KEY_WARLORD_RELEASED",
GC.getHeroInfo(getLegionHero()).getDescription(),
pLoser->getNameNoDesc().GetCString());
- gDLL->getInterfaceIFace()->addMessage(getOwnerINLINE(), true,
GC.getEVENT_MESSAGE_TIME(), szBuffer, "AS2D_UNIT_GREATPEOPLE",
MESSAGE_TYPE_INFO, GC.getHeroInfo(getLegionHero()).getButton(),
(ColorTypes)GC.getInfoTypeForString("COLOR_GREEN"), getX_INLINE(),
getY_INLINE(), true, true);
- }
- if (pLoser->isHuman())
- {
- szBuffer = gDLL->getText("TXT_KEY_WARLORD_BEEN_RELEASED",
pLoser->getNameNoDesc().GetCString(),
GC.getHeroInfo(getLegionHero()).getDescription());
- gDLL->getInterfaceIFace()->addMessage(pLoser->getOwnerINLINE(),
true, GC.getEVENT_MESSAGE_TIME(), szBuffer, "AS2D_CITYRAZED",
MESSAGE_TYPE_INFO, GC.getHeroInfo(getLegionHero()).getButton(),
(ColorTypes)GC.getInfoTypeForString("COLOR_RED"), pLoser->getX_INLINE(),
pLoser->getY_INLINE(), true, true);
- }
- }
- }
- }
- }
- }
+ //if (iConvertWarlordChance > 0)
+ //{
+ // if (pLoser->getHeroType() == NO_HERO &&
pLoser->getLeaderUnitType() != NO_UNIT)
+ // {
+ // if (GC.getGameINLINE().getSorenRandNum(100, "Convert Warlord")
< iConvertWarlordChance)
+ // {
+ // CvUnit* pWarlord =
GET_PLAYER(getOwnerINLINE()).initUnit(pLoser->getLeaderUnitType(),
getX_INLINE(), getY_INLINE());
+ // if (pWarlord != NULL)
+ // {
+ //
GC.getGameINLINE().removeGreatPersonBornName(pWarlord->getNameNoDesc());
+ // CvWString szOldName = pLoser->getNameNoDesc();
+ // if (GC.getGameINLINE().isGreatPersonBorn(szOldName))
+ // {
+ // pWarlord->setName(szOldName);
+ // }
+ // if (isHuman())
+ // {
+ // szBuffer = gDLL->getText("TXT_KEY_WARLORD_CONVERTED",
GC.getHeroInfo(getLegionHero()).getDescription(),
pLoser->getNameNoDesc().GetCString());
+ // gDLL->getInterfaceIFace()->addMessage(getOwnerINLINE(), true,
GC.getEVENT_MESSAGE_TIME(), szBuffer, "AS2D_UNIT_GREATPEOPLE",
MESSAGE_TYPE_INFO, GC.getHeroInfo(getLegionHero()).getButton(),
(ColorTypes)GC.getInfoTypeForString("COLOR_GREEN"), getX_INLINE(),
getY_INLINE(), true, true);
+ // }
+ // if (pLoser->isHuman())
+ // {
+ // szBuffer = gDLL->getText("TXT_KEY_WARLORD_BETRAYED",
pLoser->getNameNoDesc().GetCString(),
GC.getHeroInfo(getLegionHero()).getDescription());
+ // gDLL->getInterfaceIFace()->addMessage(pLoser->getOwnerINLINE(),
true, GC.getEVENT_MESSAGE_TIME(), szBuffer, "AS2D_CITYRAZED",
MESSAGE_TYPE_INFO, GC.getHeroInfo(getLegionHero()).getButton(),
(ColorTypes)GC.getInfoTypeForString("COLOR_RED"), pLoser->getX_INLINE(),
pLoser->getY_INLINE(), true, true);
+ // }
+ // }
+ // }
+ // else
+ // {
+ // CvCity* pLoserCapital =
GET_PLAYER(pLoser->getOwnerINLINE()).getCapitalCity();
+ // if (pLoserCapital != NULL
&& !pLoser->atPlot(pLoserCapital->plot()))
+ // {
+ // CvUnit* pWarlord =
GET_PLAYER(pLoser->getOwnerINLINE()).initUnit(pLoser->getLeaderUnitType(),
pLoserCapital->getX_INLINE(), pLoserCapital->getY_INLINE());
+ // if (pWarlord != NULL)
+ // {
+ //
GC.getGameINLINE().removeGreatPersonBornName(pWarlord->getNameNoDesc());
+ // CvWString szOldName = pLoser->getNameNoDesc();
+ // if (GC.getGameINLINE().isGreatPersonBorn(szOldName))
+ // {
+ // pWarlord->setName(szOldName);
+ // }
+
+ // if (isHuman())
+ // {
+ // szBuffer = gDLL->getText("TXT_KEY_WARLORD_RELEASED",
GC.getHeroInfo(getLegionHero()).getDescription(),
pLoser->getNameNoDesc().GetCString());
+ // gDLL->getInterfaceIFace()->addMessage(getOwnerINLINE(), true,
GC.getEVENT_MESSAGE_TIME(), szBuffer, "AS2D_UNIT_GREATPEOPLE",
MESSAGE_TYPE_INFO, GC.getHeroInfo(getLegionHero()).getButton(),
(ColorTypes)GC.getInfoTypeForString("COLOR_GREEN"), getX_INLINE(),
getY_INLINE(), true, true);
+ // }
+ // if (pLoser->isHuman())
+ // {
+ // szBuffer = gDLL->getText("TXT_KEY_WARLORD_BEEN_RELEASED",
pLoser->getNameNoDesc().GetCString(),
GC.getHeroInfo(getLegionHero()).getDescription());
+ // gDLL->getInterfaceIFace()->addMessage(pLoser->getOwnerINLINE(),
true, GC.getEVENT_MESSAGE_TIME(), szBuffer, "AS2D_CITYRAZED",
MESSAGE_TYPE_INFO, GC.getHeroInfo(getLegionHero()).getButton(),
(ColorTypes)GC.getInfoTypeForString("COLOR_RED"), pLoser->getX_INLINE(),
pLoser->getY_INLINE(), true, true);
+ // }
+ // }
+ // }
+ // }
+ // }
+ //}

if (bDefeatGeneralRestoreMoves)
{
@@ -16623,7 +16623,7 @@

if (bCaptureBarbarian && !bEnemyCaptured)
{
- if (pLoser->isBarbarian() && !pLoser->isNoCapture())
+ if (pLoser->isBarbarian() && !pLoser->isNoCapture()
&& !pLoser->isNakedHero())
{
CvUnit* pNewUnit =
GET_PLAYER(getOwnerINLINE()).initUnit(pLoser->getUnitType(), getX_INLINE(),
getY_INLINE());
pNewUnit->finishMoves();
@@ -17037,7 +17037,10 @@
gDLL->getInterfaceIFace()->addMessage(getOwnerINLINE(), true,
GC.getEVENT_MESSAGE_TIME(), szBuffer, "AS2D_POSITIVE_DING",
MESSAGE_TYPE_INFO, NULL, (ColorTypes)GC.getInfoTypeForString("COLOR_RED"),
pLoserPlot->getX_INLINE(), pLoserPlot->getY_INLINE());
szBuffer = gDLL->getText("TXT_KEY_HERO_MORALE_SECOND_ATTACKED",
getNameKey(), GC.getHeroInfo(getLegionHero()).getDescription());
gDLL->getInterfaceIFace()->addMessage(pLoser->getOwnerINLINE(), true,
GC.getEVENT_MESSAGE_TIME(), szBuffer, "AS2D_NEGATIVE_DING",
MESSAGE_TYPE_INFO, NULL, (ColorTypes)GC.getInfoTypeForString("COLOR_RED"),
pLoserPlot->getX_INLINE(), pLoserPlot->getY_INLINE());
- attack(pLoserPlot, false, pBestDefender);
+ if (canMoveInto(pLoserPlot, true))
+ {
+ attack(pLoserPlot, false, pBestDefender);
+ }
return;
}
}
=======================================
--- /trunk/The History of Three Kingdoms/Documents/changelog.txt Fri Oct 2
09:08:25 2009
+++ /trunk/The History of Three Kingdoms/Documents/changelog.txt Wed Oct 7
20:41:24 2009
@@ -1088,3 +1088,6 @@
0.304: ÐÞÕý£ºÐÞÕýÓ¢ÐÛ×ÔÈ»ËÀÍöµÄÒ»´¦Bug
ÐÞÕý½â¾ÈÓ¢ÐÛºó×´Ì¬ÒÀÈ»Îª·ýÂ²µÄBug
ÐÞÕýÓÎÏ·Ñ¡ÏîºÍ½â¾ÈÓ¢ÐÛµÄ¶ªÊ§ÎÄ×Ö
+
+0.305: ÐÞÕý£ºÐÞÕý¼¸¸öCTD
+ ÐÞÕý¼¯ÍÅ¾üÖÐÆÕÍ¨Ó¢ÐÛÎÞ·¨Õý³£»ñµÃÇ×ÎÀ¶Ó½úÉýµÄBug
=======================================
--- /trunk/The History of Three Kingdoms/Documents/changelog_en.txt Fri
Oct 2 09:08:25 2009
+++ /trunk/The History of Three Kingdoms/Documents/changelog_en.txt Wed
Oct 7 20:41:24 2009
@@ -1,3 +1,6 @@
+0.305: fix: fix few CTDs
+ fix a bug a non-guardian member hero in an Army cannot acquire core
troop promotion as usual.
+
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

Reply all

Reply to author

Forward

0 new messages