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' into features/ttn

Browse source
This commit is contained in:
John 2015-07-16 15:53:32 +03:00
commit 603dad00cb
2 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
toontown/battle/DistributedBattleBaseAI.py
View file

@ -1634,8 +1634,6 @@ class DistributedBattleBaseAI(DistributedObjectAI.DistributedObjectAI, BattleBas
toon.inventory.zeroInv(1) toon.inventory.zeroInv(1)
deadToons.append(activeToon) deadToons.append(activeToon)
self.notify.debug('AFTER ROUND: toon: %d setHp: %d' % (toon.doId, toon.hp)) self.notify.debug('AFTER ROUND: toon: %d setHp: %d' % (toon.doId, toon.hp))
if toon.unlimitedGags:
toon.doRestock(noUber=0)
for deadToon in deadToons: for deadToon in deadToons:
self.__removeToon(deadToon) self.__removeToon(deadToon)

2
toontown/catalog/CatalogFurnitureItem.py
View file

@ -74,7 +74,7 @@ MaxTrunkIds = (4000, 4010)
TvToPosScale = { TvToPosScale = {
1530: ((-1.15, -0.5, 1.1), (2.5, 1.7, 1.4)), 1530: ((-1.15, -0.5, 1.1), (2.5, 1.7, 1.4)),
1531: ((-2.3, -0.2, 1.6), (5)), 1531: ((-2.3, -0.2, 1.6), (5, 5, 5)),
1532: ((-7, -0.2, 1.8), (15, 10, 8.5)) 1532: ((-7, -0.2, 1.8), (15, 10, 8.5))
} }