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

Grammar fixes, settings.json beautify, crash fixes, GC fixes (still breaks though with #f), and gag selection fix

Browse source
This commit is contained in:
John 2015-08-06 14:55:00 +03:00
parent 3093813f06
commit 68b8b047a5
5 changed files with 19 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
otp/otpbase/OTPLocalizerEnglish.py
View file

@ -376,7 +376,7 @@ SuitFaceoffTaunts = {'b': ['Do you have a donation for me?',
'Good, it takes two to mingle.', 'Good, it takes two to mingle.',
"Let's mingle.", "Let's mingle.",
'This looks like a good place to mingle.', 'This looks like a good place to mingle.',
"Well,isn't this cozy?", "Well, isn't this cozy?",
"You're mingling with defeat.", "You're mingling with defeat.",
"I'm going to mingle in your business.", "I'm going to mingle in your business.",
"Are you sure you're ready to mingle?"], "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?', 'Care to take a few turns with me?',
'I have my own special spin on the subject.'], 'I have my own special spin on the subject.'],
'f': ["I'm gonna tell the boss about you!", '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.", "I'm using you to step up the corporate ladder.",
"You're not going to like the way I work.", "You're not going to like the way I work.",
'The boss is counting on me to stop you.', 'The boss is counting on me to stop you.',
@ -644,7 +644,7 @@ SuitFaceoffTaunts = {'b': ['Do you have a donation for me?',
"I've been asked to pinch-hit.", "I've been asked to pinch-hit.",
"I'll prove you're not dreaming.", "I'll prove you're not dreaming.",
'Heads you lose, tails I win.', 'Heads you lose, tails I win.',
'A Penny for your gags.'], 'A penny for your gags.'],
'tw': ['Things are about to get very tight.', 'tw': ['Things are about to get very tight.',
"That's Mr. Tightwad to you.", "That's Mr. Tightwad to you.",
"I'm going to cut off your funding.", "I'm going to cut off your funding.",

2
otp/settings/Settings.py
View file

@ -17,7 +17,7 @@ class Settings(collections.MutableMapping):
def write(self): def write(self):
with open(self.filename, 'w') as f: 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): def __setitem__(self, key, value):
self.store[key] = value self.store[key] = value

6
toontown/toon/NPCToons.py
View file

@ -11564,8 +11564,7 @@ NPCToonDict = {20000: (-1,
0, 0,
10, 10,
5, 5,
27, 27),
0),
'm', 'm',
0, 0,
NPC_REGULAR), NPC_REGULAR),
@ -11583,8 +11582,7 @@ NPCToonDict = {20000: (-1,
0, 0,
0, 0,
0, 0,
15, 15),
0),
'm', 'm',
0, 0,
NPC_REGULAR), NPC_REGULAR),

14
toontown/toonbase/ToontownStart.py
View file

@ -1,4 +1,8 @@
#!/usr/bin/env python2 #!/usr/bin/env python2
import gc
gc.disable()
import __builtin__ import __builtin__
__builtin__.process = 'client' __builtin__.process = 'client'
@ -193,11 +197,15 @@ del version
base.loader = base.loader base.loader = base.loader
__builtin__.loader = base.loader __builtin__.loader = base.loader
autoRun = ConfigVariableBool('toontown-auto-run', 1) autoRun = ConfigVariableBool('toontown-auto-run', 1)
gc.enable()
gc.collect()
if autoRun: if autoRun:
try: try:
base.run() base.run()
except SystemExit: except SystemExit:
raise pass
except: except:
print describeException() import traceback
raise traceback.print_exc()

3
toontown/town/TownBattle.py
View file

@ -359,9 +359,6 @@ class TownBattle(StateData.StateData):
def enterAttack(self): def enterAttack(self):
self.attackPanel.enter() self.attackPanel.enter()
self.accept(self.attackPanelDoneEvent, self.__handleAttackPanelDone) self.accept(self.attackPanelDoneEvent, self.__handleAttackPanelDone)
for toonPanel in self.toonPanels:
toonPanel.setValues(0, BattleBase.NO_ATTACK)
return None return None
def exitAttack(self): def exitAttack(self):