From 2610e164e7be33a555fa3e65008a007affe65f33 Mon Sep 17 00:00:00 2001 From: Open Toontown <57279094+opentoontown@users.noreply.github.com> Date: Thu, 20 Jan 2022 15:26:26 -0500 Subject: [PATCH] more astron gone --- otp/otpbase/OTPBase.py | 2 -- toontown/battle/BattlePlace.py | 26 +----------------------- toontown/toon/DistributedToonAI.py | 25 ----------------------- toontown/town/Street.py | 9 +------- toontown/town/TownLoader.py | 6 ------ toontown/uberdog/ToontownUDRepository.py | 7 +------ 6 files changed, 3 insertions(+), 72 deletions(-) diff --git a/otp/otpbase/OTPBase.py b/otp/otpbase/OTPBase.py index 2c61ef1..d052502 100644 --- a/otp/otpbase/OTPBase.py +++ b/otp/otpbase/OTPBase.py @@ -10,9 +10,7 @@ class OTPBase(ShowBase): def __init__(self, windowType = None): self.wantEnviroDR = False ShowBase.__init__(self, windowType=windowType) - __builtins__['__astron__'] = ConfigVariableBool('astron-support', 1).value __builtins__['__execWarnings__'] = ConfigVariableBool('want-exec-warnings', 0).value - OTPBase.notify.info('__astron__ == %s' % __astron__) if ConfigVariableBool('want-phase-checker', 0).value: from direct.showbase import Loader Loader.phaseChecker = self.loaderPhaseChecker diff --git a/toontown/battle/BattlePlace.py b/toontown/battle/BattlePlace.py index fb30e9d..57f11aa 100644 --- a/toontown/battle/BattlePlace.py +++ b/toontown/battle/BattlePlace.py @@ -1,8 +1,6 @@ from pandac.PandaModules import * from toontown.toon import Toon from toontown.hood import Place -from toontown.hood import ZoneUtil -from toontown.toonbase import ToontownGlobals class BattlePlace(Place.Place): @@ -96,29 +94,7 @@ class BattlePlace(Place.Place): def doEnterZone(self, newZoneId): if newZoneId != self.zoneId: if newZoneId != None: - if __astron__: - if hasattr(self, 'zoneVisDict'): - visList = self.zoneVisDict[newZoneId] - else: - visList = base.cr.playGame.getPlace().loader.zoneVisDict[newZoneId] - - if newZoneId not in visList: - visList.append(newZoneId) - - base.cr.sendSetZoneMsg(newZoneId, visList) - else: - base.cr.sendSetZoneMsg(newZoneId) + base.cr.sendSetZoneMsg(newZoneId) self.notify.debug('Entering Zone %d' % newZoneId) self.zoneId = newZoneId return - - if __astron__: - def genDNAFileName(self, zoneId): - zoneId = ZoneUtil.getCanonicalZoneId(zoneId) - hoodId = ZoneUtil.getCanonicalHoodId(zoneId) - hood = ToontownGlobals.dnaMap[hoodId] - phase = ToontownGlobals.streetPhaseMap[hoodId] - if hoodId == zoneId: - zoneId = 'sz' - - return 'phase_%s/dna/%s_%s.dna' % (phase, hood, zoneId) diff --git a/toontown/toon/DistributedToonAI.py b/toontown/toon/DistributedToonAI.py index 536300b..1643d1e 100644 --- a/toontown/toon/DistributedToonAI.py +++ b/toontown/toon/DistributedToonAI.py @@ -216,8 +216,6 @@ class DistributedToonAI(DistributedPlayerAI.DistributedPlayerAI, DistributedSmoo if self.WantOldGMNameBan: self._checkOldGMName() messenger.send('avatarEntered', [self]) - if __astron__: - self.sendUpdate('setDefaultShard', [self.air.districtId]) if hasattr(self, 'gameAccess') and self.gameAccess != 2: if self.hat[0] != 0: self.replaceItemInAccessoriesList(ToonDNA.HAT, 0, 0, 0, self.hat[0], self.hat[1], self.hat[2]) @@ -236,29 +234,6 @@ class DistributedToonAI(DistributedPlayerAI.DistributedPlayerAI, DistributedSmoo self.b_setShoesList(self.shoesList) self.b_setShoes(0, 0, 0) - if __astron__: - def setLocation(self, parentId, zoneId): - DistributedPlayerAI.DistributedPlayerAI.setLocation(self, parentId, zoneId) - if self.isPlayerControlled(): - if 100 <= zoneId < ToontownGlobals.DynamicZonesBegin: - hood = ZoneUtil.getHoodId(zoneId) - self.sendUpdate('setLastHood', [hood]) - self.setDefaultZone(hood) - self.sendUpdate('setDefaultZone', [hood]) - - canonicalZoneId = ZoneUtil.getCanonicalZoneId(zoneId) - canonicalHood = ZoneUtil.getHoodId(canonicalZoneId) - hoodsVisited = list(self.getHoodsVisited()) - if canonicalHood not in hoodsVisited: - hoodsVisited.append(canonicalHood) - self.b_setHoodsVisited(hoodsVisited) - - if canonicalZoneId == ToontownGlobals.GoofySpeedway: - teleportAccess = self.getTeleportAccess() - if ToontownGlobals.GoofySpeedway not in teleportAccess: - teleportAccess.append(ToontownGlobals.GoofySpeedway) - self.b_setTeleportAccess(teleportAccess) - def sendDeleteEvent(self): if simbase.wantPets: isInEstate = self.isInEstate() diff --git a/toontown/town/Street.py b/toontown/town/Street.py index 743bcd1..a7876cc 100644 --- a/toontown/town/Street.py +++ b/toontown/town/Street.py @@ -349,14 +349,7 @@ class Street(BattlePlace.BattlePlace): if newZoneId != None: self.loader.zoneDict[newZoneId].setColor(0, 0, 1, 1, 100) if newZoneId != None: - if not __astron__: - base.cr.sendSetZoneMsg(newZoneId) - else: - visZones = [self.loader.node2zone[x] for x in self.loader.nodeDict[newZoneId]] - visZones.append(ZoneUtil.getBranchZone(newZoneId)) - if newZoneId not in visZones: - visZones.append(newZoneId) - base.cr.sendSetZoneMsg(newZoneId, visZones) + base.cr.sendSetZoneMsg(newZoneId) self.notify.debug('Entering Zone %d' % newZoneId) self.zoneId = newZoneId geom = base.cr.playGame.getPlace().loader.geom diff --git a/toontown/town/TownLoader.py b/toontown/town/TownLoader.py index fc5280a..db4a244 100644 --- a/toontown/town/TownLoader.py +++ b/toontown/town/TownLoader.py @@ -73,8 +73,6 @@ class TownLoader(StateData.StateData): del self.hood del self.nodeDict del self.zoneDict - if __astron__: - del self.node2zone del self.fadeInDict del self.fadeOutDict del self.nodeList @@ -229,8 +227,6 @@ class TownLoader(StateData.StateData): def makeDictionaries(self, dnaStore): self.nodeDict = {} self.zoneDict = {} - if __astron__: - self.node2zone = {} self.nodeList = [] self.fadeInDict = {} self.fadeOutDict = {} @@ -254,8 +250,6 @@ class TownLoader(StateData.StateData): self.nodeDict[zoneId] = [] self.nodeList.append(groupNode) self.zoneDict[zoneId] = groupNode - if __astron__: - self.node2zone[groupNode] = zoneId fadeDuration = 0.5 self.fadeOutDict[groupNode] = Sequence(Func(groupNode.setTransparency, 1), LerpColorScaleInterval(groupNode, fadeDuration, a0, startColorScale=a1), Func(groupNode.clearColorScale), Func(groupNode.clearTransparency), Func(groupNode.stash), name='fadeZone-' + str(zoneId), autoPause=1) self.fadeInDict[groupNode] = Sequence(Func(groupNode.unstash), Func(groupNode.setTransparency, 1), LerpColorScaleInterval(groupNode, fadeDuration, a1, startColorScale=a0), Func(groupNode.clearColorScale), Func(groupNode.clearTransparency), name='fadeZone-' + str(zoneId), autoPause=1) diff --git a/toontown/uberdog/ToontownUDRepository.py b/toontown/uberdog/ToontownUDRepository.py index 9ee9b85..5bc14f5 100644 --- a/toontown/uberdog/ToontownUDRepository.py +++ b/toontown/uberdog/ToontownUDRepository.py @@ -8,15 +8,12 @@ from toontown.distributed.ToontownInternalRepository import ToontownInternalRepo from toontown.parties.ToontownTimeManager import ToontownTimeManager -# TODO: Remove Astron dependence. - class ToontownUDRepository(ToontownInternalRepository): notify = DirectNotifyGlobal.directNotify.newCategory('ToontownUDRepository') def __init__(self, baseChannel, serverId): ToontownInternalRepository.__init__(self, baseChannel, serverId, dcSuffix='UD') self.toontownTimeManager = None - self.astronLoginManager = None def handleConnected(self): ToontownInternalRepository.handleConnected(self) @@ -42,6 +39,4 @@ class ToontownUDRepository(ToontownInternalRepository): globalClockRealTimeUponLogin=globalClock.getRealTime()) def createGlobals(self): - if __astron__: - # Create our Astron login manager... - self.astronLoginManager = self.generateGlobalObject(OTP_DO_ID_ASTRON_LOGIN_MANAGER, 'AstronLoginManager') + pass