mirror of
https://github.com/Sneed-Group/Poodletooth-iLand
synced 2024-12-24 04:02:40 -06:00
Fixed Make-A-Toon warping, fix names, add phallic and phallus to blacklist
This commit is contained in:
parent
0e9e48ceff
commit
5539bf7ca9
3 changed files with 11 additions and 5 deletions
|
@ -94,7 +94,10 @@ class MakeAToon(StateData.StateData):
|
|||
self.toon.gender = 'd'
|
||||
self.toon.reparentTo(render)
|
||||
self.toon.loop('neutral')
|
||||
self.toon.setPosHpr(-4.1, -2, 0, 200, 0, 0)
|
||||
self.toon.setScale(self.toonScale)
|
||||
self.spotlight.setPos(2, -1.95, 0.41)
|
||||
self.toon.setPos(Point3(1.5, -4, 0))
|
||||
self.toon.setH(120)
|
||||
self.guiTopBar.show()
|
||||
self.guiBottomBar.show()
|
||||
self.guiCancelButton.show()
|
||||
|
|
|
@ -48,21 +48,23 @@ def executeHttpRequest(url, extras):
|
|||
except:
|
||||
return None
|
||||
|
||||
notify = directNotify.newCategory('ClientServicesManagerUD')
|
||||
|
||||
def executeHttpRequestAndLog(url, **extras):
|
||||
response = executeHttpRequest(url, extras)
|
||||
|
||||
if response is None:
|
||||
self.notify.error('A request to ' + url + ' went wrong.')
|
||||
notify.error('A request to ' + url + ' went wrong.')
|
||||
return None
|
||||
|
||||
try:
|
||||
data = json.loads(response)
|
||||
except:
|
||||
self.notify.error('Malformed response from ' + url + '.')
|
||||
notify.error('Malformed response from ' + url + '.')
|
||||
return None
|
||||
|
||||
if 'error' in data:
|
||||
self.notify.warning('Error from ' + url + ':' + data['error'])
|
||||
notify.warning('Error from ' + url + ':' + data['error'])
|
||||
return None
|
||||
|
||||
return data
|
||||
|
@ -151,6 +153,7 @@ class RemoteAccountDB(AccountDB):
|
|||
|
||||
def addNameRequest(self, avId, name):
|
||||
executeHttpRequestAndLog('nameadd', id=avId, name=name)
|
||||
return True
|
||||
|
||||
def getNameStatus(self, avId):
|
||||
data = executeHttpRequestAndLog('nameget', id=avId)
|
||||
|
|
File diff suppressed because one or more lines are too long
Loading…
Reference in a new issue