stolenrays
Deity
- Joined
- Aug 2, 2009
- Messages
- 2,061
I'm not clear what you are trying to merge. If you attach the two original unaltered files you wish to merge and I'll take a look.
def doPillageGold(self, argsList):
"controls the gold result of pillaging"
pPlot = argsList[0]
pUnit = argsList[1]
iPillageGold = 0
iPillageGold = CyGame().getSorenRandNum(gc.getImprovementInfo(pPlot.getImprovementType()).getPillageGold(), "Pillage Gold 1")
iPillageGold += CyGame().getSorenRandNum(gc.getImprovementInfo(pPlot.getImprovementType()).getPillageGold(), "Pillage Gold 2")
iPillageGold += (pUnit.getPillageChange() * iPillageGold) / 100
## Suzerainty Start ##
pPlayer = gc.getPlayer( pUnit.getOwner( ) )
iLegalCivicOption = CvUtil.findInfoTypeNum(gc.getCivicOptionInfo,gc.getNumCivicOptionInfos(),'CIVICOPTION_LEGAL')
iSuzerainty = CvUtil.findInfoTypeNum(gc.getCivicInfo,gc.getNumCivicInfos(),'CIVIC_SUZERAINTY')
iLegalCivic = pPlayer.getCivics(iLegalCivicOption)
if (iLegalCivic == iSuzerainty):
iPillageGold = ( ( ( 0 ) * 3 ) / 2 )
iPillageGold = ( ( ( CyGame().getSorenRandNum(gc.getImprovementInfo(pPlot.getImprovementType()).getPillageGold(), "Pillage Gold 1") ) * 3 ) / 2 )
iPillageGold += ( ( ( CyGame().getSorenRandNum(gc.getImprovementInfo(pPlot.getImprovementType()).getPillageGold(), "Pillage Gold 2") ) * 3 ) / 2 )
iPillageGold += ( ( ( (pUnit.getPillageChange() * iPillageGold) / 100 ) * 3 ) / 2 )
else:
iPillageGold = 0
iPillageGold = CyGame().getSorenRandNum(gc.getImprovementInfo(pPlot.getImprovementType()).getPillageGold(), "Pillage Gold 1")
iPillageGold += CyGame().getSorenRandNum(gc.getImprovementInfo(pPlot.getImprovementType()).getPillageGold(), "Pillage Gold 2")
iPillageGold += (pUnit.getPillageChange() * iPillageGold) / 100
## Suzerainty End ##
return iPillageGold
def onBeginPlayerTurn(self, argsList):
'Called at the beginning of a players turn'
iGameTurn, iPlayer = argsList
## Suzerainty Start ##
pPlayer = gc.getPlayer(iPlayer)
iLegalCivicOption = CvUtil.findInfoTypeNum(gc.getCivicOptionInfo,gc.getNumCivicOptionInfos(),'CIVICOPTION_LEGAL')
iSuzerainty = CvUtil.findInfoTypeNum(gc.getCivicInfo,gc.getNumCivicInfos(),'CIVIC_SUZERAINTY')
iLegalCivic = pPlayer.getCivics(iLegalCivicOption)
if (iLegalCivic == iSuzerainty):
pPID = pPlayer.getID()
iGold = pPlayer.getGold( )
if pPlayer.getGold( ) >= 5000:
pPlayer.changeGold( 50 )
if pPlayer.getGold( ) < 5000:
if pPlayer.getGold( ) >= 100:
pPlayer.changeGold( iGold//100 )
else:
pPlayer.changeGold( 1 )
## Suzerainty End ##