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

Merge branch 'master' of https://gitlab.com/toontown-created/src

Browse source
This commit is contained in:
Nigger 2015-03-30 19:03:44 -04:00
commit dd61403856
4 changed files with 51 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

73
astron/databases/air_cache/pets_401000001.pets
View file

@ -1,47 +1,54 @@
(dp1
I4000
(lp2
I11
aI177
aI238
aI152
aI89
I44
aI170
aI242
aI222
aI111
asI1000
(lp3
I123
aI161
aI145
aI138
aI122
I162
aI246
aI230
aI9
aI130
asI9000
(lp4
I66
aI201
aI27
aI102
aI185
I238
aI160
aI252
aI128
aI55
asI2000
(lp5
I135
aI20
aI54
aI240
aI147
I134
aI234
aI185
aI178
aI237
asI5000
(lp6
I129
aI194
aI222
aI92
aI37
asI3000
I227
aI61
aI35
aI72
aI121
asI7000
(lp7
I166
aI114
aI70
aI144
aI30
I152
aI250
aI12
aI249
aI42
asI3000
(lp8
I34
aI75
aI197
aI112
aI54
asS'day'
p8
I16523
p9
I16524
s.

6
toontown/makeatoon/TrackShop.py
View file

@ -10,6 +10,12 @@ class TrackShop(StateData.StateData):
def __init__(self, doneEvent):
StateData.StateData.__init__(self, doneEvent)
self.quest = None
self.label = None
self.leftButton = None
self.rightButton = None
self.track = None
self.icon = None
self.loaded = False
self.index = 0
return

2
toontown/town/TownBattle.py
View file

@ -268,7 +268,7 @@ class TownBattle(StateData.StateData):
for cogPanel in self.cogPanels:
cogPanel.hide()
cogPanel.updateHealthBar()
cogPanel.setPos(0, 0, 0.75)
cogPanel.setPos(0, 0, 0.62)
if num == 1:
self.cogPanels[0].setX(self.oddPos[1])

8
toontown/town/TownBattleCogPanel.py
View file

@ -35,7 +35,7 @@ class TownBattleCogPanel(DirectFrame):
def __init__(self, id):
gui = loader.loadModel('phase_3.5/models/gui/battle_gui')
DirectFrame.__init__(self, relief=None, image=gui.find('**/ToonBtl_Status_BG'), image_color=Vec4(0.5, 0.5, 0.5, 0.7))
DirectFrame.__init__(self, relief=None, image=gui.find('**/ToonBtl_Status_BG'), image_color=Vec4(0.86, 0.86, 0.86, 0.7))
self.setScale(0.8)
self.initialiseoptions(TownBattleCogPanel)
self.levelText = DirectLabel(parent=self, text='', pos=(-0.06, 0, -0.075), text_scale=0.055)
@ -82,7 +82,7 @@ class TownBattleCogPanel(DirectFrame):
self.head = Suit.attachSuitHead(self, suitName)
self.head.setX(0.1)
self.head.setZ(0.01)
self.head.setScale(0.087)
self.head.setScale(0.05)
def generateHealthBar(self):
model = loader.loadModel('phase_3.5/models/gui/matching_game_gui')
@ -92,8 +92,8 @@ class TownBattleCogPanel(DirectFrame):
button.setH(180.0)
button.setColor(self.healthColors[0])
button.reparentTo(self)
button.setX(-0.08)
button.setZ(0.02)
button.setX(-0.065)
button.setZ(0.05)
self.healthBar = button
glow = BattleProps.globalPropPool.getProp('glow')
glow.reparentTo(self.healthBar)