Sneed-Group/Poodletooth-iLand
1
0
Fork 0
mirror of https://github.com/Sneed-Group/Poodletooth-iLand synced 2024-12-23 11:42:39 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

Quests, minigames

Browse source
This commit is contained in:
DenialMC 2015-05-05 23:04:40 +03:00
parent dd0b4fdbbe
commit b5cd121dca
4 changed files with 24 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
toontown/minigame/MinigameCreatorAI.py
View file

@ -20,7 +20,6 @@ import DistributedTugOfWarGameAI
import DistributedTwoDGameAI
import DistributedVineGameAI
from otp.ai.MagicWordGlobal import *
from toontown.minigame.TempMinigameAI import *
from toontown.toonbase import ToontownGlobals

42
toontown/quest/Quests.py
View file

@ -1059,23 +1059,20 @@ class BuildingQuest(CogQuest):
type = TTLocalizer.Cog
else:
type = self.trackNames[self.trackCodes.index(buildingTrack)]
floors = TTLocalizer.QuestsBuildingQuestFloorNumbers[self.getNumFloors() - 1]
floors = ''
if self.isCogdo():
if count == 1:
return TTLocalizer.QuestsCogdoQuestDesc
if buildingTrack == Any:
text = TTLocalizer.QuestsCogdoQuestDescU if count == 1 else TTLocalizer.QuestsCogdoQuestDescUM
else:
return TTLocalizer.QuestsCogdoQuestDescC
text = TTLocalizer.QuestsCogdoQuestDesc if count == 1 else TTLocalizer.QuestsCogdoQuestDescM
else:
floors = TTLocalizer.QuestsBuildingQuestFloorNumbers[self.getNumFloors() - 1]
if count == 1:
if floors == '':
text = TTLocalizer.QuestsBuildingQuestDesc
else:
text = TTLocalizer.QuestsBuildingQuestDescF
elif floors == '':
text = TTLocalizer.QuestsBuildingQuestDescC
text = TTLocalizer.QuestsBuildingQuestDesc if floors == '' else TTLocalizer.QuestsBuildingQuestDescF
else:
text = TTLocalizer.QuestsBuildingQuestDescCF
text = TTLocalizer.QuestsBuildingQuestDescC if floors == '' else TTLocalizer.QuestsBuildingQuestDescCF
return (text % {'count': count,
'floors': floors,
@ -1089,32 +1086,29 @@ class BuildingQuest(CogQuest):
return getFinishToonTaskSCStrings(toNpcId)
count = self.getNumBuildings()
buildingTrack = self.getBuildingTrack()
floors = ''
if buildingTrack == Any:
type = TTLocalizer.Cog
else:
type = self.trackNames[self.trackCodes.index(buildingTrack)]
floors = TTLocalizer.QuestsBuildingQuestFloorNumbers[self.getNumFloors() - 1]
if self.isCogdo():
if count == 1:
return TTLocalizer.QuestsCogdoQuestDesc
if buildingTrack == Any:
text = TTLocalizer.QuestsCogdoQuestDescU if count == 1 else TTLocalizer.QuestsCogdoQuestDescMUI
else:
return TTLocalizer.QuestsCogdoQuestDescI
text = TTLocalizer.QuestsCogdoQuestDesc if count == 1 else TTLocalizer.QuestsCogdoQuestDescMI
else:
floors = TTLocalizer.QuestsBuildingQuestFloorNumbers[self.getNumFloors() - 1]
if count == 1:
if floors == '':
text = TTLocalizer.QuestsBuildingQuestDesc
else:
text = TTLocalizer.QuestsBuildingQuestDescF
elif floors == '':
text = TTLocalizer.QuestsBuildingQuestDescI
text = TTLocalizer.QuestsBuildingQuestDesc if floors == '' else TTLocalizer.QuestsBuildingQuestDescF
else:
text = TTLocalizer.QuestsBuildingQuestDescIF
text = TTLocalizer.QuestsBuildingQuestDescI if floors == '' else TTLocalizer.QuestsBuildingQuestDescIF
objective = text % {'floors': floors,
'type': type}
location = self.getLocationName()
return TTLocalizer.QuestsBuildingQuestSCString % {'objective': objective,
'location': location}
'location': self.getLocationName()}
def getHeadlineString(self):
return TTLocalizer.QuestsBuildingQuestHeadline

7
toontown/toonbase/TTLocalizerEnglish.py
View file

@ -279,8 +279,11 @@ QuestsBuildingQuestDescCF = '%(count)s %(floors)s story %(type)s Buildings'
QuestsBuildingQuestDescI = 'some %(type)s Buildings'
QuestsBuildingQuestDescIF = 'some %(floors)s story %(type)s Buildings'
QuestsCogdoQuestDesc = 'a %(type)s Field Office'
QuestsCogdoQuestDescC = '%(count)s %(type)s Field Offices'
QuestsCogdoQuestDescI = 'some %(type)s Field Offices'
QuestsCogdoQuestDescM = '%(count)s %(type)s Field Offices'
QuestsCogdoQuestDescMUI = 'some %(type)s Field Offices'
QuestsCogdoQuestDescU = 'a Field Office'
QuestsCogdoQuestDescUM = '%(count)s Field Offices'
QuestsCogdoQuestDescMI = 'some Field Offices'
QuestFactoryQuestFactory = 'Factory'
QuestsFactoryQuestFactories = 'Factories'
QuestsFactoryQuestHeadline = 'DEFEAT'

3
toontown/toonbase/ToontownGlobals.py
View file

@ -364,8 +364,7 @@ MinigameNames = {'race': RaceGameId,
'ice': IceGameId,
'thief': CogThiefGameId,
'2d': TwoDGameId,
'photo': PhotoGameId,
'template': MinigameTemplateId}
'photo': PhotoGameId}
MinigameTemplateId = -1
MinigameIDs = (RaceGameId,
CannonGameId,