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

psu_proto: Review and move send_100e to psu_proto. Fix NPC location bug and missing name at Mina and Parum GUARDIANS.

Browse Source
This commit is contained in:
Loïc Hoguin 2010-09-25 21:46:04 +02:00
parent 44f39528b8
commit 0b497aeae4
3 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/egs_game.erl
View File

@ -258,7 +258,6 @@ event({counter_enter, CounterID, FromZoneID, FromMapID, FromEntryID}, State=#sta
FromArea = {psu_area, OldArea#psu_area.questid, FromZoneID, FromMapID},
User = OldUser#egs_user_model{areatype=counter, area={psu_area, 16#7fffffff, 0, 0}, entryid=0, prev_area=FromArea, prev_entryid=FromEntryID},
egs_user_model:write(User),
AreaName = "Counter",
QuestFile = "data/lobby/counter.quest.nbl",
ZoneFile = "data/lobby/counter.zone.nbl",
%% broadcast unspawn to other people
@ -273,7 +272,7 @@ event({counter_enter, CounterID, FromZoneID, FromMapID, FromEntryID}, State=#sta
psu_proto:send_020f(ZoneFile, 0, 255, State),
State2 = State#state{areanb=State#state.areanb + 1},
psu_proto:send_0205(User, 0, State2),
psu_game:send_100e(16#7fffffff, 0, 0, AreaName, CounterID),
psu_proto:send_100e(CounterID, "Counter", State2),
psu_proto:send_0215(0, State2),
psu_proto:send_0215(0, State2),
psu_proto:send_020c(State2),

17
src/psu/psu_game.erl
View File

@ -167,7 +167,7 @@ area_load(AreaType, IsStart, SetID, OldUser, User, QuestFile, ZoneFile, AreaName
end,
State2 = State#state{areanb=State#state.areanb + 1},
psu_proto:send_0205(User, IsSeasonal, State2),
send_100e(QuestID, ZoneID, (User#egs_user_model.area)#psu_area.mapid, AreaName, 16#ffffffff),
psu_proto:send_100e(User#egs_user_model.area, User#egs_user_model.entryid, AreaName, State2),
if AreaType =:= mission ->
psu_proto:send_0215(0, State2),
if IsStart =:= true ->
@ -567,21 +567,6 @@ send_1005(Name) ->
GID = get(gid),
send(<< 16#10050300:32, 16#ffff:16, 0:144, 16#00011300:32, GID:32/little, 0:64, Before/binary, GID:32/little, 0:64, Name/binary, After/binary >>).
%% @doc Send the player's current location.
send_100e(QuestID, ZoneID, MapID, Location, CounterID) ->
GID = get(gid),
UCS2Location = << << X:8, 0:8 >> || X <- Location >>,
Packet = << 16#100e0300:32, 16#ffffffbf:32, 0:128, 16#00011300:32, GID:32/little, 0:64,
1:32/little, MapID:16/little, ZoneID:16/little, QuestID:32/little, UCS2Location/binary >>,
PaddingSize = (128 - byte_size(Packet) - 8) * 8,
case CounterID of
16#ffffffff ->
Footer = << CounterID:32/little-unsigned-integer, 0:32 >>;
_ ->
Footer = << CounterID:32/little-unsigned-integer, 1:32/little-unsigned-integer >>
end,
send(<< Packet/binary, 0:PaddingSize, Footer/binary >>).
%% @todo No idea. Also the 2 PartyPos in the built packet more often than not match, but sometimes don't? That's probably because one is PartyPos and the other is LID or something.
send_100f(NPCid, PartyPos) ->
send(<< (header(16#100f))/binary, NPCid:16/little-unsigned-integer, 1, PartyPos:8, PartyPos:32/little-unsigned-integer >>).

19
src/psu/psu_proto.erl
View File

@ -1363,6 +1363,25 @@ send_1006(EventID, State) ->
send_1006(EventID, PartyPos, #state{socket=Socket, gid=DestGID}) ->
packet_send(Socket, << 16#10060300:32, 16#ffff:16, 0:144, 16#00011300:32, DestGID:32/little, 0:64, EventID:8, PartyPos:8, 0:16 >>).
%% @doc Send the player's current location.
%% @todo Handle PartyPos.
%% @todo Receive the AreaName as UCS2 directly to allow for color codes and the like.
%% @todo Handle TargetLID probably (right after the padding).
send_100e(CounterID, AreaName, #state{socket=Socket, gid=DestGID}) ->
PartyPos = 0,
UCS2Name = << << X:8, 0:8 >> || X <- AreaName >>,
Padding = 8 * (64 - byte_size(UCS2Name)),
CounterType = if CounterID =:= 16#ffffffff -> 2; true -> 1 end,
packet_send(Socket, << 16#100e0300:32, 16#ffffffbf:32, 0:128, 16#00011300:32, DestGID:32, 0:64,
1, PartyPos, 0:48, 16#ffffff7f:32, UCS2Name/binary, 0:Padding, 0:32, CounterID:32/little, CounterType:32/little >>).
send_100e(#psu_area{questid=QuestID, zoneid=ZoneID, mapid=MapID}, EntryID, AreaName, #state{socket=Socket, gid=DestGID}) ->
PartyPos = 0,
UCS2Name = << << X:8, 0:8 >> || X <- AreaName >>,
Padding = 8 * (64 - byte_size(UCS2Name)),
packet_send(Socket, << 16#100e0300:32, 16#ffffffbf:32, 0:128, 16#00011300:32, DestGID:32, 0:64,
1, PartyPos, ZoneID:16/little, MapID:16/little, EntryID:16/little, QuestID:32/little,
UCS2Name/binary, 0:Padding, 0:32, 16#ffffffff:32, 0:32 >>).
%% @doc Mission start related.
send_1020(#state{socket=Socket, gid=DestGID}) ->
packet_send(Socket, << 16#10200300:32, 16#ffff:16, 0:144, 16#00011300:32, DestGID:32/little, 0:64 >>).