From 1c01fddd82af00d76f2898a6eb344b5a73e2807f Mon Sep 17 00:00:00 2001
From: John <denialmc@outlook.com>
Date: Thu, 27 Aug 2015 12:10:34 +0300
Subject: [PATCH] Revert lure number showing + use invisible.png in color shop

---
 toontown/makeatoon/ColorShop.py      |  2 +-
 toontown/town/TownBattleToonPanel.py | 20 ++------------------
 2 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/toontown/makeatoon/ColorShop.py b/toontown/makeatoon/ColorShop.py
index 9ed310cb..c9bf9adc 100755
--- a/toontown/makeatoon/ColorShop.py
+++ b/toontown/makeatoon/ColorShop.py
@@ -91,7 +91,7 @@ class ColorShop(StateData.StateData):
         self.pickContainer.setTransparency(True)
         self.pickImage = PNMImage(int((ToontownGlobals.COLOR_SATURATION_MAX - ToontownGlobals.COLOR_SATURATION_MIN) * 100), int((ToontownGlobals.COLOR_VALUE_MAX - ToontownGlobals.COLOR_VALUE_MIN) * 100))
         self.hueSlider = DirectSlider(parent=self.advancedFrame, relief=None, image='phase_3/maps/color_picker_hue.jpg', scale=0.3, pos=(-0.05, 0, -0.43), image_scale=(0.1, 1.0, 1.0), pageSize=5, orientation=DGG.VERTICAL, command=self.__chooseHue)
-        self.pickButton = DirectButton(parent=self.advancedFrame, relief=None, image='phase_3/maps/color_picker_empty.png', scale=0.3, pos=(-0.45, 0, -0.43), frameColor=(1, 1, 1, 0.1), pressEffect=0)
+        self.pickButton = DirectButton(parent=self.advancedFrame, relief=None, image='phase_3/maps/invisible.png', scale=0.3, pos=(-0.45, 0, -0.43), frameColor=(1, 1, 1, 0.1), pressEffect=0)
         self.pickButton.bind(DGG.B1PRESS, self.__startPickColor)
         self.pickButton.bind(DGG.B1RELEASE, self.__stopPickColor)
         self.partsFrame = DirectFrame(parent=self.advancedFrame, image=shuffleFrame, image_scale=halfButtonInvertScale, relief=None, pos=(-0.395, 0, -0.85), hpr=(0, 0, -2), scale=0.9, frameColor=(1, 1, 1, 1), text=TTLocalizer.ColorAll, text_scale=0.0625, text_pos=(-0.001, -0.015), text_fg=(1, 1, 1, 1))
diff --git a/toontown/town/TownBattleToonPanel.py b/toontown/town/TownBattleToonPanel.py
index 8ded4661..c056149c 100755
--- a/toontown/town/TownBattleToonPanel.py
+++ b/toontown/town/TownBattleToonPanel.py
@@ -24,8 +24,6 @@ class TownBattleToonPanel(DirectFrame):
         self.sosText.hide()
         self.fireText = DirectLabel(parent=self, relief=None, pos=(0.1, 0, 0.015), text=TTLocalizer.TownBattleToonFire, text_scale=0.06)
         self.fireText.hide()
-        self.roundsText = DirectLabel(parent=self, relief=None, pos=(0.16, 0, -0.07), text='', text_scale=0.045)
-        self.roundsText.hide()
         self.sosHead = None
         self.undecidedText = DirectLabel(parent=self, relief=None, pos=(0.1, 0, 0.015), text=TTLocalizer.TownBattleUndecided, text_scale=0.1)
         self.healthText = DirectLabel(parent=self, text='', pos=(-0.06, 0, -0.075), text_scale=0.055)
@@ -102,14 +100,11 @@ class TownBattleToonPanel(DirectFrame):
         self.undecidedText.hide()
         self.sosText.hide()
         self.fireText.hide()
-        self.roundsText.hide()
         self.gagNode.hide()
         self.whichText.hide()
         self.passNode.hide()
         self.cleanupSosHead()
         self.hoverButton.unbind(DGG.ENTER)
-        self.whichText.setPos(0.1, 0, -0.08)
-        self.whichText['text_scale'] = 0.05
         if self.hasGag:
             self.gag.removeNode()
             self.hasGag = 0
@@ -166,17 +161,6 @@ class TownBattleToonPanel(DirectFrame):
             if numTargets is not None and targetIndex is not None and localNum is not None:
                 self.whichText.show()
                 self.whichText['text'] = self.determineWhichText(numTargets, targetIndex, localNum, index)
-                self.roundsText.setPos(0.16, 0, -0.07)
-                self.roundsText['text_scale'] = 0.045
-            elif track == LURE_TRACK:
-                self.roundsText['text_scale'] = 0.05
-                self.roundsText.setPos(0.1, 0, -0.08)
-            if track == LURE_TRACK:
-                self.roundsText.show()
-                self.roundsText['text'] = str(NumRoundsLured[level])
-                self.whichText.setPos(0.085, 0, -0.07)
-                self.whichText['text_scale'] = 0.045
-                
         else:
             self.notify.error('Bad track value: %s' % track)
 
@@ -184,6 +168,7 @@ class TownBattleToonPanel(DirectFrame):
         returnStr = ''
         targetList = range(numTargets)
         targetList.reverse()
+
         for i in targetList:
             if targetIndex == -1:
                 returnStr += 'X'
@@ -221,9 +206,8 @@ class TownBattleToonPanel(DirectFrame):
             self.sosHead = None
 
     def cleanupLaffMeter(self):
-        self.notify.debug('Cleaning up laffmeter!')
         self.ignore(self.hpChangeEvent)
+
         if self.laffMeter:
             self.laffMeter.destroy()
             self.laffMeter = None
-        return