DANIEL: db values cleanup

This commit is contained in:
John 2015-05-31 01:01:29 +03:00 committed by Loudrob
parent f84f140ce0
commit 93e0c04dce
8 changed files with 3 additions and 43 deletions

View file

@ -144,7 +144,6 @@ struct FriendEntry {
dclass DistributedPlayer : DistributedAvatar {
arrivedOnDistrict(DoId districtId) ownrecv ram;
setAccountName(string name = "") required ownrecv db;
setWhisperSCFrom(DoId fromAv, uint16 msgIndex) ownrecv clsend;
setWhisperSCCustomFrom(DoId fromAv, uint16 msgIndex) ownrecv clsend;
setWhisperSCEmoteFrom(DoId fromAv, uint16 emoteId) ownrecv clsend;
@ -152,9 +151,7 @@ dclass DistributedPlayer : DistributedAvatar {
setSC(uint16 msgIndex) broadcast ownsend airecv;
setSCCustom(uint16 msgIndex) broadcast ownsend airecv;
setFriendsList(FriendEntry[] = []) ownrecv required db airecv;
setDISLname(string) broadcast ownrecv ram;
setDISLid(uint32 = 0) broadcast ownrecv ram db airecv required;
OwningAccount(DoId);
WishName(string = "") db ram;
WishNameState(string = "OPEN") db ram;
setAdminAccess(uint16 = 0) broadcast ownrecv required airecv;
@ -644,7 +641,6 @@ dclass DistributedToon : DistributedPlayer {
setNPCFriendsDict(FriendEntry[] = []) required ownrecv db;
setDefaultShard(uint32 = 0) required ownrecv broadcast db;
setDefaultZone(uint32 = 0) required ownrecv broadcast db;
setZonesVisited(uint32[] = [ 2000 ]) required ownrecv db;
setHoodsVisited(uint32[] = [ 2000 ]) required ownrecv db;
setLastHood(uint32 = 0) required ownrecv broadcast db;
setTutorialAck(uint8) required ownrecv db;
@ -797,7 +793,6 @@ dclass DistributedToon : DistributedPlayer {
setPartyStatus(uint64, uint8) ownrecv airecv;
announcePartyStarted(uint64) ownrecv;
setNeverStartedPartyRefunded(uint64, int8, uint16) ownrecv;
setDISLname(string) ram;
setDISLid(uint32) ram db airecv;
setAnimalSound(uint8 index) ram broadcast ownrecv;
setBuffs(uint32[] = []) required ownrecv db;

View file

@ -34,7 +34,6 @@ class DistributedPlayer(DistributedAvatar.DistributedAvatar, PlayerBase.PlayerBa
self.timeFriendsListChanged = None
self.lastFailedTeleportMessage = {}
self._districtWeAreGeneratedOn = None
self.DISLname = ''
self.DISLid = 0
self.adminAccess = 0
self.autoRun = 0
@ -120,9 +119,6 @@ class DistributedPlayer(DistributedAvatar.DistributedAvatar, PlayerBase.PlayerBa
if self is localAvatar:
return True
def setAccountName(self, accountName):
self.accountName = accountName
def setSystemMessage(self, aboutId, chatString, whisperType = WTSystem):
self.displayWhisper(aboutId, chatString, whisperType)
@ -357,9 +353,6 @@ class DistributedPlayer(DistributedAvatar.DistributedAvatar, PlayerBase.PlayerBa
messenger.send('friendsListChanged')
Avatar.reconsiderAllUnderstandable()
def setDISLname(self, name):
self.DISLname = name
def setDISLid(self, id):
self.DISLid = id

View file

@ -16,7 +16,6 @@ class DistributedPlayerAI(DistributedAvatarAI.DistributedAvatarAI, PlayerBase.Pl
PlayerBase.PlayerBase.__init__(self)
ClsendTracker.__init__(self)
self.friendsList = []
self.DISLname = ''
self.DISLid = 0
self.adminAccess = 0
@ -77,12 +76,6 @@ class DistributedPlayerAI(DistributedAvatarAI.DistributedAvatarAI, PlayerBase.Pl
def friendsNotify(self, avId, status):
pass
def setAccountName(self, accountName):
self.accountName = accountName
def getAccountName(self):
return self.accountName
def setDISLid(self, id):
self.DISLid = id

View file

@ -151,10 +151,7 @@ class DatabaseObject:
def fillin(self, do, dclass):
do.doId = self.doId
for field, value in self.values.items():
if field == 'setZonesVisited' and value.getLength() == 1:
self.notify.warning('Ignoring broken setZonesVisited')
else:
dclass.directUpdate(do, field, value)
dclass.directUpdate(do, field, value)
def reload(self, do, dclass, fields):
self.doId = do.doId

View file

@ -189,12 +189,12 @@ class MapPage(ShtikerPage.ShtikerPage):
self.hoodLabel.hide()
else:
self.hoodLabel.hide()
safeZonesVisited = base.localAvatar.hoodsVisited
hoodsVisited = base.localAvatar.hoodsVisited
hoodTeleportList = base.localAvatar.getTeleportAccess()
for hood in self.allZones:
label = self.labels[self.allZones.index(hood)]
clouds = self.clouds[self.allZones.index(hood)]
if not self.book.safeMode and hood in safeZonesVisited:
if not self.book.safeMode and hood in hoodsVisited:
label['text_fg'] = (0, 0, 0, 1)
label.show()
for cloud in clouds:

View file

@ -89,7 +89,6 @@ class DistributedToon(DistributedPlayer.DistributedPlayer, Toon.Toon, Distribute
self.trophyScore = 0
self.trophyStar = None
self.trophyStarSpeed = 0
self.safeZonesVisited = []
self.NPCFriendsDict = {}
self.earnedExperience = None
self.track = None
@ -230,7 +229,6 @@ class DistributedToon(DistributedPlayer.DistributedPlayer, Toon.Toon, Distribute
self.DistributedToon_deleted
except:
self.DistributedToon_deleted = 1
del self.safeZonesVisited
DistributedPlayer.DistributedPlayer.delete(self)
Toon.Toon.delete(self)
DistributedSmoothNode.DistributedSmoothNode.delete(self)
@ -661,9 +659,6 @@ class DistributedToon(DistributedPlayer.DistributedPlayer, Toon.Toon, Distribute
'battle': 1}])
return
def setZonesVisited(self, hoods):
self.safeZonesVisited = hoods
def setHoodsVisited(self, hoods):
self.hoodsVisited = hoods
if ToontownGlobals.SellbotHQ in hoods or ToontownGlobals.CashbotHQ in hoods or ToontownGlobals.LawbotHQ in hoods:

View file

@ -1024,13 +1024,6 @@ class DistributedToonAI(DistributedPlayerAI.DistributedPlayerAI, DistributedSmoo
def d_setEarnedExperience(self, earnedExp):
self.sendUpdate('setEarnedExperience', [earnedExp])
def setZonesVisited(self, hoods):
self.safeZonesVisited = hoods
self.notify.debug('setting safe zone list to %s' % self.safeZonesVisited)
def getZonesVisited(self):
return self.safeZonesVisited
def setHoodsVisited(self, hoods):
self.hoodsVisited = hoods
self.notify.debug('setting hood zone list to %s' % self.hoodsVisited)

View file

@ -67,9 +67,6 @@ class DistributedToonUD(DistributedObjectUD):
def setDefaultZone(self, todo0):
pass
def setZonesVisited(self, todo0):
pass
def setHoodsVisited(self, todo0):
pass
@ -523,9 +520,6 @@ class DistributedToonUD(DistributedObjectUD):
def setNeverStartedPartyRefunded(self, todo0, todo1, todo2):
pass
def setDISLname(self, todo0):
pass
def setDISLid(self, todo0):
pass