Sneed-Group/Poodletooth-iLand
1
0
Fork 0
mirror of https://github.com/Sneed-Group/Poodletooth-iLand synced 2024-10-31 00:37:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

No disney chars in the name accepted screen

Browse source
This commit is contained in:
DenialMC 2015-05-13 18:48:02 +03:00
parent 1c2548283b
commit e4f3e4a810
3 changed files with 2 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
toontown/distributed/ToontownClientRepository.py
View file

@ -129,7 +129,9 @@ class ToontownClientRepository(OTPClientRepository.OTPClientRepository):
def congratulations(self, avatarChoice): def congratulations(self, avatarChoice):
self.acceptedScreen = loader.loadModel('phase_3/models/gui/toon_council') self.acceptedScreen = loader.loadModel('phase_3/models/gui/toon_council')
self.acceptedScreen.find('**/chars').removeNode()
self.acceptedScreen.setScale(0.667) self.acceptedScreen.setScale(0.667)
self.acceptedScreen.setPos(0, 0, 0.2)
self.acceptedScreen.reparentTo(aspect2d) self.acceptedScreen.reparentTo(aspect2d)
base.setBackgroundColor(Vec4(0.7647, 0.3529, 0.2352, 1)) base.setBackgroundColor(Vec4(0.7647, 0.3529, 0.2352, 1))
buttons = loader.loadModel('phase_3/models/gui/dialog_box_buttons_gui') buttons = loader.loadModel('phase_3/models/gui/dialog_box_buttons_gui')

17
toontown/makeatoon/NameShop.py
View file

@ -78,11 +78,9 @@ class NameShop(StateData.StateData):
State.State('PickAName', self.enterPickANameState, self.exitPickANameState, ['TypeAName', 'Done']), State.State('PickAName', self.enterPickANameState, self.exitPickANameState, ['TypeAName', 'Done']),
State.State('TypeAName', self.enterTypeANameState, self.exitTypeANameState, ['PickAName', State.State('TypeAName', self.enterTypeANameState, self.exitTypeANameState, ['PickAName',
'Approval', 'Approval',
'Accepted',
'Rejected']), 'Rejected']),
State.State('Approval', self.enterApprovalState, self.exitApprovalState, ['PickAName', 'ApprovalAccepted']), State.State('Approval', self.enterApprovalState, self.exitApprovalState, ['PickAName', 'ApprovalAccepted']),
State.State('ApprovalAccepted', self.enterApprovalAcceptedState, self.exitApprovalAcceptedState, ['Done']), State.State('ApprovalAccepted', self.enterApprovalAcceptedState, self.exitApprovalAcceptedState, ['Done']),
State.State('Accepted', self.enterAcceptedState, self.exitAcceptedState, ['Done']),
State.State('Rejected', self.enterRejectedState, self.exitRejectedState, ['TypeAName']), State.State('Rejected', self.enterRejectedState, self.exitRejectedState, ['TypeAName']),
State.State('Done', self.enterDone, self.exitDone, ['Init'])], 'Init', 'Done') State.State('Done', self.enterDone, self.exitDone, ['Init'])], 'Init', 'Done')
self.parentFSM = makeAToon.fsm self.parentFSM = makeAToon.fsm
@ -764,21 +762,6 @@ class NameShop(StateData.StateData):
def exitApprovalAcceptedState(self): def exitApprovalAcceptedState(self):
pass pass
def enterAcceptedState(self):
self.notify.debug('enterAcceptedState')
self.acceptedDialog = TTDialog.TTGlobalDialog(doneEvent='acceptedDone', message=TTLocalizer.NameShopNameAccepted, style=TTDialog.Acknowledge)
self.acceptedDialog.show()
self.acceptOnce('acceptedDone', self.__handleAccepted)
def __handleAccepted(self):
self.acceptedDialog.cleanup()
self.doneStatus = 'done'
self.storeSkipTutorialRequest()
messenger.send(self.doneEvent)
def exitAcceptedState(self):
pass
def enterRejectedState(self): def enterRejectedState(self):
self.notify.debug('enterRejectedState') self.notify.debug('enterRejectedState')
self.rejectedDialog = TTDialog.TTGlobalDialog(doneEvent='rejectedDone', message=TTLocalizer.NameShopNameRejected, style=TTDialog.Acknowledge) self.rejectedDialog = TTDialog.TTGlobalDialog(doneEvent='rejectedDone', message=TTLocalizer.NameShopNameRejected, style=TTDialog.Acknowledge)

1
toontown/toonbase/TTLocalizerEnglish.py
View file

@ -4485,7 +4485,6 @@ PleaseTypeName = 'Please type your name:'
AllNewNames = 'All new names must be\napproved by the Toon Council.' AllNewNames = 'All new names must be\napproved by the Toon Council.'
NameMessages = 'Be creative, and remember:\nno NPC names, please.' NameMessages = 'Be creative, and remember:\nno NPC names, please.'
NameShopNameRejected = 'The name you\nsubmitted has\nbeen rejected.' NameShopNameRejected = 'The name you\nsubmitted has\nbeen rejected.'
NameShopNameAccepted = 'Congratulations!\nThe name you\nsubmitted has\nbeen accepted!'
NoPunctuation = "You can't use punctuation marks in your name!" NoPunctuation = "You can't use punctuation marks in your name!"
PeriodOnlyAfterLetter = 'You can use a period in your name, but only after a letter.' PeriodOnlyAfterLetter = 'You can use a period in your name, but only after a letter.'
ApostropheOnlyAfterLetter = 'You can use an apostrophe in your name, but only after a letter.' ApostropheOnlyAfterLetter = 'You can use an apostrophe in your name, but only after a letter.'