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

shit

Browse source
This commit is contained in:
Loudrob 2015-04-28 08:36:01 -04:00
parent b870c27184
commit 518a9c6e0c
2 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
toontown/building/DistributedSuitInteriorAI.py
View file

@ -319,9 +319,10 @@ class DistributedSuitInteriorAI(DistributedObjectAI.DistributedObjectAI):
self.suits.append(info[0]) self.suits.append(info[0])
self.activeSuits.append(info[0]) self.activeSuits.append(info[0])
self.joinedReserves.append(info) self.joinedReserves.append(info)
continue
for info in self.joinedReserves: for info in self.joinedReserves:
self.reserveSuits.remove(info) self.reserveSuits.remove(info)
if len(self.joinedReserves) > 0: if len(self.joinedReserves) > 0:
self.fsm.request('ReservesJoining') self.fsm.request('ReservesJoining')
self.d_setSuits() self.d_setSuits()

6
toontown/cogdominium/DistributedCogdoInterior.py
View file

@ -693,11 +693,7 @@ class DistributedCogdoInterior(DistributedObject.DistributedObject):
suit.setH(180) suit.setH(180)
suit.loop('neutral') suit.loop('neutral')
if len(self.suits) == len(self.joiningReserves): track = Sequence(Func(camera.wrtReparentTo, self.elevatorModelOut), Func(camera.setPos, Point3(0, -8, 2)), Func(camera.setHpr, Vec3(0, 10, 0)), Parallel(SoundInterval(self.openSfx), LerpPosInterval(self.leftDoorOut, ElevatorData[ELEVATOR_NORMAL]['closeTime'], Point3(0, 0, 0), startPos=ElevatorUtils.getLeftClosePoint(ELEVATOR_NORMAL), blendType='easeOut'), LerpPosInterval(self.rightDoorOut, ElevatorData[ELEVATOR_NORMAL]['closeTime'], Point3(0, 0, 0), startPos=ElevatorUtils.getRightClosePoint(ELEVATOR_NORMAL), blendType='easeOut')), Wait(SUIT_HOLD_ELEVATOR_TIME), Func(camera.wrtReparentTo, render), Func(callback))
camSequence = Sequence(Func(camera.wrtReparentTo, localAvatar), Func(camera.setPos, Point3(0, 5, 5)), Func(camera.headsUp, self.elevatorModelOut))
else:
camSequence = Sequence(Func(camera.wrtReparentTo, self.elevatorModelOut), Func(camera.setPos, Point3(0, -8, 2)), Func(camera.setHpr, Vec3(0, 10, 0)))
track = Sequence(camSequence, Parallel(SoundInterval(self.openSfx), LerpPosInterval(self.leftDoorOut, ElevatorData[ELEVATOR_NORMAL]['closeTime'], Point3(0, 0, 0), startPos=ElevatorUtils.getLeftClosePoint(ELEVATOR_NORMAL), blendType='easeOut'), LerpPosInterval(self.rightDoorOut, ElevatorData[ELEVATOR_NORMAL]['closeTime'], Point3(0, 0, 0), startPos=ElevatorUtils.getRightClosePoint(ELEVATOR_NORMAL), blendType='easeOut')), Wait(SUIT_HOLD_ELEVATOR_TIME), Func(camera.wrtReparentTo, render), Func(callback))
track.start(ts) track.start(ts)
self.activeIntervals[name] = track self.activeIntervals[name] = track