Merge branch 'features/ttn' of https://git.toontownstride.com/toontownstride/src into features/ttn

toontown/parties/DistributedPartyAI.py

@@ -149,6 +149,7 @@ class DistributedPartyAI(DistributedObjectAI):
 
     def _removeAvatar(self, avId):
         if avId in self.avIdsAtParty:
-            print 'REMOVE FROM PARTTY!'
+            print 'REMOVE FROM PARTY!'
             self.air.globalPartyMgr.d_toonLeftParty(self.info.get('partyId', 0), avId)
             self.avIdsAtParty.remove(avId)
+#Thanks Fooster for the typo fix

toontown/toonbase/TTLocalizerEnglish.py

@@ -4599,15 +4599,15 @@ SuitInvasionEnd = [
 ]
 SuitInvasionUpdate = [
  'Keep it up, Toons!!!',
- 'The Cogs appear to be decreasing in numbers!!!'
+ "The Cogs are beginning to explode in laughter!!!"
 ]
 SuitInvasionBulletin = [
  'There is a Cog invasion in progress!!!',
  '%(plural)s have taken over Toontown!!!'
 ]
 SkelecogInvasionBegin = [
- "Hmm... We're getting a strange reading over here...",
+ "This just in, Sellbot HQ's factory is going bonkers!",
- 'The Cog factories are running out of parts to build new Cogs!',
+ "Sellbot HQ's factory is pushing out incomplete cogs!",
  '%(singular)s Skelecogs have taken over Toontown!!!'
 ]
 SkelecogInvasionEnd = [
@@ -4616,35 +4616,35 @@ SkelecogInvasionEnd = [
 ]
 SkelecogInvasionBulletin = [
  'There is a Cog invasion in progress!!!',
- 'The Cog factories are running out of parts to build new Cogs!',
+ "Sellbot HQ's factory has pushed out incomplete Cogs!",
  '%(singular)s Skelecogs have taken over Toontown!!!'
 ]
 WaiterInvasionBegin = [
- 'It appears that the C.E.O. has fired all his waiters...',
+ 'Uh oh, it appears that the Cogs banquet has been rescheduled!',
- 'The unemployed %(singular)s waiters are invading Toontown!!!'
+ 'The Waiter %(singular)s are invading Toontown!!!'
 ]
 WaiterInvasionEnd = [
- 'The unemployed %(singular)s waiters have been defeated!!!',
+ 'The Waiter %(singular)s waiters have been defeated!!!',
  'The Toons have saved the day once again!!!'
 ]
 WaiterInvasionBulletin = [
  'There is a Cog invasion in progress!!!',
- 'The C.E.O. has fired all of his waiters!!!',
+ 'The Cogs banquet has been rescheduled!!!',
- 'The unemployed %(singular)s waiters are invading Toontown!!!'
+ 'The Waiter %(singular)s are invading Toontown!!!'
 ]
 V2InvasionBegin = [
- "Yikes!!! This isn't good, Toons!",
+ "Oh my, stock up on gags toons!",
- 'A major firmware update has been released to the Cogs!!!',
+ 'The Toon HQ has spotted a Version 2.0 Cog Invasion!',
- 'Version 2.0 %(plural)s have taken over Toontown!!!'
+ 'The V2 %(plural)s have taken over Toontown!!!'
 ]
 V2InvasionEnd = [
- 'The Version 2.0 %(singular)s invasion has ended!!!',
+ 'The V2 %(singular)s invasion has ended!!!',
  'The Toons have saved the day once again!!!'
 ]
 V2InvasionBulletin = [
- 'There is a Cog invasion in progress!!!',
+ "There is a Cog invasion in progress!!!",
- 'A major firmware update has been released to the Cogs!!!',
+ 'The Toon HQ has spotted a storm of Version 2.0 Cogs!',
- 'Version 2.0 %(plural)s have taken over Toontown!!!'
+ 'The V2 %(plural)s have taken over Toontown!!!'
 ]
 LeaderboardTitle = 'Toon Platoon'
 QuestScript101_0 = 'Come here! Use the arrow keys to move.'
@@ -9869,4 +9869,4 @@ Blacklist = [
  "willy",
  "xrated",
  "xxx"
-]
+]