DANIEL: Remove jor-el cam

This commit is contained in:
John 2015-06-09 23:29:58 +03:00 committed by Loudrob
parent db17bbdc84
commit 0634d53718
6 changed files with 0 additions and 89 deletions

View file

@ -341,7 +341,6 @@ from toontown.ai import DistributedResistanceEmoteMgr/AI
from toontown.ai import DistributedScavengerHuntTarget/AI
from toontown.ai import DistributedTrickOrTreatTarget/AI
from toontown.ai import DistributedWinterCarolingTarget/AI
from toontown.ai import DistributedJorElCam/AI
from toontown.coghq import DistributedMint/AI
from toontown.coghq import DistributedMintRoom/AI
from toontown.coghq import DistributedMintBattle/AI
@ -2489,9 +2488,6 @@ dclass DistributedWinterCarolingTarget : DistributedObject {
requestScavengerHunt() airecv clsend;
};
dclass DistributedJorElCam : DistributedObject {
};
dclass DistributedVehicle : DistributedSmoothNode {
setOwner(uint32) required broadcast ram;
setState(char, uint32) broadcast ram;

View file

@ -33,9 +33,6 @@ want-house-types #t
# Chat:
want-whitelist #t
# Optional:
want-jor-el-cam #f
# Developer options:
show-population #t
want-instant-parties #t

View file

@ -1,52 +0,0 @@
from direct.directnotify import DirectNotifyGlobal
from direct.distributed.DistributedObject import DistributedObject
from direct.interval.IntervalGlobal import *
from toontown.toon import ToonHead
from toontown.toon import ToonDNA
from toontown.nametag import NametagGroup
from otp.otpbase import OTPGlobals
class DistributedJorElCam(DistributedObject):
notify = DirectNotifyGlobal.directNotify.newCategory('DistributedJorElCam')
def __init__(self, cr):
DistributedObject.__init__(self, cr)
self.head = None
self.dna = None
def generate(self):
DistributedObject.generate(self)
self.dna = ToonDNA.ToonDNA()
self.dna.newToonRandom()
self.head = ToonHead.ToonHead()
self.head.setupHead(self.dna)
self.head.reparentTo(render)
self.head.setPos(75, 0, 20)
self.head.setHpr(90, 0, 0)
self.head.setScale(10)
self.head.startBlink()
self.head.startLookAround()
pieces = [['*head*', '*muzzle*'], ['*ears*', '*nose*']]
for p in pieces[0]:
pc = '**/%s' % p
for node in self.head.findAllMatches(pc):
if not node.is_empty():
node.setColor(1, 1, 1, 1)
for p in pieces[1]:
pc = '**/%s' % p
for node in self.head.findAllMatches(pc):
if not node.is_empty():
node.setColor(0, 0, 0, 1)
base.cr.jorElHead = self.head
def delete(self):
del self.head
del base.cr.jorElHead
DistributedObject.delete(self)
def disable(self):
self.head.cleanup()
self.head.removeNode()
DistributedObject.disable(self)

View file

@ -1,24 +0,0 @@
from direct.directnotify import DirectNotifyGlobal
from direct.distributed.DistributedObjectAI import DistributedObjectAI
from toontown.toon import ToonDNA
class DistributedJorElCamAI(DistributedObjectAI):
notify = DirectNotifyGlobal.directNotify.newCategory("DistributedJorElCamAI")
def __init__(self, air):
DistributedObjectAI.__init__(self, air)
self.air = air
self.dna = None
def generate(self):
self.dna = ToonDNA.ToonDNA()
self.dna.newToonRandom()
DistributedObjectAI.generate(self)
def delete(self):
del self.dna
DistributedObjectAI.delete(self)
def disable(self):
self.dna = None
DistributedObjectAI.disable(self)

View file

@ -91,7 +91,6 @@ class ToontownAIRepository(ToontownInternalRepository):
self.baseXpMultiplier = self.config.GetFloat('base-xp-multiplier', 1.0)
self.wantHalloween = self.config.GetBool('want-halloween', False)
self.wantChristmas = self.config.GetBool('want-christmas', False)
self.wantJorElCam = self.config.GetBool('want-jor-el-cam', False)
self.cogSuitMessageSent = False

View file

@ -7,7 +7,6 @@ from toontown.toonbase import TTLocalizer
from toontown.toonbase import ToontownGlobals
from toontown.ai import DistributedTrickOrTreatTargetAI
from toontown.ai import DistributedWinterCarolingTargetAI
from toontown.ai import DistributedJorElCamAI
class TTHoodAI(HoodAI.HoodAI):
@ -41,10 +40,6 @@ class TTHoodAI(HoodAI.HoodAI):
self.WinterCarolingTargetManager = DistributedWinterCarolingTargetAI.DistributedWinterCarolingTargetAI(self.air)
self.WinterCarolingTargetManager.generateWithRequired(2649)
if simbase.air.wantJorElCam:
self.JorElCamManager = DistributedJorElCamAI.DistributedJorElCamAI(self.air)
self.JorElCamManager.generateWithRequired(self.zoneId)
def shutdown(self):
HoodAI.HoodAI.shutdown(self)
ButterflyGlobals.clearIndexes(self.zoneId)