idz: Clean up Team and TeamMember data models

src/idz/encoder/_team.ts

@@ -1,42 +1,58 @@
 import iconv = require("iconv-lite");
+
 import { JoinAutoTeamResponse } from "../response/joinAutoTeam";
 import { LoadTeamResponse } from "../response/loadTeam";
+import { encodeChara } from "./_chara";
 
 export function _team(res: JoinAutoTeamResponse | LoadTeamResponse) {
   const buf = Buffer.alloc(0x0ca0);
 
-  buf.writeUInt32LE(res.team.id, 0x000c);
-  iconv.encode(res.team.name, "shift_jis").copy(buf, 0x0024);
-
-  for (let i = 0; i < 6; i++) {
-    const base = 0x011c + i * 0x004c;
-    const member = res.members[i];
-
-    if (member === undefined) {
-      break;
-    }
-
-    buf.writeInt32LE(1, base + 0x0000); // Presence
-    iconv.encode(member.name + "\0", "shift_jis").copy(buf, base + 0x0004);
-    buf.writeInt32LE(member.lv, base + 0x0018);
-    buf.writeInt32LE(member.monthPoints, base + 0x0024);
-  }
-
-  // xM
-
-  /*
-  buf.writeInt16LE(0x00001, 0x0344 + 0x0000);
-  buf.writeInt8(0x02, 0x0344 + 0x0003);
-  buf.writeInt32LE(0x00000003, 0x0344 + 0x0004);
-  iconv.encode("str\0", sjis).copy(buf, 0x0344 + 0x0008);
-  buf.writeInt32LE(0x00000004, 0x0344 + 0x001c);
-  */
-
   if (res.type === "join_auto_team_res") {
     buf.writeInt16LE(0x007c, 0x0000);
   } else {
     buf.writeInt16LE(0x0078, 0x0000);
   }
 
+  const leader = res.members.find(item => item.leader);
+
+  buf.writeUInt32LE(res.team.extId, 0x000c);
+  iconv.encode(res.team.name, "shift_jis").copy(buf, 0x0024);
+  buf.writeUInt32LE(res.team.nameBg, 0x00d8);
+  buf.writeUInt32LE(res.team.nameFx, 0x00dc);
+  buf.fill(0xff, 0x00e0, 0x00f9); // Bitset: Unlocked BGs probably
+  buf.fill(0xff, 0x00f9, 0x0101); // Bitset: Unlocked FX probably
+  buf.writeUInt32LE(leader ? leader.profile.aimeId : 0, 0x0080);
+
+  for (let i = 0; i < 6; i++) {
+    const base = 0x011c + i * 0x005c;
+    const member = res.members[i];
+
+    if (member === undefined) {
+      break;
+    }
+
+    const { profile, chara } = member;
+    const accessTime = (profile.accessTime.getTime() / 1000) | 0;
+
+    buf.writeInt32LE(profile.aimeId, base + 0x0000);
+    iconv.encode(profile.name + "\0", "shift_jis").copy(buf, base + 0x0004);
+    buf.writeInt32LE(profile.lv, base + 0x0018);
+    buf.writeInt32LE(0, base + 0x0024); // Month points, TODO
+    buf.writeUInt32LE(accessTime, base + 0x0034);
+    encodeChara(chara).copy(buf, base + 0x0044);
+  }
+
+  // Team Time Attack:
+
+  /*for (let i = 0; i < 6; i++) {
+    const base = 0x0344 + 0x20 * i;
+
+    buf.writeInt16LE(0x00001, base + 0x0000);
+    buf.writeInt8(0x02, base + 0x0003);
+    buf.writeInt32LE(0x00000003, base + 0x0004);
+    iconv.encode("str\0", "shift_jis").copy(buf, base + 0x0008);
+    buf.writeInt32LE(0x00000004, base + 0x001c);
+  }*/
+
   return buf;
 }

src/idz/encoder/createTeam.ts

@@ -5,7 +5,7 @@ export function createTeam(res: CreateTeamResponse): Buffer {
 
   buf.writeUInt16LE(0x0072, 0x0000);
   buf.writeUInt32LE(res.status, 0x0004);
-  buf.writeUInt32LE(res.teamId, 0x0008);
+  buf.writeUInt32LE(res.teamExtId, 0x0008);
 
   return buf;
 }