Merge pull request #10 from gyorokpeter/gh11

GH-11 add support for skin selection

Author: Igoorx

player.py

@@ -4,10 +4,11 @@
 from buffer import Buffer
 
 class Player(object):
-    def __init__(self, client, name, team, match):
+    def __init__(self, client, name, team, match, skin):
         self.client = client
         self.server = client.server
         self.match = match
+        self.skin = skin
 
         self.name = ' '.join(emoji.emojize(re.sub(r"[^\x00-\x7F]+", "", emoji.demojize(name)).strip())[:20].split()).upper()
         self.team = team
@@ -42,7 +43,7 @@ def getSimpleData(self):
         return {"id": self.id, "name": self.name, "team": self.team}
 
     def serializePlayerObject(self):
-        return Buffer().writeInt16(self.id).writeInt8(self.level).writeInt8(self.zone).writeShor2(self.posX, self.posY).toBytes()
+        return Buffer().writeInt16(self.id).writeInt8(self.level).writeInt8(self.zone).writeShor2(self.posX, self.posY).writeInt16(self.skin).toBytes()
 
     def loadWorld(self, worldName):
         self.dead = True
@@ -83,7 +84,7 @@ def onLoadComplete(self):
         self.pendingWorld = None
         self.lastXOk = True
 
-        self.sendBin(0x02, Buffer().writeInt16(self.id)) # ASSIGN_PID
+        self.sendBin(0x02, Buffer().writeInt16(self.id).writeInt16(self.skin)) # ASSIGN_PID
 
         self.match.onPlayerReady(self)
 
@@ -100,7 +101,7 @@ def handlePkt(self, code, b, pktData):
 
             self.client.stopDCTimer()
 
-            self.match.broadBin(0x10, Buffer().writeInt16(self.id).write(pktData))
+            self.match.broadBin(0x10, Buffer().writeInt16(self.id).write(pktData).writeInt16(self.skin))
 
         elif code == 0x11: # KILL_PLAYER_OBJECT
             if self.dead:

server.py

@@ -100,15 +100,17 @@ def onMessage(self, payload, isBinary):
             return
 
     def sendJSON(self, j):
+        #print("sendJSON: "+str(j))
         self.sendMessage(json.dumps(j).encode('utf-8'), False)
 
     def sendBin(self, code, buff):
         msg=Buffer().writeInt8(code).write(buff.toBytes() if isinstance(buff, Buffer) else buff).toBytes()
+        #print("sendBin: "+str(code)+" "+str(msg))
         self.sendMessage(msg, True)
 
     def loginSuccess(self):
         self.sendJSON({"packets": [
-            {"name": self.player.name, "team": self.player.team, "sid": "i-dont-know-for-what-this-is-used", "type": "l01"}
+            {"name": self.player.name, "team": self.player.team, "sid": "i-dont-know-for-what-this-is-used", "type": "l01", "skin": self.player.skin}
         ], "type": "s01"})
 
     def setState(self, state):
@@ -157,11 +159,12 @@ def onTextMessage(self, payload):
                 team = packet["team"][:3].strip().upper()
                 if len(team) == 0:
                     team = self.server.defaultTeam
-                
+                skin = packet["skin"] if "skin" in packet else 0
                 self.player = Player(self,
                                      packet["name"],
                                      team,
-                                     self.server.getMatch(team, packet["private"] if "private" in packet else False))
+                                     self.server.getMatch(team, packet["private"] if "private" in packet else False),
+                                     skin)
                 self.loginSuccess()
                 self.server.players.append(self.player)