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

Merge branch 'master' of https://gitlab.com/ToontownUnited/src

Browse source
This commit is contained in:
DenialMC 2015-04-19 01:54:45 +03:00
commit 1364ee1021
1 changed files with 0 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
toontown/toon/DistributedToonAI.py
View file

@ -4856,10 +4856,6 @@ def dna(part, value):
value = ToonDNA.toonSpeciesTypes[speciesIndex] value = ToonDNA.toonSpeciesTypes[speciesIndex]
if value not in ToonDNA.toonSpeciesTypes: if value not in ToonDNA.toonSpeciesTypes:
return 'Invalid species: ' + value return 'Invalid species: ' + value
if (dna.headColor == 0x1a) and (value == 'c'):
return 'Invalid species for color: black'
if (dna.headColor == 0x00) and (value == 'b'):
return 'Invalid species for color: white'
dna.head = value + dna.head[1:3] dna.head = value + dna.head[1:3]
invoker.b_setDNAString(dna.makeNetString()) invoker.b_setDNAString(dna.makeNetString())
return 'Species set to: ' + dna.head[0] return 'Species set to: ' + dna.head[0]
@ -4895,10 +4891,6 @@ def dna(part, value):
if part == 'headcolor': if part == 'headcolor':
if dna.gender not in ('m', 'f'): if dna.gender not in ('m', 'f'):
return 'Unknown gender.' return 'Unknown gender.'
if (value == 0x1a) or (0x1a in (dna.headColor, dna.armColor, dna.legColor)):
return 'Toon contains black parts!'
if (value == 0x00) or (0x00 in (dna.headColor, dna.armColor, dna.legColor)):
return 'Toon contains white parts!'
if (dna.gender == 'm') and (value not in ToonDNA.defaultBoyColorList): if (dna.gender == 'm') and (value not in ToonDNA.defaultBoyColorList):
return 'Invalid male head color index: ' + str(value) return 'Invalid male head color index: ' + str(value)
if (dna.gender == 'f') and (value not in ToonDNA.defaultGirlColorList): if (dna.gender == 'f') and (value not in ToonDNA.defaultGirlColorList):
@ -4910,10 +4902,6 @@ def dna(part, value):
if part == 'armcolor': if part == 'armcolor':
if dna.gender not in ('m', 'f'): if dna.gender not in ('m', 'f'):
return 'Unknown gender.' return 'Unknown gender.'
if (value == 0x1a) or (0x1a in (dna.headColor, dna.armColor, dna.legColor)):
return 'Toon contains black parts!'
if (value == 0x00) or (0x00 in (dna.headColor, dna.armColor, dna.legColor)):
return 'Toon contains white parts!'
if (dna.gender == 'm') and (value not in ToonDNA.defaultBoyColorList): if (dna.gender == 'm') and (value not in ToonDNA.defaultBoyColorList):
return 'Invalid male arm color index: ' + str(value) return 'Invalid male arm color index: ' + str(value)
if (dna.gender == 'f') and (value not in ToonDNA.defaultGirlColorList): if (dna.gender == 'f') and (value not in ToonDNA.defaultGirlColorList):
@ -4925,10 +4913,6 @@ def dna(part, value):
if part == 'legcolor': if part == 'legcolor':
if dna.gender not in ('m', 'f'): if dna.gender not in ('m', 'f'):
return 'Unknown gender.' return 'Unknown gender.'
if (value == 0x1a) or (0x1a in (dna.headColor, dna.armColor, dna.legColor)):
return 'Toon contains black parts!'
if (value == 0x00) or (0x00 in (dna.headColor, dna.armColor, dna.legColor)):
return 'Toon contains white parts!'
if (dna.gender == 'm') and (value not in ToonDNA.defaultBoyColorList): if (dna.gender == 'm') and (value not in ToonDNA.defaultBoyColorList):
return 'Invalid male leg color index: ' + str(value) return 'Invalid male leg color index: ' + str(value)
if (dna.gender == 'f') and (value not in ToonDNA.defaultGirlColorList): if (dna.gender == 'f') and (value not in ToonDNA.defaultGirlColorList):