Fucking go die in a fire + added Unavailable to TTLocalizer

toontown/toon/NPCFriendPanel.py

@@ -193,7 +193,7 @@ class NPCFriendCard(DirectFrame):
             countText = TTLocalizer.NPCFriendPanelRemaining % count
             self.sosCallButton['state'] = DGG.NORMAL
         else:
-            countText = 'Unavailable'
+            countText = TTLocalizer.NPCFriendUnavailable
             self.sosCallButton['state'] = DGG.DISABLED
         self.sosCountInfo['text'] = countText
         return

toontown/toon/ToonTeleportPanel.py

@@ -75,9 +75,6 @@ class ToonTeleportPanel(DirectFrame):
             State.State('unknownHood',
                 self.enterUnknownHood,
                 self.exitUnknownHood),
-            State.State('unavailableHood',
-                self.enterUnavailableHood,
-                self.exitUnavailableHood),
             State.State('otherShard',
                 self.enterOtherShard,
                 self.exitOtherShard),
@@ -179,13 +176,6 @@ class ToonTeleportPanel(DirectFrame):
     def exitUnknownHood(self):
         self.bOk.hide()
 
-    def enterUnavailableHood(self, hoodId):
-        self['text'] = TTLocalizer.TeleportPanelUnavailableHood % base.cr.hoodMgr.getFullnameFromId(hoodId)
-        self.bOk.show()
-
-    def exitUnavailableHood(self):
-        self.bOk.hide()
-
     def enterSelf(self):
         self['text'] = TTLocalizer.TeleportPanelDenySelf
         self.bOk.show()
@@ -232,7 +222,6 @@ class ToonTeleportPanel(DirectFrame):
         shardName = base.cr.getShardName(shardId)
         if shardName is None:
             shardName = 'unknown'
-        print 'enterTeleport: %r, %r, %r, %r, %r' % (shardId, shardName, hoodId, zoneId, self.avId)
         hoodsVisited = base.localAvatar.hoodsVisited
         canonicalHoodId = ZoneUtil.getCanonicalZoneId(hoodId)
         if hoodId == ToontownGlobals.MyEstate:
@@ -245,9 +234,6 @@ class ToonTeleportPanel(DirectFrame):
         elif canonicalHoodId not in hoodsVisited + ToontownGlobals.HoodsAlwaysVisited:
             teleportNotify.debug('enterTeleport: unknownHood')
             self.fsm.request('unknownHood', [hoodId])
-        elif canonicalHoodId not in base.cr.hoodMgr.getAvailableZones():
-            print 'hoodId %d not ready' % hoodId
-            self.fsm.request('unavailableHood', [hoodId])
         else:
             if shardId == base.localAvatar.defaultShard:
                 shardId = None

toontown/toonbase/TTLocalizerEnglish.py

@@ -1998,7 +1998,6 @@ TeleportPanelIgnored = '%s is ignoring you.'
 TeleportPanelNotOnline = "%s isn't online right now."
 TeleportPanelWentAway = '%s went away.'
 TeleportPanelUnknownHood = "You don't know how to get to %s!"
-TeleportPanelUnavailableHood = '%s is not available right now; try again later.'
 TeleportPanelDenySelf = "You can't go to yourself!"
 TeleportPanelOtherShard = "%(avName)s is in district %(shardName)s, and you're in district %(myShardName)s.  Do you want to switch to %(shardName)s?"
 TeleportPanelBusyShard = '%(avName)s is in a full District.'
@@ -8940,4 +8939,5 @@ DonaldChatter = ["I'm glad you're here today!",
  'Sometimes I play trolley games just to eat the fruit pie!',
  'I hope you are enjoying your stay in Toontown!',
  'I like what you are wearing.',
- 'I love to play tag. Do you?']
+ 'I love to play tag. Do you?']
+ NPCFriendUnavailable = 'Unavailable'