From e97ae1ffb56a9f31d62fa5b653de8f5ce2eaf3a5 Mon Sep 17 00:00:00 2001
From: Jake Probst <jake.probst@gmail.com>
Date: Thu, 5 Sep 2019 15:09:29 -0700
Subject: [PATCH] forgot to include these pt. 2

---
 src/login/entities.rs | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/src/login/entities.rs b/src/login/entities.rs
index f6e37ec..25085d1 100644
--- a/src/login/entities.rs
+++ b/src/login/entities.rs
@@ -1,20 +1,34 @@
 use std::time::SystemTime;
 
 use libpso::character::settings;
-
+use libpso::character::character;
+use libpso::character::guildcard;
 
 pub struct UserAccount {
-    pub id: i32,
+    pub id: u32,
     pub username: String,
     pub password: String,
-    pub guildcard: Option<i32>,
-    pub team_id: Option<i32>,
+    pub guildcard: Option<u32>,
+    pub team_id: Option<u32>,
     pub banned: bool,
     pub muted_until: SystemTime,
     pub created_at: SystemTime,
 }
+
 pub struct UserSettings {
-    pub id: i32,
-    pub user_id: i32,
+    pub id: u32,
+    pub user_id: u32,
     pub settings: settings::UserSettings,
 }
+
+pub struct Character {
+    pub id: u32,
+    pub user_id: u32,
+    pub character: character::Character,
+}
+
+pub struct GuildCardData {
+    pub id: u32,
+    pub user_id: u32,
+    pub guildcard: guildcard::GuildCardData,
+}