Fix pet scales

This commit is contained in:
John 2015-07-07 14:15:10 +03:00
parent 85461c0107
commit 3ca278f940
3 changed files with 6 additions and 2 deletions

View file

@ -49,8 +49,8 @@ class CatalogPetTrickItem(CatalogItem.CatalogItem):
dna = PetDNA.getRandomPetDNA()
pet.setDNA(dna)
pet.setH(180)
pet.setScale(1.25)
model, ival = self.makeFrameModel(pet, 0)
pet.setScale(2.0)
pet.setP(-40)
track = PetTricks.getTrickIval(pet, self.trickId)
name = 'petTrick-item-%s' % self.sequenceNumber

View file

@ -114,9 +114,9 @@ class Pet(Avatar.Avatar):
else:
self.style = dna
self.generatePet()
self.generateMoods()
self.initializeDropShadow()
self.initializeNametag3d()
self.generateMoods()
self.dropShadow.setScale(0.75)
def generatePet(self):

View file

@ -66,6 +66,7 @@ class PetshopGUI(DirectObject):
self.petModel.fitAndCenterHead(0.435, forGui=1)
self.petModel.reparentTo(self.petView)
self.petModel.setH(225)
self.petModel.setScale(0.125)
self.petModel.enterNeutralHappy()
self.allNames = TTLocalizer.NeutralPetNames
if gender == 0:
@ -217,6 +218,7 @@ class PetshopGUI(DirectObject):
self.petModel.fitAndCenterHead(0.395, forGui=1)
self.petModel.reparentTo(self.petView)
self.petModel.setH(130)
self.petModel.setScale(0.125)
self.petModel.enterNeutralHappy()
self.moneyDisplay = DirectLabel(parent=self, relief=None, text=str(base.localAvatar.getTotalMoney()), text_scale=0.075, text_fg=(0.95, 0.95, 0, 1), text_shadow=(0, 0, 0, 1), text_pos=(0.225, 0.33), text_font=ToontownGlobals.getSignFont())
self.accept(localAvatar.uniqueName('moneyChange'), self.__moneyChange)
@ -265,6 +267,7 @@ class PetshopGUI(DirectObject):
self.petModel.fitAndCenterHead(0.395, forGui=1)
self.petModel.reparentTo(self.petView)
self.petModel.setH(130)
self.petModel.setScale(0.125)
self.petModel.enterNeutralSad()
model.removeNode()
self.initialized = True
@ -373,6 +376,7 @@ class PetshopGUI(DirectObject):
self.petModel.fitAndCenterHead(0.57, forGui=1)
self.petModel.reparentTo(self.petView)
self.petModel.setH(130)
self.petModel.setScale(0.125)
self.petModel.enterNeutralHappy()
self.descLabel = DirectLabel(parent=self, pos=(-0.4, 0, 0.72), relief=None, scale=0.05, text=self.petDesc[self.curPet], text_align=TextNode.ALeft, text_wordwrap=TTLocalizer.PGUIwordwrap, text_scale=TTLocalizer.PGUIdescLabel)
if self.petCost[self.curPet] > base.localAvatar.getTotalMoney():