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

psu_proto: Move send_1205 to psu_proto without reviewing it.

Browse Source
This commit is contained in:
Loïc Hoguin 2011-02-26 18:44:42 +01:00
parent 82e82503fa
commit fde0f8b3fe
3 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/egs_game.erl
View File

@ -100,7 +100,7 @@ cast(Command, Data, #client{gid=GID, lid=LID})
%% @todo Handle this packet properly.
%% @todo Spawn cleared response event shouldn't be handled following this packet but when we see the spawn actually dead HP-wise.
%% @todo Type shouldn't be :32 but it seems when the later 16 have something it's not a spawn event.
raw(16#0402, << _:352, Data/bits >>, #client{gid=GID}) ->
raw(16#0402, << _:352, Data/bits >>, Client=#client{gid=GID}) ->
<< SpawnID:32/little, _:64, Type:32/little, _:64 >> = Data,
case Type of
7 -> % spawn cleared @todo 1201 sent back with same values apparently, but not always
@ -108,7 +108,7 @@ raw(16#0402, << _:352, Data/bits >>, #client{gid=GID}) ->
{ok, User} = egs_users:read(GID),
{BlockID, EventID} = psu_instance:spawn_cleared_event(User#users.instancepid, element(2, User#users.area), SpawnID),
if EventID =:= false -> ignore;
true -> psu_game:send_1205(EventID, BlockID, 0)
true -> psu_proto:send_1205(EventID, BlockID, 0, Client)
end;
_ ->
ignore
@ -116,10 +116,10 @@ raw(16#0402, << _:352, Data/bits >>, #client{gid=GID}) ->
%% @todo Handle this packet.
%% @todo 3rd Unsafe Passage C, EventID 10 BlockID 2 = mission cleared?
raw(16#0404, << _:352, Data/bits >>, _Client) ->
raw(16#0404, << _:352, Data/bits >>, Client) ->
<< EventID:8, BlockID:8, _:16, Value:8, _/bits >> = Data,
log("unknown command 0404: eventid ~b blockid ~b value ~b", [EventID, BlockID, Value]),
psu_game:send_1205(EventID, BlockID, Value);
psu_proto:send_1205(EventID, BlockID, Value, Client);
%% @todo Used in the tutorial. Not sure what it does. Give an item (the PA) maybe?
%% @todo Probably should ignore that until more is known.
@ -176,7 +176,7 @@ raw(16#1106, << _:352, Data/bits >>, Client) ->
psu_proto:send_110e(Data, Client);
%% @doc Probably asking permission to start the video (used for syncing?).
raw(16#1112, << _:352, Data/bits >>, _Client) ->
raw(16#1112, << _:352, Data/bits >>, Client) ->
psu_proto:send_1113(Data, Client);
%% @todo Not sure yet. Value is probably a TargetID. Used in Airboard Rally. Replying with the same value starts the race.
@ -611,13 +611,13 @@ event({object_crystal_activate, ObjectID}, _Client) ->
psu_game:send_1213(ObjectID, 1);
%% @doc Server-side event.
event({object_event_trigger, BlockID, EventID}, _Client) ->
psu_game:send_1205(EventID, BlockID, 0);
event({object_event_trigger, BlockID, EventID}, Client) ->
psu_proto:send_1205(EventID, BlockID, 0, Client);
event({object_goggle_target_activate, ObjectID}, #client{gid=GID}) ->
event({object_goggle_target_activate, ObjectID}, Client=#client{gid=GID}) ->
{ok, User} = egs_users:read(GID),
{BlockID, EventID} = psu_instance:std_event(User#users.instancepid, element(2, User#users.area), ObjectID),
psu_game:send_1205(EventID, BlockID, 0),
psu_proto:send_1205(EventID, BlockID, 0, Client),
psu_game:send_1213(ObjectID, 8);
%% @todo Make NPC characters heal too.
@ -634,41 +634,41 @@ event({object_healing_pad_tick, [_PartyPos]}, Client=#client{gid=GID}) ->
psu_proto:send_0111(User2, 4, Client)
end;
event({object_key_console_enable, ObjectID}, #client{gid=GID}) ->
event({object_key_console_enable, ObjectID}, Client=#client{gid=GID}) ->
{ok, User} = egs_users:read(GID),
{BlockID, [EventID|_]} = psu_instance:std_event(User#users.instancepid, element(2, User#users.area), ObjectID),
psu_game:send_1205(EventID, BlockID, 0),
psu_proto:send_1205(EventID, BlockID, 0, Client),
psu_game:send_1213(ObjectID, 1);
event({object_key_console_init, ObjectID}, #client{gid=GID}) ->
event({object_key_console_init, ObjectID}, Client=#client{gid=GID}) ->
{ok, User} = egs_users:read(GID),
{BlockID, [_, EventID, _]} = psu_instance:std_event(User#users.instancepid, element(2, User#users.area), ObjectID),
psu_game:send_1205(EventID, BlockID, 0);
psu_proto:send_1205(EventID, BlockID, 0, Client);
event({object_key_console_open_gate, ObjectID}, #client{gid=GID}) ->
event({object_key_console_open_gate, ObjectID}, Client=#client{gid=GID}) ->
{ok, User} = egs_users:read(GID),
{BlockID, [_, _, EventID]} = psu_instance:std_event(User#users.instancepid, element(2, User#users.area), ObjectID),
psu_game:send_1205(EventID, BlockID, 0),
psu_proto:send_1205(EventID, BlockID, 0, Client),
psu_game:send_1213(ObjectID, 1);
%% @todo Now that it's separate from object_key_console_enable, handle it better than that, don't need a list of events.
event({object_key_enable, ObjectID}, #client{gid=GID}) ->
event({object_key_enable, ObjectID}, Client=#client{gid=GID}) ->
{ok, User} = egs_users:read(GID),
{BlockID, [EventID|_]} = psu_instance:std_event(User#users.instancepid, element(2, User#users.area), ObjectID),
psu_game:send_1205(EventID, BlockID, 0),
psu_proto:send_1205(EventID, BlockID, 0, Client),
psu_game:send_1213(ObjectID, 1);
%% @todo Some switch objects apparently work differently, like the light switch in Mines in MAG'.
event({object_switch_off, ObjectID}, #client{gid=GID}) ->
event({object_switch_off, ObjectID}, Client=#client{gid=GID}) ->
{ok, User} = egs_users:read(GID),
{BlockID, EventID} = psu_instance:std_event(User#users.instancepid, element(2, User#users.area), ObjectID),
psu_game:send_1205(EventID, BlockID, 1),
psu_proto:send_1205(EventID, BlockID, 1, Client),
psu_game:send_1213(ObjectID, 0);
event({object_switch_on, ObjectID}, #client{gid=GID}) ->
event({object_switch_on, ObjectID}, Client=#client{gid=GID}) ->
{ok, User} = egs_users:read(GID),
{BlockID, EventID} = psu_instance:std_event(User#users.instancepid, element(2, User#users.area), ObjectID),
psu_game:send_1205(EventID, BlockID, 0),
psu_proto:send_1205(EventID, BlockID, 0, Client),
psu_game:send_1213(ObjectID, 1);
event({object_vehicle_boost_enable, ObjectID}, _Client) ->

5
src/psu/psu_game.erl
View File

@ -337,11 +337,6 @@ send_1016(PartyPos) ->
GID = get(gid),
send(<< 16#10160300:32, 16#ffff0000:32, 0:128, 16#00011300:32, GID:32/little, 0:64, PartyPos:32/little >>).
%% @doc Object events response?
%% @todo Not sure what Value does exactly. It's either 0 or 1.
send_1205(EventID, BlockID, Value) ->
send(<< (header(16#1205))/binary, EventID, BlockID, 0:16, Value, 0:24 >>).
%% @todo Figure out what this packet does. Sane values for counter and missions for now.
send_1206() ->
send(<< (header(16#1206))/binary, 0:32, 16#80020000:32, 0:5120 >>).

6
src/psu/psu_proto.erl
View File

@ -1583,6 +1583,12 @@ send_1202(#client{socket=Socket, gid=DestGID}) ->
send_1204(#client{socket=Socket, gid=DestGID, lid=DestLID}) ->
packet_send(Socket, << 16#12040300:32, DestLID:16/little, 0:144, 16#00011300:32, DestGID:32/little, 0:96, 16#20000000:32, 0:256 >>).
%% @doc Object events response?
%% @todo Not sure what Value does exactly. It's either 0 or 1.
%% @todo This packet hasn't been reviewed at all yet.
send_1205(EventID, BlockID, Value, #client{socket=Socket, gid=DestGID}) ->
packet_send(Socket, << 16#12050300:32, 16#ffff:16, 0:144, 16#00011300:32, DestGID:32/little, 0:64, EventID, BlockID, 0:16, Value, 0:24 >>).
%% @doc Send the player's partner card.
%% @todo Handle the LID and comment properly.
send_1500(Character, #client{socket=Socket, gid=DestGID}) ->