From 8c47aa0fd0c311a5093ae517653c0607413aa1ef Mon Sep 17 00:00:00 2001 From: John Date: Thu, 28 May 2015 21:01:37 +0300 Subject: [PATCH] Added PBN nametag font --- toontown/catalog/CatalogNametagItem.py | 6 ------ toontown/toon/DistributedToonAI.py | 2 -- toontown/toonbase/TTLocalizerEnglish.py | 9 ++++----- 3 files changed, 4 insertions(+), 13 deletions(-) diff --git a/toontown/catalog/CatalogNametagItem.py b/toontown/catalog/CatalogNametagItem.py index c0759aa0..f15e4901 100755 --- a/toontown/catalog/CatalogNametagItem.py +++ b/toontown/catalog/CatalogNametagItem.py @@ -43,12 +43,6 @@ class CatalogNametagItem(CatalogItem.CatalogItem): else: name = name + TTLocalizer.NametagLabel return name - if self.nametagStyle == 0: - name = TTLocalizer.NametagCitizen - elif self.nametagStyle == 1: - name = TTLocalizer.NametagAction - elif self.nametagStyle == 2: - name = TTLocalizer.NametagFrilly def recordPurchase(self, avatar, optional): if avatar: diff --git a/toontown/toon/DistributedToonAI.py b/toontown/toon/DistributedToonAI.py index 0b5164dc..4bbe048b 100755 --- a/toontown/toon/DistributedToonAI.py +++ b/toontown/toon/DistributedToonAI.py @@ -4899,8 +4899,6 @@ def nametagStyle(nametagStyle): currentAccess = spellbook.getInvokerAccess() if nametagStyle >= len(TTLocalizer.NametagFontNames): return 'Invalid nametag style.' - if nametagStyle != 0 and nametagStyle != 10 and currentAccess == CATEGORY_MODERATOR.defaultAccess: - return 'Invalid access level!' target = spellbook.getTarget() target.b_setNametagStyle(nametagStyle) return 'Nametag style set to: %s.' % TTLocalizer.NametagFontNames[nametagStyle] diff --git a/toontown/toonbase/TTLocalizerEnglish.py b/toontown/toonbase/TTLocalizerEnglish.py index c2bf8bdf..e6cfdbf6 100755 --- a/toontown/toonbase/TTLocalizerEnglish.py +++ b/toontown/toonbase/TTLocalizerEnglish.py @@ -30,7 +30,8 @@ NametagFonts = ( 'phase_3/models/fonts/Danger.bam', 'phase_3/models/fonts/Alie.bam', 'phase_3/models/fonts/OysterBar.bam', - 'phase_3/models/fonts/RedDogSaloon.bam' + 'phase_3/models/fonts/RedDogSaloon.bam', + 'phase_3/models/fonts/PBN.ttf' ) NametagFontNames = ( 'Default', @@ -47,7 +48,8 @@ NametagFontNames = ( 'Action', 'Poetic', 'Boardwalk', - 'Western' + 'Western', + 'Pixelated' ) NametagLabel = ' Nametag' BasicNameTag = 'Basic' @@ -5038,9 +5040,6 @@ EstateCannonGameEnd = 'The Cannon Game rental is over.' GameTableRentalEnd = 'The Game Table rental is over.' MessageConfirmRent = 'Begin rental? Cancel to save the rental for later' MessageConfirmGarden = 'Are you sure you want to start a garden?' -NametagCitizen = 'Citizen Name Tag' -NametagAction = 'Action Name Tag' -NametagFrilly = 'Frilly Name Tag' FurnitureYourOldCloset = 'your old wardrobe' FurnitureYourOldBank = 'your old bank' FurnitureYourOldTrunk = 'your old trunk'