Sneed-Group/Poodletooth-iLand
1
0
Fork 0
mirror of https://github.com/Sneed-Group/Poodletooth-iLand synced 2024-12-23 19:52:37 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert lure number showing + use invisible.png in color shop

Browse source
This commit is contained in:
John 2015-08-27 12:10:34 +03:00
parent 85f8122dbc
commit 1c01fddd82
2 changed files with 3 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
toontown/makeatoon/ColorShop.py
View file

@ -91,7 +91,7 @@ class ColorShop(StateData.StateData):
self.pickContainer.setTransparency(True) 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.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.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.B1PRESS, self.__startPickColor)
self.pickButton.bind(DGG.B1RELEASE, self.__stopPickColor) 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)) 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))

20
toontown/town/TownBattleToonPanel.py
View file

@ -24,8 +24,6 @@ class TownBattleToonPanel(DirectFrame):
self.sosText.hide() 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 = DirectLabel(parent=self, relief=None, pos=(0.1, 0, 0.015), text=TTLocalizer.TownBattleToonFire, text_scale=0.06)
self.fireText.hide() 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.sosHead = None
self.undecidedText = DirectLabel(parent=self, relief=None, pos=(0.1, 0, 0.015), text=TTLocalizer.TownBattleUndecided, text_scale=0.1) 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) 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.undecidedText.hide()
self.sosText.hide() self.sosText.hide()
self.fireText.hide() self.fireText.hide()
self.roundsText.hide()
self.gagNode.hide() self.gagNode.hide()
self.whichText.hide() self.whichText.hide()
self.passNode.hide() self.passNode.hide()
self.cleanupSosHead() self.cleanupSosHead()
self.hoverButton.unbind(DGG.ENTER) self.hoverButton.unbind(DGG.ENTER)
self.whichText.setPos(0.1, 0, -0.08)
self.whichText['text_scale'] = 0.05
if self.hasGag: if self.hasGag:
self.gag.removeNode() self.gag.removeNode()
self.hasGag = 0 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: if numTargets is not None and targetIndex is not None and localNum is not None:
self.whichText.show() self.whichText.show()
self.whichText['text'] = self.determineWhichText(numTargets, targetIndex, localNum, index) 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: else:
self.notify.error('Bad track value: %s' % track) self.notify.error('Bad track value: %s' % track)
@ -184,6 +168,7 @@ class TownBattleToonPanel(DirectFrame):
returnStr = '' returnStr = ''
targetList = range(numTargets) targetList = range(numTargets)
targetList.reverse() targetList.reverse()
for i in targetList: for i in targetList:
if targetIndex == -1: if targetIndex == -1:
returnStr += 'X' returnStr += 'X'
@ -221,9 +206,8 @@ class TownBattleToonPanel(DirectFrame):
self.sosHead = None self.sosHead = None
def cleanupLaffMeter(self): def cleanupLaffMeter(self):
self.notify.debug('Cleaning up laffmeter!')
self.ignore(self.hpChangeEvent) self.ignore(self.hpChangeEvent)
if self.laffMeter: if self.laffMeter:
self.laffMeter.destroy() self.laffMeter.destroy()
self.laffMeter = None self.laffMeter = None
return