diff --git a/astron/dclass/united.dc b/astron/dclass/united.dc index 11278e0b..53ee95e9 100644 --- a/astron/dclass/united.dc +++ b/astron/dclass/united.dc @@ -320,7 +320,6 @@ from toontown.building import DistributedHQInterior/AI from toontown.building import DistributedGagshopInterior/AI from toontown.building import DistributedPetshopInterior/AI from toontown.building import DistributedKartShopInterior/AI -from toontown.building import DistributedLibraryInterior/AI from toontown.building import DistributedDoor/AI from toontown.estate import DistributedHouseDoor/AI from toontown.coghq import DistributedCogHQDoor/AI @@ -501,10 +500,8 @@ from toontown.safezone import DistributedChineseCheckers/AI from toontown.safezone import DistributedCheckers/AI from toontown.safezone import DistributedFindFour/AI from toontown.uberdog.DistributedPartyManager/AI/UD import DistributedPartyManager/AI/UD -from toontown.rpc.AwardManager/UD import AwardManager/UD from toontown.coderedemption.TTCodeRedemptionMgr/AI import TTCodeRedemptionMgr/AI from toontown.friends.TrueFriendsMgr/AI import TrueFriendsMgr/AI -from toontown.ai import DistributedSillyMeterMgr/AI from toontown.cogdominium import DistributedCogdoInterior/AI from toontown.cogdominium import DistributedCogdoBattleBldg/AI from toontown.cogdominium import DistributedCogdoElevatorExt/AI @@ -1850,10 +1847,6 @@ dclass DistributedKartShopInterior : DistributedObject { setZoneIdAndBlock(uint32, uint16) required broadcast ram; }; -dclass DistributedLibraryInterior : DistributedObject { - setZoneIdAndBlock(uint32, uint16) required broadcast ram; -}; - dclass DistributedDoor : DistributedObject { setZoneIdAndBlock(uint32, uint32) required broadcast ram; setSwing(int8) required broadcast ram; @@ -3286,10 +3279,6 @@ dclass ClientServicesManager : DistributedObjectGlobal { systemMessage(string message); }; -dclass AwardManager : DistributedObjectGlobal { - giveAwardToToon(uint32, DoId, string, DoId, uint32, uint32); -}; - dclass TTCodeRedemptionMgr : DistributedObject { redeemCode(char [0-256]) airecv clsend; redeemCodeResult(uint32); @@ -3367,12 +3356,5 @@ dclass TTUFriendsManager : DistributedObjectGlobal { setSleepAutoReply(uint32 fromId); }; -dclass DistributedSillyMeterMgr : DistributedObject { - setNumPhases(uint8) required broadcast ram; - setDates(datetime []) broadcast required; - setCurPhase(int8) required broadcast ram; - setIsRunning(bool) required broadcast ram; -}; - dclass ARGManager : DistributedObjectGlobal { }; \ No newline at end of file diff --git a/otp/distributed/DCClassImports.py b/otp/distributed/DCClassImports.py index cfc4b7b2..772d00bb 100644 --- a/otp/distributed/DCClassImports.py +++ b/otp/distributed/DCClassImports.py @@ -2,19 +2,19 @@ from pandac.PandaModules import * -hashVal = 2216445237L +hashVal = 3327868546L from toontown.coghq import DistributedCashbotBossSafe, DistributedCashbotBossCrane, DistributedBattleFactory, DistributedCashbotBossTreasure, DistributedCogHQDoor, DistributedSellbotHQDoor, DistributedFactoryElevatorExt, DistributedMintElevatorExt, DistributedLawOfficeElevatorExt, DistributedLawOfficeElevatorInt, LobbyManager, DistributedMegaCorp, DistributedFactory, DistributedLawOffice, DistributedLawOfficeFloor, DistributedLift, DistributedDoorEntity, DistributedSwitch, DistributedButton, DistributedTrigger, DistributedCrushableEntity, DistributedCrusherEntity, DistributedStomper, DistributedStomperPair, DistributedLaserField, DistributedGolfGreenGame, DistributedSecurityCamera, DistributedMover, DistributedElevatorMarker, DistributedBarrelBase, DistributedGagBarrel, DistributedBeanBarrel, DistributedHealBarrel, DistributedGrid, ActiveCell, DirectionalCell, CrusherCell, DistributedCrate, DistributedSinkingPlatform, BattleBlocker, DistributedMint, DistributedMintRoom, DistributedMintBattle, DistributedStage, DistributedStageRoom, DistributedStageBattle, DistributedLawbotBossGavel, DistributedLawbotCannon, DistributedLawbotChair, DistributedCogKart, DistributedCountryClub, DistributedCountryClubRoom, DistributedMoleField, DistributedCountryClubBattle, DistributedMaze, DistributedFoodBelt, DistributedBanquetTable, DistributedGolfSpot from toontown.golf import DistributedPhysicsWorld, DistributedGolfHole, DistributedGolfCourse -from toontown.building import DistributedAnimatedProp, DistributedTrophyMgr, DistributedBuilding, DistributedBuildingQueryMgr, DistributedToonInterior, DistributedToonHallInterior, DistributedSuitInterior, DistributedHQInterior, DistributedGagshopInterior, DistributedPetshopInterior, DistributedKartShopInterior, DistributedLibraryInterior, DistributedDoor, DistributedKnockKnockDoor, DistributedElevator, DistributedElevatorFSM, DistributedElevatorExt, DistributedElevatorInt, DistributedElevatorFloor, DistributedBossElevator, DistributedVPElevator, DistributedCFOElevator, DistributedCJElevator, DistributedBBElevator, DistributedBoardingParty, DistributedTutorialInterior, DistributedClubElevator +from toontown.building import DistributedAnimatedProp, DistributedTrophyMgr, DistributedBuilding, DistributedBuildingQueryMgr, DistributedToonInterior, DistributedToonHallInterior, DistributedSuitInterior, DistributedHQInterior, DistributedGagshopInterior, DistributedPetshopInterior, DistributedKartShopInterior, DistributedDoor, DistributedKnockKnockDoor, DistributedElevator, DistributedElevatorFSM, DistributedElevatorExt, DistributedElevatorInt, DistributedElevatorFloor, DistributedBossElevator, DistributedVPElevator, DistributedCFOElevator, DistributedCJElevator, DistributedBBElevator, DistributedBoardingParty, DistributedTutorialInterior, DistributedClubElevator from toontown.uberdog.DistributedPartyManager import DistributedPartyManager from otp.friends import FriendManager from otp.level import DistributedLevel, DistributedEntity, DistributedInteractiveEntity from toontown.shtiker import DeleteManager, PurchaseManager, NewbiePurchaseManager from toontown.groups import GroupManager from toontown.uberdog.ClientServicesManager import ClientServicesManager -from toontown.ai import WelcomeValleyManager, NewsManager, DistributedAprilToonsMgr, DistributedBlackCatMgr, DistributedReportMgr, DistributedPolarPlaceEffectMgr, DistributedGreenToonEffectMgr, DistributedResistanceEmoteMgr, DistributedScavengerHuntTarget, DistributedTrickOrTreatTarget, DistributedWinterCarolingTarget, DistributedSillyMeterMgr +from toontown.ai import WelcomeValleyManager, NewsManager, DistributedAprilToonsMgr, DistributedBlackCatMgr, DistributedReportMgr, DistributedPolarPlaceEffectMgr, DistributedGreenToonEffectMgr, DistributedResistanceEmoteMgr, DistributedScavengerHuntTarget, DistributedTrickOrTreatTarget, DistributedWinterCarolingTarget from otp.chat import ChatAgent from toontown.parties.GlobalPartyManager import GlobalPartyManager from toontown.racing.DistributedStartingBlock import DistributedViewingBlock @@ -27,7 +27,6 @@ from toontown.fishing import DistributedFishingPond, DistributedFishingTarget, D from toontown.minigame import DistributedMinigame, DistributedMinigameTemplate, DistributedRaceGame, DistributedCannonGame, DistributedPatternGame, DistributedRingGame, DistributedTagGame, DistributedMazeGame, DistributedTugOfWarGame, DistributedCatchGame, DistributedDivingGame, DistributedTargetGame, DistributedVineGame, DistributedIceGame, DistributedCogThiefGame, DistributedTwoDGame from toontown.racing import DistributedVehicle, DistributedStartingBlock, DistributedRace, DistributedKartPad, DistributedRacePad, DistributedViewPad, DistributedStartingBlock, DistributedLeaderBoard, DistributedGag, DistributedProjectile from toontown.catalog import CatalogManager, AccountDate -from toontown.rpc.AwardManager import AwardManager from toontown.parties import DistributedParty, DistributedPartyActivity, DistributedPartyTeamActivity, DistributedPartyCannon, DistributedPartyCannonActivity, DistributedPartyCatchActivity, DistributedPartyWinterCatchActivity, DistributedPartyCogActivity, DistributedPartyWinterCogActivity, DistributedPartyFireworksActivity, DistributedPartyDanceActivityBase, DistributedPartyDanceActivity, DistributedPartyDance20Activity, DistributedPartyValentineDanceActivity, DistributedPartyValentineDance20Activity, DistributedPartyTrampolineActivity, DistributedPartyValentineTrampolineActivity, DistributedPartyVictoryTrampolineActivity, DistributedPartyWinterTrampolineActivity, DistributedPartyTugOfWarActivity, DistributedPartyJukeboxActivityBase, DistributedPartyJukeboxActivity, DistributedPartyJukebox40Activity, DistributedPartyValentineJukeboxActivity, DistributedPartyValentineJukebox40Activity from toontown.friends.TrueFriendsMgr import TrueFriendsMgr from toontown.friends import TTUFriendsManager diff --git a/toontown/ai/DistributedSillyMeterMgr.py b/toontown/ai/DistributedSillyMeterMgr.py deleted file mode 100644 index d369a684..00000000 --- a/toontown/ai/DistributedSillyMeterMgr.py +++ /dev/null @@ -1,26 +0,0 @@ -from direct.directnotify import DirectNotifyGlobal -from direct.distributed import DistributedObject - -class DistributedSillyMeterMgr(DistributedObject.DistributedObject): - neverDisable = 1 - notify = DirectNotifyGlobal.directNotify.newCategory('DistributedSillyMeterMgr') - - def __init__(self, cr): - DistributedObject.DistributedObject.__init__(self, cr) - cr.SillyMeterMgr = self - - def delete(self): - DistributedObject.DistributedObject.delete(self) - cr.SillyMeterMgr = None - - def setCurPhase(self, newPhase): - pass - - def setIsRunning(self, isRunning): - pass - - def getCurPhaseDuration(self): - return -1 - - def getCurPhaseStartDate(self): - return -1 diff --git a/toontown/ai/DistributedSillyMeterMgrAI.py b/toontown/ai/DistributedSillyMeterMgrAI.py deleted file mode 100644 index 36c258c1..00000000 --- a/toontown/ai/DistributedSillyMeterMgrAI.py +++ /dev/null @@ -1,5 +0,0 @@ -from direct.directnotify import DirectNotifyGlobal -from direct.distributed.DistributedObjectAI import DistributedObjectAI - -class DistributedSillyMeterMgrAI(DistributedObjectAI): - notify = DirectNotifyGlobal.directNotify.newCategory("DistributedSillyMeterMgrAI") diff --git a/toontown/building/DistributedBuildingMgrAI.py b/toontown/building/DistributedBuildingMgrAI.py index f48ff8e2..cb1f0d06 100644 --- a/toontown/building/DistributedBuildingMgrAI.py +++ b/toontown/building/DistributedBuildingMgrAI.py @@ -6,7 +6,6 @@ from toontown.building import GagshopBuildingAI from toontown.building import HQBuildingAI from toontown.building import KartShopBuildingAI from toontown.building import PetshopBuildingAI -from toontown.building import LibraryBuildingAI from toontown.hood import ZoneUtil @@ -60,8 +59,6 @@ class DistributedBuildingMgrAI: continue if isinstance(building, KartShopBuildingAI.KartShopBuildingAI): continue - if isinstance(building, LibraryBuildingAI.LibraryBuildingAI): - continue if not building.isSuitBlock(): blocks.append(blockNumber) return blocks @@ -91,7 +88,6 @@ class DistributedBuildingMgrAI: gagshopBlocks = [] petshopBlocks = [] kartshopBlocks = [] - libraryBlocks = [] for i in xrange(self.dnaStore.getNumBlockNumbers()): blockNumber = self.dnaStore.getBlockNumberAt(i) buildingType = self.dnaStore.getBlockBuildingType(blockNumber) @@ -104,15 +100,13 @@ class DistributedBuildingMgrAI: petshopBlocks.append(blockNumber) elif buildingType == 'kartshop': kartshopBlocks.append(blockNumber) - elif buildingType == 'library': - libraryBlocks.append(blockNumber) else: blocks.append(blockNumber) - return (blocks, hqBlocks, gagshopBlocks, petshopBlocks, kartshopBlocks, libraryBlocks) + return (blocks, hqBlocks, gagshopBlocks, petshopBlocks, kartshopBlocks) def findAllLandmarkBuildings(self): backups = simbase.backups.load('block-info', (self.air.districtId, self.branchId), default={}) - (blocks, hqBlocks, gagshopBlocks, petshopBlocks, kartshopBlocks, libraryBlocks) = self.getDNABlockLists() + (blocks, hqBlocks, gagshopBlocks, petshopBlocks, kartshopBlocks) = self.getDNABlockLists() for blockNumber in blocks: self.newBuilding(blockNumber, backup=backups.get(blockNumber, None)) for blockNumber in hqBlocks: @@ -123,8 +117,6 @@ class DistributedBuildingMgrAI: self.newPetshopBuilding(block) for block in kartshopBlocks: self.newKartShopBuilding(block) - for block in libraryBlocks: - self.newLibraryBuilding(block) def newBuilding(self, blockNumber, backup=None): building = DistributedBuildingAI.DistributedBuildingAI( @@ -192,16 +184,6 @@ class DistributedBuildingMgrAI: self.__buildings[blockNumber] = building return building - def newLibraryBuilding(self, blockNumber): - dnaStore = self.air.dnaStoreMap[self.canonicalBranchId] - exteriorZoneId = dnaStore.getZoneFromBlockNumber(blockNumber) - exteriorZoneId = ZoneUtil.getTrueZoneId(exteriorZoneId, self.branchId) - interiorZoneId = (self.branchId - (self.branchId%100)) + 500 + blockNumber - building = LibraryBuildingAI.LibraryBuildingAI( - self.air, exteriorZoneId, interiorZoneId, blockNumber) - self.__buildings[blockNumber] = building - return building - def save(self): backups = {} for blockNumber in self.getSuitBlocks(): diff --git a/toontown/building/DistributedLibraryInterior.py b/toontown/building/DistributedLibraryInterior.py deleted file mode 100644 index 56179354..00000000 --- a/toontown/building/DistributedLibraryInterior.py +++ /dev/null @@ -1,73 +0,0 @@ -from direct.distributed.DistributedObject import DistributedObject -import random - -from toontown.building import ToonInteriorColors -from toontown.dna.DNAParser import * -from toontown.hood import ZoneUtil -from toontown.toon.DistributedNPCToonBase import DistributedNPCToonBase - - -class DistributedLibraryInterior(DistributedObject): - def announceGenerate(self): - DistributedObject.announceGenerate(self) - - self.interior = loader.loadModel('phase_4/models/modules/ttc_library_interior.bam') - self.interior.reparentTo(render) - - generator = random.Random() - generator.seed(self.zoneId) - self.replaceRandom(self.interior, generator=generator) - - doorOrigin = self.interior.find('**/door_origin;+s') - doorOrigin.setScale(0.8) - doorOrigin.setY(doorOrigin, -0.025) - - door = self.cr.playGame.dnaStore.findNode('door_double_round_ur') - doorNodePath = door.copyTo(doorOrigin) - - hoodId = ZoneUtil.getCanonicalHoodId(self.zoneId) - doorColor = ToonInteriorColors.colors[hoodId]['TI_door'][0] - setupDoor( - doorNodePath, self.interior, doorOrigin, self.cr.playGame.dnaStore, - str(self.block), doorColor) - - doorFrame = doorNodePath.find('door_double_round_ur_flat') - doorFrame.wrtReparentTo(self.interior) - doorFrame.setColor(doorColor) - - for npcToon in self.cr.doFindAllInstances(DistributedNPCToonBase): - npcToon.initToonState() - - def disable(self): - self.interior.removeNode() - del self.interior - - DistributedObject.disable(self) - - def setZoneIdAndBlock(self, zoneId, block): - self.zoneId = zoneId - self.block = block - - def replaceRandom(self, root, generator=random): - for nodePath in root.findAllMatches('**/random_???_*'): - name = nodePath.getName() - - category = name[11:] - - if name[7] in ('m', 't'): - codeCount = self.cr.playGame.dnaStore.getNumCatalogCodes(category) - index = generator.randint(0, codeCount - 1) - code = self.cr.playGame.dnaStore.getCatalogCode(category, index) - if name[7] == 'm': - _nodePath = self.cr.playGame.dnaStore.findNode(code).copyTo(nodePath) - if name[8] == 'r': - self.replaceRandom(_nodePath, generator=generator) - else: - texture = self.cr.playGame.dnaStore.findTexture(code) - nodePath.setTexture(texture, 100) - _nodePath = nodePath - - if name[8] == 'c': - hoodId = ZoneUtil.getCanonicalHoodId(self.zoneId) - colors = ToonInteriorColors.colors[hoodId] - _nodePath.setColorScale(generator.choice(colors[category])) diff --git a/toontown/building/DistributedLibraryInteriorAI.py b/toontown/building/DistributedLibraryInteriorAI.py deleted file mode 100644 index 124a61b3..00000000 --- a/toontown/building/DistributedLibraryInteriorAI.py +++ /dev/null @@ -1,12 +0,0 @@ -from direct.distributed.DistributedObjectAI import DistributedObjectAI - - -class DistributedLibraryInteriorAI(DistributedObjectAI): - def __init__(self, block, air, zoneId): - DistributedObjectAI.__init__(self, air) - - self.block = block - self.zoneId = zoneId - - def getZoneIdAndBlock(self): - return (self.zoneId, self.block) diff --git a/toontown/building/LibraryBuildingAI.py b/toontown/building/LibraryBuildingAI.py deleted file mode 100644 index 05c5b64a..00000000 --- a/toontown/building/LibraryBuildingAI.py +++ /dev/null @@ -1,45 +0,0 @@ -from pandac.PandaModules import * - -from toontown.building import DistributedLibraryInteriorAI -from toontown.building import DistributedDoorAI -from toontown.building import DoorTypes -from toontown.toon import NPCToons - - -class LibraryBuildingAI: - def __init__(self, air, exteriorZone, interiorZone, blockNumber): - self.air = air - self.exteriorZone = exteriorZone - self.interiorZone = interiorZone - self.setup(blockNumber) - - def cleanup(self): - for npc in self.npcs: - npc.requestDelete() - del self.npcs - self.door.requestDelete() - del self.door - self.insideDoor.requestDelete() - del self.insideDoor - self.interior.requestDelete() - del self.interior - - def setup(self, blockNumber): - self.interior = DistributedLibraryInteriorAI.DistributedLibraryInteriorAI( - blockNumber, self.air, self.interiorZone) - self.interior.generateWithRequired(self.interiorZone) - - self.npcs = NPCToons.createNpcsInZone(self.air, self.interiorZone) - - door = DistributedDoorAI.DistributedDoorAI( - self.air, blockNumber, DoorTypes.EXT_STANDARD) - insideDoor = DistributedDoorAI.DistributedDoorAI( - self.air, blockNumber, DoorTypes.INT_STANDARD) - door.setOtherDoor(insideDoor) - insideDoor.setOtherDoor(door) - door.zoneId = self.exteriorZone - insideDoor.zoneId = self.interiorZone - door.generateWithRequired(self.exteriorZone) - insideDoor.generateWithRequired(self.interiorZone) - self.door = door - self.insideDoor = insideDoor diff --git a/toontown/rpc/AwardManager.py b/toontown/rpc/AwardManager.py deleted file mode 100644 index c6f8ae1e..00000000 --- a/toontown/rpc/AwardManager.py +++ /dev/null @@ -1,4 +0,0 @@ -from direct.distributed.DistributedObjectGlobal import DistributedObjectGlobal - -class AwardManager(DistributedObjectGlobal): - pass diff --git a/toontown/rpc/AwardManagerConsts.py b/toontown/rpc/AwardManagerConsts.py deleted file mode 100644 index bdf58005..00000000 --- a/toontown/rpc/AwardManagerConsts.py +++ /dev/null @@ -1,20 +0,0 @@ -GiveAwardErrors = Enum('Success, WrongGender, NotGiftable, FullMailbox, FullAwardMailbox, AlreadyInMailbox, AlreadyInGiftQueue, AlreadyInOrderedQueue, AlreadyInCloset, AlreadyBeingWorn, AlreadyInAwardMailbox, AlreadyInThirtyMinuteQueue, AlreadyInMyPhrases, AlreadyKnowDoodleTraining, AlreadyRented, GenericAlreadyHaveError, UnknownError, UnknownToon, NonToon,') -GiveAwardErrorStrings = {GiveAwardErrors.Success: 'success', - GiveAwardErrors.WrongGender: 'wrong gender', - GiveAwardErrors.NotGiftable: 'item is not giftable', - GiveAwardErrors.FullMailbox: 'mailbox is full', - GiveAwardErrors.FullAwardMailbox: 'award mailbox is full', - GiveAwardErrors.AlreadyInMailbox: 'award already in mailbox.', - GiveAwardErrors.AlreadyInGiftQueue: 'award already in gift queue.', - GiveAwardErrors.AlreadyInOrderedQueue: 'award already in ordered queue.', - GiveAwardErrors.AlreadyInCloset: 'award already in closet.', - GiveAwardErrors.AlreadyBeingWorn: 'award already being worn.', - GiveAwardErrors.AlreadyInAwardMailbox: 'award already in award mailbox', - GiveAwardErrors.AlreadyInThirtyMinuteQueue: 'award already in 30 minute queue', - GiveAwardErrors.AlreadyInMyPhrases: 'speed chat award already in my phrases', - GiveAwardErrors.AlreadyKnowDoodleTraining: 'doodle training award already known', - GiveAwardErrors.AlreadyRented: 'award is already rented', - GiveAwardErrors.GenericAlreadyHaveError: 'generic-already-have error', - GiveAwardErrors.UnknownError: 'unknown error', - GiveAwardErrors.UnknownToon: 'toon not in database', - GiveAwardErrors.NonToon: 'this is not a toon'} diff --git a/toontown/rpc/AwardManagerUD.py b/toontown/rpc/AwardManagerUD.py deleted file mode 100644 index f7f8928f..00000000 --- a/toontown/rpc/AwardManagerUD.py +++ /dev/null @@ -1,9 +0,0 @@ -from direct.directnotify import DirectNotifyGlobal -from direct.distributed.DistributedObjectGlobalUD import DistributedObjectGlobalUD - -class AwardManagerUD(DistributedObjectGlobalUD): - notify = DirectNotifyGlobal.directNotify.newCategory("AwardManagerUD") - - def giveAwardToToon(self, todo0, todo1, todo2, todo3, todo4, todo5): - pass - diff --git a/toontown/suit/DistributedSuitPlannerAI.py b/toontown/suit/DistributedSuitPlannerAI.py index b5ec43a7..fd72e9b0 100644 --- a/toontown/suit/DistributedSuitPlannerAI.py +++ b/toontown/suit/DistributedSuitPlannerAI.py @@ -97,7 +97,7 @@ class DistributedSuitPlannerAI(DistributedObjectAI.DistributedObjectAI, SuitPlan self.notify.debug('Creating a building manager AI in zone' + str(self.zoneId)) self.buildingMgr = self.air.buildingManagers.get(self.zoneId) if self.buildingMgr: - (blocks, hqBlocks, gagshopBlocks, petshopBlocks, kartshopBlocks, libraryBlocks) = self.buildingMgr.getDNABlockLists() + (blocks, hqBlocks, gagshopBlocks, petshopBlocks, kartshopBlocks) = self.buildingMgr.getDNABlockLists() for currBlock in blocks: bldg = self.buildingMgr.getBuilding(currBlock) bldg.setSuitPlannerExt(self) diff --git a/toontown/toonbase/TTLocalizerEnglish.py b/toontown/toonbase/TTLocalizerEnglish.py index e37ace47..a360e18c 100644 --- a/toontown/toonbase/TTLocalizerEnglish.py +++ b/toontown/toonbase/TTLocalizerEnglish.py @@ -5030,7 +5030,6 @@ AccessoryNamePrefix = {0: 'hat unisex ', 9: 'glasses girl ', 10: 'backpack girl ', 11: 'shoes girl '} -AwardManagerAccessoryNames = {} AccessoryTypeNames = {} for accessoryId in CatalogAccessoryItemGlobals.AccessoryTypes.keys(): accessoryInfo = CatalogAccessoryItemGlobals.AccessoryTypes[accessoryId] @@ -5042,301 +5041,8 @@ for accessoryId in CatalogAccessoryItemGlobals.AccessoryTypes.keys(): accessoryStyleDescription = BackpackStylesDescriptions else: accessoryStyleDescription = ShoesStylesDescriptions - if accessoryInfo[3]: - AwardManagerAccessoryNames[accessoryId] = AccessoryNamePrefix[accessoryInfo[0]] + accessoryStyleDescription[accessoryInfo[1]] AccessoryTypeNames[accessoryId] = accessoryStyleDescription[accessoryInfo[1]] -ShirtStylesDescriptions = {'bss1': 'solid', - 'bss2': 'single stripe', - 'bss3': 'collar', - 'bss4': 'double stripe', - 'bss5': 'multiple stripes', - 'bss6': 'collar w/ pocket', - 'bss7': 'hawaiian', - 'bss8': 'collar w/ 2 pockets', - 'bss9': 'bowling shirt', - 'bss10': 'vest (special)', - 'bss11': 'collar w/ ruffles', - 'bss12': 'soccer jersey (special)', - 'bss13': 'lightning bolt (special)', - 'bss14': 'jersey 19 (special)', - 'bss15': 'guayavera', - 'gss1': 'girl solid', - 'gss2': 'girl single stripe', - 'gss3': 'girl collar', - 'gss4': 'girl double stripes', - 'gss5': 'girl collar w/ pocket', - 'gss6': 'girl flower print', - 'gss7': 'girl flower trim (special)', - 'gss8': 'girl collar w/ 2 pockets', - 'gss9': 'girl denim vest (special)', - 'gss10': 'girl peasant', - 'gss11': 'girl peasant w/ mid stripe', - 'gss12': 'girl soccer jersey (special)', - 'gss13': 'girl hearts', - 'gss14': 'girl stars (special)', - 'gss15': 'girl flower', - 'c_ss1': 'yellow hooded - Series 1', - 'c_ss2': 'yellow with palm tree - Series 1', - 'c_ss3': 'purple with stars - Series 2', - 'c_bss1': 'blue stripes (boys only) - Series 1', - 'c_bss2': 'orange (boys only) - Series 1', - 'c_bss3': 'lime green with stripe (boys only) - Series 2', - 'c_bss4': 'red kimono with checkerboard (boys only) - Series 2', - 'c_gss1': 'girl blue with yellow stripes (girls only) - Series 1', - 'c_gss2': 'girl pink and beige with flower (girls only) - Series 1', - 'c_gss3': 'girl Blue and gold with wavy stripes (girls only) - Series 2', - 'c_gss4': 'girl Blue and pink with bow (girls only) - Series 2', - 'c_gss5': 'girl Aqua kimono white stripe (girls only) - UNUSED', - 'c_ss4': 'Tie dye shirt (boys and girls) - Series 3', - 'c_ss5': 'light blue with blue and white stripe (boys only) - Series 3', - 'c_ss6': 'cowboy shirt 1 : Series 4', - 'c_ss7': 'cowboy shirt 2 : Series 4', - 'c_ss8': 'cowboy shirt 3 : Series 4', - 'c_ss9': 'cowboy shirt 4 : Series 4', - 'c_ss10': 'cowboy shirt 5 : Series 4', - 'c_ss11': 'cowboy shirt 6 : Series 4', - 'hw_ss1': 'Halloween Ghost', - 'hw_ss2': 'Halloween Pumpkin', - 'hw_ss3': 'Halloween Vampire', - 'hw_ss4': 'Halloween Turtle', - 'hw_ss5': 'Halloween Bee', - 'hw_ss6': 'Halloween Pirate', - 'hw_ss7': 'Halloween SuperToon', - 'hw_ss8': 'Halloween Vampire NoCape', - 'hw_ss9': 'Halloween Dinosaur', - 'wh_ss1': 'Winter Holiday 1', - 'wh_ss2': 'Winter Holiday 2', - 'wh_ss3': 'Winter Holiday 3', - 'wh_ss4': 'Winter Holiday 4', - 'vd_ss1': 'girl Valentines day, pink with red hearts (girls)', - 'vd_ss2': 'Valentines day, red with white hearts', - 'vd_ss3': 'Valentines day, white with winged hearts (boys)', - 'vd_ss4': ' Valentines day, pink with red flamed heart', - 'vd_ss5': '2009 Valentines day, white with red cupid', - 'vd_ss6': '2009 Valentines day, blue with green and red hearts', - 'vd_ss7': '2010 Valentines day, red with white wings', - 'sd_ss1': "St Pat's Day, four leaf clover shirt", - 'sd_ss2': "St Pat's Day, pot o gold shirt", - 'sd_ss3': 'Ides of March greenToon shirt', - 'tc_ss1': 'T-Shirt Contest, Fishing Vest', - 'tc_ss2': 'T-Shirt Contest, Fish Bowl', - 'tc_ss3': 'T-Shirt Contest, Paw Print', - 'tc_ss4': 'T-Shirt Contest, Backpack', - 'tc_ss5': 'T-Shirt Contest, Lederhosen ', - 'tc_ss6': 'T-Shirt Contest, Watermelon ', - 'tc_ss7': 'T-Shirt Contest, Race Shirt', - 'j4_ss1': 'July 4th, Flag', - 'j4_ss2': 'July 4th, Fireworks', - 'c_ss12': 'Catalog series 7, Green w/ yellow buttons', - 'c_ss13': 'Catalog series 7, Purple w/ big flower', - 'pj_ss1': 'Blue Banana Pajama shirt', - 'pj_ss2': 'Red Horn Pajama shirt', - 'pj_ss3': 'Purple Glasses Pajama shirt', - 'sa_ss1': 'Award Striped Shirt', - 'sa_ss2': 'Award Fishing Shirt 1', - 'sa_ss3': 'Award Fishing Shirt 2', - 'sa_ss4': 'Award Gardening Shirt 1', - 'sa_ss5': 'Award Gardening Shirt 2', - 'sa_ss6': 'Award Party Shirt 1', - 'sa_ss7': 'Award Party Shirt 2', - 'sa_ss8': 'Award Racing Shirt 1', - 'sa_ss9': 'Award Racing Shirt 2', - 'sa_ss10': 'Award Summer Shirt 1', - 'sa_ss11': 'Award Summer Shirt 2', - 'sa_ss12': 'Award Golf Shirt 1', - 'sa_ss13': 'Award Golf Shirt 2', - 'sa_ss14': 'Award Halloween Bee Shirt', - 'sa_ss15': 'Award Halloween SuperToon Shirt', - 'sa_ss16': 'Award Matathon Shirt 1', - 'sa_ss17': 'Award Save Building Shirt 1', - 'sa_ss18': 'Award Save Building Shirt 2', - 'sa_ss19': 'Award Toontask Shirt 1', - 'sa_ss20': 'Award Toontask Shirt 2', - 'sa_ss21': 'Award Trolley Shirt 1', - 'sa_ss22': 'Award Trolley Shirt 2', - 'sa_ss23': 'Award Winter Shirt 1', - 'sa_ss24': 'Award Halloween Skeleton Shirt', - 'sa_ss25': 'Award Halloween Spider Shirt', - 'sa_ss26': 'Award Most Cogs Defeated Shirt', - 'sa_ss27': 'Award Most V.P.s Defeated Shirt', - 'sa_ss28': 'Award Sellbot Smasher Shirt', - 'sa_ss29': 'Award Most C.J.s Defeated Shirt', - 'sa_ss30': 'Award Lawbot Smasher Shirt', - 'sa_ss31': 'Award Racing Shirt 3', - 'sa_ss32': 'Award Fishing Shirt 4', - 'sa_ss33': 'Award Golf Shirt 3', - 'sa_ss34': 'Award Most Cogs Defeated Shirt 2', - 'sa_ss35': 'Award Racing Shirt 4', - 'sa_ss36': 'Award Save Building Shirt 3', - 'sa_ss37': 'Award Trolley Shirt 3', - 'sa_ss38': 'Award Fishing Shirt 5', - 'sa_ss39': 'Award Golf Shirt 4', - 'sa_ss40': 'Award Halloween Witchy Moon Shirt', - 'sa_ss41': 'Award Winter Holiday Sled Shirt', - 'sa_ss42': 'Award Halloween Batty Moon Shirt', - 'sa_ss43': 'Award Winter Holiday Mittens Shirt', - 'sa_ss44': 'Award Fishing Shirt 6', - 'sa_ss45': 'Award Fishing Shirt 7', - 'sa_ss46': 'Award Golf Shirt 5', - 'sa_ss47': 'Award Racing Shirt 5', - 'sa_ss48': 'Award Racing Shirt 6', - 'sa_ss49': 'Award Most Cogs Defeated shirt 3', - 'sa_ss50': 'Award Most Cogs Defeated shirt 4', - 'sa_ss51': 'Award Trolley shirt 4', - 'sa_ss52': 'Award Trolley shirt 5', - 'sa_ss53': 'Award Save Building Shirt 4', - 'sa_ss54': 'Award Save Building Shirt 5', - 'sa_ss55': 'Award Anniversary', - 'sc_1': 'Scientist top 1', - 'sc_2': 'Scientist top 2', - 'sc_3': 'Scientist top 3', - 'sil_1': 'Silly Mailbox Shirt', - 'sil_2': 'Silly Trash Can Shirt', - 'sil_3': 'Loony Labs Shirt', - 'sil_4': 'Silly Hydrant Shirt', - 'sil_5': 'Sillymeter Whistle Shirt', - 'sil_6': 'Silly Cog-Crusher Shirt', - 'sil_7': 'Victory Party Shirt 1', - 'sil_8': 'Victory Party Shirt 2', - 'emb_us1': 'placeholder emblem shirt 1', - 'emb_us2': 'placeholder emblem shirt 2', - 'emb_us3': 'placeholder emblem shirt 3', - 'sb_1': 'Sellbot Icon Shirt', - 'lb_1': 'Lawbot Icon Shirt', - 'jb_1': 'Jellybean Shirt', - 'jb_2': 'Doodle Shirt', - 'ugcms': 'Get Connected Mover & Shaker', - 'weed': '420 blaze it'} -BottomStylesDescriptions = {'bbs1': 'plain w/ pockets', - 'bbs2': 'belt', - 'bbs3': 'cargo', - 'bbs4': 'hawaiian', - 'bbs5': 'side stripes (special)', - 'bbs6': 'soccer shorts', - 'bbs7': 'side flames (special)', - 'bbs8': 'denim', - 'vd_bs1': 'Valentines shorts', - 'vd_bs2': 'Green with red heart', - 'vd_bs3': 'Blue denim with green and red heart', - 'c_bs1': 'Orange with blue side stripes', - 'c_bs2': 'Blue with gold cuff stripes', - 'c_bs5': 'Green stripes - series 7', - 'sd_bs1': 'St. Pats leprechaun shorts', - 'sd_bs2': 'Ides of March greenToon shorts', - 'pj_bs1': 'Blue Banana Pajama pants', - 'pj_bs2': 'Red Horn Pajama pants', - 'pj_bs3': 'Purple Glasses Pajama pants', - 'wh_bs1': 'Winter Holiday Shorts Style 1', - 'wh_bs2': 'Winter Holiday Shorts Style 2', - 'wh_bs3': 'Winter Holiday Shorts Style 3', - 'wh_bs4': 'Winter Holiday Shorts Style 4', - 'hw_bs1': 'Halloween Bee Shorts male', - 'hw_bs2': 'Halloween Pirate Shorts male', - 'hw_bs5': 'Halloween SuperToon Shorts male', - 'hw_bs6': 'Halloween Vampire NoCape Shorts male', - 'hw_bs7': 'Halloween Dinosaur Shorts male', - 'sil_bs1': 'Silly Cog-Crusher Shorts', - 'gsk1': 'solid', - 'gsk2': 'polka dots (special)', - 'gsk3': 'vertical stripes', - 'gsk4': 'horizontal stripe', - 'gsk5': 'flower print', - 'gsk6': '2 pockets (special) ', - 'gsk7': 'denim skirt', - 'gsh1': 'plain w/ pockets', - 'gsh2': 'flower', - 'gsh3': 'denim shorts', - 'c_gsk1': 'blue skirt with tan border and button', - 'c_gsk2': 'purple skirt with pink and ribbon', - 'c_gsk3': 'teal skirt with yellow and star', - 'vd_gs1': 'red skirt with hearts', - 'vd_gs2': 'Pink flair skirt with polka hearts', - 'vd_gs3': 'Blue denim skirt with green and red heart', - 'c_gsk4': 'rainbow skirt - Series 3', - 'sd_gs1': 'St. Pats day shorts', - 'sd_gs2': 'Ides of March greenToon skirt', - 'c_gsk5': 'Western skirts 1', - 'c_gsk6': 'Western skirts 2', - 'c_bs3': 'Western shorts 1', - 'c_bs4': 'Western shorts 2', - 'j4_bs1': 'July 4th shorts', - 'j4_gs1': 'July 4th Skirt', - 'c_gsk7': 'Blue with flower - series 7', - 'pj_gs1': 'Blue Banana Pajama pants', - 'pj_gs2': 'Red Horn Pajama pants', - 'pj_gs3': 'Purple Glasses Pajama pants', - 'wh_gsk1': 'Winter Holiday Skirt Style 1', - 'wh_gsk2': 'Winter Holiday Skirt Style 2', - 'wh_gsk3': 'Winter Holiday Skirt Style 3', - 'wh_gsk4': 'Winter Holiday Skirt Style 4', - 'sa_bs1': 'Award Fishing Shorts', - 'sa_bs2': 'Award Gardening Shorts', - 'sa_bs3': 'Award Party Shorts', - 'sa_bs4': 'Award Racing Shorts', - 'sa_bs5': 'Award Summer Shorts', - 'sa_bs6': 'Award Golf Shorts 1', - 'sa_bs7': 'Award Halloween Bee Shorts', - 'sa_bs8': 'Award Halloween SuperToon Shorts', - 'sa_bs9': 'Award Save Building Shorts 1', - 'sa_bs10': 'Award Trolley Shorts 1', - 'sa_bs11': 'Award Halloween Spider Shorts', - 'sa_bs12': 'Award Halloween Skeleton Shorts', - 'sa_bs13': 'Award Sellbot Smasher Shorts male', - 'sa_bs14': 'Award Lawbot Smasher Shorts male', - 'sa_bs15': 'Award Racing Shorts 1', - 'sa_bs16': 'Award Golf Shorts 3', - 'sa_bs17': 'Award Racing Shorts 4', - 'sa_bs18': 'Award Golf Shorts 4', - 'sa_bs19': 'Award Golf Shorts 5', - 'sa_bs20': 'Award Racing Shorts 5', - 'sa_bs21': 'Award Racing Shorts 6', - 'sa_gs1': 'Award Fishing Skirt', - 'sa_gs2': 'Award Gardening Skirt', - 'sa_gs3': 'Award Party Skirt', - 'sa_gs4': 'Award Racing Skirt', - 'sa_gs5': 'Award Summer Skirt', - 'sa_gs6': 'Award Golf Skirt 1', - 'sa_gs7': 'Award Halloween Bee Skirt', - 'sa_gs8': 'Award Halloween SuperToon Skirt', - 'sa_gs9': 'Award Save Building Skirt 1', - 'sa_gs10': 'Award Trolley Skirt 1', - 'sa_gs11': 'Award Halloween Skeleton Skirt', - 'sa_gs12': 'Award Halloween Spider Skirt', - 'sa_gs13': 'Award Sellbot Smasher Shorts female', - 'sa_gs14': 'Award Lawbot Smasher Shorts female', - 'sa_gs15': 'Award Racing Skirt 1', - 'sa_gs16': 'Award Golf Skirt 2', - 'sa_gs17': 'Award Racing Skirt 4', - 'sa_gs18': 'Award Golf Skirt 3', - 'sa_gs19': 'Award Golf Skirt 4', - 'sa_gs20': 'Award Racing Skirt 5', - 'sa_gs21': 'Award Racing Skirt 6', - 'sc_bs1': 'Scientist bottom male 1', - 'sc_bs2': 'Scientist bottom male 2', - 'sc_bs3': 'Scientist bottom male 3', - 'sc_gs1': 'Scientist bottom female 1', - 'sc_gs2': 'Scientist bottom female 2', - 'sc_gs3': 'Scientist bottom female 3', - 'sil_bs1': 'Silly Cog-Crusher Shorts male', - 'sil_gs1': 'Silly Cog-Crusher Shorts female', - 'hw_bs3': 'Halloween Vampire Shorts male', - 'hw_gs3': 'Halloween Vampire Shorts female', - 'hw_bs4': 'Halloween Turtle Shorts male', - 'hw_gs4': 'Halloween Turtle Shorts female', - 'hw_gs1': 'Halloween Bee Shorts female', - 'hw_gs2': 'Halloween Pirate Shorts female', - 'hw_gs5': 'Halloween SuperToon Shorts female', - 'hw_gs6': 'Halloween Vampire NoCape Shorts female', - 'hw_gs7': 'Halloween Dinosaur Shorts female', - 'hw_gsk1': 'Halloween Pirate Skirt', - 'nig2': 'The N Shorts'} -AwardMgrBoy = 'boy' -AwardMgrGirl = 'girl' -AwardMgrUnisex = 'unisex' -AwardMgrShorts = 'shorts' -AwardMgrSkirt = 'skirt' -AwardMgrShirt = 'shirt' SpecialEventMailboxStrings = {1: 'A special item from the Toon Council just for you!', 2: "Here is your Melville's Fishing Tournament prize! Congratulations!", 3: "Here is your Billy Budd's Fishing Tournament prize! Congratulations!", @@ -5517,150 +5223,6 @@ FurnitureNames = {100: 'Armchair', 10010: 'Tall Pumpkin', 10020: 'Winter Tree', 10030: 'Winter Wreath'} -AwardManagerFurnitureNames = {100: 'Armchair A - Series 1', - 105: 'Armchair A - Series 7', - 110: 'Chair - Series 1', - 120: 'Desk Chair - Series 2', - 130: 'Log Chair - Series 2', - 140: 'Lobster Chair - Series 3', - 145: 'Lifejacket Chair - Series 3', - 150: 'Saddle Stool - Series 4', - 160: 'Native Chair - Series 4', - 170: 'Cupcake Chair - Series 6', - 200: "Bed Boy's bed - Initial Furniture", - 205: "Bed Boy's bed Series 7", - 210: "Bed Girl's bed - Series 1", - 220: 'Bathtub Bed', - 230: 'Leaf Bed', - 240: 'Boat Bed', - 250: 'Cactus Hammock', - 260: 'Ice Cream Bed', - 270: "Olivia Erin & Cat's Bed - Trolley Bed", - 300: 'Player Piano', - 310: 'Pipe Organ', - 400: 'Fireplace - Square Fireplace Initial Furniture', - 410: 'Fireplace - Girly Fireplace Series 1', - 420: 'Round Fireplace', - 430: 'Fireplace - bug room series 2', - 440: 'Apple Fireplace', - 450: "Erin's Fireplace - coral", - 460: "Erin's Lit Fireplace - coral", - 470: 'Lit Fireplace - square fireplace with fire', - 480: 'Round Lit Fireplace', - 490: 'Lit Fireplac - girl fireplace with firee', - 491: 'Lit Fireplace - bug room fireplace', - 492: 'Apple Lit Fireplace', - 500: 'boy Wardrobe - 10 items initial', - 502: 'boy 15 item Wardrobe', - 504: 'boy 20 item Wardrobe', - 506: 'boy 25 item Wardrobe', - 508: 'boy 50 item Wardrobe', - 510: 'girl Wardrobe - 10 items initial', - 512: 'girl 15 item Wardrobe', - 514: 'girl 20 item Wardrobe', - 516: 'girl 25 item Wardrobe', - 518: 'girl 50 item Wardrobe', - 600: 'Short Lamp', - 610: 'Tall Lamp', - 620: 'Table Lamp - Series 1', - 625: 'Table Lamp - Series 7', - 630: 'Daisy Lamp 1', - 640: 'Daisy Lamp 2', - 650: 'Jellyfish Lamp 1', - 660: 'Jellyfish Lamp 2', - 670: 'Cowboy Lamp', - 680: 'Candle', - 681: 'Lit Candle', - 700: 'Cushioned Chair - Series 1', - 705: 'Cushioned Chair - Series 7', - 710: 'Couch - series 1', - 715: 'Couch - series 7', - 720: 'Hay Couch', - 730: 'Shortcake Couch', - 800: 'Desk', - 810: 'Log Desk', - 900: 'Umbrella Stand', - 910: 'Coat Rack - series 1', - 920: 'Trash Can', - 930: 'Red Mushroom', - 940: 'Yellow Mushroom', - 950: 'Coat Rack - underwater', - 960: 'Barrel Stand', - 970: 'Cactus Plant', - 980: 'Teepee', - 990: "Juliette's Fan - gag fan", - 1000: 'Large Rug', - 1010: 'Round Rug - Series 1', - 1015: 'Round Rug - Series 7', - 1020: 'Small Rug', - 1030: 'Leaf Mat', - 1040: 'Presents', - 1050: 'Sled', - 1100: 'Display Cabinet - Red', - 1110: 'Display Cabinet - Yellow', - 1120: 'Tall Bookcase', - 1130: 'Low Bookcase', - 1140: 'Sundae Chest', - 1200: 'End Table', - 1210: 'Small Table - series 1 ', - 1215: 'Small Table - series 7', - 1220: 'Coffee Table sq', - 1230: 'Coffee Table bw', - 1240: "Snorkeler's Table", - 1250: 'Cookie Table', - 1260: 'Bedroom Table', - 1300: 'Bean Bank', - 1310: '15000 Bean Bank', - 1320: '20000 Bean Bank', - 1330: '25000 Bean Bank', - 1340: '30000 Bean Bank', - 1399: 'Telephone', - 1400: 'Cezanne Toon', - 1410: 'Flowers', - 1420: 'Modern Mickey', - 1430: 'Rembrandt Toon', - 1440: 'Toonscape', - 1441: "Whistler's Horse", - 1442: 'Toon Star', - 1443: 'Not a Pie', - 1450: 'Mickey and Minnie', - 1500: 'Radio A series 2', - 1510: 'Radio B series 1', - 1520: 'Radio C series 2', - 1530: 'Television', - 1600: 'Short Vase A', - 1610: 'Tall Vase A', - 1620: 'Short Vase B', - 1630: 'Tall Vase B', - 1640: 'Short Vase C', - 1650: 'Short Vase D', - 1660: 'Coral Vase', - 1661: 'Shell Vase', - 1670: 'Rose Vase', - 1680: 'Rose Watercan', - 1700: 'Popcorn Cart', - 1710: 'Ladybug', - 1720: 'Fountain', - 1725: 'Washing Machine', - 1800: 'Fish Bowl skull', - 1810: 'Fish Bowl lizard', - 1900: 'Swordfish', - 1910: 'Hammerhead', - 1920: 'Hanging Horns', - 1930: 'Simple Sombrero', - 1940: 'Fancy Sombrero', - 1950: 'Dream Catcher', - 1960: 'Horseshoe', - 1970: 'Bison Portrait', - 2000: 'Candy Swing Set', - 2010: 'Cake Slide', - 3000: 'Banana Split Tub', - 4000: 'Boy Trunk', - 4010: 'Girl Trunk', - 10000: 'Short Pumpkin', - 10010: 'Tall Pumpkin', - 10020: 'Winter Tree', - 10030: 'Winter Wreath'} ClothingArticleNames = ('Shirt', 'Shirt', 'Shirt',