oo[pssieisss

config/release/dev.prc

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

toontown/chat/TTSequenceList.py

@@ -0,0 +1,36 @@
+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')

toontown/suit/DistributedSuitBaseAI.py

@@ -117,6 +117,7 @@ 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):
@@ -195,4 +196,4 @@ class DistributedSuitBaseAI(DistributedAvatarAI.DistributedAvatarAI, SuitBase.Su
         self.d_setWaiter(flag)
 
     def getWaiter(self):
-        return self.waiter
+        return self.waiter