psu_proto: Handle that auto incremented area-related number properly.
This commit is contained in:
Loïc Hoguin
parent
a93c620a17
commit
74c491380d
@ -18,7 +18,7 @@
|
||||
%% along with EGS. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
%% @doc Per-process state used by the various EGS modules.
|
||||
-record(state, {socket, gid, lid=16#ffff}).
|
||||
-record(state, {socket, gid, lid=16#ffff, areanb=0}).
|
||||
|
||||
%% @doc Table containing counters current values.
|
||||
-record(counters, {name, id}).
|
||||
|
||||
@ -200,11 +200,11 @@ raw(Command, _Data, State) ->
|
||||
%% @todo Probably move area_load inside the event and make other events call this one when needed.
|
||||
event({area_change, QuestID, ZoneID, MapID, EntryID}, State) ->
|
||||
event({area_change, QuestID, ZoneID, MapID, EntryID, 16#ffffffff}, State);
|
||||
event({area_change, QuestID, ZoneID, MapID, EntryID, PartyPos}, _State) ->
|
||||
event({area_change, QuestID, ZoneID, MapID, EntryID, PartyPos}, State) ->
|
||||
case PartyPos of
|
||||
16#ffffffff ->
|
||||
log("area change (~b,~b,~b,~b,~b)", [QuestID, ZoneID, MapID, EntryID, PartyPos]),
|
||||
psu_game:area_load(QuestID, ZoneID, MapID, EntryID);
|
||||
psu_game:area_load(QuestID, ZoneID, MapID, EntryID, State);
|
||||
_Any -> %% @todo Handle area_change event for NPCs in story missions.
|
||||
ignore
|
||||
end;
|
||||
@ -271,24 +271,27 @@ event({counter_enter, CounterID, FromZoneID, FromMapID, FromEntryID}, State=#sta
|
||||
psu_proto:send_010d(User#egs_user_model{lid=0}, State),
|
||||
psu_game:send_0200(mission),
|
||||
psu_proto:send_020f(ZoneFile, 0, 255, State),
|
||||
psu_proto:send_0205(User, 0, 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_0215(0, State),
|
||||
psu_proto:send_0215(0, State),
|
||||
psu_proto:send_020c(State),
|
||||
psu_proto:send_0215(0, State2),
|
||||
psu_proto:send_0215(0, State2),
|
||||
psu_proto:send_020c(State2),
|
||||
psu_game:send_1202(),
|
||||
psu_game:send_1204(),
|
||||
psu_game:send_1206(),
|
||||
psu_game:send_1207(),
|
||||
psu_game:send_1212(),
|
||||
psu_proto:send_0201(User#egs_user_model{lid=0}, State),
|
||||
psu_proto:send_0201(User#egs_user_model{lid=0}, State2),
|
||||
psu_game:send_0a06(),
|
||||
case User#egs_user_model.partypid of
|
||||
undefined -> ignore;
|
||||
_ -> psu_game:send_022c(0, 16#12)
|
||||
end,
|
||||
psu_proto:send_0208(State),
|
||||
psu_game:send_0236();
|
||||
State3 = State2#state{areanb=State2#state.areanb + 1},
|
||||
psu_proto:send_0208(State3),
|
||||
psu_game:send_0236(),
|
||||
{ok, State3};
|
||||
|
||||
%% @doc Leave mission counter handler.
|
||||
event(counter_leave, State=#state{gid=GID}) ->
|
||||
|
||||
@ -86,7 +86,7 @@ area_get_season(QuestID) ->
|
||||
end.
|
||||
|
||||
%% @doc Load the given map as a standard lobby.
|
||||
area_load(QuestID, ZoneID, MapID, EntryID) ->
|
||||
area_load(QuestID, ZoneID, MapID, EntryID, State) ->
|
||||
{ok, OldUser} = egs_user_model:read(get(gid)),
|
||||
[{type, AreaType}, {file, QuestFile}|MissionInfo] = proplists:get_value(QuestID, ?QUESTS, [{type, undefined}, {file, undefined}]),
|
||||
[IsStart, RealZoneID, RealMapID, RealEntryID, NbSetsInQuest] = case AreaType of
|
||||
@ -121,10 +121,9 @@ area_load(QuestID, ZoneID, MapID, EntryID) ->
|
||||
User = OldUser#egs_user_model{instancepid=InstancePid, areatype=AreaType, area={psu_area, QuestID, RealZoneID, RealMapID}, entryid=RealEntryID},
|
||||
egs_user_model:write(User),
|
||||
RealSetID = if SetID > NbSetsInZone - 1 -> NbSetsInZone - 1; true -> SetID end,
|
||||
area_load(AreaType, IsStart, RealSetID, OldUser, User, QuestFile, ZoneFile, AreaName).
|
||||
area_load(AreaType, IsStart, RealSetID, OldUser, User, QuestFile, ZoneFile, AreaName, State).
|
||||
|
||||
area_load(AreaType, IsStart, SetID, OldUser, User, QuestFile, ZoneFile, AreaName) ->
|
||||
State = #state{socket=User#egs_user_model.socket, gid=User#egs_user_model.id, lid=User#egs_user_model.lid},
|
||||
area_load(AreaType, IsStart, SetID, OldUser, User, QuestFile, ZoneFile, AreaName, State) ->
|
||||
#psu_area{questid=OldQuestID, zoneid=OldZoneID} = OldUser#egs_user_model.area,
|
||||
#psu_area{questid=QuestID, zoneid=ZoneID, mapid=_MapID} = User#egs_user_model.area,
|
||||
QuestChange = if OldQuestID /= QuestID, QuestFile /= undefined -> true; true -> false end,
|
||||
@ -166,17 +165,18 @@ area_load(AreaType, IsStart, SetID, OldUser, User, QuestFile, ZoneFile, AreaName
|
||||
psu_proto:send_020f(ZoneFile, SetID, SeasonID, State);
|
||||
true -> ignore
|
||||
end,
|
||||
psu_proto:send_0205(User, IsSeasonal, State),
|
||||
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),
|
||||
if AreaType =:= mission ->
|
||||
psu_proto:send_0215(0, State),
|
||||
psu_proto:send_0215(0, State2),
|
||||
if IsStart =:= true ->
|
||||
psu_proto:send_0215(0, State),
|
||||
psu_proto:send_0215(0, State2),
|
||||
send_0c09();
|
||||
true -> ignore
|
||||
end;
|
||||
true ->
|
||||
psu_proto:send_020c(State)
|
||||
psu_proto:send_020c(State2)
|
||||
end,
|
||||
if ZoneChange =:= true ->
|
||||
case AreaType of
|
||||
@ -202,7 +202,7 @@ area_load(AreaType, IsStart, SetID, OldUser, User, QuestFile, ZoneFile, AreaName
|
||||
send_1309();
|
||||
true -> ignore
|
||||
end,
|
||||
psu_proto:send_0201(User#egs_user_model{lid=0}, State),
|
||||
psu_proto:send_0201(User#egs_user_model{lid=0}, State2),
|
||||
if ZoneChange =:= true ->
|
||||
send_0a06();
|
||||
true -> ignore
|
||||
@ -212,13 +212,15 @@ area_load(AreaType, IsStart, SetID, OldUser, User, QuestFile, ZoneFile, AreaName
|
||||
undefined -> ignore;
|
||||
_ -> send_022c(0, 16#12)
|
||||
end,
|
||||
psu_proto:send_0208(State),
|
||||
State3 = State2#state{areanb=State2#state.areanb + 1},
|
||||
psu_proto:send_0208(State3),
|
||||
send_0236(),
|
||||
if User#egs_user_model.partypid =/= undefined, AreaType =:= mission ->
|
||||
{ok, NPCList} = psu_party:get_npc(User#egs_user_model.partypid),
|
||||
npc_load(User, NPCList);
|
||||
true -> ok
|
||||
end.
|
||||
end,
|
||||
{ok, State3}.
|
||||
|
||||
%% @todo Don't change the NPC info unless you are the leader!
|
||||
npc_load(_Leader, []) ->
|
||||
|
||||
@ -396,7 +396,7 @@ parse(_Size, 16#0304, Channel, Data) ->
|
||||
Modifiers = {chat_modifiers, ChatType, ChatCutIn, ChatCutInAngle, ChatMsgLength, ChatChannel, ChatCharacterType},
|
||||
{chat, FromTypeID, FromGID, FromName, Modifiers, ChatMsg};
|
||||
|
||||
%% @todo Probably safely ignored. VarJ is apparently replied with the same value as sent by 0205, the one after EntryID.
|
||||
%% @doc Probably safely ignored. VarJ is apparently replied with the same value sent by 0205, the one after EntryID.
|
||||
parse(Size, 16#0806, Channel, Data) ->
|
||||
<< _LID:16/little, VarA:16/little, VarB:32/little, VarC:32/little, VarD:32/little, VarE:32/little,
|
||||
VarF:32/little, VarG:32/little, VarH:32/little, VarI:32/little, VarJ:32/little >> = Data,
|
||||
@ -430,7 +430,8 @@ parse(Size, 16#0807, Channel, Data) ->
|
||||
?ASSERT_EQ(VarI, 0),
|
||||
{area_change, QuestID, ZoneID, MapID, EntryID, PartyPos};
|
||||
|
||||
%% @todo Probably safely ignored. Still, figure out VarJ. It can be different than 2.
|
||||
%% @doc Probably safely ignored. VarJ is apparently replied with the same value sent by 0208.
|
||||
%% @todo Find out why we don't receive this command anymore.
|
||||
parse(Size, 16#0808, Channel, Data) ->
|
||||
<< _LID:16/little, VarA:16/little, VarB:32/little, VarC:32/little, VarD:32/little, VarE:32/little,
|
||||
VarF:32/little, VarG:32/little, VarH:32/little, VarI:32/little, VarJ:32/little >> = Data,
|
||||
@ -1245,14 +1246,14 @@ send_0202(#state{socket=Socket, gid=DestGID, lid=DestLID}) ->
|
||||
|
||||
%% @doc Make the client load a new map.
|
||||
%% @todo We set a value of 1 and not 0 after EntryID because this value is never found to be 0.
|
||||
send_0205(CharUser, IsSeasonal, #state{socket=Socket, gid=DestGID, lid=DestLID}) ->
|
||||
send_0205(CharUser, IsSeasonal, #state{socket=Socket, gid=DestGID, lid=DestLID, areanb=AreaNb}) ->
|
||||
#egs_user_model{area=#psu_area{zoneid=ZoneID, mapid=MapID}, entryid=EntryID} = CharUser,
|
||||
packet_send(Socket, << 16#02050300:32, DestLID:16/little, 0:144, 16#00011300:32, DestGID:32/little, 0:64,
|
||||
16#ffffffff:32, ZoneID:32/little, MapID:32/little, EntryID:32/little, 1:32/little, 0:24, IsSeasonal:8 >>).
|
||||
16#ffffffff:32, ZoneID:32/little, MapID:32/little, EntryID:32/little, AreaNb:32/little, 0:24, IsSeasonal:8 >>).
|
||||
|
||||
%% @doc Indicate to the client that loading should finish.
|
||||
send_0208(#state{socket=Socket, gid=DestGID, lid=DestLID}) ->
|
||||
packet_send(Socket, << 16#02080300:32, DestLID:16/little, 0:144, 16#00011300:32, DestGID:32/little, 0:64, 2:32/little >>).
|
||||
send_0208(#state{socket=Socket, gid=DestGID, lid=DestLID, areanb=AreaNb}) ->
|
||||
packet_send(Socket, << 16#02080300:32, DestLID:16/little, 0:144, 16#00011300:32, DestGID:32/little, 0:64, AreaNb:32/little >>).
|
||||
|
||||
%% @todo No idea what this one does. For unknown reasons it uses channel 2.
|
||||
%% @todo Handle the DestLID properly?
|
||||
|
||||
Loading…
Reference in New Issue
Block a user