Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 54c516d

Browse files
committed
Merge branch 'master' into release
2 parents 15ec5ce + 9cf3499 commit 54c516d

33 files changed

Lines changed: 1020 additions & 914 deletions

Assets/Python/Contrib/Pedia/Pedia.py

Lines changed: 1 addition & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -1403,68 +1403,7 @@ def link(self, szLink):
14031403
elif szPrefix == "ERA":
14041404
return self.pediaJump(self.PEDIA_CONCEPTS, "Eras", iType)
14051405

1406-
print "Ambiguous link, may lead to the wrong pedia page."
1407-
for i in xrange(GC.getNumTechInfos()):
1408-
if GC.getTechInfo(i).isMatchForLink(szLink, False):
1409-
return self.pediaJump(self.PEDIA_TECHS, "", i)
1410-
for i in xrange(GC.getNumUnitInfos()):
1411-
if GC.getUnitInfo(i).isMatchForLink(szLink, False):
1412-
return self.pediaJump(self.PEDIA_UNITS_0, "", i)
1413-
for i in xrange(GC.getNumUnitCombatInfos()):
1414-
if GC.getUnitCombatInfo(i).isMatchForLink(szLink, False):
1415-
return self.pediaJump(self.PEDIA_SPECIAL, "UnitCombat", i)
1416-
for i in xrange(GC.getNumPromotionInfos()):
1417-
if GC.getPromotionInfo(i).isMatchForLink(szLink, False):
1418-
return self.pediaJump(self.PEDIA_PROMOTIONS, "", i)
1419-
for i in xrange(GC.getNumBuildingInfos()):
1420-
if GC.getBuildingInfo(i).isMatchForLink(szLink, False):
1421-
return self.pediaJump(self.PEDIA_BUILDINGS_0, "", i)
1422-
for i in xrange(GC.getNumProjectInfos()):
1423-
if GC.getProjectInfo(i).isMatchForLink(szLink, False):
1424-
return self.pediaJump(self.PEDIA_SPECIAL, "Project", i)
1425-
for i in xrange(GC.getNumSpecialistInfos()):
1426-
if GC.getSpecialistInfo(i).isMatchForLink(szLink, False):
1427-
return self.pediaJump(self.PEDIA_SPECIAL, "Specialist", i)
1428-
for i in xrange(GC.getNumTerrainInfos()):
1429-
if GC.getTerrainInfo(i).isMatchForLink(szLink, False):
1430-
return self.pediaJump(self.PEDIA_LANDSCAPE, "Terrain", i)
1431-
for i in xrange(GC.getNumFeatureInfos()):
1432-
if GC.getFeatureInfo(i).isMatchForLink(szLink, False):
1433-
return self.pediaJump(self.PEDIA_LANDSCAPE, "Feature", i)
1434-
for i in xrange(GC.getNumRouteInfos()):
1435-
if GC.getRouteInfo(i).isMatchForLink(szLink, False):
1436-
return self.pediaJump(self.PEDIA_SPECIAL, "Route", i)
1437-
for i in xrange(GC.getNumBonusInfos()):
1438-
if GC.getBonusInfo(i).isMatchForLink(szLink, False):
1439-
return self.pediaJump(self.PEDIA_BONUSES, "", i)
1440-
for i in xrange(GC.getNumImprovementInfos()):
1441-
if GC.getImprovementInfo(i).isMatchForLink(szLink, False):
1442-
return self.pediaJump(self.PEDIA_LANDSCAPE, "Improvement", i)
1443-
for i in xrange(GC.getNumCivilizationInfos()):
1444-
if GC.getCivilizationInfo(i).isMatchForLink(szLink, False):
1445-
return self.pediaJump(self.PEDIA_LEADERSHIP, "Civ", i)
1446-
for i in xrange(GC.getNumLeaderHeadInfos()):
1447-
if GC.getLeaderHeadInfo(i).isMatchForLink(szLink, False):
1448-
return self.pediaJump(self.PEDIA_LEADERSHIP, "Leader", i)
1449-
for i in xrange(GC.getNumCivicInfos()):
1450-
if GC.getCivicInfo(i).isMatchForLink(szLink, False):
1451-
return self.pediaJump(self.PEDIA_LEADERSHIP, "Civic", i)
1452-
for i in xrange(GC.getNumReligionInfos()):
1453-
if GC.getReligionInfo(i).isMatchForLink(szLink, False):
1454-
return self.pediaJump(self.PEDIA_LEADERSHIP, "Religion", i)
1455-
for i in xrange(GC.getNumCorporationInfos()):
1456-
if GC.getCorporationInfo(i).isMatchForLink(szLink, False):
1457-
return self.pediaJump(self.PEDIA_SPECIAL, "Corporation", i)
1458-
for i in xrange(GC.getNumConceptInfos()):
1459-
if GC.getConceptInfo(i).isMatchForLink(szLink, False):
1460-
return self.pediaJump(self.PEDIA_CONCEPTS, "", i)
1461-
for i in xrange(GC.getNumNewConceptInfos()):
1462-
if GC.getNewConceptInfo(i).isMatchForLink(szLink, False):
1463-
return self.pediaJump(self.PEDIA_CONCEPTS, "NEW", i)
1464-
for i in xrange(GC.getNumTraitInfos()):
1465-
if GC.getTraitInfo(i).isMatchForLink(szLink, False):
1466-
return self.pediaJump(self.PEDIA_LEADERSHIP, "Trait", i)
1467-
print "Error - Invalid Link"
1406+
print "[ERROR] - Invalid Link"
14681407

14691408
def back(self):
14701409
if len(self.pediaHistory) > 2:

0 commit comments

Comments
 (0)