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

Initial work on new street

Browse source
This commit is contained in:
John 2015-08-03 02:48:08 +03:00
parent ab5ae94e17
commit 61a703e04d
8 changed files with 289 additions and 386 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
toontown/building/DistributedBuilding.py
View file

@ -435,7 +435,9 @@ class DistributedBuilding(DistributedObject.DistributedObject):
return
dnaStore = self.cr.playGame.dnaStore
level = int(self.difficulty / 2) + 1
suitNP = dnaStore.findNode('suit_landmark_' + chr(self.track) + str(level))
if level > 5:
self.notify.warning('Level is bigger than 5: %s' % level)
suitNP = dnaStore.findNode('suit_landmark_' + chr(self.track) + str(min(level, 5)))
zoneId = dnaStore.getZoneFromBlockNumber(self.block)
newParentNP = base.cr.playGame.hood.loader.zoneDict[zoneId]
suitBuildingNP = suitNP.copyTo(newParentNP)

6
toontown/fishing/FishGlobals.py
View file

@ -367,7 +367,7 @@ __fishDict = {0: ((1,
(5,
11,
1,
(TTG.DonaldsDreamland, TTG.MyEstate, TTG.OutdoorZone))),
(TTG.DonaldsDreamland, TTG.MyEstate, TTG.OutdoorZone, TTG.BedtimeBoulevard))),
4: ((2,
8,
1,
@ -470,7 +470,7 @@ __fishDict = {0: ((1,
(6,
10,
7,
(TTG.LullabyLane,)),
(TTG.LullabyLane, TTG.BedtimeBoulevard)),
(1,
1,
3,
@ -478,7 +478,7 @@ __fishDict = {0: ((1,
(2,
6,
5,
(TTG.LullabyLane,)),
(TTG.LullabyLane, TTG.BedtimeBoulevard)),
(10,
14,
3,

6
toontown/fishing/FishingTargetGlobals.py
View file

@ -146,6 +146,12 @@ __targetInfoDict = {ToontownGlobals.ToontownCentral: (2,
-2.1,
14,
-2.1 - 0.378),
ToontownGlobals.BedtimeBoulevard: (2,
378,
-355,
-2.04,
14,
-2 - 0.483),
ToontownGlobals.MyEstate: (5,
30,
-126,

1
toontown/toon/DistributedToon.py
View file

@ -13,7 +13,6 @@ import operator
from panda3d.core import *
import random
import time
import Experience
import InventoryNew
import TTEmote

498
toontown/toon/NPCToons.py
View file

@ -11135,234 +11135,12 @@ NPCToonDict = {20000: (-1,
'm',
0,
NPC_FISHERMAN),
9301: (-1,
9301: (9329,
lnames[9301],
('pss',
'ms',
'l',
'm',
20,
0,
20,
20,
26,
0,
0,
0,
15,
0),
'r',
'm',
0,
NPC_REGULAR),
9302: (-1,
lnames[9302],
('bsl',
'ms',
'm',
'f',
20,
0,
20,
20,
3,
4,
0,
0,
5,
18),
'f',
0,
NPC_REGULAR),
9303: (-1,
lnames[9303],
('bll',
'ss',
's',
'm',
11,
0,
11,
11,
3,
6,
0,
0,
1,
2),
'm',
0,
NPC_REGULAR),
9304: (-1,
lnames[9304],
('ssl',
'sd',
'l',
'f',
13,
0,
13,
13,
1,
2,
0,
0,
0,
10),
'f',
0,
NPC_REGULAR),
9305: (-1,
lnames[9305],
('hll',
'ls',
'l',
'm',
8,
0,
8,
8,
1,
3,
0,
0,
1,
16),
'm',
0,
NPC_REGULAR),
9306: (-1,
lnames[9306],
('dsl',
'ms',
's',
'm',
5,
0,
5,
5,
1,
0,
0,
0,
0,
4),
'm',
0,
NPC_REGULAR),
9307: (-1,
lnames[9307],
('pls',
'ls',
's',
'f',
14,
0,
14,
14,
0,
11,
0,
0,
5,
9),
'f',
0,
NPC_REGULAR),
9308: (-1,
lnames[9308],
('bsl',
'ls',
'l',
'm',
12,
0,
12,
12,
1,
10,
0,
0,
1,
13),
'm',
0,
NPC_REGULAR),
9309: (-1,
lnames[9309],
('sss',
'ms',
'l',
'm',
2,
0,
2,
2,
0,
4,
0,
0,
0,
6),
'm',
0,
NPC_REGULAR),
9310: (-1,
lnames[9310],
('fsl',
'ls',
'm',
'm',
17,
0,
17,
17,
4,
4,
0,
0,
0,
10),
'm',
0,
NPC_REGULAR),
9311: (-1,
lnames[9311],
('mss',
'sd',
's',
'f',
24,
0,
24,
24,
3,
1,
0,
0,
0,
13),
'f',
0,
NPC_REGULAR),
9312: (-1,
lnames[9312],
('pss',
'sd',
'l',
'f',
9,
0,
9,
9,
0,
8,
0,
0,
11,
0),
'f',
0,
NPC_REGULAR),
NPC_FISHERMAN),
7001: (-1,
lnames[7001],
('bss',
@ -11574,6 +11352,234 @@ NPCToonDict = {20000: (-1,
'm',
0,
NPC_REGULAR),
7012: (-1,
lnames[7012],
('pss',
'ms',
'l',
'm',
20,
0,
20,
20,
26,
0,
0,
0,
15,
0),
'm',
0,
NPC_REGULAR),
7013: (-1,
lnames[7013],
('bsl',
'ms',
'm',
'f',
20,
0,
20,
20,
3,
4,
0,
0,
5,
18),
'f',
0,
NPC_REGULAR),
7014: (-1,
lnames[7014],
('bll',
'ss',
's',
'm',
11,
0,
11,
11,
3,
6,
0,
0,
1,
2),
'm',
0,
NPC_REGULAR),
7015: (-1,
lnames[7015],
('ssl',
'sd',
'l',
'f',
13,
0,
13,
13,
1,
2,
0,
0,
0,
10),
'f',
0,
NPC_REGULAR),
7016: (-1,
lnames[7016],
('hll',
'ls',
'l',
'm',
8,
0,
8,
8,
1,
3,
0,
0,
1,
16),
'm',
0,
NPC_REGULAR),
7017: (-1,
lnames[7017],
('dsl',
'ms',
's',
'm',
5,
0,
5,
5,
1,
0,
0,
0,
0,
4),
'm',
0,
NPC_REGULAR),
7018: (-1,
lnames[7018],
('pls',
'ls',
's',
'f',
14,
0,
14,
14,
0,
11,
0,
0,
5,
9),
'f',
0,
NPC_REGULAR),
7019: (-1,
lnames[7019],
('bsl',
'ls',
'l',
'm',
12,
0,
12,
12,
1,
10,
0,
0,
1,
13),
'm',
0,
NPC_REGULAR),
7020: (-1,
lnames[7020],
('sss',
'ms',
'l',
'm',
2,
0,
2,
2,
0,
4,
0,
0,
0,
6),
'm',
0,
NPC_REGULAR),
7021: (-1,
lnames[7021],
('fsl',
'ls',
'm',
'm',
17,
0,
17,
17,
4,
4,
0,
0,
0,
10),
'm',
0,
NPC_REGULAR),
7022: (-1,
lnames[7022],
('mss',
'sd',
's',
'f',
24,
0,
24,
24,
3,
1,
0,
0,
0,
13),
'f',
0,
NPC_REGULAR),
7023: (-1,
lnames[7023],
('pss',
'sd',
'l',
'f',
9,
0,
9,
9,
0,
8,
0,
0,
11,
0),
'f',
0,
NPC_REGULAR),
10001: (10000,
lnames[10001],
'r',
@ -11799,28 +11805,16 @@ HQnpcFriends = {2001: (ToontownBattleGlobals.HEAL_TRACK,
ToontownBattleGlobals.DROP_TRACK,
0,
3)}
FOnpcFriends = {9310: (ToontownBattleGlobals.LURE_TRACK,
1,
0,
0),
9311: (ToontownBattleGlobals.LURE_TRACK,
1,
0,
1),
9312: (ToontownBattleGlobals.LURE_TRACK,
FOnpcFriends = {9301: (ToontownBattleGlobals.HEAL_TRACK,
3,
0,
2),
9307: (ToontownBattleGlobals.SOUND_TRACK,
1,
10,
0),
9308: (ToontownBattleGlobals.SOUND_TRACK,
9302: (ToontownBattleGlobals.HEAL_TRACK,
3,
20,
1),
9309: (ToontownBattleGlobals.SOUND_TRACK,
4,
9303: (ToontownBattleGlobals.HEAL_TRACK,
3,
30,
2),
9304: (ToontownBattleGlobals.DROP_TRACK,
@ -11835,17 +11829,29 @@ FOnpcFriends = {9310: (ToontownBattleGlobals.LURE_TRACK,
3,
50,
2),
9301: (ToontownBattleGlobals.HEAL_TRACK,
3,
9307: (ToontownBattleGlobals.SOUND_TRACK,
1,
10,
0),
9302: (ToontownBattleGlobals.HEAL_TRACK,
9308: (ToontownBattleGlobals.SOUND_TRACK,
3,
20,
1),
9303: (ToontownBattleGlobals.HEAL_TRACK,
3,
9309: (ToontownBattleGlobals.SOUND_TRACK,
4,
30,
2),
9310: (ToontownBattleGlobals.LURE_TRACK,
1,
0,
0),
9311: (ToontownBattleGlobals.LURE_TRACK,
1,
0,
1),
9312: (ToontownBattleGlobals.LURE_TRACK,
3,
0,
2)}
disabledSosCards = ConfigVariableList('disable-sos-card')

25
toontown/toonbase/TTLocalizerEnglish.py
View file

@ -6224,18 +6224,7 @@ NPCToonNames = {20000: 'Tutorial Tom',
9235: lHQOfficerM,
9236: lHQOfficerM,
9237: 'Fisherman Jung',
9301: 'Phil Bettur',
9302: 'Emma Phatic',
9303: 'GiggleMesh',
9304: 'Anne Ville',
9305: 'Bud Erfingerz',
9306: 'J.S. Bark',
9307: 'Bea Sharpe',
9308: 'Otto Toon',
9309: 'Al Capella',
9310: 'Des Traction',
9311: 'Dee Version',
9312: 'Bo Nanapeel',
9301: 'Fisherman John',
7001: 'N. Prisoned',
7002: 'R.E. Leaseme',
7003: 'Lemmy Owte',
@ -6247,6 +6236,18 @@ NPCToonNames = {20000: 'Tutorial Tom',
7009: 'Jimmy Thelock',
7010: 'Jaymo',
7011: 'Donald',
7012: 'Phil Bettur',
7013: 'Emma Phatic',
7014: 'GiggleMesh',
7015: 'Anne Ville',
7016: 'Bud Erfingerz',
7017: 'J.S. Bark',
7018: 'Bea Sharpe',
7019: 'Otto Toon',
7020: 'Al Capella',
7021: 'Des Traction',
7022: 'Dee Version',
7023: 'Bo Nanapeel',
10001: 'Healer Sara',
11001: 'Healer Gabriel',
12001: 'Healer Bill',

2
toontown/toonbase/ToontownGlobals.py
View file

@ -177,7 +177,7 @@ HoodHierarchy = {ToontownCentral: (SillyStreet, LoopyLane, PunchlinePlace),
TheBrrrgh: (WalrusWay, SleetStreet, PolarPlace),
MinniesMelodyland: (AltoAvenue, BaritoneBoulevard, TenorTerrace),
DaisyGardens: (ElmStreet, MapleStreet, OakStreet),
DonaldsDreamland: (LullabyLane, PajamaPlace),
DonaldsDreamland: (LullabyLane, PajamaPlace, BedtimeBoulevard),
GoofySpeedway: ()}
BossbotHQ = 10000
BossbotLobby = 10100

131
toontown/toontowngui/ToontownLoadingScreen.py
View file

@ -1,7 +1,6 @@
from panda3d.core import *
from pandac.PandaModules import *
from direct.gui.DirectGui import *
from toontown.toonbase import ToontownGlobals
from toontown.toonbase import TTLocalizer
from toontown.toonbase import ToontownGlobals, TTLocalizer
from toontown.hood import ZoneUtil
import random
@ -12,6 +11,10 @@ class ToontownLoadingScreen:
def __init__(self):
self.__expectedCount = 0
self.__count = 0
self.textures = [(loader.loadTexture('phase_3.5/maps/loading/toon.jpg'), ToontownGlobals.getSignFont(), (0.2, 0.6, 0.9, 1)),
(loader.loadTexture('phase_3.5/maps/loading/cog.jpg'), ToontownGlobals.getSuitFont(), (1.0, 1.0, 1.0, 1)),
(loader.loadTexture('phase_3.5/maps/loading/default.jpg'), ToontownGlobals.getInterfaceFont(), (0, 0, 0.5, 1))
]
self.gui = loader.loadModel('phase_3/models/gui/progress-background.bam')
self.title = DirectLabel(guiId='ToontownLoadingScreenTitle', parent=self.gui, relief=None, pos=(base.a2dRight/5, 0, 0.235), text='', textMayChange=1, text_scale=0.08, text_fg=(0, 0, 0.5, 1), text_align=TextNode.ALeft, text_font=ToontownGlobals.getInterfaceFont())
self.tip = DirectLabel(guiId='ToontownLoadingScreenTip', parent=self.gui, relief=None, pos=(0, 0, 0.045), text='', textMayChange=1, text_scale=0.05, text_fg=(1, 1, 1, 1), text_shadow=(0, 0, 0, 1), text_align=TextNode.ACenter)
@ -35,135 +38,21 @@ class ToontownLoadingScreen:
return TTLocalizer.TipTitle + ' ' + random.choice(TTLocalizer.TipDict.get(tipCategory))
def begin(self, range, label, gui, tipCategory, zoneId):
self.defaultTex = 'phase_3.5/maps/loading/default.jpg'
self.defaultFont = ToontownGlobals.getInterfaceFont()
self.defaultFontColor = (0, 0, 0.5, 1)
self.zone2picture = {
ToontownGlobals.GoofySpeedway : 'phase_3.5/maps/loading/toon.jpg',
ToontownGlobals.ToontownCentral : 'phase_3.5/maps/loading/toon.jpg',
ToontownGlobals.SillyStreet : 'phase_3.5/maps/loading/toon.jpg',
ToontownGlobals.LoopyLane : 'phase_3.5/maps/loading/toon.jpg',
ToontownGlobals.PunchlinePlace : 'phase_3.5/maps/loading/toon.jpg',
ToontownGlobals.DonaldsDock : 'phase_3.5/maps/loading/toon.jpg',
ToontownGlobals.BarnacleBoulevard : 'phase_3.5/maps/loading/toon.jpg',
ToontownGlobals.SeaweedStreet : 'phase_3.5/maps/loading/toon.jpg',
ToontownGlobals.LighthouseLane : 'phase_3.5/maps/loading/toon.jpg',
ToontownGlobals.DaisyGardens : 'phase_3.5/maps/loading/toon.jpg',
ToontownGlobals.ElmStreet : 'phase_3.5/maps/loading/toon.jpg',
ToontownGlobals.MapleStreet : 'phase_3.5/maps/loading/toon.jpg',
ToontownGlobals.OakStreet : 'phase_3.5/maps/loading/toon.jpg',
ToontownGlobals.MinniesMelodyland : 'phase_3.5/maps/loading/toon.jpg',
ToontownGlobals.AltoAvenue : 'phase_3.5/maps/loading/toon.jpg',
ToontownGlobals.BaritoneBoulevard : 'phase_3.5/maps/loading/toon.jpg',
ToontownGlobals.TenorTerrace : 'phase_3.5/maps/loading/toon.jpg',
ToontownGlobals.TheBrrrgh : 'phase_3.5/maps/loading/toon.jpg',
ToontownGlobals.WalrusWay : 'phase_3.5/maps/loading/toon.jpg',
ToontownGlobals.SleetStreet : 'phase_3.5/maps/loading/toon.jpg',
ToontownGlobals.PolarPlace : 'phase_3.5/maps/loading/toon.jpg',
ToontownGlobals.DonaldsDreamland : 'phase_3.5/maps/loading/toon.jpg',
ToontownGlobals.LullabyLane : 'phase_3.5/maps/loading/toon.jpg',
ToontownGlobals.PajamaPlace : 'phase_3.5/maps/loading/toon.jpg',
ToontownGlobals.OutdoorZone : 'phase_3.5/maps/loading/toon.jpg',
ToontownGlobals.GolfZone : 'phase_3.5/maps/loading/toon.jpg',
ToontownGlobals.SellbotHQ : 'phase_3.5/maps/loading/cog.jpg',
ToontownGlobals.SellbotFactoryExt : 'phase_3.5/maps/loading/cog.jpg',
ToontownGlobals.SellbotFactoryInt : 'phase_3.5/maps/loading/cog.jpg',
ToontownGlobals.SellbotMegaCorpInt : 'phase_3.5/maps/loading/cog.jpg',
ToontownGlobals.CashbotHQ : 'phase_3.5/maps/loading/cog.jpg',
ToontownGlobals.LawbotHQ : 'phase_3.5/maps/loading/cog.jpg',
ToontownGlobals.BossbotHQ : 'phase_3.5/maps/loading/cog.jpg'
}
self.zone2font = {
ToontownGlobals.GoofySpeedway : ToontownGlobals.getSignFont(),
ToontownGlobals.ToontownCentral : ToontownGlobals.getSignFont(),
ToontownGlobals.SillyStreet : ToontownGlobals.getSignFont(),
ToontownGlobals.LoopyLane : ToontownGlobals.getSignFont(),
ToontownGlobals.PunchlinePlace : ToontownGlobals.getSignFont(),
ToontownGlobals.DonaldsDock : ToontownGlobals.getSignFont(),
ToontownGlobals.BarnacleBoulevard : ToontownGlobals.getSignFont(),
ToontownGlobals.SeaweedStreet : ToontownGlobals.getSignFont(),
ToontownGlobals.LighthouseLane : ToontownGlobals.getSignFont(),
ToontownGlobals.DaisyGardens : ToontownGlobals.getSignFont(),
ToontownGlobals.ElmStreet : ToontownGlobals.getSignFont(),
ToontownGlobals.MapleStreet : ToontownGlobals.getSignFont(),
ToontownGlobals.OakStreet : ToontownGlobals.getSignFont(),
ToontownGlobals.MinniesMelodyland : ToontownGlobals.getSignFont(),
ToontownGlobals.AltoAvenue : ToontownGlobals.getSignFont(),
ToontownGlobals.BaritoneBoulevard : ToontownGlobals.getSignFont(),
ToontownGlobals.TenorTerrace : ToontownGlobals.getSignFont(),
ToontownGlobals.TheBrrrgh : ToontownGlobals.getSignFont(),
ToontownGlobals.WalrusWay : ToontownGlobals.getSignFont(),
ToontownGlobals.SleetStreet : ToontownGlobals.getSignFont(),
ToontownGlobals.PolarPlace : ToontownGlobals.getSignFont(),
ToontownGlobals.DonaldsDreamland : ToontownGlobals.getSignFont(),
ToontownGlobals.LullabyLane : ToontownGlobals.getSignFont(),
ToontownGlobals.PajamaPlace : ToontownGlobals.getSignFont(),
ToontownGlobals.OutdoorZone : ToontownGlobals.getSignFont(),
ToontownGlobals.GolfZone : ToontownGlobals.getSignFont(),
ToontownGlobals.SellbotHQ : ToontownGlobals.getSuitFont(),
ToontownGlobals.SellbotFactoryExt : ToontownGlobals.getSuitFont(),
ToontownGlobals.SellbotFactoryInt : ToontownGlobals.getSuitFont(),
ToontownGlobals.SellbotMegaCorpInt : ToontownGlobals.getSuitFont(),
ToontownGlobals.CashbotHQ : ToontownGlobals.getSuitFont(),
ToontownGlobals.LawbotHQ : ToontownGlobals.getSuitFont(),
ToontownGlobals.BossbotHQ : ToontownGlobals.getSuitFont()
}
self.zone2fontcolor = {
ToontownGlobals.GoofySpeedway : VBase4(0.2, 0.6, 0.9, 1.0),
ToontownGlobals.ToontownCentral : VBase4(0.2, 0.6, 0.9, 1.0),
ToontownGlobals.SillyStreet : VBase4(0.2, 0.6, 0.9, 1.0),
ToontownGlobals.LoopyLane : VBase4(0.2, 0.6, 0.9, 1.0),
ToontownGlobals.PunchlinePlace : VBase4(0.2, 0.6, 0.9, 1.0),
ToontownGlobals.DonaldsDock : VBase4(0.2, 0.6, 0.9, 1.0),
ToontownGlobals.BarnacleBoulevard : VBase4(0.2, 0.6, 0.9, 1.0),
ToontownGlobals.SeaweedStreet : VBase4(0.2, 0.6, 0.9, 1.0),
ToontownGlobals.LighthouseLane : VBase4(0.2, 0.6, 0.9, 1.0),
ToontownGlobals.DaisyGardens : VBase4(0.2, 0.6, 0.9, 1.0),
ToontownGlobals.ElmStreet : VBase4(0.2, 0.6, 0.9, 1.0),
ToontownGlobals.MapleStreet : VBase4(0.2, 0.6, 0.9, 1.0),
ToontownGlobals.OakStreet : VBase4(0.2, 0.6, 0.9, 1.0),
ToontownGlobals.MinniesMelodyland : VBase4(0.2, 0.6, 0.9, 1.0),
ToontownGlobals.AltoAvenue : VBase4(0.2, 0.6, 0.9, 1.0),
ToontownGlobals.BaritoneBoulevard : VBase4(0.2, 0.6, 0.9, 1.0),
ToontownGlobals.TenorTerrace : VBase4(0.2, 0.6, 0.9, 1.0),
ToontownGlobals.TheBrrrgh : VBase4(0.2, 0.6, 0.9, 1.0),
ToontownGlobals.WalrusWay : VBase4(0.2, 0.6, 0.9, 1.0),
ToontownGlobals.SleetStreet : VBase4(0.2, 0.6, 0.9, 1.0),
ToontownGlobals.PolarPlace : VBase4(0.2, 0.6, 0.9, 1.0),
ToontownGlobals.DonaldsDreamland : VBase4(0.2, 0.6, 0.9, 1.0),
ToontownGlobals.LullabyLane : VBase4(0.2, 0.6, 0.9, 1.0),
ToontownGlobals.PajamaPlace : VBase4(0.2, 0.6, 0.9, 1.0),
ToontownGlobals.OutdoorZone : VBase4(0.2, 0.6, 0.9, 1.0),
ToontownGlobals.GolfZone : VBase4(0.2, 0.6, 0.9, 1.0),
ToontownGlobals.SellbotHQ : (1.0, 1.0, 1.0, 1.0),
ToontownGlobals.SellbotFactoryExt : (1.0, 1.0, 1.0, 1.0),
ToontownGlobals.SellbotFactoryInt : (1.0, 1.0, 1.0, 1.0),
ToontownGlobals.SellbotMegaCorpInt : (1.0, 1.0, 1.0, 1.0),
ToontownGlobals.CashbotHQ : (1.0, 1.0, 1.0, 1.0),
ToontownGlobals.LawbotHQ : (1.0, 1.0, 1.0, 1.0),
ToontownGlobals.BossbotHQ : (1.0, 1.0, 1.0, 1.0)
}
info = self.textures[ZoneUtil.isCogHQZone(zoneId) if zoneId else 2]
self.waitBar['range'] = range
self.title['text'] = label
self.loadingScreenTex = self.zone2picture.get(ZoneUtil.getBranchZone(zoneId), self.defaultTex)
self.loadingScreenFont = self.zone2font.get(ZoneUtil.getBranchZone(zoneId), self.defaultFont)
self.loadingScreenFontColor = self.zone2fontcolor.get(ZoneUtil.getBranchZone(zoneId), self.defaultFontColor)
self.background = loader.loadTexture(self.loadingScreenTex)
self.__count = 0
self.__expectedCount = range
if gui:
self.waitBar['frameSize'] = (base.a2dLeft+(base.a2dRight/4.95), base.a2dRight-(base.a2dRight/4.95), -0.03, 0.03)
self.title['text_font'] = self.loadingScreenFont
self.title['text_fg'] = self.loadingScreenFontColor
self.title['text_font'] = info[1]
self.title['text_fg'] = info[2]
self.title.reparentTo(base.a2dpBottomLeft, LOADING_SCREEN_SORT_INDEX)
self.title.setPos(base.a2dRight/5, 0, 0.235)
self.tip['text'] = self.getTip(tipCategory)
self.gui.setPos(0, -0.1, 0)
self.gui.reparentTo(aspect2d, LOADING_SCREEN_SORT_INDEX)
self.gui.setTexture(self.background, 1)
#if self.loadingScreenTex == self.defaultTex:
# self.logo.reparentTo(base.a2dpTopCenter, LOADING_SCREEN_SORT_INDEX)
self.gui.setTexture(info[0], 1)
self.logo.reparentTo(base.a2dpTopCenter, LOADING_SCREEN_SORT_INDEX)
else:
self.title.reparentTo(base.a2dpBottomLeft, LOADING_SCREEN_SORT_INDEX)