Menu
▾
▴
[Civ4mods-svn] SF.net SVN: civ4mods:[3259] realism/bts/trunk/mod/Assets/Python
|
From: <sjo...@us...> - 2011-02-11 12:30:11
|
Revision: 3259
http://civ4mods.svn.sourceforge.net/civ4mods/?rev=3259&view=rev
Author: sjodster
Date: 2011-02-11 12:30:04 +0000 (Fri, 11 Feb 2011)
Log Message:
-----------
More thoroughly disabled corporations:
* Can no longer access the corporation screen by shortcut key
* Removed corporations from Sevopedia
Modified Paths:
--------------
realism/bts/trunk/mod/Assets/Python/Components/Sevopedia/SevoPediaMain.py
realism/bts/trunk/mod/Assets/Python/Components/Sevopedia/SevoScreenEnums.py
realism/bts/trunk/mod/Assets/Python/EntryPoints/CvScreensInterface.py
Modified: realism/bts/trunk/mod/Assets/Python/Components/Sevopedia/SevoPediaMain.py
===================================================================
--- realism/bts/trunk/mod/Assets/Python/Components/Sevopedia/SevoPediaMain.py 2011-02-11 11:33:25 UTC (rev 3258)
+++ realism/bts/trunk/mod/Assets/Python/Components/Sevopedia/SevoPediaMain.py 2011-02-11 12:30:04 UTC (rev 3259)
@@ -41,7 +41,9 @@
import SevoPediaHistory
import SevoPediaProject
import SevoPediaReligion
-import SevoPediaCorporation
+# MOD - START - No Corporations
+#import SevoPediaCorporation
+# MOD - END - No Corporations
import SevoPediaIndex
import UnitUpgradesGraph
@@ -170,7 +172,9 @@
SevoScreenEnums.PEDIA_TRAITS : self.placeTraits,
SevoScreenEnums.PEDIA_CIVICS : self.placeCivics,
SevoScreenEnums.PEDIA_RELIGIONS : self.placeReligions,
- SevoScreenEnums.PEDIA_CORPORATIONS : self.placeCorporations,
+# MOD - START - No Corporations
+# SevoScreenEnums.PEDIA_CORPORATIONS : self.placeCorporations,
+# MOD - END - No Corporations
SevoScreenEnums.PEDIA_CONCEPTS : self.placeConcepts,
SevoScreenEnums.PEDIA_BTS_CONCEPTS : self.placeBTSConcepts,
SevoScreenEnums.PEDIA_HINTS : self.placeHints,
@@ -207,7 +211,9 @@
SevoScreenEnums.PEDIA_TRAITS : SevoPediaTrait.SevoPediaTrait(self),
SevoScreenEnums.PEDIA_CIVICS : SevoPediaCivic.SevoPediaCivic(self),
SevoScreenEnums.PEDIA_RELIGIONS : SevoPediaReligion.SevoPediaReligion(self),
- SevoScreenEnums.PEDIA_CORPORATIONS : SevoPediaCorporation.SevoPediaCorporation(self),
+# MOD - START - No Corporations
+# SevoScreenEnums.PEDIA_CORPORATIONS : SevoPediaCorporation.SevoPediaCorporation(self),
+# MOD - END - No Corporations
SevoScreenEnums.PEDIA_CONCEPTS : SevoPediaHistory.SevoPediaHistory(self),
SevoScreenEnums.PEDIA_BTS_CONCEPTS : SevoPediaHistory.SevoPediaHistory(self),
SevoScreenEnums.PEDIA_SHORTCUTS : SevoPediaHistory.SevoPediaHistory(self),
@@ -373,7 +379,9 @@
self.szCategoryTraits = localText.getText("TXT_KEY_PEDIA_TRAITS", ())
self.szCategoryCivics = localText.getText("TXT_KEY_PEDIA_CATEGORY_CIVIC", ())
self.szCategoryReligions = localText.getText("TXT_KEY_PEDIA_CATEGORY_RELIGION", ())
- self.szCategoryCorporations = localText.getText("TXT_KEY_CONCEPT_CORPORATIONS", ())
+# MOD - START - No Corporations
+# self.szCategoryCorporations = localText.getText("TXT_KEY_CONCEPT_CORPORATIONS", ())
+# MOD - END - No Corporations
self.szCategoryConcepts = localText.getText("TXT_KEY_PEDIA_CATEGORY_CONCEPT", ())
self.szCategoryConceptsNew = localText.getText("TXT_KEY_PEDIA_CATEGORY_CONCEPT_NEW", ())
self.szCategoryHints = localText.getText("TXT_KEY_PEDIA_CATEGORY_HINTS", ())
@@ -413,7 +421,9 @@
["CIVS", self.szCategoryTraits],
["CIVICS", self.szCategoryCivics],
["CIVICS", self.szCategoryReligions],
- ["CIVICS", self.szCategoryCorporations],
+# MOD - START - No Corporations
+# ["CIVICS", self.szCategoryCorporations],
+# MOD - END - No Corporations
["HINTS", self.szCategoryConcepts],
["HINTS", self.szCategoryConceptsNew],
["HINTS", self.szCategoryHints],
@@ -721,13 +731,14 @@
return self.getSortedList(gc.getNumReligionInfos(), gc.getReligionInfo)
- def placeCorporations(self):
- self.list = self.getCorporationList()
- self.placeItems(WidgetTypes.WIDGET_PEDIA_JUMP_TO_CORPORATION, gc.getCorporationInfo)
-
- def getCorporationList(self):
- return self.getSortedList(gc.getNumCorporationInfos(), gc.getCorporationInfo)
+# MOD - START - No Corporations
+# def placeCorporations(self):
+# self.list = self.getCorporationList()
+# self.placeItems(WidgetTypes.WIDGET_PEDIA_JUMP_TO_CORPORATION, gc.getCorporationInfo)
+# def getCorporationList(self):
+# return self.getSortedList(gc.getNumCorporationInfos(), gc.getCorporationInfo)
+# MOD - END - No Corporations
def placeConcepts(self):
self.list = self.getConceptList()
@@ -952,9 +963,11 @@
for i in range(gc.getNumReligionInfos()):
if (gc.getReligionInfo(i).isMatchForLink(szLink, False)):
return self.pediaJump(SevoScreenEnums.PEDIA_RELIGIONS, i, True, True)
- for i in range(gc.getNumCorporationInfos()):
- if (gc.getCorporationInfo(i).isMatchForLink(szLink, False)):
- return self.pediaJump(SevoScreenEnums.PEDIA_CORPORATIONS, i, True, True)
+# MOD - START - No Corporations
+# for i in range(gc.getNumCorporationInfos()):
+# if (gc.getCorporationInfo(i).isMatchForLink(szLink, False)):
+# return self.pediaJump(SevoScreenEnums.PEDIA_CORPORATIONS, i, True, True)
+# MOD - END - No Corporations
for i in range(gc.getNumConceptInfos()):
if (gc.getConceptInfo(i).isMatchForLink(szLink, False)):
return self.pediaJump(SevoScreenEnums.PEDIA_CONCEPTS, i, True, True)
Modified: realism/bts/trunk/mod/Assets/Python/Components/Sevopedia/SevoScreenEnums.py
===================================================================
--- realism/bts/trunk/mod/Assets/Python/Components/Sevopedia/SevoScreenEnums.py 2011-02-11 11:33:25 UTC (rev 3258)
+++ realism/bts/trunk/mod/Assets/Python/Components/Sevopedia/SevoScreenEnums.py 2011-02-11 12:30:04 UTC (rev 3259)
@@ -28,7 +28,9 @@
PEDIA_TRAITS = 220
PEDIA_CIVICS = 221
PEDIA_RELIGIONS = 222
-PEDIA_CORPORATIONS = 223
+# MOD - START - No Corporations
+#PEDIA_CORPORATIONS = 223
+# MOD - END - No Corporations
PEDIA_CONCEPTS = 224
PEDIA_BTS_CONCEPTS = 225
PEDIA_HINTS = 226
Modified: realism/bts/trunk/mod/Assets/Python/EntryPoints/CvScreensInterface.py
===================================================================
--- realism/bts/trunk/mod/Assets/Python/EntryPoints/CvScreensInterface.py 2011-02-11 11:33:25 UTC (rev 3258)
+++ realism/bts/trunk/mod/Assets/Python/EntryPoints/CvScreensInterface.py 2011-02-11 12:30:04 UTC (rev 3259)
@@ -5,7 +5,9 @@
import CvForeignAdvisor
import CvExoticForeignAdvisor
import CvReligionScreen
-import CvCorporationScreen
+# MOD - START - No Corporations
+#import CvCorporationScreen
+# MOD - END - No Corporations
import CvCivicsScreen
import CvVictoryScreen
import CvEspionageAdvisor
@@ -46,9 +48,9 @@
from CvScreenEnums import *
from CvPythonExtensions import *
-# MOD - START - Great Person Mod for Warlords
+# MOD - START - Great Person Mod
import CvGreatPersonScreen
-# MOD - END - Great Person Mod for Warlords
+# MOD - END - Great Person Mod
# BUG - Options - end
import BugCore
@@ -104,10 +106,12 @@
if (-1 != CyGame().getActivePlayer()):
religionScreen.interfaceScreen()
-corporationScreen = CvCorporationScreen.CvCorporationScreen()
-def showCorporationScreen():
- if (-1 != CyGame().getActivePlayer()):
- corporationScreen.interfaceScreen()
+# MOD - START - No Corporations
+#corporationScreen = CvCorporationScreen.CvCorporationScreen()
+#def showCorporationScreen():
+# if (-1 != CyGame().getActivePlayer()):
+# corporationScreen.interfaceScreen()
+# MOD - END - No Corporations
optionsScreen = CvOptionsScreen.CvOptionsScreen()
def showOptionsScreen():
@@ -319,7 +323,9 @@
PEDIA_CIVILIZATION : pediaMainScreen,
PEDIA_LEADER : pediaMainScreen,
PEDIA_RELIGION : pediaMainScreen,
- PEDIA_CORPORATION : pediaMainScreen,
+# MOD - START - No Corporations
+# PEDIA_CORPORATION : pediaMainScreen,
+# MOD - END - No Corporations
PEDIA_HISTORY : pediaMainScreen,
SevoScreenEnums.PEDIA_MAIN : pediaMainScreen,
@@ -349,7 +355,9 @@
SevoScreenEnums.PEDIA_TRAITS : pediaMainScreen,
SevoScreenEnums.PEDIA_CIVICS : pediaMainScreen,
SevoScreenEnums.PEDIA_RELIGIONS : pediaMainScreen,
- SevoScreenEnums.PEDIA_CORPORATIONS : pediaMainScreen,
+# MOD - START - No Corporations
+# SevoScreenEnums.PEDIA_CORPORATIONS : pediaMainScreen,
+# MOD - END - No Corporations
SevoScreenEnums.PEDIA_CONCEPTS : pediaMainScreen,
SevoScreenEnums.PEDIA_BTS_CONCEPTS : pediaMainScreen,
SevoScreenEnums.PEDIA_HINTS : pediaMainScreen,
@@ -374,7 +382,9 @@
PEDIA_LEADER : pediaMainScreen,
PEDIA_HISTORY : pediaMainScreen,
PEDIA_RELIGION : pediaMainScreen,
- PEDIA_CORPORATION : pediaMainScreen,
+# MOD - START - No Corporations
+# PEDIA_CORPORATION : pediaMainScreen,
+# MOD - END - No Corporations
SevoScreenEnums.PEDIA_MAIN : pediaMainScreen,
SevoScreenEnums.PEDIA_TECHS : pediaMainScreen,
@@ -403,7 +413,9 @@
SevoScreenEnums.PEDIA_TRAITS : pediaMainScreen,
SevoScreenEnums.PEDIA_CIVICS : pediaMainScreen,
SevoScreenEnums.PEDIA_RELIGIONS : pediaMainScreen,
- SevoScreenEnums.PEDIA_CORPORATIONS : pediaMainScreen,
+# MOD - START - No Corporations
+# SevoScreenEnums.PEDIA_CORPORATIONS : pediaMainScreen,
+# MOD - END - No Corporations
SevoScreenEnums.PEDIA_CONCEPTS : pediaMainScreen,
SevoScreenEnums.PEDIA_BTS_CONCEPTS : pediaMainScreen,
SevoScreenEnums.PEDIA_HINTS : pediaMainScreen,
@@ -531,11 +543,13 @@
else:
pediaMainScreen.pediaJump(PEDIA_RELIGION, argsList[0], True)
-def pediaJumpToCorporation(argsList):
- if (bUsingSevopedia):
- pediaMainScreen.pediaJump(SevoScreenEnums.PEDIA_CORPORATIONS, argsList[0], True, False)
- else:
- pediaMainScreen.pediaJump(PEDIA_CORPORATION, argsList[0], True)
+# MOD - START - No Corporations
+#def pediaJumpToCorporation(argsList):
+# if (bUsingSevopedia):
+# pediaMainScreen.pediaJump(SevoScreenEnums.PEDIA_CORPORATIONS, argsList[0], True, False)
+# else:
+# pediaMainScreen.pediaJump(PEDIA_CORPORATION, argsList[0], True)
+# MOD - END - No Corporations
def pediaShowHistorical(argsList):
if (bUsingSevopedia):
@@ -1127,8 +1141,10 @@
elif ((iData1 >= FeatTypes.FEAT_POPULATION_HALF_MILLION) and (iData1 <= FeatTypes.FEAT_POPULATION_2_BILLION)):
# 1 is for the demographics tab...
showInfoScreen([1, 0])
- elif iData1 == FeatTypes.FEAT_CORPORATION_ENABLED:
- showCorporationScreen()
+# MOD - START - No Corporations
+# elif iData1 == FeatTypes.FEAT_CORPORATION_ENABLED:
+# showCorporationScreen()
+# MOD - END - No Corporations
def featAccomplishedOnFocusCallback(argsList):
iData1 = argsList[0]
@@ -1161,7 +1177,9 @@
HandleInputMap = { MAIN_INTERFACE : mainInterface,
# DOMESTIC_ADVISOR : domesticAdvisor,
RELIGION_SCREEN : religionScreen,
- CORPORATION_SCREEN : corporationScreen,
+# MOD - START - No Corporations
+# CORPORATION_SCREEN : corporationScreen,
+# MOD - END - No Corporations
CIVICS_SCREEN : civicScreen,
TECH_CHOOSER : techChooser,
FOREIGN_ADVISOR : foreignAdvisor,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
