Sancaros/egs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

egs_users: Rename id into gid inside the users record.

Browse Source
This commit is contained in:
Loïc Hoguin 2011-02-13 00:35:05 +01:00
parent 098ad5243a
commit a484de77e0
9 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/records.hrl
View File

@ -56,7 +56,7 @@
%% @todo Probably can use a "param" or "extra" field to store the game-specific information (for things that don't need to be queried). %% @todo Probably can use a "param" or "extra" field to store the game-specific information (for things that don't need to be queried).
-record(users, { -record(users, {
%% General information. %% General information.
id :: integer(), %% @todo Rename into gid. gid :: integer(),
lid :: non_neg_integer(), lid :: non_neg_integer(),
pid :: pid(), pid :: pid(),
time :: integer(), time :: integer(),

10
src/egs_game.erl
View File

@ -233,7 +233,7 @@ event({chat, _FromTypeID, FromGID, _FromName, Modifiers, ChatMsg}, #state{gid=Us
ignore; ignore;
UserGID -> %% player chat: disregard whatever was sent except modifiers and message. UserGID -> %% player chat: disregard whatever was sent except modifiers and message.
{ok, User} = egs_users:read(UserGID), {ok, User} = egs_users:read(UserGID),
[16#00001200, User#users.id, (User#users.character)#characters.name]; [16#00001200, User#users.gid, (User#users.character)#characters.name];
NPCGID -> %% npc chat: @todo Check that the player is the party leader and this npc is in his party. NPCGID -> %% npc chat: @todo Check that the player is the party leader and this npc is in his party.
{ok, User} = egs_users:read(NPCGID), {ok, User} = egs_users:read(NPCGID),
[16#00001d00, FromGID, (User#users.character)#characters.name] [16#00001d00, FromGID, (User#users.character)#characters.name]
@ -478,7 +478,7 @@ event({npc_force_invite, NPCid}, State=#state{gid=GID}) ->
PartyPid -> PartyPid ->
ignore ignore
end, end,
{ok, PartyPos} = psu_party:join(PartyPid, npc, TmpNPCUser#users.id), {ok, PartyPos} = psu_party:join(PartyPid, npc, TmpNPCUser#users.gid),
#users{instancepid=InstancePid, area=Area, entryid=EntryID, pos=Pos} = User, #users{instancepid=InstancePid, area=Area, entryid=EntryID, pos=Pos} = User,
NPCUser = TmpNPCUser#users{lid=PartyPos, partypid=PartyPid, instancepid=InstancePid, areatype=mission, area=Area, entryid=EntryID, pos=Pos}, NPCUser = TmpNPCUser#users{lid=PartyPos, partypid=PartyPid, instancepid=InstancePid, areatype=mission, area=Area, entryid=EntryID, pos=Pos},
egs_users:write(NPCUser), egs_users:write(NPCUser),
@ -490,7 +490,7 @@ event({npc_force_invite, NPCid}, State=#state{gid=GID}) ->
psu_proto:send_010d(SentNPCUser, State), psu_proto:send_010d(SentNPCUser, State),
psu_proto:send_0201(SentNPCUser, State), psu_proto:send_0201(SentNPCUser, State),
psu_proto:send_0215(0, State), psu_proto:send_0215(0, State),
psu_game:send_0a04(SentNPCUser#users.id), psu_game:send_0a04(SentNPCUser#users.gid),
psu_game:send_022c(0, 16#12), psu_game:send_022c(0, 16#12),
psu_game:send_1004(npc_mission, SentNPCUser, PartyPos), psu_game:send_1004(npc_mission, SentNPCUser, PartyPos),
psu_game:send_100f((SentNPCUser#users.character)#characters.npcid, PartyPos), psu_game:send_100f((SentNPCUser#users.character)#characters.npcid, PartyPos),
@ -510,7 +510,7 @@ event({npc_invite, NPCid}, #state{gid=GID}) ->
PartyPid -> PartyPid ->
ignore ignore
end, end,
{ok, PartyPos} = psu_party:join(PartyPid, npc, TmpNPCUser#users.id), {ok, PartyPos} = psu_party:join(PartyPid, npc, TmpNPCUser#users.gid),
NPCUser = TmpNPCUser#users{lid=PartyPos, partypid=PartyPid}, NPCUser = TmpNPCUser#users{lid=PartyPos, partypid=PartyPid},
egs_users:write(NPCUser), egs_users:write(NPCUser),
egs_users:write(User#users{partypid=PartyPid}), egs_users:write(User#users{partypid=PartyPid}),
@ -766,7 +766,7 @@ event({unicube_select, Selection, EntryID}, State=#state{gid=GID}) ->
undefined -> ignore; undefined -> ignore;
PartyPid -> PartyPid ->
%% @todo Replace stop by leave when leaving stops the party correctly when nobody's there anymore. %% @todo Replace stop by leave when leaving stops the party correctly when nobody's there anymore.
%~ psu_party:leave(User#users.partypid, User#users.id) %~ psu_party:leave(User#users.partypid, User#users.gid)
{ok, NPCList} = psu_party:get_npc(PartyPid), {ok, NPCList} = psu_party:get_npc(PartyPid),
[egs_users:delete(NPCGID) || {_Spot, NPCGID} <- NPCList], [egs_users:delete(NPCGID) || {_Spot, NPCGID} <- NPCList],
psu_party:stop(PartyPid) psu_party:stop(PartyPid)

4
src/egs_game_server.erl
View File

@ -45,7 +45,7 @@ on_exit(Pid) ->
[egs_users:delete(NPCGID) || {_Spot, NPCGID} <- NPCList], [egs_users:delete(NPCGID) || {_Spot, NPCGID} <- NPCList],
psu_party:stop(PartyPid) psu_party:stop(PartyPid)
end, end,
egs_users:delete(User#users.id), egs_users:delete(User#users.gid),
case User#users.uni of case User#users.uni of
undefined -> undefined ->
ignore; ignore;
@ -54,7 +54,7 @@ on_exit(Pid) ->
{ok, List} = egs_users:select({neighbors, User}), {ok, List} = egs_users:select({neighbors, User}),
lists:foreach(fun(Other) -> Other#users.pid ! {egs, player_unspawn, User} end, List) lists:foreach(fun(Other) -> Other#users.pid ! {egs, player_unspawn, User} end, List)
end, end,
io:format("game (~p): quit~n", [User#users.id]); io:format("game (~p): quit~n", [User#users.gid]);
{error, _Reason} -> {error, _Reason} ->
ignore ignore
end. end.

2
src/egs_login.erl
View File

@ -67,7 +67,7 @@ event(system_game_server_request, State=#state{socket=Socket}) ->
event({system_key_auth_request, AuthGID, AuthKey}, State=#state{socket=Socket}) -> event({system_key_auth_request, AuthGID, AuthKey}, State=#state{socket=Socket}) ->
egs_accounts:key_auth(AuthGID, AuthKey), egs_accounts:key_auth(AuthGID, AuthKey),
LID = 1 + mnesia:dirty_update_counter(counters, lobby, 1) rem 1023, LID = 1 + mnesia:dirty_update_counter(counters, lobby, 1) rem 1023,
egs_users:write(#users{id=AuthGID, pid=self(), lid=LID}), egs_users:write(#users{gid=AuthGID, pid=self(), lid=LID}),
put(socket, Socket), put(socket, Socket),
put(gid, AuthGID), put(gid, AuthGID),
State2 = State#state{gid=AuthGID}, State2 = State#state{gid=AuthGID},

2
src/egs_npc_db.erl
View File

@ -68,7 +68,7 @@ handle_call({create, NPCid, BaseLevel}, _From, State) ->
UCS2Name = << TmpUCS2Name/binary, 0:Padding >>, UCS2Name = << TmpUCS2Name/binary, 0:Padding >>,
Character = #characters{gid=NPCGID, slot=0, type=npc, npcid=NPCid, name=UCS2Name, race=Race, gender=Gender, class=Class, appearance=Appearance, 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}, 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},
User = #users{id=NPCGID, character=Character, areatype=lobby, area={0, 0, 0}, entryid=0}, User = #users{gid=NPCGID, character=Character, areatype=lobby, area={0, 0, 0}, entryid=0},
{reply, User, State}; {reply, User, State};
handle_call(stop, _From, State) -> handle_call(stop, _From, State) ->

2
src/egs_users.erl
View File

@ -58,7 +58,7 @@ select(all) ->
{ok, List}; {ok, List};
select({neighbors, User}) -> select({neighbors, User}) ->
List = do(qlc:q([X || X <- mnesia:table(?TABLE), List = do(qlc:q([X || X <- mnesia:table(?TABLE),
X#?TABLE.id /= User#?TABLE.id, X#?TABLE.gid /= User#?TABLE.gid,
X#?TABLE.pid /= undefined, X#?TABLE.pid /= undefined,
X#?TABLE.instancepid =:= User#?TABLE.instancepid, X#?TABLE.instancepid =:= User#?TABLE.instancepid,
X#?TABLE.area =:= User#?TABLE.area X#?TABLE.area =:= User#?TABLE.area

2
src/psu/psu_characters.erl
View File

@ -45,7 +45,7 @@ character_tuple_to_binary(Tuple) ->
%% @todo The value before IntDir seems to be the player's current animation. 01 stand up, 08 ?, 17 normal sit %% @todo The value before IntDir seems to be the player's current animation. 01 stand up, 08 ?, 17 normal sit
character_user_to_binary(User) -> character_user_to_binary(User) ->
#users{id=CharGID, lid=CharLID, character=Character, pos={X, Y, Z, Dir}, area={QuestID, ZoneID, MapID}, entryid=EntryID, #users{gid=CharGID, lid=CharLID, character=Character, pos={X, Y, Z, Dir}, area={QuestID, ZoneID, MapID}, entryid=EntryID,
prev_area={PrevQuestID, PrevZoneID, PrevMapID}, prev_entryid=PrevEntryID} = User, prev_area={PrevQuestID, PrevZoneID, PrevMapID}, prev_entryid=PrevEntryID} = User,
#characters{npcid=NPCid, type=Type, mainlevel=Level, stats=Stats, se=SE, currenthp=CurrentHP, maxhp=MaxHP} = Character, #characters{npcid=NPCid, type=Type, mainlevel=Level, stats=Stats, se=SE, currenthp=CurrentHP, maxhp=MaxHP} = Character,
#level{number=LV} = Level, #level{number=LV} = Level,

6
src/psu/psu_game.erl
View File

@ -205,7 +205,7 @@ npc_load(Leader, [{PartyPos, NPCGID}|NPCList], State) ->
psu_proto:send_010d(NPCUser, State), psu_proto:send_010d(NPCUser, State),
psu_proto:send_0201(NPCUser, State), psu_proto:send_0201(NPCUser, State),
psu_proto:send_0215(0, State), psu_proto:send_0215(0, State),
send_0a04(NPCUser#users.id), send_0a04(NPCUser#users.gid),
send_1004(npc_mission, NPCUser, PartyPos), send_1004(npc_mission, NPCUser, PartyPos),
send_100f((NPCUser#users.character)#characters.npcid, PartyPos), send_100f((NPCUser#users.character)#characters.npcid, PartyPos),
send_1601(PartyPos), send_1601(PartyPos),
@ -263,7 +263,7 @@ send_022c(A, B) ->
%% @todo The value before IntDir seems to be the player's current animation. 01 stand up, 08 ?, 17 normal sit %% @todo The value before IntDir seems to be the player's current animation. 01 stand up, 08 ?, 17 normal sit
send_0503({PrevX, PrevY, PrevZ, _AnyDir}) -> send_0503({PrevX, PrevY, PrevZ, _AnyDir}) ->
{ok, User} = egs_users:read(get(gid)), {ok, User} = egs_users:read(get(gid)),
#users{id=GID, pos={X, Y, Z, Dir}, area={QuestID, ZoneID, MapID}, entryid=EntryID} = User, #users{gid=GID, pos={X, Y, Z, Dir}, area={QuestID, ZoneID, MapID}, entryid=EntryID} = User,
IntDir = trunc(Dir * 182.0416), IntDir = trunc(Dir * 182.0416),
send(<< 16#05030300:32, 0:64, GID:32/little-unsigned-integer, 0:64, 16#00011300:32, GID:32/little-unsigned-integer, 0:64, GID:32/little-unsigned-integer, 0:32, send(<< 16#05030300:32, 0:64, GID:32/little-unsigned-integer, 0:64, 16#00011300:32, GID:32/little-unsigned-integer, 0:64, GID:32/little-unsigned-integer, 0:32,
16#1000:16, IntDir:16/little-unsigned-integer, PrevX:32/little-float, PrevY:32/little-float, PrevZ:32/little-float, X:32/little-float, Y:32/little-float, Z:32/little-float, 16#1000:16, IntDir:16/little-unsigned-integer, PrevX:32/little-float, PrevY:32/little-float, PrevZ:32/little-float, X:32/little-float, Y:32/little-float, Z:32/little-float,
@ -406,7 +406,7 @@ send_1004(Type, User, PartyPos) ->
end, end,
UserGID = get(gid), UserGID = get(gid),
#users{id=GID, character=Character, area={QuestID, ZoneID, MapID}, entryid=EntryID} = User, #users{gid=GID, character=Character, area={QuestID, ZoneID, MapID}, entryid=EntryID} = User,
#characters{npcid=NPCid, name=Name, mainlevel=MainLevel} = Character, #characters{npcid=NPCid, name=Name, mainlevel=MainLevel} = Character,
Level = MainLevel#level.number, Level = MainLevel#level.number,
send(<< 16#10040300:32, 16#ffff0000:32, 0:128, 16#00011300:32, UserGID:32/little-unsigned-integer, 0:64, send(<< 16#10040300:32, 16#ffff0000:32, 0:128, 16#00011300:32, UserGID:32/little-unsigned-integer, 0:64,

14
src/psu/psu_proto.erl
View File

@ -1198,7 +1198,7 @@ parse_hits(Hits, Acc) ->
%% @todo Probably don't pattern match the data like this... %% @todo Probably don't pattern match the data like this...
%% @todo Handle the DestLID properly. %% @todo Handle the DestLID properly.
send_010d(CharUser, #state{socket=Socket, gid=DestGID}) -> send_010d(CharUser, #state{socket=Socket, gid=DestGID}) ->
CharGID = CharUser#users.id, CharGID = CharUser#users.gid,
CharLID = CharUser#users.lid, CharLID = CharUser#users.lid,
<< _:640, CharBin/bits >> = psu_characters:character_user_to_binary(CharUser), << _:640, CharBin/bits >> = psu_characters:character_user_to_binary(CharUser),
packet_send(Socket, << 16#010d0300:32, 0:160, 16#00011300:32, DestGID:32/little, packet_send(Socket, << 16#010d0300:32, 0:160, 16#00011300:32, DestGID:32/little,
@ -1208,14 +1208,14 @@ send_010d(CharUser, #state{socket=Socket, gid=DestGID}) ->
%% @doc Trigger a character-related event. %% @doc Trigger a character-related event.
send_0111(CharUser, EventID, State) -> send_0111(CharUser, EventID, State) ->
send_0111(CharUser, EventID, 0, State). send_0111(CharUser, EventID, 0, State).
send_0111(#users{id=CharGID, lid=CharLID}, EventID, Param, #state{socket=Socket, gid=DestGID, lid=DestLID}) -> send_0111(#users{gid=CharGID, lid=CharLID}, EventID, Param, #state{socket=Socket, gid=DestGID, lid=DestLID}) ->
packet_send(Socket, << 16#01110300:32, DestLID:16/little, 0:48, CharGID:32/little, 0:64, 16#00011300:32, DestGID:32/little, 0:64, packet_send(Socket, << 16#01110300:32, DestLID:16/little, 0:48, CharGID:32/little, 0:64, 16#00011300:32, DestGID:32/little, 0:64,
CharGID:32/little, CharLID:32/little, EventID:32/little, Param:32/little >>). CharGID:32/little, CharLID:32/little, EventID:32/little, Param:32/little >>).
%% @doc Update the character level, blastbar, luck and money information. %% @doc Update the character level, blastbar, luck and money information.
send_0115(CharUser, State) -> send_0115(CharUser, State) ->
send_0115(CharUser, 16#ffffffff, State). send_0115(CharUser, 16#ffffffff, State).
send_0115(#users{id=CharGID, lid=CharLID, character=Character}, EnemyTargetID, #state{socket=Socket, gid=DestGID, lid=DestLID}) -> send_0115(#users{gid=CharGID, lid=CharLID, character=Character}, EnemyTargetID, #state{socket=Socket, gid=DestGID, lid=DestLID}) ->
packet_send(Socket, << 16#01150300:32, DestLID:16/little, 0:48, CharGID:32/little, 0:64, 16#00011300:32, DestGID:32/little, 0:64, packet_send(Socket, << 16#01150300:32, DestLID:16/little, 0:48, CharGID:32/little, 0:64, 16#00011300:32, DestGID:32/little, 0:64,
CharGID:32/little, CharLID:32/little, EnemyTargetID:32/little, (build_char_level(Character))/binary >>). CharGID:32/little, CharLID:32/little, EnemyTargetID:32/little, (build_char_level(Character))/binary >>).
@ -1235,7 +1235,7 @@ build_char_level(#characters{type=Type, mainlevel=#level{number=Level, exp=EXP},
%% @doc Revive player with optional SEs. %% @doc Revive player with optional SEs.
%% @todo SEs. %% @todo SEs.
send_0117(#users{id=CharGID, lid=CharLID, character=#characters{currenthp=HP}}, #state{socket=Socket, gid=DestGID, lid=DestLID}) -> send_0117(#users{gid=CharGID, lid=CharLID, character=#characters{currenthp=HP}}, #state{socket=Socket, gid=DestGID, lid=DestLID}) ->
SE = << 0:64 >>, SE = << 0:64 >>,
packet_send(Socket, << 16#01170300:32, DestLID:16/little, 0:48, CharGID:32/little, 0:64, 16#00011300:32, DestGID:32/little, 0:64, packet_send(Socket, << 16#01170300:32, DestLID:16/little, 0:48, CharGID:32/little, 0:64, 16#00011300:32, DestGID:32/little, 0:64,
CharGID:32/little, CharLID:32/little, SE/binary, HP:32/little, 0:32 >>). CharGID:32/little, CharLID:32/little, SE/binary, HP:32/little, 0:32 >>).
@ -1259,7 +1259,7 @@ send_0201(CharUser, #state{socket=Socket, gid=DestGID}) ->
npc -> [16#00001d00, 255]; npc -> [16#00001d00, 255];
_ -> [16#00001200, 0] _ -> [16#00001200, 0]
end, end,
CharGID = CharUser#users.id, CharGID = CharUser#users.gid,
CharBin = psu_characters:character_user_to_binary(CharUser), CharBin = psu_characters:character_user_to_binary(CharUser),
IsGM = 0, IsGM = 0,
OnlineStatus = 0, OnlineStatus = 0,
@ -1273,7 +1273,7 @@ send_0202(#state{socket=Socket, gid=DestGID, lid=DestLID}) ->
%% @doc Spawn a player with the given GID and LID. %% @doc Spawn a player with the given GID and LID.
%% @todo Handle the LID properly. %% @todo Handle the LID properly.
send_0203(#users{id=CharGID, lid=CharLID}, #state{socket=Socket, gid=DestGID}) -> send_0203(#users{gid=CharGID, lid=CharLID}, #state{socket=Socket, gid=DestGID}) ->
packet_send(Socket, << 16#02030300:32, 0:160, 16#00011300:32, packet_send(Socket, << 16#02030300:32, 0:160, 16#00011300:32,
DestGID:32/little, 0:64, CharGID:32/little, CharLID:32/little >>). DestGID:32/little, 0:64, CharGID:32/little, CharLID:32/little >>).
@ -1285,7 +1285,7 @@ send_0204(User, #state{socket=Socket, gid=DestGID}) ->
npc -> 16#00001d00; npc -> 16#00001d00;
_ -> 16#00001200 _ -> 16#00001200
end, end,
#users{id=CharGID, lid=CharLID} = User, #users{gid=CharGID, lid=CharLID} = User,
packet_send(Socket, << 16#02040300:32, 0:32, CharTypeID:32, CharGID:32/little, 0:64, packet_send(Socket, << 16#02040300:32, 0:32, CharTypeID:32, CharGID:32/little, 0:64,
16#00011300:32, DestGID:32/little, 0:64, CharGID:32/little, CharLID:32/little, 100:32/little >>). 16#00011300:32, DestGID:32/little, 0:64, CharGID:32/little, CharLID:32/little, 100:32/little >>).