From 794d1298eefc193381394093df38f2838224b02c Mon Sep 17 00:00:00 2001 From: John Date: Mon, 17 Aug 2015 01:53:29 +0300 Subject: [PATCH] Add level range to suit page --- toontown/shtiker/SuitPage.py | 7 ++++--- toontown/toonbase/TTLocalizerEnglish.py | 4 +++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/toontown/shtiker/SuitPage.py b/toontown/shtiker/SuitPage.py index ea0b3692..08deae1d 100755 --- a/toontown/shtiker/SuitPage.py +++ b/toontown/shtiker/SuitPage.py @@ -336,7 +336,7 @@ class SuitPage(ShtikerPage.ShtikerPage): yStart = -0.18 xOffset = 0.199 yOffset = 0.284 - self.rolloverFrame = DirectFrame(parent=self.panelNode, relief=None, geom=DGG.getDefaultDialogGeom(), geom_color=(0.5, 0.5, 0.5, 1), geom_scale=(0.73, 0, 0.55), text_scale=0.05, text_pos=(0, 0.2), text='', text_fg=(1, 1, 1, 1), pos=(0.44, 0, 0)) + self.rolloverFrame = DirectFrame(parent=self.panelNode, relief=None, geom=DGG.getDefaultDialogGeom(), geom_color=(0.5, 0.5, 0.5, 1), geom_scale=(0.73, 0, 0.65), text_scale=0.05, text_pos=(0, 0.26), text='', text_fg=(1, 1, 1, 1), pos=(0.44, 0, 0)) self.rolloverFrame.setBin('gui-popup', 0) self.rolloverFrame.hide() for dept in xrange(0, len(SuitDNA.suitDepts)): @@ -488,10 +488,11 @@ class SuitPage(ShtikerPage.ShtikerPage): if status in (COG_DEFEATED, COG_COMPLETE1, COG_COMPLETE2): name = SuitDNA.suitHeadTypes[index] attributes = SuitBattleGlobals.SuitAttributes[name] + level = attributes['level'] attacks = sorted(attributes['attacks'], key=lambda x: x[0]) groupAttacks = [] singleAttacks = [] - + for attack in attacks: if attack[0] in SuitBattleGlobals.DisabledAttacks: continue @@ -500,7 +501,7 @@ class SuitPage(ShtikerPage.ShtikerPage): else: singleAttacks.append(attack) - info = TTLocalizer.SuitPageAttackFormat % (self.getAttackStrings(groupAttacks), self.getAttackStrings(singleAttacks)) + info = TTLocalizer.SuitPageAttackFormat % (level + 1, level + 5, self.getAttackStrings(groupAttacks), self.getAttackStrings(singleAttacks)) panel.hoverButton.bind(DGG.ENTER, self.showInfo, extraArgs=[panel, info]) panel.hoverButton.bind(DGG.EXIT, self.hideInfo) diff --git a/toontown/toonbase/TTLocalizerEnglish.py b/toontown/toonbase/TTLocalizerEnglish.py index b7109236..2ed21536 100755 --- a/toontown/toonbase/TTLocalizerEnglish.py +++ b/toontown/toonbase/TTLocalizerEnglish.py @@ -8726,9 +8726,11 @@ ShardPageTeleport = 'Teleport to\n%s' TeleportButton = 'Teleport' -SuitPageAttackFormat = '\x01androidGreen\x01Group attacks:\x02\n%s\n\n\x01androidGreen\x01Regular attacks:\x02\n%s' +SuitPageAttackFormat = 'Levels: %s-%s\n\n\x01androidGreen\x01Group attacks:\x02\n%s\n\n\x01androidGreen\x01Regular attacks:\x02\n%s' SuitPageNoAttacks = 'None' +BattleGagPopup = '%s: %s\nGags left: %s' + Blacklist = [ "$1ut", "$h1t",