Sneed-Group/Poodletooth-iLand
2
0
Fork 0
mirror of https://github.com/Sneed-Group/Poodletooth-iLand synced 2025-01-09 17:53:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix a few bugs - jukebox's still broken

Browse source
This commit is contained in:
John 2015-07-07 13:37:24 +03:00
parent 0a3df8b2ea
commit 02fb386ed5
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
toontown/estate/DistributedEstate.py
View file

@ -408,6 +408,8 @@ class DistributedEstate(DistributedObject.DistributedObject):
self.popupFishGUI()
def __handleFishSaleDone(self, sell=0):
base.setCellsAvailable(base.bottomCells, 1)
base.cr.playGame.getPlace().setState('walk')
self.ignore(self.fishGuiDoneEvent)
self.sendUpdate('completeFishSale', [sell])
self.ignore('stoppedAsleep')
@ -415,6 +417,8 @@ class DistributedEstate(DistributedObject.DistributedObject):
self.fishGui = None
def popupFishGUI(self):
base.setCellsAvailable(base.bottomCells, 0)
base.cr.playGame.getPlace().setState('stopped')
self.acceptOnce(self.fishGuiDoneEvent, self.__handleFishSaleDone)
self.fishGui = FishSellGUI.FishSellGUI(self.fishGuiDoneEvent)
self.accept('stoppedAsleep', self.__handleFishSaleDone)

6
toontown/estate/Estate.py
View file

@ -44,7 +44,8 @@ class Estate(Place.Place):
'teleportOut',
'doorOut',
'push',
'pet']),
'pet',
'activity']),
State.State('stopped', self.enterStopped, self.exitStopped, ['walk', 'teleportOut']),
State.State('sit', self.enterSit, self.exitSit, ['walk']),
State.State('push', self.enterPush, self.exitPush, ['walk']),
@ -57,7 +58,8 @@ class Estate(Place.Place):
'doorOut',
'push',
'pet',
'teleportOut']),
'teleportOut',
'activity']),
State.State('teleportIn', self.enterTeleportIn, self.exitTeleportIn, ['walk', 'petTutorial']),
State.State('teleportOut', self.enterTeleportOut, self.exitTeleportOut, ['teleportIn', 'walk', 'final']),
State.State('doorIn', self.enterDoorIn, self.exitDoorIn, ['walk']),