zontreck/ToonTownRewritten
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

doomsday: New counters and cameras

Browse source
This commit is contained in:
Joey Z 2014-04-19 15:10:55 -04:00
parent c46cc60daf
commit 039e8d67cb
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
resources

@ -1 +1 @@
Subproject commit 7c4202ea3b623761fc0beadafc839b9828ef5810
Subproject commit 6efd751881aa0e9bcf9f8a9c3eaa09fb01d6c1ff

2
toontown/election/DistributedElectionCamera.py
View file

@ -14,7 +14,7 @@ class DistributedElectionCamera(DistributedNode):
def generate(self):
self.assign(render.attachNewNode('DistributedElectionCamera'))
DistributedNode.generate(self)
self.camera = loader.loadModel('phase_4/models/events/camera.egg')
self.camera = loader.loadModel('phase_4/models/events/election_tvCamera')
self.camera.reparentTo(render)
self.camera.setScale(0.25)
propJoint = self.camera.find('**/hat')

6
toontown/election/DistributedElectionEvent.py
View file

@ -40,14 +40,16 @@ class DistributedElectionEvent(DistributedObject, FSM):
podium.reparentTo(self.showFloor)
podium.setPosHpr(-6, 0, 3, 270, -2, 5)
podium.setScale(0.65)
counterLeft = loader.loadModel('phase_4/models/events/election_counterLeft')
counterLeft = Actor.Actor('phase_4/models/events/election_counterLeft-mod', {'count': 'phase_4/models/events/election_counterLeft-countSeq'})
counterLeft.reparentTo(self.showFloor)
counterLeft.setPosHpr(13.5, 10, 2.95, 270, 0, 0)
counterLeft.setScale(2.0)
counterRight = loader.loadModel('phase_4/models/events/election_counterRight')
counterRight = Actor.Actor('phase_4/models/events/election_counterRight-mod', {'count': 'phase_4/models/events/election_counterRight-countSeq'})
counterRight.reparentTo(self.showFloor)
counterRight.setPosHpr(13.5, -10, 3.25, 270, 0, 0)
counterRight.setScale(2.0)
counterLeft.pose('count', 0)
counterRight.pose('count', 0)
rope = loader.loadModel('phase_4/models/events/election_rope')
rope.reparentTo(self.showFloor)
rope.setPosHpr(-34, 18, 0.46, 270, 0, 0)