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 pet shop

Browse source
This commit is contained in:
Daniel 2015-03-29 19:46:50 +03:00
parent 35abc0b1c3
commit 983eb61b68
3 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
toontown/pets/PetDNA.py
View file

@ -2,6 +2,7 @@ from toontown.toon import ToonDNA
from pandac.PandaModules import VBase4 from pandac.PandaModules import VBase4
from toontown.toonbase import TTLocalizer, ToontownGlobals from toontown.toonbase import TTLocalizer, ToontownGlobals
from direct.showbase import PythonUtil from direct.showbase import PythonUtil
import random
NumFields = 9 NumFields = 9
Fields = {'head': 0, Fields = {'head': 0,
'ears': 1, 'ears': 1,
@ -179,17 +180,17 @@ PetEyeColors = (VBase4(0.29, 0.29, 0.69, 1.0),
VBase4(0.49, 0.99, 0.49, 1.0)) VBase4(0.49, 0.99, 0.49, 1.0))
PetGenders = [0, 1] PetGenders = [0, 1]
def getRandomPetDNA(zoneId = ToontownGlobals.DonaldsDreamland): def getRandomPetDNA(seed = 0, zoneId = ToontownGlobals.DonaldsDreamland):
from random import choice random.seed(seed + zoneId)
head = choice(range(-1, len(HeadParts))) head = random.choice(range(-1, len(HeadParts)))
ears = choice(range(-1, len(EarParts))) ears = random.choice(range(-1, len(EarParts)))
nose = choice(range(-1, len(NoseParts))) nose = random.choice(range(-1, len(NoseParts)))
tail = choice(range(-1, len(TailParts))) tail = random.choice(range(-1, len(TailParts)))
body = getSpecies(zoneId) body = getSpecies(zoneId)
color = choice(range(0, len(getColors(body)))) color = random.choice(range(0, len(getColors(body))))
colorScale = choice(range(0, len(ColorScales))) colorScale = random.choice(range(0, len(ColorScales)))
eyes = choice(range(0, len(PetEyeColors))) eyes = random.choice(range(0, len(PetEyeColors)))
gender = choice(range(0, len(PetGenders))) gender = random.choice(range(0, len(PetGenders)))
return [head, return [head,
ears, ears,
nose, nose,

4
toontown/pets/PetUtil.py
View file

@ -3,9 +3,9 @@ from toontown.toonbase import TTLocalizer
from direct.showbase import PythonUtil from direct.showbase import PythonUtil
def getPetInfoFromSeed(seed, safezoneId): def getPetInfoFromSeed(seed, safezoneId):
dnaArray = PetDNA.getRandomPetDNA(safezoneId) dnaArray = PetDNA.getRandomPetDNA(seed, safezoneId)
gender = PetDNA.getGender(dnaArray) gender = PetDNA.getGender(dnaArray)
nameString = TTLocalizer.getRandomPetName(gender=gender, seed=seed + safezoneId) nameString = TTLocalizer.getRandomPetName(gender=gender, seed=seed)
traitSeed = PythonUtil.randUint31() traitSeed = PythonUtil.randUint31()
return (nameString, dnaArray, traitSeed) return (nameString, dnaArray, traitSeed)

2
toontown/toon/DistributedNPCPetclerkAI.py
View file

@ -105,7 +105,7 @@ class DistributedNPCPetclerkAI(DistributedNPCToonBaseAI):
if av.petId != 0: if av.petId != 0:
simbase.air.petMgr.deleteToonsPet(avId) simbase.air.petMgr.deleteToonsPet(avId)
gender = petNum % len(PetDNA.PetGenders) gender = petNum % len(PetDNA.PetGenders)
if nameIndex not in xrange(0, TTLocalizer.PetNameIndexMAX): if nameIndex not in xrange(0, len(TTLocalizer.PetNameDictionary) - 1):
self.air.writeServerEvent('avoid_crash', avId, "DistributedNPCPetclerkAI.petAdopted and didn't have valid nameIndex!") self.air.writeServerEvent('avoid_crash', avId, "DistributedNPCPetclerkAI.petAdopted and didn't have valid nameIndex!")
self.notify.warning("somebody called petAdopted and didn't have valid nameIndex to adopt! avId: %s" % avId) self.notify.warning("somebody called petAdopted and didn't have valid nameIndex to adopt! avId: %s" % avId)
return return