This commit is contained in:
DenialMC 2015-04-08 20:09:38 +03:00
parent f4598d9141
commit 7b9174b692
16 changed files with 7 additions and 44 deletions

View file

@ -8,10 +8,6 @@ general:
- ../dclass/toon.dc
uberdogs:
- class: CentralLogger
id: 4688
anonymous: false
- class: ClientServicesManager
id: 4665
anonymous: true

View file

@ -8,10 +8,6 @@ general:
- ../dclass/toon.dc
uberdogs:
- class: CentralLogger
id: 4688
anonymous: false
- class: ClientServicesManager
id: 4665
anonymous: true

View file

@ -8,10 +8,6 @@ general:
- ../dclass/toon.dc
uberdogs:
- class: CentralLogger
id: 4688
anonymous: false
- class: ClientServicesManager
id: 4665
anonymous: true

View file

@ -8,10 +8,6 @@ general:
- ../dclass/toon.dc
uberdogs:
- class: CentralLogger
id: 4688
anonymous: false
- class: ClientServicesManager
id: 4665
anonymous: true

View file

@ -8,10 +8,6 @@ general:
- ../dclass/toon.dc
uberdogs:
- class: CentralLogger
id: 4688
anonymous: false
- class: ClientServicesManager
id: 4665
anonymous: true

View file

@ -8,10 +8,6 @@ general:
- ../dclass/toon.dc
uberdogs:
- class: CentralLogger
id: 4688
anonymous: false
- class: ClientServicesManager
id: 4665
anonymous: true

View file

@ -8,10 +8,6 @@ general:
- ../dclass/toon.dc
uberdogs:
- class: CentralLogger
id: 4688
anonymous: false
- class: ClientServicesManager
id: 4665
anonymous: true

View file

@ -8,10 +8,6 @@ general:
- ../dclass/toon.dc
uberdogs:
- class: CentralLogger
id: 4688
anonymous: false
- class: ClientServicesManager
id: 4665
anonymous: true

View file

@ -10,10 +10,6 @@ messagedirector:
bind: 127.0.0.1:7100
uberdogs:
- class: CentralLogger
id: 4688
anonymous: false
- class: ClientServicesManager
id: 4665
anonymous: true

View file

@ -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;

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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))

View file

@ -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)

View file

@ -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?'