Sneed-Group/Poodletooth-iLand
2
0
Fork 0
mirror of https://github.com/Sneed-Group/Poodletooth-iLand synced 2025-01-09 17:53:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of http://gitlab.com/toontown-unlimited/src

Browse source
This commit is contained in:
Daniel 2015-03-09 19:33:38 +02:00
commit 139f562964
1 changed files with 18 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
toontown/shtiker/ShardPage.py
View file

@ -28,7 +28,7 @@ def compareShardTuples(a, b):
return 0 return 0
def setupInvasionMarkerAny(node): def setupInvasionMarkerAny(node):
pass # TODO pass
def setupInvasionMarker(node, invasionStatus): def setupInvasionMarker(node, invasionStatus):
if node.find('**/*invasion-marker'): if node.find('**/*invasion-marker'):
@ -369,22 +369,17 @@ class ShardPage(ShtikerPage.ShtikerPage):
self.rejectGroup(3) self.rejectGroup(3)
return return
suitIdx = -1 suitIdx = -1
if groupId == 10000: gids = {10000:0, 11000:1, 12000:2, 13000:3}
suitIdx = 0 suitIdx = gids.get(groupId)
elif groupId == 11000: if suitIdx is not None:
suitIdx = 1 merits = base.localAvatar.cogMerits[suitIdx]
elif groupId == 12000: if CogDisguiseGlobals.getTotalMerits(base.localAvatar, suitIdx) > merits:
suitIdx = 2 self.rejectGroup(2, suitIdx)
elif groupId == 13000: return
suitIdx = 3 parts = base.localAvatar.getCogParts()
merits = base.localAvatar.cogMerits[suitIdx] if not CogDisguiseGlobals.isSuitComplete(parts, suitIdx):
if CogDisguiseGlobals.getTotalMerits(base.localAvatar, suitIdx) > merits: self.rejectGroup(1)
self.rejectGroup(2, suitIdx) return
return
parts = base.localAvatar.getCogParts()
if not CogDisguiseGlobals.isSuitComplete(parts, suitIdx):
self.rejectGroup(1)
return
base.cr.groupManager.d_addPlayerToGroup(groupId, base.localAvatar.doId) base.cr.groupManager.d_addPlayerToGroup(groupId, base.localAvatar.doId)
self.currentGroupJoined = groupId self.currentGroupJoined = groupId
try: try:
@ -394,12 +389,7 @@ class ShardPage(ShtikerPage.ShtikerPage):
place = base.cr.playGame.hood.loader.place place = base.cr.playGame.hood.loader.place
except: except:
place = base.cr.playGame.hood.place place = base.cr.playGame.hood.place
if ZoneUtil.getCanonicalHoodId(self.getCurrentZoneId()) != groupId: place.requestTeleport(groupId, groupId, base.localAvatar.defaultShard, -1)
place.requestTeleport(groupId, groupId, base.localAvatar.defaultShard, -1)
else:
btpl = (self.currentBTP, self.currentBTL, self.currentBTR, self.currentBTI)
args = self.currentO.append(btpl)
self.reloadRightBrain(*args)
def leaveGroup(self, groupId, buttonTuple): def leaveGroup(self, groupId, buttonTuple):
self.acceptOnce('confLeave', self.confirmLeaveGroup, extraArgs=[groupId, buttonTuple]) self.acceptOnce('confLeave', self.confirmLeaveGroup, extraArgs=[groupId, buttonTuple])
@ -423,20 +413,11 @@ class ShardPage(ShtikerPage.ShtikerPage):
except: except:
place = base.cr.playGame.hood.place place = base.cr.playGame.hood.place
hoodId = -1 hoodId = -1
if groupId == 10000: gids = {10000:1000, 11000:5000, 12000:9000, 13000:3000}
hoodId = 1000 hoodId = gids.get(groupId)
elif groupId == 11000: if hoodId is None:
hoodId = 5000 return
elif groupId == 12000: place.requestTeleport(hoodId, hoodId, base.localAvatar.defaultShard, -1)
hoodId = 9000
elif groupId == 13000:
hoodId = 3000
if ZoneUtil.getCanonicalHoodId(self.getCurrentZoneId()) != hoodId:
place.requestTeleport(hoodId, hoodId, base.localAvatar.defaultShard, -1)
else:
btpl = (self.currentBTP, self.currentBTL, self.currentBTR, self.currentBTI)
args = self.currentO.append(btpl)
self.reloadRightBrain(*args)
def getPopColor(self, pop): def getPopColor(self, pop):
if pop <= self.lowPop: if pop <= self.lowPop:
@ -605,7 +586,6 @@ class ShardPage(ShtikerPage.ShtikerPage):
if self.currentGroupJoined: if self.currentGroupJoined:
self.rejectGroup(5) self.rejectGroup(5)
return return
if shardId == currentShardId: if shardId == currentShardId:
return return
elif shardId == base.localAvatar.defaultShard: elif shardId == base.localAvatar.defaultShard:
@ -619,5 +599,4 @@ class ShardPage(ShtikerPage.ShtikerPage):
place = base.cr.playGame.hood.loader.place place = base.cr.playGame.hood.loader.place
except: except:
place = base.cr.playGame.hood.place place = base.cr.playGame.hood.place
place.requestTeleport(canonicalHoodId, canonicalHoodId, shardId, -1) place.requestTeleport(canonicalHoodId, canonicalHoodId, shardId, -1)