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

YET MORE WORK. ALMOST DONE.

Browse source
This commit is contained in:
John Cote 2015-06-25 23:33:15 -04:00
parent 5cc0d8f27a
commit dd45d7d7be
5 changed files with 16 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
toontown/estate/DistributedCannon.py
View file

@ -1579,4 +1579,4 @@ class DistributedCannon(DistributedObject.DistributedObject):
def turnOnBumperCollision(self, whatever = 0):
if self.bumperCol:
self.bumperCol.setCollideMask(ToontownGlobals.WallBitmask)# decompiled 0 files: 0 okay, 1 failed, 0 verify failed
self.bumperCol.setCollideMask(ToontownGlobals.WallBitmask)

2
toontown/safezone/OZSafeZoneLoader.py
View file

@ -8,8 +8,6 @@ from panda3d.core import *
import random
from otp.avatar import Avatar
from toontown.chat.ChatGlobals import *
from toontown.nametag.NametagGroup import *
from otp.otpbase import OTPGlobals
from toontown.distributed import DelayDelete
from toontown.effects import Bubbles

4
toontown/suit/BossCog.py
View file

@ -14,7 +14,7 @@ import SuitDNA
from otp.avatar import Avatar
from toontown.battle import BattleParticles
from toontown.battle import BattleProps
from toontown.nametag import NametagGlobals
from otp.nametag.NametagGroup import NametagGroup
from toontown.toonbase import TTLocalizer
from toontown.toonbase import ToontownGlobals
@ -34,7 +34,7 @@ class BossCog(Avatar.Avatar):
def __init__(self):
Avatar.Avatar.__init__(self)
self.setFont(ToontownGlobals.getSuitFont())
self.setPlayerType(NametagGlobals.CCSuit)
self.setPlayerType(NametagGroup.CCSuit)
self.setPickable(0)
self.doorA = None
self.doorB = None

18
toontown/suit/DistributedBossCog.py
View file

@ -21,7 +21,7 @@ from toontown.friends import FriendsListManager
from direct.controls.ControlManager import CollisionHandlerRayStart
from direct.showbase import PythonUtil
import random
from toontown.nametag import NametagGlobals
from otp.nametag import NametagGlobals
class DistributedBossCog(DistributedAvatar.DistributedAvatar, BossCog.BossCog):
notify = DirectNotifyGlobal.directNotify.newCategory('DistributedBossCog')
@ -957,7 +957,7 @@ class DistributedBossCog(DistributedAvatar.DistributedAvatar, BossCog.BossCog):
self.transitions.IrisModelName = 'phase_3/models/misc/iris'
self.transitions.FadeModelName = 'phase_3/models/misc/fade'
self.transitions.fadeScreen(alpha=1)
NametagGlobals.setWant2dNametags(False)
NametagGlobals.setMasterArrowsOn(0)
def __doneWaitForToons(self):
self.doneBarrier('WaitForToons')
@ -966,7 +966,7 @@ class DistributedBossCog(DistributedAvatar.DistributedAvatar, BossCog.BossCog):
self.show()
self.transitions.noFade()
del self.transitions
NametagGlobals.setWant2dNametags(True)
NametagGlobals.setMasterArrowsOn(1)
def enterElevator(self):
for toonId in self.involvedToons:
@ -997,7 +997,7 @@ class DistributedBossCog(DistributedAvatar.DistributedAvatar, BossCog.BossCog):
def enterIntroduction(self):
self.controlToons()
ElevatorUtils.openDoors(self.leftDoor, self.rightDoor, self.elevatorType)
NametagGlobals.setWant2dNametags(False)
NametagGlobals.setMasterArrowsOn(0)
intervalName = 'IntroductionMovie'
delayDeletes = []
seq = Sequence(self.makeIntroductionMovie(delayDeletes), Func(self.__beginBattleOne), name=intervalName)
@ -1016,7 +1016,7 @@ class DistributedBossCog(DistributedAvatar.DistributedAvatar, BossCog.BossCog):
self.clearInterval(intervalName)
self.unstickToons()
self.releaseToons()
NametagGlobals.setWant2dNametags(True)
NametagGlobals.setMasterArrowsOn(1)
ElevatorUtils.closeDoors(self.leftDoor, self.rightDoor, self.elevatorType)
def enterBattleOne(self):
@ -1039,8 +1039,8 @@ class DistributedBossCog(DistributedAvatar.DistributedAvatar, BossCog.BossCog):
self.accept('clickedNametag', self.__clickedNameTag)
self.accept('friendAvatar', self.__handleFriendAvatar)
self.accept('avatarDetails', self.__handleAvatarDetails)
NametagGlobals.setWant2dNametags(False)
NametagGlobals.setWantActiveNametags(True)
NametagGlobals.setMasterArrowsOn(0)
NametagGlobals.setMasterNametagsActive(1)
def exitBattleThree(self):
self.ignore('clickedNameTag')
@ -1084,8 +1084,8 @@ class DistributedBossCog(DistributedAvatar.DistributedAvatar, BossCog.BossCog):
self.accept('clickedNametag', self.__clickedNameTag)
self.accept('friendAvatar', self.__handleFriendAvatar)
self.accept('avatarDetails', self.__handleAvatarDetails)
NametagGlobals.setWant2dNametags(False)
NametagGlobals.setWantActiveNametags(True)
NametagGlobals.setMasterArrowsOn(0)
NametagGlobals.setMasterNametagsActive(1)
def exitBattleFour(self):
self.ignore('clickedNameTag')

7
toontown/suit/DistributedBossbotBoss.py
View file

@ -12,11 +12,9 @@ from toontown.battle import MovieToonVictory
from toontown.battle import RewardPanel
from toontown.battle import SuitBattleGlobals
from toontown.building import ElevatorConstants
from toontown.chat.ChatGlobals import *
from toontown.coghq import CogDisguiseGlobals
from toontown.distributed import DelayDelete
from toontown.effects import DustCloud
from toontown.nametag import NametagGlobals
from toontown.suit import DistributedBossCog
from toontown.suit import Suit
from toontown.suit import SuitDNA
@ -25,6 +23,9 @@ from toontown.toon import ToonDNA
from toontown.toonbase import TTLocalizer
from toontown.toonbase import ToontownGlobals
from toontown.toonbase import ToontownTimer
from otp.nametag import NametagGroup
from otp.nametag.NametagConstants import *
from otp.nametag import NametagGlobals
OneBossCog = None
@ -195,7 +196,7 @@ class DistributedBossbotBoss(DistributedBossCog.DistributedBossCog, FSM.FSM):
npc = Toon.Toon()
npc.setName(TTLocalizer.BossbotResistanceToonName)
npc.setPickable(0)
npc.setPlayerType(NametagGlobals.CCNonPlayer)
npc.setPlayerType(NametagGroup.CCNonPlayer)
dna = ToonDNA.ToonDNA()
dna.newToonRandom(11237, 'm', 1)
dna.head = 'sls'