diff --git a/toontown/battle/DistributedBattleBaseAI.py b/toontown/battle/DistributedBattleBaseAI.py index 33612a81..d511b62c 100755 --- a/toontown/battle/DistributedBattleBaseAI.py +++ b/toontown/battle/DistributedBattleBaseAI.py @@ -1634,8 +1634,6 @@ class DistributedBattleBaseAI(DistributedObjectAI.DistributedObjectAI, BattleBas toon.inventory.zeroInv(1) deadToons.append(activeToon) self.notify.debug('AFTER ROUND: toon: %d setHp: %d' % (toon.doId, toon.hp)) - if toon.unlimitedGags: - toon.doRestock(noUber=0) for deadToon in deadToons: self.__removeToon(deadToon) diff --git a/toontown/catalog/CatalogFurnitureItem.py b/toontown/catalog/CatalogFurnitureItem.py index 02b4b7d2..3e5716e8 100755 --- a/toontown/catalog/CatalogFurnitureItem.py +++ b/toontown/catalog/CatalogFurnitureItem.py @@ -74,7 +74,7 @@ MaxTrunkIds = (4000, 4010) TvToPosScale = { 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)) }