Revert "oo[pssieisss"

This reverts commit 260e5af56f.
This commit is contained in:
Loudrob 2015-04-01 16:29:52 -04:00
parent 010c075265
commit b5c8ba3fcb
3 changed files with 1 additions and 39 deletions

View file

@ -27,7 +27,6 @@ want-achievements #f
# Chat:
want-whitelist #f
want-blacklist-sequence #f
# Cashbot boss:
want-resistance-toonup #t

View file

@ -1,36 +0,0 @@
from pandac.PandaModules import *
from otp.chat.SequenceList import SequenceList
from direct.directnotify import DirectNotifyGlobal
class TTSequenceList(SequenceList):
def __init__(self):
self.notify = DirectNotifyGlobal.directNotify.newCategory('TTSequenceList')
sequenceListURL = config.GetString('blacklist-sequence-url', '')
if sequenceListURL == '':
self.notify.warning('No Sequence BL URL specified! Continuing with local sequence.')
SequenceList.__init__(self, self.loadSquencesLocally())
else:
SequenceList.__init__(self, self.downloadSequences(sequenceListURL))
def downloadSequences(self, url):
fs = Ramfile()
http = HTTPClient.getGlobalPtr()
self.ch = http.makeChannel(True)
self.ch.getHeader(DocumentSpec(url))
doc = self.ch.getDocumentSpec()
self.ch.getDocument(doc)
self.ch.downloadToRam(fs)
return fs.getData().split('\r\n')
def loadSquencesLocally(self):
vfs = VirtualFileSystem.getGlobalPtr()
filename = Filename('tsequence.dat')
searchPath = DSearchPath()
searchPath.appendDirectory(Filename('/server'))
found = vfs.resolveFilename(filename, searchPath)
if not found:
self.notify.warning("Couldn't find blacklist sequence data file!")
return
data = vfs.readFile(filename, True)
return data.split('\n')

View file

@ -117,7 +117,6 @@ class DistributedSuitBaseAI(DistributedAvatarAI.DistributedAvatarAI, SuitBase.Su
def useSkeleRevive(self):
self.skeleRevives -= 1
self.currHP = self.maxHP
self.d_setHP(self.currHP)
self.reviveFlag = 1
def reviveCheckAndClear(self):
@ -196,4 +195,4 @@ class DistributedSuitBaseAI(DistributedAvatarAI.DistributedAvatarAI, SuitBase.Su
self.d_setWaiter(flag)
def getWaiter(self):
return self.waiter
return self.waiter