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

Removed some of the TTI-ish features from Loading Screen and added globals for new street.

Browse source
This commit is contained in:
Loudrob 2015-03-31 23:07:13 -04:00
parent a2a1ea6fa7
commit 976de78682
3 changed files with 40 additions and 103 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,54 +1,54 @@
(dp1
I4000
(lp2
I44
aI170
aI242
aI222
aI111
I8
aI25
aI166
aI149
aI59
asI1000
(lp3
I162
aI246
aI230
aI9
aI130
I20
aI156
aI148
aI67
aI107
asI9000
(lp4
I238
aI160
aI252
aI128
aI55
I144
aI49
aI71
aI198
aI134
asI2000
(lp5
I134
aI234
aI185
aI178
aI237
I145
aI195
aI42
aI10
aI65
asI5000
(lp6
I227
aI61
aI35
aI72
aI121
I238
aI37
aI127
aI207
aI232
asI7000
(lp7
I152
aI250
aI12
aI249
aI42
I183
aI112
aI190
aI222
aI14
asI3000
(lp8
I34
aI75
aI197
aI112
aI54
I80
aI160
aI214
aI38
aI241
asS'day'
p9
I16524
I16526
s.

3
toontown/building/SuitBuildingGlobals.py
View file

@ -200,6 +200,8 @@ buildingMinMax = {
config.GetInt('lullaby-lane-building-max', 12)],
ToontownGlobals.PajamaPlace: [config.GetInt('pajama-place-building-min', 6),
config.GetInt('pajama-place-building-max', 12)],
ToontownGlobals.RockAByeRoad: [config.GetInt('rock-a-bye-road-building-min', 6),
config.GetInt('rock-a-bye-road-building-max', 12)],
ToontownGlobals.SellbotHQ: [0, 0],
ToontownGlobals.SellbotFactoryExt: [0, 0],
ToontownGlobals.CashbotHQ: [0, 0],
@ -225,6 +227,7 @@ buildingChance = {
ToontownGlobals.PolarPlace: config.GetFloat('polar-place-building-chance', 100.0),
ToontownGlobals.LullabyLane: config.GetFloat('lullaby-lane-building-chance', 100.0),
ToontownGlobals.PajamaPlace: config.GetFloat('pajama-place-building-chance', 100.0),
ToontownGlobals.RockAByeRoad: config.GetFloat('rock-a-bye-road-building-chance', 100.0),
ToontownGlobals.SellbotHQ: 0.0,
ToontownGlobals.SellbotFactoryExt: 0.0,
ToontownGlobals.CashbotHQ: 0.0,

68
toontown/toontowngui/ToontownLoadingScreen.py
View file

@ -12,53 +12,6 @@ LOADING_SCREEN_SORT_INDEX = 4000
class ToontownLoadingScreen:
defaultTex = 'phase_3.5/maps/loading/default.jpg'
zone2picture = {
ToontownGlobals.GoofySpeedway : 'phase_3.5/maps/loading/gs.jpg',
ToontownGlobals.ToontownCentral : 'phase_3.5/maps/loading/ttc.jpg',
ToontownGlobals.SillyStreet : 'phase_3.5/maps/loading/ttc_ss.jpg',
ToontownGlobals.LoopyLane : 'phase_3.5/maps/loading/ttc_ll.jpg',
ToontownGlobals.PunchlinePlace : 'phase_3.5/maps/loading/ttc_pp.jpg',
ToontownGlobals.DonaldsDock : 'phase_3.5/maps/loading/dd.jpg',
ToontownGlobals.BarnacleBoulevard : 'phase_3.5/maps/loading/dd_bb.jpg',
ToontownGlobals.SeaweedStreet : 'phase_3.5/maps/loading/dd_ss.jpg',
ToontownGlobals.LighthouseLane : 'phase_3.5/maps/loading/dd_ll.jpg',
ToontownGlobals.DaisyGardens : 'phase_3.5/maps/loading/dg.jpg',
ToontownGlobals.ElmStreet : 'phase_3.5/maps/loading/dg_es.jpg',
ToontownGlobals.MapleStreet : 'phase_3.5/maps/loading/dg_ms.jpg',
ToontownGlobals.OakStreet : 'phase_3.5/maps/loading/dg_os.jpg',
ToontownGlobals.MinniesMelodyland : 'phase_3.5/maps/loading/mml.jpg',
ToontownGlobals.AltoAvenue : 'phase_3.5/maps/loading/mml_aa.jpg',
ToontownGlobals.BaritoneBoulevard : 'phase_3.5/maps/loading/mml_bb.jpg',
ToontownGlobals.TenorTerrace : 'phase_3.5/maps/loading/mml_tt.jpg',
ToontownGlobals.TheBrrrgh : 'phase_3.5/maps/loading/tb.jpg',
ToontownGlobals.WalrusWay : 'phase_3.5/maps/loading/tb_ww.jpg',
ToontownGlobals.SleetStreet : 'phase_3.5/maps/loading/tb_ss.jpg',
ToontownGlobals.PolarPlace : 'phase_3.5/maps/loading/tb_pp.jpg',
ToontownGlobals.DonaldsDreamland : 'phase_3.5/maps/loading/ddl.jpg',
ToontownGlobals.LullabyLane : 'phase_3.5/maps/loading/ddl_ll.jpg',
ToontownGlobals.PajamaPlace : 'phase_3.5/maps/loading/ddl_pp.jpg',
ToontownGlobals.OutdoorZone : 'phase_3.5/maps/loading/oz.jpg',
ToontownGlobals.GolfZone : 'phase_3.5/maps/loading/gz.jpg',
ToontownGlobals.SellbotHQ : 'phase_3.5/maps/loading/sbhq.jpg',
ToontownGlobals.CashbotHQ : 'phase_3.5/maps/loading/cbhq.jpg',
ToontownGlobals.LawbotHQ : 'phase_3.5/maps/loading/lbhq.jpg',
ToontownGlobals.BossbotHQ : 'phase_3.5/maps/loading/bbhq.jpg'
}
emotes = [
{'emote': 'bored', 'frame': 135},
{'emote': 'run', 'frame': 7},
{'emote': 'victory', 'frame': 10},
{'emote': 'applause', 'frame': 23},
{'emote': 'sprinkle-dust', 'frame': 40},
{'emote': 'hypnotize', 'frame': 25},
{'emote': 'cringe', 'frame': 25},
{'emote': 'wave', 'frame': 25},
{'emote': 'shrug', 'frame': 30},
{'emote': 'duck', 'frame': 40},
{'emote': 'up', 'frame': 60},
{'emote': 'down', 'frame': 23},
{'emote': 'bow', 'frame': 45}
]
def __init__(self):
self.__expectedCount = 0
@ -75,13 +28,10 @@ class ToontownLoadingScreen:
scale = self.logo.getScale()
# self.logo.setPos(scale[0], 0, -scale[2])
self.logo.setPos(0, 0, -scale[2])
self.toon = None
def destroy(self):
self.title.destroy()
self.gui.removeNode()
if self.toon:
self.toon.delete()
self.logo.removeNode()
def getTip(self, tipCategory):
@ -90,25 +40,11 @@ class ToontownLoadingScreen:
def begin(self, range, label, gui, tipCategory, zoneId):
self.waitBar['range'] = range
self.title['text'] = label
loadingScreenTex = self.zone2picture.get(ZoneUtil.getBranchZone(zoneId), self.defaultTex)
loadingScreenTex = self.defaultTex
self.background = loader.loadTexture(loadingScreenTex)
self.__count = 0
self.__expectedCount = range
if gui:
if base.localAvatarStyle:
from toontown.toon import Toon
emote = random.choice(self.emotes)
self.toon = Toon.Toon()
self.toon.setDNA(base.localAvatarStyle)
try: self.toon.pose(*emote.values())
except: self.toon.pose(emote['emote'], emote['frame'])
self.toon.getGeomNode().setDepthWrite(1)
self.toon.getGeomNode().setDepthTest(1)
self.toon.setHpr(205, 0, 0)
self.toon.setScale(0.18)
self.toon.setPos(base.a2dBottomRight.getX()/1.25, 0, -0.034)
self.toon.reparentTo(self.waitBar)
self.waitBar['frameSize'] = (base.a2dLeft+(base.a2dRight/8.15), base.a2dRight-(base.a2dRight/2.57), -0.03, 0.03)
self.title.reparentTo(base.a2dpBottomLeft, LOADING_SCREEN_SORT_INDEX)
self.title.setPos(0.24, 0, 0.23)
self.gui.setPos(0, -0.1, 0)
@ -128,8 +64,6 @@ class ToontownLoadingScreen:
self.waitBar.reparentTo(self.gui)
self.title.reparentTo(self.gui)
self.gui.reparentTo(hidden)
if self.toon:
self.toon.reparentTo(hidden)
self.logo.reparentTo(hidden)
return (self.__expectedCount, self.__count)