diff --git a/otp/otpbase/OTPLocalizerEnglish.py b/otp/otpbase/OTPLocalizerEnglish.py index d37d265f..bf709ccf 100755 --- a/otp/otpbase/OTPLocalizerEnglish.py +++ b/otp/otpbase/OTPLocalizerEnglish.py @@ -376,7 +376,7 @@ SuitFaceoffTaunts = {'b': ['Do you have a donation for me?', 'Good, it takes two to mingle.', "Let's mingle.", 'This looks like a good place to mingle.', - "Well,isn't this cozy?", + "Well, isn't this cozy?", "You're mingling with defeat.", "I'm going to mingle in your business.", "Are you sure you're ready to mingle?"], @@ -520,7 +520,7 @@ SuitFaceoffTaunts = {'b': ['Do you have a donation for me?', 'Care to take a few turns with me?', 'I have my own special spin on the subject.'], 'f': ["I'm gonna tell the boss about you!", - "I may be just a flunky - But I'm real spunky.", + "I may be just a Flunky - But I'm real spunky.", "I'm using you to step up the corporate ladder.", "You're not going to like the way I work.", 'The boss is counting on me to stop you.', @@ -543,7 +543,7 @@ SuitFaceoffTaunts = {'b': ['Do you have a donation for me?', 'Careful, I may leave a mark.'], 'ym': ["I'm positive you're not going to like this.", "I don't know the meaning of no.", - 'Want to meet? I say yes, anytime.', + 'Want to meet? I say yes, anytime.', 'You need some positive enforcement.', "I'm going to make a positive impression.", "I haven't been wrong yet.", @@ -592,7 +592,7 @@ SuitFaceoffTaunts = {'b': ['Do you have a donation for me?', 'Can I interest you in an insurance plan?', 'You should have missed my call.', "You won't be able to get rid of me now.", - 'This a bad time? Good.', + 'This a bad time? Good.', 'I was planning on running into you.', 'I will be reversing the charges for this call.', 'I have some costly items for you today.', @@ -644,7 +644,7 @@ SuitFaceoffTaunts = {'b': ['Do you have a donation for me?', "I've been asked to pinch-hit.", "I'll prove you're not dreaming.", 'Heads you lose, tails I win.', - 'A Penny for your gags.'], + 'A penny for your gags.'], 'tw': ['Things are about to get very tight.', "That's Mr. Tightwad to you.", "I'm going to cut off your funding.", diff --git a/otp/settings/Settings.py b/otp/settings/Settings.py index 5fa803ba..de87fe0e 100755 --- a/otp/settings/Settings.py +++ b/otp/settings/Settings.py @@ -17,7 +17,7 @@ class Settings(collections.MutableMapping): def write(self): with open(self.filename, 'w') as f: - json.dump(self.store, f) + json.dump(self.store, f, sort_keys=True, indent=2, separators=(',', ': ')) def __setitem__(self, key, value): self.store[key] = value diff --git a/toontown/toon/NPCToons.py b/toontown/toon/NPCToons.py index 3cfcf9a0..c4652bb9 100755 --- a/toontown/toon/NPCToons.py +++ b/toontown/toon/NPCToons.py @@ -11564,8 +11564,7 @@ NPCToonDict = {20000: (-1, 0, 10, 5, - 27, - 0), + 27), 'm', 0, NPC_REGULAR), @@ -11583,8 +11582,7 @@ NPCToonDict = {20000: (-1, 0, 0, 0, - 15, - 0), + 15), 'm', 0, NPC_REGULAR), diff --git a/toontown/toonbase/ToontownStart.py b/toontown/toonbase/ToontownStart.py index 5687efb5..ba86dacf 100644 --- a/toontown/toonbase/ToontownStart.py +++ b/toontown/toonbase/ToontownStart.py @@ -1,4 +1,8 @@ #!/usr/bin/env python2 +import gc + +gc.disable() + import __builtin__ __builtin__.process = 'client' @@ -193,11 +197,15 @@ del version base.loader = base.loader __builtin__.loader = base.loader autoRun = ConfigVariableBool('toontown-auto-run', 1) + +gc.enable() +gc.collect() + if autoRun: try: base.run() except SystemExit: - raise + pass except: - print describeException() - raise + import traceback + traceback.print_exc() \ No newline at end of file diff --git a/toontown/town/TownBattle.py b/toontown/town/TownBattle.py index 79cb54b6..2f788092 100755 --- a/toontown/town/TownBattle.py +++ b/toontown/town/TownBattle.py @@ -359,9 +359,6 @@ class TownBattle(StateData.StateData): def enterAttack(self): self.attackPanel.enter() self.accept(self.attackPanelDoneEvent, self.__handleAttackPanelDone) - for toonPanel in self.toonPanels: - toonPanel.setValues(0, BattleBase.NO_ATTACK) - return None def exitAttack(self):