DANIEL: Proper toonKilledCogs method

This commit is contained in:
John 2015-05-30 17:05:37 +03:00 committed by Loudrob
parent 1ff5f28056
commit f1ffdc9a1e
4 changed files with 9 additions and 49 deletions

View file

@ -183,8 +183,6 @@ dclass DistributedPlayer : DistributedAvatar {
OwningAccount(DoId);
WishName(string = "") db ram;
WishNameState(string = "OPEN") db ram;
setPreviousAccess(uint8 = 0) required db airecv;
setAccess(uint8 = 2) broadcast ownrecv required ram airecv;
setAdminAccess(uint16 = 0) broadcast ownrecv required airecv;
setAsGM(bool = 0) required ram broadcast ownrecv airecv;
};
@ -673,10 +671,8 @@ dclass DistributedToon : DistributedPlayer {
setNPCFriendsDict(FriendEntry[] = []) required ownrecv db;
setDefaultShard(uint32 = 0) required ownrecv broadcast db;
setDefaultZone(uint32 = 0) required ownrecv broadcast db;
setShtickerBook(blob = []) required ownrecv db;
setZonesVisited(uint32[] = [ 2000 ]) required ownrecv db;
setHoodsVisited(uint32[] = [ 2000 ]) required ownrecv db;
setInterface(blob = []) required ownrecv db;
setLastHood(uint32 = 0) required ownrecv broadcast db;
setTutorialAck(uint8) required ownrecv db;
setMaxClothes(uint32 = 10) required ownrecv db;
@ -747,7 +743,6 @@ dclass DistributedToon : DistributedPlayer {
requestDeleteQuest(uint32[]) ownsend airecv;
setCheesyEffect(int16 = 0, uint32 = 0, uint32 = 0) required broadcast ownrecv db;
setGhostMode(uint8) broadcast ownrecv ram;
setPosIndex(uint8 = 0) required ownrecv db;
setFishCollection(uint8[] = [], uint8[] = [], uint16[] = []) required ownrecv db;
setMaxFishTank(uint8 = 20) required ownrecv db;
setFishTank(uint8[] = [], uint8[] = [], uint16[] = []) required ownrecv db;

View file

@ -144,7 +144,6 @@ class DistributedToon(DistributedPlayer.DistributedPlayer, Toon.Toon, Distribute
self.tunnelCenterOffset = 9.0
self.tunnelCenterInfluence = 0.6
self.pivotAngle = 90 + 45
self.posIndex = 0
self.houseId = 0
self.money = 0
self.bankMoney = 0
@ -415,9 +414,6 @@ class DistributedToon(DistributedPlayer.DistributedPlayer, Toon.Toon, Distribute
return
self.defaultZone = zoneId
def setShtickerBook(self, string):
pass
def setAsGM(self, state):
self.notify.debug('Setting GM State: %s' % state)
DistributedPlayer.DistributedPlayer.setAsGM(self, state)
@ -688,9 +684,6 @@ class DistributedToon(DistributedPlayer.DistributedPlayer, Toon.Toon, Distribute
'battle': 1}])
return
def setInterface(self, string):
pass
def setZonesVisited(self, hoods):
self.safeZonesVisited = hoods
@ -1287,12 +1280,6 @@ class DistributedToon(DistributedPlayer.DistributedPlayer, Toon.Toon, Distribute
def getHouseId(self):
return self.houseId
def setPosIndex(self, index):
self.posIndex = index
def getPosIndex(self):
return self.posIndex
def b_setSpeedChatStyleIndex(self, index):
realIndexToSend = 0
if type(index) == type(0) and 0 <= index and index < len(speedChatStyles):

View file

@ -101,7 +101,6 @@ class DistributedToonAI(DistributedPlayerAI.DistributedPlayerAI, DistributedSmoo
self.bankMoney = 0
self.gardenSpecials = []
self.houseId = 0
self.posIndex = 0
self.savedCheesyEffect = ToontownGlobals.CENormal
self.savedCheesyHoodId = 0
self.savedCheesyExpireTime = 0
@ -499,12 +498,6 @@ class DistributedToonAI(DistributedPlayerAI.DistributedPlayerAI, DistributedSmoo
def getDefaultZone(self):
return self.defaultZone
def setShtickerBook(self, string):
self.notify.debug('setting shticker book to %s' % string)
def getShtickerBook(self):
return ''
def d_setFriendsList(self, friendsList):
self.sendUpdate('setFriendsList', [friendsList])
@ -1031,12 +1024,6 @@ class DistributedToonAI(DistributedPlayerAI.DistributedPlayerAI, DistributedSmoo
def d_setEarnedExperience(self, earnedExp):
self.sendUpdate('setEarnedExperience', [earnedExp])
def setInterface(self, string):
self.notify.debug('setting interface to %s' % string)
def getInterface(self):
return ''
def setZonesVisited(self, hoods):
self.safeZonesVisited = hoods
self.notify.debug('setting safe zone list to %s' % self.safeZonesVisited)
@ -2030,12 +2017,6 @@ class DistributedToonAI(DistributedPlayerAI.DistributedPlayerAI, DistributedSmoo
def getHouseId(self):
return self.houseId
def setPosIndex(self, index):
self.posIndex = index
def getPosIndex(self):
return self.posIndex
def b_setCustomMessages(self, customMessages):
self.d_setCustomMessages(customMessages)
self.setCustomMessages(customMessages)
@ -4102,7 +4083,6 @@ class DistributedToonAI(DistributedPlayerAI.DistributedPlayerAI, DistributedSmoo
self.redeemedCodes.remove(code)
self.b_setRedeemedCodes(self.redeemedCodes)
@magicWord(category=CATEGORY_PROGRAMMER, types=[str, int, int])
def cheesyEffect(value, hood=0, expire=0):
"""
@ -4149,6 +4129,14 @@ def maxHp(maxHp):
invoker.toonUp(maxHp - invoker.getHp())
return 'Set your max HP to: %d' % maxHp
@magicWord(category=CATEGORY_PROGRAMMER, types=[str])
def textColor(color):
"""
Modify the target's text color.
"""
spellbook.getTarget().b_setTextColor(color)
return 'Set your color to: %s' % color
@magicWord(category=CATEGORY_MODERATOR, types=[str])
def allSummons():
"""
@ -4909,8 +4897,7 @@ def getZone():
@magicWord(category=CATEGORY_PROGRAMMER)
def getPos():
invoker = spellbook.getInvoker()
return 'Pos: %s, PosIndex: %s' % (invoker.getPos(), invoker.getPosIndex())
return 'Pos: %s' % spellbook.getInvoker().getPos()
@magicWord(category=CATEGORY_MODERATOR, types=[int])
def nametagStyle(nametagStyle):

View file

@ -67,18 +67,12 @@ class DistributedToonUD(DistributedObjectUD):
def setDefaultZone(self, todo0):
pass
def setShtickerBook(self, todo0):
pass
def setZonesVisited(self, todo0):
pass
def setHoodsVisited(self, todo0):
pass
def setInterface(self, todo0):
pass
def setLastHood(self, todo0):
pass
@ -286,9 +280,6 @@ class DistributedToonUD(DistributedObjectUD):
def setGhostMode(self, todo0):
pass
def setPosIndex(self, todo0):
pass
def setFishCollection(self, todo0, todo1, todo2):
pass