From 1f8f8ad7a9542ce64f8226801fa2806fa1e572bc Mon Sep 17 00:00:00 2001 From: Master Jumblespeed Date: Wed, 26 Aug 2015 20:26:04 -0400 Subject: [PATCH] rpc: adjust some responses for avId details --- resources | 2 +- toontown/rpc/ToontownRPCHandler.py | 5 +++-- toontown/toonbase/ToontownStartRemoteDB.py | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/resources b/resources index 38571686..c1bd385d 160000 --- a/resources +++ b/resources @@ -1 +1 @@ -Subproject commit 385716865935081c00f8ebbc53ab2875aef4ef19 +Subproject commit c1bd385db43e86c7c2008e252f977868a1f68561 diff --git a/toontown/rpc/ToontownRPCHandler.py b/toontown/rpc/ToontownRPCHandler.py index 2baa3d5a..ff16e881 100755 --- a/toontown/rpc/ToontownRPCHandler.py +++ b/toontown/rpc/ToontownRPCHandler.py @@ -648,8 +648,9 @@ class ToontownRPCHandler(ToontownRPCHandlerBase): dna.makeFromNetString(fields['setDNAString'][0]) result['species'] = ToonDNA.getSpeciesName(dna.head) - result['head-color'] = dna.headColor - result['max-hp'] = fields['setMaxHp'][0] + result['head_color'] = dna.headColor + result['max_hp'] = fields['setMaxHp'][0] + result['hp'] = fields['setHp'][0] result['online'] = (avId in self.air.friendsManager.onlineToons) return result diff --git a/toontown/toonbase/ToontownStartRemoteDB.py b/toontown/toonbase/ToontownStartRemoteDB.py index 53c97af8..976b6353 100644 --- a/toontown/toonbase/ToontownStartRemoteDB.py +++ b/toontown/toonbase/ToontownStartRemoteDB.py @@ -15,7 +15,7 @@ distribution = 'qa' accountServerEndpoint = 'https://toontownstride.com/api/' -data = urllib.urlencode({'username': username, 'password': password, 'distribution': distribution}) +data = urllib.urlencode({'username': username, 'password': password, 'distribution': distribution, 'version': 'dev'}) cookie_jar = cookielib.LWPCookieJar() cookie = urllib2.HTTPCookieProcessor(cookie_jar) opener = urllib2.build_opener(cookie)