From 7b9174b6924abaffdb8fad5db658e01e6e98eb62 Mon Sep 17 00:00:00 2001 From: DenialMC Date: Wed, 8 Apr 2015 20:09:38 +0300 Subject: [PATCH] Fixes --- astron/config/clientagent-0.yml | 4 ---- astron/config/clientagent-1.yml | 4 ---- astron/config/clientagent-2.yml | 4 ---- astron/config/clientagent-3.yml | 4 ---- astron/config/clientagent-4.yml | 4 ---- astron/config/clientagent-5.yml | 4 ---- astron/config/clientagent-6.yml | 4 ---- astron/config/clientagent-7.yml | 4 ---- astron/config/cluster.yml | 4 ---- astron/dclass/united.dc | 2 +- otp/distributed/DCClassImports.py | 2 +- otp/distributed/OtpDoGlobals.py | 1 - toontown/ai/DistributedReportMgr.py | 3 --- toontown/ai/DistributedReportMgrAI.py | 2 +- toontown/ai/ToontownAIRepository.py | 3 +++ toontown/toonbase/TTLocalizerEnglish.py | 2 +- 16 files changed, 7 insertions(+), 44 deletions(-) diff --git a/astron/config/clientagent-0.yml b/astron/config/clientagent-0.yml index 3eb32408..fab5d392 100644 --- a/astron/config/clientagent-0.yml +++ b/astron/config/clientagent-0.yml @@ -8,10 +8,6 @@ general: - ../dclass/toon.dc uberdogs: - - class: CentralLogger - id: 4688 - anonymous: false - - class: ClientServicesManager id: 4665 anonymous: true diff --git a/astron/config/clientagent-1.yml b/astron/config/clientagent-1.yml index f1a15803..b3c70b0c 100644 --- a/astron/config/clientagent-1.yml +++ b/astron/config/clientagent-1.yml @@ -8,10 +8,6 @@ general: - ../dclass/toon.dc uberdogs: - - class: CentralLogger - id: 4688 - anonymous: false - - class: ClientServicesManager id: 4665 anonymous: true diff --git a/astron/config/clientagent-2.yml b/astron/config/clientagent-2.yml index 5aa06124..df23b6d8 100644 --- a/astron/config/clientagent-2.yml +++ b/astron/config/clientagent-2.yml @@ -8,10 +8,6 @@ general: - ../dclass/toon.dc uberdogs: - - class: CentralLogger - id: 4688 - anonymous: false - - class: ClientServicesManager id: 4665 anonymous: true diff --git a/astron/config/clientagent-3.yml b/astron/config/clientagent-3.yml index fff8afbc..811837e2 100644 --- a/astron/config/clientagent-3.yml +++ b/astron/config/clientagent-3.yml @@ -8,10 +8,6 @@ general: - ../dclass/toon.dc uberdogs: - - class: CentralLogger - id: 4688 - anonymous: false - - class: ClientServicesManager id: 4665 anonymous: true diff --git a/astron/config/clientagent-4.yml b/astron/config/clientagent-4.yml index ddea5de7..b99a122a 100644 --- a/astron/config/clientagent-4.yml +++ b/astron/config/clientagent-4.yml @@ -8,10 +8,6 @@ general: - ../dclass/toon.dc uberdogs: - - class: CentralLogger - id: 4688 - anonymous: false - - class: ClientServicesManager id: 4665 anonymous: true diff --git a/astron/config/clientagent-5.yml b/astron/config/clientagent-5.yml index 041eff3d..ef034083 100644 --- a/astron/config/clientagent-5.yml +++ b/astron/config/clientagent-5.yml @@ -8,10 +8,6 @@ general: - ../dclass/toon.dc uberdogs: - - class: CentralLogger - id: 4688 - anonymous: false - - class: ClientServicesManager id: 4665 anonymous: true diff --git a/astron/config/clientagent-6.yml b/astron/config/clientagent-6.yml index d5e7f4ca..2bcb2f3f 100644 --- a/astron/config/clientagent-6.yml +++ b/astron/config/clientagent-6.yml @@ -8,10 +8,6 @@ general: - ../dclass/toon.dc uberdogs: - - class: CentralLogger - id: 4688 - anonymous: false - - class: ClientServicesManager id: 4665 anonymous: true diff --git a/astron/config/clientagent-7.yml b/astron/config/clientagent-7.yml index 4aca58ca..ca93110b 100644 --- a/astron/config/clientagent-7.yml +++ b/astron/config/clientagent-7.yml @@ -8,10 +8,6 @@ general: - ../dclass/toon.dc uberdogs: - - class: CentralLogger - id: 4688 - anonymous: false - - class: ClientServicesManager id: 4665 anonymous: true diff --git a/astron/config/cluster.yml b/astron/config/cluster.yml index c9e951bb..41b8d948 100644 --- a/astron/config/cluster.yml +++ b/astron/config/cluster.yml @@ -10,10 +10,6 @@ messagedirector: bind: 127.0.0.1:7100 uberdogs: - - class: CentralLogger - id: 4688 - anonymous: false - - class: ClientServicesManager id: 4665 anonymous: true diff --git a/astron/dclass/united.dc b/astron/dclass/united.dc index f9cbf99a..3cd69b7a 100644 --- a/astron/dclass/united.dc +++ b/astron/dclass/united.dc @@ -823,7 +823,7 @@ dclass DistributedToon : DistributedPlayer { setExperience(blob = [0*14]) required broadcast db; setTrueFriends(uint32[]) required ownrecv db; setIgnored(uint32[]) required clsend airecv ownrecv db; - setReported(uint32[]) required clrecv db; + setReported(uint32[]) required ownrecv db; setMaxCarry(uint8 = 20) required ownrecv db; setTrackAccess(uint16[] = [0,0,0,0,1,1,0]) required broadcast ownrecv db; setTrackProgress(int8 = -1, uint32 = 0) required ownrecv db; diff --git a/otp/distributed/DCClassImports.py b/otp/distributed/DCClassImports.py index 864e476d..bb1fee0d 100644 --- a/otp/distributed/DCClassImports.py +++ b/otp/distributed/DCClassImports.py @@ -2,7 +2,7 @@ from pandac.PandaModules import * -hashVal = 3777956254L +hashVal = 3773405074L 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 diff --git a/otp/distributed/OtpDoGlobals.py b/otp/distributed/OtpDoGlobals.py index 469794ec..e0399d33 100644 --- a/otp/distributed/OtpDoGlobals.py +++ b/otp/distributed/OtpDoGlobals.py @@ -35,7 +35,6 @@ OTP_DO_ID_TOONTOWN_AVATAR_MANAGER = 4682 OTP_DO_ID_TOONTOWN_TEMP_STORE_MANAGER = 4684 OTP_DO_ID_SWITCHBOARD_MANAGER = 4685 OTP_DO_ID_PLAYER_FRIENDS_MANAGER = 4687 -OTP_DO_ID_CENTRAL_LOGGER = 4688 OTP_DO_ID_CARS_AVATAR_MANAGER = 4689 OTP_DO_ID_TOONTOWN_MAIL_MANAGER = 4690 OTP_DO_ID_TOONTOWN_PARTY_MANAGER = 4691 diff --git a/toontown/ai/DistributedReportMgr.py b/toontown/ai/DistributedReportMgr.py index 237c3d73..74797cb0 100644 --- a/toontown/ai/DistributedReportMgr.py +++ b/toontown/ai/DistributedReportMgr.py @@ -5,9 +5,6 @@ class DistributedReportMgr(DistributedObject.DistributedObject): neverDisable = 1 notify = DirectNotifyGlobal.directNotify.newCategory('DistributedReportMgr') - def __init__(self, cr): - DistributedObject.DistributedObject.__init__(self, cr) - def announceGenerate(self): DistributedObject.DistributedObject.announceGenerate(self) base.cr.reportMgr = self diff --git a/toontown/ai/DistributedReportMgrAI.py b/toontown/ai/DistributedReportMgrAI.py index 45bc9d6c..842aa37f 100644 --- a/toontown/ai/DistributedReportMgrAI.py +++ b/toontown/ai/DistributedReportMgrAI.py @@ -29,7 +29,7 @@ class DistributedReportMgrAI(DistributedObjectAI): self.reports.append('%s|%s|%s|%s' % (timestamp, reporterId, avId, category)) def sendAllReports(self): - if not self.reports or config.GetString('accountdb-type', 'developer') != 'remote':: + if not self.reports or config.GetString('accountdb-type', 'developer') != 'remote': return executeHttpRequestAndLog('report', reports=','.join(self.reports)) diff --git a/toontown/ai/ToontownAIRepository.py b/toontown/ai/ToontownAIRepository.py index 2fc39f5f..8a7f3ee2 100644 --- a/toontown/ai/ToontownAIRepository.py +++ b/toontown/ai/ToontownAIRepository.py @@ -16,6 +16,7 @@ from toontown.ai.HolidayManagerAI import HolidayManagerAI from toontown.ai.NewsManagerAI import NewsManagerAI from toontown.ai.QuestManagerAI import QuestManagerAI from toontown.ai.DistributedBlackCatMgrAI import DistributedBlackCatMgrAI +from toontown.ai.DistributedReportMgrAI import DistributedReportMgrAI from toontown.catalog.AccountDateAI import AccountDateAI from toontown.building.DistributedBuildingQueryMgrAI import DistributedBuildingQueryMgrAI from toontown.building.DistributedTrophyMgrAI import DistributedTrophyMgrAI @@ -115,6 +116,8 @@ class ToontownAIRepository(ToontownInternalRepository): self.suitInvasionManager = SuitInvasionManagerAI(self) self.blackCatMgr = DistributedBlackCatMgrAI(self) self.blackCatMgr.generateWithRequired(2) + self.reportMgr = DistributedReportMgrAI(self) + self.reportMgr.generateWithRequired(2) self.trophyMgr = DistributedTrophyMgrAI(self) self.trophyMgr.generateWithRequired(2) self.cogSuitMgr = CogSuitManagerAI.CogSuitManagerAI(self) diff --git a/toontown/toonbase/TTLocalizerEnglish.py b/toontown/toonbase/TTLocalizerEnglish.py index 93f28ce7..fe9a8525 100644 --- a/toontown/toonbase/TTLocalizerEnglish.py +++ b/toontown/toonbase/TTLocalizerEnglish.py @@ -1942,7 +1942,7 @@ ReportPanelWarning = "We take reporting very seriously. Your report will be view ReportPanelThanks = 'Thank you! Your report has been sent to a Moderator for review. There is no need to contact us again about the issue. The moderation team will take appropriate action for a toon found breaking our rules.' ReportPanelRemovedFriend = 'We have automatically removed %s from your Toon Friends List.' ReportPanelAlreadyReported = 'You have already reported %s during this session. A Moderator will review your previous report.' -IgnorePanelTitle = 'Ignore A PToon' +IgnorePanelTitle = 'Ignore A Toon' IgnorePanelAddIgnore = 'Would you like to ignore %s?' IgnorePanelIgnore = 'You are now ignoring %s.' IgnorePanelRemoveIgnore = 'Would you like to stop ignoring %s?'