Introduce egs_accounts for accounts handling.

include/records.hrl

@@ -20,6 +20,13 @@
 %% @doc Per-process state used by the various EGS modules.
 -record(state, {socket, gid, slot, lid=16#ffff, areanb=0}).
 
+%% @doc Accounts. So far only used for storing temporary information.
+%% @todo Hash the password.
+%% @todo Add email, password_salt, is_ingame, register_time, last_login_time, etc.
+-record(accounts, {
+	gid, username, password, auth_state
+}).
+
 %% @doc Table containing counters current values.
 -record(counters, {name, id}).
 
@@ -36,13 +43,12 @@
 
 -record(egs_user_model, {
 	%% General information.
-	id, lid, pid, socket, state, time, character,
+	id, lid, pid, time, character,
 	%% Location/state related information.
 	instancepid, partypid, areatype, area, entryid, pos=#pos{x=0.0, y=0.0, z=0.0, dir=0.0}, shopid,
 	prev_area=#psu_area{questid=0, zoneid=0, mapid=0}, prev_entryid=0, %% universeid
 	%% To be moved or deleted later on.
-	setid=0, %% @todo Current area's set number. Move that to psu_instance probably.
-	folder %% @todo Temporary save location.
+	setid=0 %% @todo Current area's set number. Move that to psu_instance probably.
 }).
 
 %% @doc Character main or class level data structure.
@@ -88,11 +94,6 @@
 	cutindisplay, mainmenucursorposition, camera3y, camera3x, camera1y, camera1x, controller, weaponswap,
 	lockon, brightness, functionkeysetting, buttondetaildisplay}).
 
-%% @doc Accounts data structure.
-%% @todo Make a disk table for storing accounts.
-
--record(accounts, {gid, username, password}). % also: characters, commonbox
-
 %% @doc Characters data structure.
 %% @todo Make a disk table for storing characters permanently. Also keep the current character in #users.
 

src/egs.app.src

@@ -10,6 +10,7 @@
 		egs_seasons,
 		egs_items_db,
 		egs_shops_db,
+		egs_accounts,
 		egs_game_server,
 		egs_login_server,
 		egs_exit_mon,

src/egs_accounts.erl

