Sneed-Group/Poodletooth-iLand
1
0
Fork 0
mirror of https://github.com/Sneed-Group/Poodletooth-iLand synced 2024-12-24 04:02:40 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix phone's 63 and nick

Browse source
This commit is contained in:
John 2015-07-17 18:36:33 +03:00
parent cc91c43036
commit d2834a6f65
3 changed files with 7 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
toontown/estate/DistributedPhone.py
View file

@ -44,7 +44,6 @@ class DistributedPhone(DistributedFurnitureItem.DistributedFurnitureItem):
self.intervalAvatar = None
self.phoneInUse = 0
self.origToonHpr = None
return
def announceGenerate(self):
self.notify.debug('announceGenerate')
@ -136,7 +135,6 @@ class DistributedPhone(DistributedFurnitureItem.DistributedFurnitureItem):
(self.model.find('**/CurveNode7'), (0, 0, 0))))
self.cord.reparentTo(self.model)
self.cord.node().setBounds(BoundingSphere(Point3(-1.0, -3.2, 2.6), 2.0))
return
def disable(self):
self.notify.debug('disable')
@ -154,7 +152,6 @@ class DistributedPhone(DistributedFurnitureItem.DistributedFurnitureItem):
self.freeAvatar()
self.ignoreAll()
DistributedFurnitureItem.DistributedFurnitureItem.disable(self)
return
def delete(self):
self.notify.debug('delete')
@ -168,16 +165,18 @@ class DistributedPhone(DistributedFurnitureItem.DistributedFurnitureItem):
self.usedInitialScale = 1
def __handleEnterSphere(self, collEntry):
if self.smoothStarted:
if self.phoneGui or self.smoothStarted:
return
if base.localAvatar.doId == self.lastAvId and globalClock.getFrameTime() <= self.lastTime + 0.5:
self.notify.debug('Ignoring duplicate entry for avatar.')
return
if self.hasLocalAvatar:
self.freeAvatar()
self.notify.debug('Entering Phone Sphere....')
taskMgr.remove(self.uniqueName('ringDoLater'))
self.ignore(self.phoneSphereEnterEvent)
self.cr.playGame.getPlace().detectedPhoneCollision()
self.hasLocalAvatar = 1
self.sendUpdate('avatarEnter', [])
@ -185,9 +184,8 @@ class DistributedPhone(DistributedFurnitureItem.DistributedFurnitureItem):
def __handlePhoneDone(self):
self.sendUpdate('avatarExit', [])
self.ignore(self.phoneGuiDoneEvent)
self.accept(self.phoneSphereEnterEvent, self.__handleEnterSphere)
self.setPos(self.getPos())
self.phoneGui = None
return
def freeAvatar(self):
if self.hasLocalAvatar:
@ -198,9 +196,7 @@ class DistributedPhone(DistributedFurnitureItem.DistributedFurnitureItem):
base.cr.playGame.getPlace().setState('walk')
self.hasLocalAvatar = 0
self.ignore(self.pickupMovieDoneEvent)
self.accept(self.phoneSphereEnterEvent, self.__handleEnterSphere)
self.lastTime = globalClock.getFrameTime()
return
def setLimits(self, numHouseItems):
self.numHouseItems = numHouseItems
@ -223,14 +219,6 @@ class DistributedPhone(DistributedFurnitureItem.DistributedFurnitureItem):
if self.phoneInUse:
self.clearInterval()
self.phoneInUse = 0
elif mode == PhoneGlobals.PHONE_MOVIE_EMPTY:
self.notify.debug('setMovie: empty')
if isLocalToon:
self.phoneDialog = TTDialog.TTDialog(dialogName='PhoneEmpty', style=TTDialog.Acknowledge, text=TTLocalizer.DistributedPhoneEmpty, text_wordwrap=15, fadeScreen=1, command=self.__clearDialog)
self.numHouseItems = None
self.phoneInUse = 0
elif mode == PhoneGlobals.PHONE_MOVIE_PICKUP:
self.notify.debug('setMovie: gui')
if avatar:
@ -241,7 +229,6 @@ class DistributedPhone(DistributedFurnitureItem.DistributedFurnitureItem):
self.acceptOnce(self.pickupMovieDoneEvent, self.__showPhoneGui)
self.playInterval(interval, elapsed, avatar)
self.phoneInUse = 1
elif mode == PhoneGlobals.PHONE_MOVIE_HANGUP:
self.notify.debug('setMovie: gui')
if avatar:
@ -249,10 +236,8 @@ class DistributedPhone(DistributedFurnitureItem.DistributedFurnitureItem):
self.playInterval(interval, elapsed, avatar)
self.numHouseItems = None
self.phoneInUse = 0
else:
self.notify.warning('unknown mode in setMovie: %s' % mode)
return
def __showPhoneGui(self):
if self.toonScale:
@ -288,7 +273,6 @@ class DistributedPhone(DistributedFurnitureItem.DistributedFurnitureItem):
self.phoneDialog.cleanup()
self.phoneDialog = None
self.freeAvatar()
return
def takePhoneInterval(self, toon):
torso = TextEncoder.upper(toon.style.torso[0])
@ -348,7 +332,6 @@ class DistributedPhone(DistributedFurnitureItem.DistributedFurnitureItem):
if avatar:
self.accept(avatar.uniqueName('disable'), self.clearInterval)
self.intervalAvatar = avatar
return
def clearInterval(self):
if self.interval != None:
@ -360,7 +343,6 @@ class DistributedPhone(DistributedFurnitureItem.DistributedFurnitureItem):
self.__receiverToPhone()
self.model.pose('SS_phoneOut', 0)
self.phoneInUse = 0
return
def ringIfHasPhoneQuest(self, task):
if Quests.avatarHasPhoneQuest(base.localAvatar) and not Quests.avatarHasCompletedPhoneQuest(base.localAvatar):
@ -380,7 +362,6 @@ class DistributedPhone(DistributedFurnitureItem.DistributedFurnitureItem):
ringIval = Parallel(Func(base.playSfx, self.ringSfx), shakeSeq, Func(phone.setR, 0))
self.playInterval(ringIval, 0.0, None)
return
def requestGiftAvatar(self, doId):
if not self.phoneGui:

6
toontown/estate/PhoneGlobals.py
View file

@ -1,5 +1,3 @@
PHONE_MOVIE_CLEAR = 2
PHONE_MOVIE_EMPTY = 3
PHONE_MOVIE_PICKUP = 4
PHONE_MOVIE_HANGUP = 5
PHONE_MOVIE_NO_HOUSE = 6
PHONE_MOVIE_PICKUP = 3
PHONE_MOVIE_HANGUP = 4

2
toontown/toonbase/TTLocalizerEnglish.py
View file

@ -5426,8 +5426,6 @@ DistributedMailboxEmpty = 'Your mailbox is empty right now. Come back here to l
DistributedMailboxWaiting = 'Your mailbox is empty right now, but the package you ordered is on its way. Check back later!'
DistributedMailboxReady = 'Your order has arrived!'
DistributedMailboxNotOwner = 'Sorry, this is not your mailbox.'
DistributedPhoneEmpty = "You can use any phone to order special items for you and your house. New items will become available to order over time.\n\nYou don't have any items available to order right now, but check back later!"
DistributedPhoneNoHouse = 'You must have a house to use the catalog!'
Clarabelle = 'Clarabelle'
MailboxExitButton = 'Close Mailbox'
MailboxAcceptButton = 'Take this item'