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 wedding cake pie

Browse source
This commit is contained in:
John 2015-06-10 15:18:35 +03:00 committed by Loudrob
parent 0634d53718
commit 78a7662ff4
3 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
toontown/battle/BattleProps.py
View file

@ -204,7 +204,8 @@ Splats = {'tart': (0.3, FruitpieColor),
'creampie-slice': (0.5, CreampieColor), 'creampie-slice': (0.5, CreampieColor),
'fruitpie': (0.7, FruitpieColor), 'fruitpie': (0.7, FruitpieColor),
'creampie': (0.7, CreampieColor), 'creampie': (0.7, CreampieColor),
'birthday-cake': (0.9, BirthdayCakeColor)} 'birthday-cake': (0.9, BirthdayCakeColor),
'wedding-cake': (0.9, BirthdayCakeColor)}
Variants = ('tart', Variants = ('tart',
'fruitpie', 'fruitpie',
'splat-tart', 'splat-tart',
@ -216,6 +217,7 @@ Variants = ('tart',
'splat-fruitpie', 'splat-fruitpie',
'splat-creampie', 'splat-creampie',
'splat-birthday-cake', 'splat-birthday-cake',
'splat-wedding-cake',
'splash-from-splat', 'splash-from-splat',
'clip-on-tie', 'clip-on-tie',
'lips', 'lips',

4
toontown/battle/MovieThrow.py
View file

@ -290,8 +290,6 @@ def __throwPie(throw, delay, hitCount):
pies = [pie, pie2] pies = [pie, pie2]
hands = toon.getRightHands() hands = toon.getRightHands()
splatName = 'splat-' + pieName splatName = 'splat-' + pieName
if pieName == 'wedding-cake':
splatName = 'splat-birthday-cake'
splat = globalPropPool.getProp(splatName) splat = globalPropPool.getProp(splatName)
splatType = globalPropPool.getPropType(splatName) splatType = globalPropPool.getPropType(splatName)
toonTrack = Sequence() toonTrack = Sequence()
@ -399,8 +397,6 @@ def __createWeddingCakeFlight(throw, groupHitDict, pie, pies):
numTargets = len(throw['target']) numTargets = len(throw['target'])
pieName = pieNames[level] pieName = pieNames[level]
splatName = 'splat-' + pieName splatName = 'splat-' + pieName
if pieName == 'wedding-cake':
splatName = 'splat-birthday-cake'
splat = globalPropPool.getProp(splatName) splat = globalPropPool.getProp(splatName)
splats = [splat] splats = [splat]
for i in xrange(numTargets - 1): for i in xrange(numTargets - 1):

2
toontown/toon/DistributedToonAI.py
View file

@ -4788,8 +4788,6 @@ def givePies(pieType, numPies=0):
if pieType == -1: if pieType == -1:
target.b_setNumPies(0) target.b_setNumPies(0)
return "Removed %s's pies." % target.getName() return "Removed %s's pies." % target.getName()
if pieType == 6:
return 'Invalid pie type!'
if not 0 <= pieType <= 7: if not 0 <= pieType <= 7:
return 'Pie type must be in range (0-7).' return 'Pie type must be in range (0-7).'
if not -1 <= numPies <= 99: if not -1 <= numPies <= 99: