sneedgroup-holder/oldschool-toontown
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

coghq: Fix interests crash

Browse source
This commit is contained in:
John Cote 2021-06-29 00:06:11 -04:00
parent a47f6a2e28
commit 18474edf5a
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
toontown/coghq/CogHQExterior.py
View file

@ -149,8 +149,8 @@ class CogHQExterior(BattlePlace.BattlePlace):
# Next, we need to collect all of the visgroup zone IDs. # Next, we need to collect all of the visgroup zone IDs.
self.zoneVisDict = {} self.zoneVisDict = {}
for i in range(dnaStore.getNumDNAVisGroupsAI()): for i in range(dnaStore.getNumDNAVisGroupsAI()):
groupFullName = dnaStore.getDNAVisGroupName(i)
visGroup = dnaStore.getDNAVisGroupAI(i) visGroup = dnaStore.getDNAVisGroupAI(i)
groupFullName = visGroup.getName()
visZoneId = int(base.cr.hoodMgr.extractGroupName(groupFullName)) visZoneId = int(base.cr.hoodMgr.extractGroupName(groupFullName))
visZoneId = ZoneUtil.getTrueZoneId(visZoneId, self.zoneId) visZoneId = ZoneUtil.getTrueZoneId(visZoneId, self.zoneId)
visibles = [] visibles = []
@ -161,4 +161,8 @@ class CogHQExterior(BattlePlace.BattlePlace):
self.zoneVisDict[visZoneId] = visibles self.zoneVisDict[visZoneId] = visibles
# Finally, we want interest in all visgroups due to this being a Cog HQ. # Finally, we want interest in all visgroups due to this being a Cog HQ.
base.cr.sendSetZoneMsg(self.zoneId, list(self.zoneVisDict.values())[0]) visList = list(self.zoneVisDict.values())[0]
if self.zoneId not in visList:
visList.append(self.zoneId)
base.cr.sendSetZoneMsg(self.zoneId, visList)

8
toontown/coghq/FactoryExterior.py
View file

@ -168,8 +168,8 @@ class FactoryExterior(BattlePlace.BattlePlace):
# Next, we need to collect all of the visgroup zone IDs. # Next, we need to collect all of the visgroup zone IDs.
self.zoneVisDict = {} self.zoneVisDict = {}
for i in range(dnaStore.getNumDNAVisGroupsAI()): for i in range(dnaStore.getNumDNAVisGroupsAI()):
groupFullName = dnaStore.getDNAVisGroupName(i)
visGroup = dnaStore.getDNAVisGroupAI(i) visGroup = dnaStore.getDNAVisGroupAI(i)
groupFullName = visGroup.getName()
visZoneId = int(base.cr.hoodMgr.extractGroupName(groupFullName)) visZoneId = int(base.cr.hoodMgr.extractGroupName(groupFullName))
visZoneId = ZoneUtil.getTrueZoneId(visZoneId, self.zoneId) visZoneId = ZoneUtil.getTrueZoneId(visZoneId, self.zoneId)
visibles = [] visibles = []
@ -180,4 +180,8 @@ class FactoryExterior(BattlePlace.BattlePlace):
self.zoneVisDict[visZoneId] = visibles self.zoneVisDict[visZoneId] = visibles
# Finally, we want interest in all visgroups due to this being a Cog HQ. # Finally, we want interest in all visgroups due to this being a Cog HQ.
base.cr.sendSetZoneMsg(self.zoneId, list(self.zoneVisDict.values())[0]) visList = list(self.zoneVisDict.values())[0]
if self.zoneId not in visList:
visList.append(self.zoneId)
base.cr.sendSetZoneMsg(self.zoneId, visList)