[sanguoforciv4] r353 committed - update 319-317 difference
codesite...@google.com
Author: TongShen.Martin
Date: Fri Oct 16 02:08:21 2009
Log: update 319-317 difference
http://code.google.com/p/sanguoforciv4/source/detail?r=353
Modified:
/trunk/317Difference/Assets/Python/CvEventManager.py
/trunk/317Difference/Assets/Python/pyWB/CvWBDesc.py
/trunk/317Difference/Resource/Themes/Civ4Theme_Common.thm
=======================================
--- /trunk/317Difference/Assets/Python/CvEventManager.py Sun Sep 20
08:55:19 2009
+++ /trunk/317Difference/Assets/Python/CvEventManager.py Fri Oct 16
02:08:21 2009
@@ -298,6 +298,11 @@
def onUpdate(self, argsList):
'Called every frame'
+ #### Sanguo Mod Tutorial, start, by poyuzhe 09.27.09
+ if (gc.getGame().getTutorialID() != -1):
+ return 0
+ #### Sanguo Mod Tutorial, end
+
fDeltaTime = argsList[0]
# allow camera to be updated
@@ -325,6 +330,11 @@
def onGameStart(self, argsList):
'Called at the start of the game'
+ #### Sanguo Mod Tutorial, start, by poyuzhe 09.27.09
+ if (gc.getGame().getTutorialID() != -1):
+ return 0
+ #### Sanguo Mod Tutorial, end
+
if (gc.getGame().getGameTurnYear() == gc.getDefineINT("START_YEAR") and
not gc.getGame().isOption(GameOptionTypes.GAMEOPTION_ADVANCED_START)):
for iPlayer in range(gc.getMAX_PLAYERS()):
player = gc.getPlayer(iPlayer)
@@ -354,6 +364,11 @@
def onBeginGameTurn(self, argsList):
'Called at the beginning of the end of each turn'
+ #### Sanguo Mod Tutorial, start, by poyuzhe 09.27.09
+ if (gc.getGame().getTutorialID() != -1):
+ return 0
+ #### Sanguo Mod Tutorial, end
+
iGameTurn = argsList[0]
CvTopCivs.CvTopCivs().turnChecker(iGameTurn)
@@ -384,6 +399,11 @@
def onFirstContact(self, argsList):
'Contact'
+ #### Sanguo Mod Tutorial, start, by poyuzhe 09.27.09
+ if (gc.getGame().getTutorialID() != -1):
+ return 0
+ #### Sanguo Mod Tutorial, end
+
iTeamX,iHasMetTeamY = argsList
if (not self.__LOG_CONTACT):
return
@@ -391,6 +411,11 @@
def onCombatResult(self, argsList):
'Combat Result'
+ #### Sanguo Mod Tutorial, start, by poyuzhe 09.27.09
+ if (gc.getGame().getTutorialID() != -1):
+ return 0
+ #### Sanguo Mod Tutorial, end
+
pWinner,pLoser = argsList
playerX = PyPlayer(pWinner.getOwner())
unitX = PyInfo.UnitInfo(pWinner.getUnitType())
@@ -448,6 +473,11 @@
def onImprovementBuilt(self, argsList):
'Improvement Built'
+ #### Sanguo Mod Tutorial, start, by poyuzhe 09.27.09
+ if (gc.getGame().getTutorialID() != -1):
+ return 0
+ #### Sanguo Mod Tutorial, end
+
iImprovement, iX, iY = argsList
if (not self.__LOG_IMPROVEMENT):
return
@@ -464,6 +494,11 @@
def onRouteBuilt(self, argsList):
'Route Built'
+ #### Sanguo Mod Tutorial, start, by poyuzhe 09.27.09
+ if (gc.getGame().getTutorialID() != -1):
+ return 0
+ #### Sanguo Mod Tutorial, end
+
iRoute, iX, iY = argsList
if (not self.__LOG_IMPROVEMENT):
return
@@ -499,6 +534,11 @@
def onBuildingBuilt(self, argsList):
'Building Completed'
+ #### Sanguo Mod Tutorial, start, by poyuzhe 09.27.09
+ if (gc.getGame().getTutorialID() != -1):
+ return 0
+ #### Sanguo Mod Tutorial, end
+
pCity, iBuildingType = argsList
game = gc.getGame()
if ((not gc.getGame().isNetworkMultiPlayer()) and (pCity.getOwner() ==
gc.getGame().getActivePlayer()) and
isWorldWonderClass(gc.getBuildingInfo(iBuildingType).getBuildingClassType())):
@@ -545,6 +585,11 @@
def onUnitMove(self, argsList):
'unit move'
+ #### Sanguo Mod Tutorial, start, by poyuzhe 09.27.09
+ if (gc.getGame().getTutorialID() != -1):
+ return 0
+ #### Sanguo Mod Tutorial, end
+
pPlot,pUnit,pOldPlot = argsList
player = PyPlayer(pUnit.getOwner())
unitInfo = PyInfo.UnitInfo(pUnit.getUnitType())
@@ -565,6 +610,11 @@
def onUnitCreated(self, argsList):
'Unit Completed'
+ #### Sanguo Mod Tutorial, start, by poyuzhe 09.27.09
+ if (gc.getGame().getTutorialID() != -1):
+ return 0
+ #### Sanguo Mod Tutorial, end
+
unit = argsList[0]
player = PyPlayer(unit.getOwner())
if (not self.__LOG_UNITBUILD):
@@ -604,6 +654,11 @@
def onUnitPromoted(self, argsList):
'Unit Promoted'
+ #### Sanguo Mod Tutorial, start, by poyuzhe 09.27.09
+ if (gc.getGame().getTutorialID() != -1):
+ return 0
+ #### Sanguo Mod Tutorial, end
+
pUnit, iPromotion = argsList
player = PyPlayer(pUnit.getOwner())
if (not self.__LOG_UNITPROMOTED):
@@ -612,6 +667,11 @@
def onUnitSelected(self, argsList):
'Unit Selected'
+ #### Sanguo Mod Tutorial, start, by poyuzhe 09.27.09
+ if (gc.getGame().getTutorialID() != -1):
+ return 0
+ #### Sanguo Mod Tutorial, end
+
unit = argsList[0]
player = PyPlayer(unit.getOwner())
if (not self.__LOG_UNITSELECTED):
@@ -673,6 +733,11 @@
def onTechAcquired(self, argsList):
'Tech Acquired'
+ #### Sanguo Mod Tutorial, start, by poyuzhe 09.27.09
+ if (gc.getGame().getTutorialID() != -1):
+ return 0
+ #### Sanguo Mod Tutorial, end
+
iTechType, iTeam, iPlayer, bAnnounce = argsList
# Note that iPlayer may be NULL (-1) and not a refer to a player object
@@ -693,6 +758,11 @@
def onTechSelected(self, argsList):
'Tech Selected'
+ #### Sanguo Mod Tutorial, start, by poyuzhe 09.27.09
+ if (gc.getGame().getTutorialID() != -1):
+ return 0
+ #### Sanguo Mod Tutorial, end
+
iTechType, iPlayer = argsList
if (not self.__LOG_TECH):
return
@@ -700,6 +770,11 @@
def onReligionFounded(self, argsList):
'Religion Founded'
+ #### Sanguo Mod Tutorial, start, by poyuzhe 09.27.09
+ if (gc.getGame().getTutorialID() != -1):
+ return 0
+ #### Sanguo Mod Tutorial, end
+
iReligion, iFounder = argsList
player = PyPlayer(iFounder)
@@ -817,6 +892,11 @@
def onCityBuilt(self, argsList):
'City Built'
+ #### Sanguo Mod Tutorial, start, by poyuzhe 09.27.09
+ if (gc.getGame().getTutorialID() != -1):
+ return 0
+ #### Sanguo Mod Tutorial, end
+
city = argsList[0]
if (city.getOwner() == gc.getGame().getActivePlayer()):
self.__eventEditCityNameBegin(city, False)
@@ -879,6 +959,11 @@
def onCityBuildingUnit(self, argsList):
'City begins building a unit'
+ #### Sanguo Mod Tutorial, start, by poyuzhe 09.27.09
+ if (gc.getGame().getTutorialID() != -1):
+ return 0
+ #### Sanguo Mod Tutorial, end
+
pCity = argsList[0]
iUnitType = argsList[1]
if (not self.__LOG_CITYBUILDING):
@@ -887,6 +972,11 @@
def onCityBuildingBuilding(self, argsList):
'City begins building a Building'
+ #### Sanguo Mod Tutorial, start, by poyuzhe 09.27.09
+ if (gc.getGame().getTutorialID() != -1):
+ return 0
+ #### Sanguo Mod Tutorial, end
+
pCity = argsList[0]
iBuildingType = argsList[1]
if (not self.__LOG_CITYBUILDING):
@@ -930,6 +1020,11 @@
def onMouseEvent(self, argsList):
'mouse handler - returns 1 if the event was consumed'
+ #### Sanguo Mod Tutorial, start, by poyuzhe 09.27.09
+ if (gc.getGame().getTutorialID() != -1):
+ return 0
+ #### Sanguo Mod Tutorial, end
+
eventType,mx,my,px,py,interfaceConsumed,screens = argsList
if ( px!=-1 and py!=-1 ):
if ( eventType == self.EventLButtonDown ):
=======================================
--- /trunk/317Difference/Assets/Python/pyWB/CvWBDesc.py Sun Sep 20 08:55:19
2009
+++ /trunk/317Difference/Assets/Python/pyWB/CvWBDesc.py Fri Oct 16 02:08:21
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:
@@ -2086,10 +2115,10 @@
'HANDICAP_DEITY' : 0
}
DupProb = { 'HANDICAP_PRINCE' : 10,
- 'HANDICAP_MONARCH' : 20,
- 'HANDICAP_EMPEROR' : 30,
- 'HANDICAP_IMMORTAL' : 40,
- 'HANDICAP_DEITY' : 50
+ 'HANDICAP_MONARCH' : 30,
+ 'HANDICAP_EMPEROR' : 50,
+ 'HANDICAP_IMMORTAL' : 70,
+ 'HANDICAP_DEITY' : 90
}
DupTimes = { 'HANDICAP_PRINCE' : 1,
'HANDICAP_MONARCH' : 1,
=======================================
--- /trunk/317Difference/Resource/Themes/Civ4Theme_Common.thm Sun Sep 20
08:55:19 2009
+++ /trunk/317Difference/Resource/Themes/Civ4Theme_Common.thm Fri Oct 16
02:08:21 2009
@@ -413,14 +413,14 @@
.Normal = SF_CtrlTheme_Civ4_Control_Font_Size3_Normal;
.Bold = SF_CtrlTheme_Civ4_Control_Font_Size3_Bold;
- .Italic = SF_CtrlTheme_Civ4_Control_Font_Size3_Italic;
- .BoldItalic = SF_CtrlTheme_Civ4_Control_Font_Size3_BoldItalic;
+ .Italic = SF_CtrlTheme_Civ4_Control_Font_Size3_Normal;
+ .BoldItalic = SF_CtrlTheme_Civ4_Control_Font_Size3_Bold;
.Header = SF_CtrlTheme_Civ4_Control_Font_Size4_Normal;
.HeaderBold = SF_CtrlTheme_Civ4_Control_Font_Size4_Bold;
.Footer = SF_CtrlTheme_Civ4_Control_Font_Size1_Normal;
- .FooterBold = SF_CtrlTheme_Civ4_Control_Font_Size1_Bold;
+ .FooterBold = SF_CtrlTheme_Civ4_Control_Font_Size1_Normal;
// .Fixed = GFont("Fonts/cour.ttf", "Courier New", "Regular",
14, GFlags(GFontFeature, GFC_FONT_ALPHA));
// .FixedBold = GFont("Fonts/courbd.ttf", "Courier New", "Bold",
14, GFlags(GFontFeature, GFC_FONT_BOLD, GFC_FONT_ALPHA));