@@ -0,0 +1,116 @@
+%% @author Loïc Hoguin <essen@dev-extend.eu>
+%% @copyright 2010 Loïc Hoguin.
+%% @doc Accounts handling.
+%%
+%%	This file is part of EGS.
+%%
+%%	EGS is free software: you can redistribute it and/or modify
+%%	it under the terms of the GNU Affero General Public License as
+%%	published by the Free Software Foundation, either version 3 of the
+%%	License, or (at your option) any later version.
+%%
+%%	EGS is distributed in the hope that it will be useful,
+%%	but WITHOUT ANY WARRANTY; without even the implied warranty of
+%%	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+%%	GNU Affero General Public License for more details.
+%%
+%%	You should have received a copy of the GNU Affero General Public License
+%%	along with EGS.  If not, see <http://www.gnu.org/licenses/>.
+
+-module(egs_accounts).
+-behavior(gen_server).
+-export([start_link/0, stop/0, get_folder/1, key_auth/2, key_auth_init/1, login_auth/2]). %% API.
+-export([init/1, handle_call/3, handle_cast/2, handle_info/2, terminate/2, code_change/3]). %% gen_server.
+
+%% Use the module name for the server's name.
+-define(SERVER, ?MODULE).
+-define(TABLE, accounts).
+
+-include("include/records.hrl").
+
+%% API.
+
+%% @spec start_link() -> {ok,Pid::pid()}
+start_link() ->
+	gen_server:start_link({local, ?SERVER}, ?MODULE, [], []).
+
+%% @spec stop() -> stopped
+stop() ->
+	gen_server:call(?SERVER, stop).
+
+%% @todo Temporary code until we properly save the player data.
+get_folder(GID) ->
+	gen_server:call(?SERVER, {get_folder, GID}).
+
+key_auth(GID, AuthKey) ->
+	gen_server:call(?SERVER, {key_auth, GID, AuthKey}).
+
+key_auth_init(GID) ->
+	gen_server:call(?SERVER, {key_auth_init, GID}).
+
+%% @todo Properly handle login authentication when accounts are saved.
+login_auth(Username, Password) ->
+	gen_server:call(?SERVER, {login_auth, Username, Password}).
+
+%% gen_server.
+
+init([]) ->
+	error_logger:info_report("egs_accounts started"),
+	{ok, undefined}.
+
+handle_call({get_folder, GID}, _From, State) ->
+	{atomic, [#accounts{username=Username, password=Password}]} = mnesia:transaction(fun() -> mnesia:read({?TABLE, GID}) end),
+	{reply, << Username/binary, "-", Password/binary >>, State};
+
+handle_call({key_auth, GID, AuthKey}, _From, State) ->
+	{atomic, [#accounts{auth_state=AuthState}]} = mnesia:transaction(fun() -> mnesia:read({?TABLE, GID}) end),
+	case AuthState of
+		{wait_for_authentication, AuthKey, TRef} ->
+			timer:cancel(TRef),
+			mnesia:transaction(fun() ->
+				Account = mnesia:read({?TABLE, GID}),
+				mnesia:write(Account#accounts{auth_state=undefined})
+			end),
+			{reply, ok, State};
+		_Any ->
+			{reply, {error, badarg}, State}
+	end;
+
+handle_call({key_auth_init, GID}, _From, State) ->
+	AuthKey = crypto:rand_bytes(4),
+	TRef = timer:send_after(10000, {key_auth_timeout, GID}),
+	mnesia:transaction(fun() ->
+		[Account] = mnesia:read({?TABLE, GID}),
+		mnesia:write(Account#accounts{auth_state={wait_for_authentication, AuthKey, TRef}})
+	end),
+	{reply, {ok, AuthKey}, State};
+
+handle_call({login_auth, Username, Password}, _From, State) ->
+	GID = 10000000 + mnesia:dirty_update_counter(counters, gid, 1),
+	mnesia:transaction(fun() -> mnesia:write(#accounts{gid=GID, username=Username, password=Password}) end),
+	{reply, {ok, GID}, State};
+
+handle_call(stop, _From, State) ->
+	{stop, normal, stopped, State};
+
+handle_call(_Request, _From, State) ->
+	{reply, ignored, State}.
+
+handle_cast(_Msg, State) ->
+	{noreply, State}.
+
+handle_info({key_auth_timeout, GID}, State) ->
+	mnesia:transaction(fun() ->
+		Account = mnesia:read({?TABLE, GID}),
+		mnesia:write(Account#accounts{auth_state=undefined})
+	end),
+	{noreply, State};
+
+handle_info(_Info, State) ->
+	{noreply, State}.
+
+terminate(_Reason, _State) ->
+	ok.
+
+code_change(_OldVsn, State, _Extra) ->
+	{ok, State}.

src/egs_app.erl

@@ -68,6 +68,7 @@ db_init() ->
 	error_logger:info_report("mnesia schema created"),
 	error_logger:info_report("starting mnesia"),
 	mnesia:start(),
+	mnesia:create_table(accounts, [{attributes, record_info(fields, accounts)}]),
 	mnesia:create_table(counters, [{attributes, record_info(fields, counters)}]),
 	mnesia:create_table(psu_object, [{attributes, record_info(fields, psu_object)}]),
 	mnesia:create_table(egs_user_model, [{attributes, record_info(fields, egs_user_model)}]),

src/egs_char_select.erl

@@ -43,8 +43,8 @@ raw(Command, _Data, State) ->
 
 %% @doc Character screen selection request and delivery.
 event(char_select_request, #state{gid=GID}) ->
-	{ok, User} = egs_user_model:read(GID),
-	psu_game:send_0d03(data_load(User#egs_user_model.folder, 0), data_load(User#egs_user_model.folder, 1), data_load(User#egs_user_model.folder, 2), data_load(User#egs_user_model.folder, 3));
+	Folder = egs_accounts:get_folder(GID),
+	psu_game:send_0d03(data_load(Folder, 0), data_load(Folder, 1), data_load(Folder, 2), data_load(Folder, 3));
 
 %% @doc The options default to 0 for everything except brightness to 4.
 %% @todo Don't forget to check for the character's name.
@@ -57,8 +57,8 @@ event({char_select_create, Slot, CharBin}, #state{gid=GID}) ->
 	%~ psu_characters:validate_name(Name),
 	%~ psu_appearance:validate_char_create(Race, Gender, Appearance),
 	%% end of check, continue doing it wrong past that point for now
-	{ok, User} = egs_user_model:read(GID),
-	Dir = io_lib:format("save/~s", [User#egs_user_model.folder]),
+	Folder = egs_accounts:get_folder(GID),
+	Dir = io_lib:format("save/~s", [Folder]),
 	File = io_lib:format("~s/~b-character", [Dir, Slot]),
 	_ = file:make_dir(Dir),
 	file:write_file(File, CharBin),
@@ -67,7 +67,8 @@ event({char_select_create, Slot, CharBin}, #state{gid=GID}) ->
 %% @doc Load the selected character into the game's universe.
 event({char_select_enter, Slot, _BackToPreviousField}, State=#state{gid=GID}) ->
 	{ok, User} = egs_user_model:read(GID),
-	[{status, 1}, {char, CharBin}, {options, OptionsBin}] = data_load(User#egs_user_model.folder, Slot),
+	Folder = egs_accounts:get_folder(GID),
+	[{status, 1}, {char, CharBin}, {options, OptionsBin}] = data_load(Folder, Slot),
 	<< Name:512/bits, RaceBin:8, GenderBin:8, ClassBin:8, AppearanceBin:776/bits, _/bits >> = CharBin,
 	Race = psu_characters:race_binary_to_atom(RaceBin),
 	Gender = psu_characters:gender_binary_to_atom(GenderBin),
@@ -75,7 +76,7 @@ event({char_select_enter, Slot, _BackToPreviousField}, State=#state{gid=GID}) ->
 	Appearance = psu_appearance:binary_to_tuple(Race, AppearanceBin),
 	Options = psu_characters:options_binary_to_tuple(OptionsBin),
 	Character = #characters{slot=Slot, name=Name, race=Race, gender=Gender, class=Class, appearance=Appearance, options=Options}, % TODO: temporary set the slot here, won't be needed later
-	User2 = User#egs_user_model{state=online, character=Character, area=#psu_area{questid=1100000, zoneid=0, mapid=4}, entryid=5},
+	User2 = User#egs_user_model{character=Character, area=#psu_area{questid=1100000, zoneid=0, mapid=4}, entryid=5},
 	egs_user_model:write(User2),
 	egs_user_model:item_add(GID, 16#11010000, #psu_special_item_variables{}),
 	egs_user_model:item_add(GID, 16#11020000, #psu_special_item_variables{}),
@@ -85,8 +86,9 @@ event({char_select_enter, Slot, _BackToPreviousField}, State=#state{gid=GID}) ->
 	egs_user_model:item_add(GID, 16#01010a00, #psu_striking_weapon_item_variables{current_pp=99, max_pp=100, element=#psu_element{type=2, percent=50}}),
 	egs_user_model:item_add(GID, 16#01010b00, #psu_striking_weapon_item_variables{current_pp=99, max_pp=100, element=#psu_element{type=3, percent=50}}),
 	{ok, User3} = egs_user_model:read(GID),
-	psu_game:char_load(User3),
-	{ok, egs_game, State#state{slot=Slot}}.
+	State2 = State#state{slot=Slot},
+	psu_game:char_load(User3, State2),
+	{ok, egs_game, State2}.
 
 %% Internal.
 

src/egs_game.erl

@@ -709,9 +709,9 @@ event({party_remove_member, PartyPos}, State=#state{gid=GID}) ->
 	psu_game:send_0204(DestUser, RemovedUser, 1),
 	psu_proto:send_0215(0, State);
 
-event({player_options_change, Options}, #state{gid=GID}) ->
-	{ok, User} = egs_user_model:read(GID),
-	file:write_file(io_lib:format("save/~s/~b-character.options", [User#egs_user_model.folder, (User#egs_user_model.character)#characters.slot]), Options);
+event({player_options_change, Options}, #state{gid=GID, slot=Slot}) ->
+	Folder = egs_accounts:get_folder(GID),
+	file:write_file(io_lib:format("save/~s/~b-character.options", [Folder, Slot]), Options);
 
 %% @todo If the player has a scape, use it! Otherwise red screen.
 %% @todo Right now we force revive with a dummy HP value.
@@ -751,7 +751,7 @@ event(unicube_request, _State) ->
 %% @todo When selecting 'Your room', load a default room.
 %% @todo When selecting 'Reload', reload the character in the current lobby.
 %% @todo Delete NPC characters and stop the party on entering myroom too.
-event({unicube_select, Selection, EntryID}, #state{gid=GID}) ->
+event({unicube_select, Selection, EntryID}, State=#state{gid=GID}) ->
 	case Selection of
 		cancel -> ignore;
 		16#ffffffff ->
@@ -761,7 +761,7 @@ event({unicube_select, Selection, EntryID}, #state{gid=GID}) ->
 			{ok, User} = egs_user_model:read(GID),
 			User2 = User#egs_user_model{area=#psu_area{questid=1120000, zoneid=0, mapid=100}, entryid=0},
 			egs_user_model:write(User2),
-			psu_game:char_load(User2);
+			psu_game:char_load(User2, State);
 		_UniID ->
 			log("uni selection (reload)"),
 			psu_game:send_0230(),
@@ -779,7 +779,7 @@ event({unicube_select, Selection, EntryID}, #state{gid=GID}) ->
 			end,
 			User2 = User#egs_user_model{entryid=EntryID},
 			egs_user_model:write(User2),
-			psu_game:char_load(User2)
+			psu_game:char_load(User2, State)
 	end.
 
 %% Internal.

src/egs_login.erl

@@ -54,7 +54,7 @@ event({system_client_version_info, _Entrance, _Language, _Platform, Version}, St
 		closed
 	end;
 
-%% Game server info request handler.
+%% @doc Game server info request handler.
 event(system_game_server_request, State=#state{socket=Socket}) ->
 	{ServerIP, ServerPort} = egs_conf:read(game_server),
 	psu_proto:send_0216(ServerIP, ServerPort, State),
@@ -65,7 +65,9 @@ event(system_game_server_request, State=#state{socket=Socket}) ->
 %%      If the user is authenticated, send him the character flags list.
 %% @todo Remove the put calls when all the send_xxxx are moved out of psu_game and into psu_proto.
 event({system_key_auth_request, AuthGID, AuthKey}, State=#state{socket=Socket}) ->
-	egs_user_model:key_auth(AuthGID, AuthKey, Socket),
+	egs_accounts:key_auth(AuthGID, AuthKey),
+	LID = 1 + mnesia:dirty_update_counter(counters, lobby, 1) rem 1023,
+	egs_user_model:write(#egs_user_model{id=AuthGID, pid=self(), lid=LID}),
 	put(socket, Socket),
 	put(gid, AuthGID),
 	State2 = State#state{gid=AuthGID},
@@ -73,14 +75,13 @@ event({system_key_auth_request, AuthGID, AuthKey}, State=#state{socket=Socket})
 	{ok, egs_char_select, State2};
 
 %% @doc Authentication request handler. Currently always succeed.
-%%      Use the temporary session ID as the GID for now.
-%%      Use username and password as a folder name for saving character data.
 %% @todo Handle real GIDs whenever there's real authentication. GID is the second SessionID in the reply.
 %% @todo Apparently it's possible to ask a question in the reply here. Used for free course on JP.
 event({system_login_auth_request, Username, Password}, State) ->
-	{ok, AuthGID, AuthKey} = egs_user_model:login_auth(Username, Password),
+	{ok, GID} = egs_accounts:login_auth(Username, Password),
+	{ok, AuthKey} = egs_accounts:key_auth_init(GID),
 	io:format("auth success for ~s ~s~n", [Username, Password]),
-	psu_proto:send_0223(AuthGID, AuthKey, State);
+	psu_proto:send_0223(GID, AuthKey, State);
 
 %% @doc MOTD request handler. Page number starts at 0.
 %% @todo Currently ignore the language and send the same MOTD file to everyone.

src/egs_sup.erl

@@ -57,6 +57,7 @@ init([]) ->
 		{egs_seasons, {egs_seasons, start_link, []}, permanent, 5000, worker, dynamic},
 		{egs_items_db, {egs_items_db, start_link, []}, permanent, 5000, worker, dynamic},
 		{egs_shops_db, {egs_shops_db, start_link, []}, permanent, 5000, worker, dynamic},
+		{egs_accounts, {egs_accounts, start_link, []}, permanent, 5000, worker, dynamic},
 		{egs_user_model, {egs_user_model, start_link, []}, permanent, 5000, worker, dynamic},
 		{egs_game_server, {egs_game_server, start_link, [GamePort]}, permanent, 5000, worker, dynamic}
 	],

src/egs_user_model.erl

@@ -19,7 +19,7 @@
 
 -module(egs_user_model).
 -behavior(gen_server).
--export([start_link/0, stop/0, count/0, read/1, select/1, write/1, delete/1, key_auth/3, login_auth/2, item_nth/2, item_add/3, item_qty_add/3, shop_enter/2, shop_leave/1, shop_get/1, money_add/2]). %% API.
+-export([start_link/0, stop/0, count/0, read/1, select/1, write/1, delete/1, item_nth/2, item_add/3, item_qty_add/3, shop_enter/2, shop_leave/1, shop_get/1, money_add/2]). %% API.
 -export([init/1, handle_call/3, handle_cast/2, handle_info/2, terminate/2, code_change/3]). %% gen_server.
 
 %% Use the module name for the server's name and for the table name.
@@ -68,12 +68,6 @@ write(User) ->
 delete(ID) ->
 	gen_server:cast(?SERVER, {delete, ID}).
 
-key_auth(GID, AuthKey, Socket) ->
-	gen_server:call(?SERVER, {key_auth, GID, AuthKey, Socket}).
-
-login_auth(Username, Password) ->
-	gen_server:call(?SERVER, {login_auth, Username, Password}).
-
 item_nth(GID, ItemIndex) ->
 	gen_server:call(?SERVER, {item_nth, GID, ItemIndex}).
 
@@ -98,7 +92,6 @@ money_add(GID, MoneyDiff) ->
 %% gen_server
 
 init([]) ->
-	timer:apply_interval(30000, gen_server, cast, [?SERVER, cleanup]),
 	error_logger:info_report("egs_user_model started"),
 	{ok, undefined}.
 
@@ -122,8 +115,7 @@ handle_call({read, ID}, _From, State) ->
 %% @todo state = undefined | {wait_for_authentication, Key} | authenticated | online
 handle_call({select, all}, _From, State) ->
 	List = do(qlc:q([X || X <- mnesia:table(?TABLE),
-		X#?TABLE.pid /= undefined,
-		X#?TABLE.state =:= online
+		X#?TABLE.pid /= undefined
 	])),
 	{reply, {ok, List}, State};
 
@@ -131,30 +123,11 @@ handle_call({select, {neighbors, User}}, _From, State) ->
 	List = do(qlc:q([X || X <- mnesia:table(?TABLE),
 		X#?TABLE.id /= User#?TABLE.id,
 		X#?TABLE.pid /= undefined,
-		X#?TABLE.state =:= online,
 		X#?TABLE.instancepid =:= User#?TABLE.instancepid,
 		X#?TABLE.area =:= User#?TABLE.area
 	])),
 	{reply, {ok, List}, State};
 
-%% @todo Handle LIDs properly, so not here.
-handle_call({key_auth, GID, AuthKey, Socket}, {Pid, _Tag}, State) ->
-	{atomic, [User]} = mnesia:transaction(fun() -> mnesia:read({?TABLE, GID}) end),
-	{wait_for_authentication, AuthKey} = User#egs_user_model.state,
-	LID = 1 + mnesia:dirty_update_counter(counters, lobby, 1) rem 1023,
-	Time = calendar:datetime_to_gregorian_seconds(calendar:universal_time()),
-	User2 = User#egs_user_model{pid=Pid, socket=Socket, state=authenticated, time=Time, lid=LID},
-	mnesia:transaction(fun() -> mnesia:write(User2) end),
-	{reply, ok, State};
-
-%% @todo Handle GIDs and accounts and login properly. We currently accept everyone and give a new GID each time.
-handle_call({login_auth, Username, Password}, _From, State) ->
-	AuthGID = 10000000 + mnesia:dirty_update_counter(counters, gid, 1),
-	AuthKey = crypto:rand_bytes(4),
-	Folder = << Username/binary, "-", Password/binary >>,
-	egs_user_model:write(#egs_user_model{id=AuthGID, state={wait_for_authentication, AuthKey}, folder=Folder}),
-	{reply, {ok, AuthGID, AuthKey}, State};
-
 handle_call({item_nth, GID, ItemIndex}, _From, State) ->
 	{atomic, [User]} = mnesia:transaction(fun() -> mnesia:read({?TABLE, GID}) end),
 	{reply, lists:nth(ItemIndex + 1, (User#egs_user_model.character)#characters.inventory), State};
@@ -214,19 +187,6 @@ handle_cast({delete, ID}, State) ->
 	mnesia:transaction(fun() -> mnesia:delete({?TABLE, ID}) end),
 	{noreply, State};
 
-%% @todo Cleanup more than the auth failures?
-handle_cast(cleanup, State) ->
-	Timeout = calendar:datetime_to_gregorian_seconds(calendar:universal_time()) - 300,
-	List = do(qlc:q([X#?TABLE.id || X <- mnesia:table(?TABLE),
-		X#?TABLE.state /= authenticated,
-		X#?TABLE.state /= online,
-		X#?TABLE.time < Timeout
-	])),
-	mnesia:transaction(fun() ->
-		lists:foreach(fun(ID) -> delete(ID) end, List)
-	end),
-	{noreply, State};
-
 %% @todo Consumable items.
 handle_cast({item_qty_add, GID, ItemIndex, QuantityDiff}, State) ->
 	{atomic, [User]} = mnesia:transaction(fun() -> mnesia:read({?TABLE, GID}) end),

src/psu/psu_game.erl

@@ -28,8 +28,7 @@
 %% @doc Load and send the character information to the client.
 %% @todo Should wait for the 021c reply before doing area_change.
 %% @todo Move this whole function directly to psu_proto, probably.
-char_load(User) ->
-	State = #state{socket=User#egs_user_model.socket, gid=User#egs_user_model.id, lid=User#egs_user_model.lid},
+char_load(User, State) ->
 	send_0d01(User),
 	% 0246
 	send_0a0a((User#egs_user_model.character)#characters.inventory),
@@ -177,16 +176,15 @@ area_load(AreaType, IsStart, SetID, OldUser, User, QuestFile, ZoneFile, AreaName
 	psu_proto:send_0236(State3),
 	if	User#egs_user_model.partypid =/= undefined, AreaType =:= mission ->
 			{ok, NPCList} = psu_party:get_npc(User#egs_user_model.partypid),
-			npc_load(User, NPCList);
+			npc_load(User, NPCList, State);
 		true -> ok
 	end,
 	{ok, State3}.
 
 %% @todo Don't change the NPC info unless you are the leader!
-npc_load(_Leader, []) ->
+npc_load(_Leader, [], _State) ->
 	ok;
-npc_load(Leader, [{PartyPos, NPCGID}|NPCList]) ->
-	State = #state{socket=Leader#egs_user_model.socket, gid=Leader#egs_user_model.id, lid=Leader#egs_user_model.lid},
+npc_load(Leader, [{PartyPos, NPCGID}|NPCList], State) ->
 	{ok, OldNPCUser} = egs_user_model:read(NPCGID),
 	#egs_user_model{instancepid=InstancePid, area=Area, entryid=EntryID, pos=Pos} = Leader,
 	NPCUser = OldNPCUser#egs_user_model{lid=PartyPos, instancepid=InstancePid, areatype=mission, area=Area, entryid=EntryID, pos=Pos},
@@ -201,7 +199,7 @@ npc_load(Leader, [{PartyPos, NPCGID}|NPCList]) ->
 	send_100f((NPCUser#egs_user_model.character)#characters.npcid, PartyPos),
 	send_1601(PartyPos),
 	send_1016(PartyPos),
-	npc_load(Leader, NPCList).
+	npc_load(Leader, NPCList, State).
 
 %% @doc Build the packet header.
 header(Command) ->

src/psu/psu_npc.erl

@@ -35,7 +35,7 @@ user_init(NPCid, BaseLevel) ->
 	#psu_npc{race=Race, gender=Gender, class=Class, level=LevelDiff, appearance=Appearance} = Settings,
 	Character = #characters{gid=NPCGID, slot=0, type=npc, npcid=NPCid, name=UCS2Name, race=Race, gender=Gender, class=Class, appearance=Appearance,
 		mainlevel={level, calc_level(BaseLevel, LevelDiff), 0}, blastbar=0, luck=2, money=0, playtime=0, stats={stats, 0, 0, 0, 0, 0, 0, 0}, se=[], currenthp=100, maxhp=100},
-	#egs_user_model{id=NPCGID, state=online, character=Character, areatype=lobby, area={psu_area, 0, 0, 0}, entryid=0,
+	#egs_user_model{id=NPCGID, character=Character, areatype=lobby, area={psu_area, 0, 0, 0}, entryid=0,
 		prev_area={psu_area, 0, 0, 0}, prev_entryid=0, pos={pos, 0.0, 0.0, 0.0, 0.0}}.
 
 calc_level(BaseLevel, LevelDiff) ->