Disable this for now.

This commit is contained in:
Loudrob 2015-07-17 10:29:56 -04:00
parent feba8e73c0
commit a20de77143
3 changed files with 48 additions and 48 deletions

View file

@ -250,7 +250,7 @@ from toontown.building import DistributedKartShopInterior/AI
from toontown.building import DistributedDoor/AI
from toontown.estate import DistributedHouseDoor/AI
from toontown.coghq import DistributedCogHQDoor/AI
from toontown.coghq import DistributedCogHQExteriorDoor/AI
//from toontown.coghq import DistributedCogHQExteriorDoor/AI
from toontown.coghq import DistributedSellbotHQDoor/AI
from toontown.toon import DistributedNPCToonBase/AI
from toontown.toon import DistributedNPCToon/AI
@ -425,7 +425,7 @@ 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.uberdog.DistributedLobbyManager/AI/UD import DistributedLobbyManager/AI/UD
//from toontown.uberdog.DistributedLobbyManager/AI/UD import DistributedLobbyManager/AI/UD
from toontown.coderedemption.TTCodeRedemptionMgr/AI import TTCodeRedemptionMgr/AI
from toontown.cogdominium import DistributedCogdoInterior/AI
from toontown.cogdominium import DistributedCogdoBattleBldg/AI
@ -442,7 +442,7 @@ from toontown.cogdominium import DistCogdoCrane/AI
from toontown.cogdominium import DistCogdoCraneMoneyBag/AI
from toontown.cogdominium import DistCogdoCraneCog/AI
from toontown.parties.GlobalPartyManager/AI/UD import GlobalPartyManager/AI/UD
from toontown.uberdog.GlobalLobbyManager/AI/UD import GlobalLobbyManager/AI/UD
//from toontown.uberdog.GlobalLobbyManager/AI/UD import GlobalLobbyManager/AI/UD
from toontown.uberdog.ARGManager import ARGManager
struct gardenSpecial {
@ -479,10 +479,10 @@ struct activity {
uint8 h;
};
struct lobby {
uint64 lobbyId;
uint32 hostId;
};
//struct lobby {
// uint64 lobbyId;
// uint32 hostId;
//};
struct party {
uint64 partyId;
@ -1725,10 +1725,10 @@ dclass DistributedHouseDoor : DistributedDoor {
dclass DistributedCogHQDoor : DistributedDoor {
};
dclass DistributedCogHQExteriorDoor : DistributedCogHQDoor {
selectLobby(uint32) broadcast;
confirmEntrance(uint32, bool) airecv clsend;
};
//dclass DistributedCogHQExteriorDoor : DistributedCogHQDoor {
// selectLobby(uint32) broadcast;
// confirmEntrance(uint32, bool) airecv clsend;
//};
dclass DistributedSellbotHQDoor : DistributedCogHQDoor {
informPlayer(uint8) broadcast ram;
@ -3041,34 +3041,34 @@ dclass DistributedFindFour : DistributedNode {
tie() broadcast;
};
dclass DistributedLobbyManager : DistributedObject {
addLobby(uint32, uint32, string, string, int8, int8, activity [], decoration [], uint32[], uint16);
addLobbyRequest(uint32) airecv clsend;
addLobbyResponse(uint32, int8);
addLobbyResponseUdToAi(uint64, int8, lobby) airecv;
//dclass DistributedLobbyManager : DistributedObject {
// addLobby(uint32, uint32, string, string, int8, int8, activity [], decoration [], uint32[], uint16);
// addLobbyRequest(uint32) airecv clsend;
// addLobbyResponse(uint32, int8);
// addLobbyResponseUdToAi(uint64, int8, lobby) airecv;
getLobbyZone(uint32, uint32, uint8) clsend airecv;
receiveLobbyZone(uint32, uint64, uint32);
freeZoneIdFromCreatedLobby(uint32, uint32) clsend airecv;
// getLobbyZone(uint32, uint32, uint8) clsend airecv;
// receiveLobbyZone(uint32, uint64, uint32);
// freeZoneIdFromCreatedLobby(uint32, uint32) clsend airecv;
sendAvToPlayground(uint32, uint8);
exitParty(uint32) clsend airecv;
// sendAvToPlayground(uint32, uint8);
// exitParty(uint32) clsend airecv;
toonHasEnteredPartyAiToUd(uint32);
toonHasExitedPartyAiToUd(uint32);
// toonHasEnteredPartyAiToUd(uint32);
// toonHasExitedPartyAiToUd(uint32);
lobbyManagerAIStartingUp(uint32, uint32);
lobbyManagerAIGoingDown(uint32, uint32);
lobbyHasFinishedUdToAllAi(uint64 lobbyId) airecv;
// lobbyManagerAIStartingUp(uint32, uint32);
// lobbyManagerAIGoingDown(uint32, uint32);
// lobbyHasFinishedUdToAllAi(uint64 lobbyId) airecv;
requestShardIdZoneIdForHostId(uint32) clsend airecv;
sendShardIdZoneIdToAvatar(uint32, uint32);
// requestShardIdZoneIdForHostId(uint32) clsend airecv;
// sendShardIdZoneIdToAvatar(uint32, uint32);
lobbyManagerUdStartingUp() airecv;
lobbyManagerUdLost() airecv;
// lobbyManagerUdStartingUp() airecv;
// lobbyManagerUdLost() airecv;
receiveId(uint64 ids[]) airecv;
};
// receiveId(uint64 ids[]) airecv;
//};
dclass DistributedPartyManager : DistributedObject {
addParty(uint32, uint32, string, string, int8, int8, activity [], decoration [], uint32[], uint16);
@ -3121,16 +3121,16 @@ dclass DistributedPartyManager : DistributedObject {
receiveId(uint64 ids[]) airecv;
};
dclass GlobalLobbyManager : DistributedObjectGlobal {
lobbyManagerAIHello(uint32 channel);
queryLobby(uint32 hostId);
addLobby(DoId avId, uint64 lobbyId);
toonJoinedLobby(uint64 lobbyId, uint32 avId);
toonLeftLobby(uint64 lobbyId, uint32 avId);
requestLobbySlot(uint64 lobbyId, uint32 avId);
lobbyDone(uint64 lobbyId);
allocIds(uint16 count);
};
//dclass GlobalLobbyManager : DistributedObjectGlobal {
// lobbyManagerAIHello(uint32 channel);
// queryLobby(uint32 hostId);
// addLobby(DoId avId, uint64 lobbyId);
// toonJoinedLobby(uint64 lobbyId, uint32 avId);
// toonLeftLobby(uint64 lobbyId, uint32 avId);
// requestLobbySlot(uint64 lobbyId, uint32 avId);
// lobbyDone(uint64 lobbyId);
// allocIds(uint16 count);
//};
dclass GlobalPartyManager : DistributedObjectGlobal {
partyManagerAIHello(uint32 channel);

View file

@ -51,7 +51,7 @@ from toontown.toon import NPCToons
from toontown.toonbase import ToontownGlobals
from toontown.tutorial.TutorialManagerAI import TutorialManagerAI
from toontown.uberdog.DistributedPartyManagerAI import DistributedPartyManagerAI
from toontown.uberdog.DistributedLobbyManagerAI import DistributedLobbyManagerAI
#from toontown.uberdog.DistributedLobbyManagerAI import DistributedLobbyManagerAI
class ToontownAIRepository(ToontownInternalRepository):
def __init__(self, baseChannel, stateServerChannel, districtName):
@ -136,10 +136,10 @@ class ToontownAIRepository(ToontownInternalRepository):
self.partyManager.generateWithRequired(2)
self.globalPartyMgr = self.generateGlobalObject(
OTP_DO_ID_GLOBAL_PARTY_MANAGER, 'GlobalPartyManager')
self.lobbyManager = DistributedLobbyManagerAI(self)
self.lobbyManager.generateWithRequired(2)
self.globalLobbyMgr = self.generateGlobalObject(
OTP_DO_ID_GLOBAL_LOBBY_MANAGER, 'GlobalLobbyManager')
#self.lobbyManager = DistributedLobbyManagerAI(self)
#self.lobbyManager.generateWithRequired(2)
#self.globalLobbyMgr = self.generateGlobalObject(
# OTP_DO_ID_GLOBAL_LOBBY_MANAGER, 'GlobalLobbyManager')
def createSafeZones(self):
NPCToons.generateZone2NpcDict()

View file

@ -61,7 +61,7 @@ class CogHQAI:
doorIndex=intDoorIndex, lockValue=lock)
intDoor.zoneId = destinationZone
extDoor = DistributedCogHQExteriorDoorAI.DistributedCogHQExteriorDoorAI(
extDoor = DistributedCogHQDoorAI.DistributedCogHQDoorAI(
self.air, 0, DoorTypes.EXT_COGHQ, destinationZone,
doorIndex=extDoorIndex, lockValue=lock)