sneedgroup-holder/oldschool-toontown
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1 from open-toontown/develop

Browse source 
Merging 9th Nov 2023
This commit is contained in:
Samuel T 2023-11-09 01:58:05 +00:00 committed by GitHub
commit c0d5cdcff4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
toontown/building/DistributedToonHallInterior.py
View file

@ -1,3 +1,4 @@
from panda3d.core import *
from panda3d.toontown import * from panda3d.toontown import *
from toontown.toonbase.ToonBaseGlobal import * from toontown.toonbase.ToonBaseGlobal import *
from direct.interval.IntervalGlobal import * from direct.interval.IntervalGlobal import *

5
toontown/minigame/DistributedPhotoGame.py
View file

@ -245,6 +245,11 @@ class DistributedPhotoGame(DistributedMinigame, PhotoGameBase.PhotoGameBase):
self.removeChildGameFSM(self.gameFSM) self.removeChildGameFSM(self.gameFSM)
del self.gameFSM del self.gameFSM
self.ignoreAll() self.ignoreAll()
for rayEntry in self.rayArray:
rayEntry[3].remove_node()
del self.rayArray
return return
def onstage(self): def onstage(self):

3
toontown/toon/Toon.py
View file

@ -860,6 +860,9 @@ class Toon(Avatar.Avatar, ToonHead):
self.resetHeight() self.resetHeight()
self.setupToonNodes() self.setupToonNodes()
self.generateBackpack() self.generateBackpack()
hands = self.getRightHands()
for bookActor, hand in zip(self.__bookActors, hands):
bookActor.reparentTo(hand)
def generateToonHead(self, copy = 1): def generateToonHead(self, copy = 1):
headHeight = ToonHead.generateToonHead(self, copy, self.style, ('1000', '500', '250')) headHeight = ToonHead.generateToonHead(self, copy, self.style, ('1000', '500', '250'))