psu_proto: Move counter_enter to events. Handle prev_area correctly. Handle CounterID correctly.

include/records.hrl

@@ -31,7 +31,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).
 
 -record(egs_user_model, {
-	id, pid, socket, state, time, character, instancepid, partypid, areatype, area, entryid, pos,
+	id, pid, socket, state, time, character, instancepid, partypid, areatype, area, entryid, counterid, pos,
 	%% psu specific fields
 	lid, setid, prev_area, prev_entryid,
 	%% temporary fields

src/psu/psu_characters.erl

@@ -51,13 +51,13 @@ character_tuple_to_binary(Tuple) ->
 
 %% @doc Convert a character tuple into a binary to be sent to clients.
 %%      Contains everything from character_tuple_to_binary/1 along with location, stats, SE and more.
-%% @todo One of the two QuestID lists has a different use. No idea what though. The second is probably the previous area.
 %% @todo The second StatsBin seems unused. Not sure what it's for.
 %% @todo Find out what the big block of 0 is at the end.
 %% @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) ->
-	#egs_user_model{id=CharGID, lid=CharLID, character=Character, pos=#pos{x=X, y=Y, z=Z, dir=Dir}, area={psu_area, QuestID, ZoneID, MapID}, entryid=EntryID} = User,
+	#egs_user_model{id=CharGID, lid=CharLID, character=Character, pos=#pos{x=X, y=Y, z=Z, dir=Dir}, area={psu_area, QuestID, ZoneID, MapID}, entryid=EntryID,
+		prev_area={psu_area, PrevQuestID, PrevZoneID, PrevMapID}, prev_entryid=PrevEntryID} = User,
 	#characters{type=Type, mainlevel=Level, stats=Stats, se=SE, currenthp=CurrentHP, maxhp=MaxHP} = Character,
 	#level{number=LV} = Level,
 	CharBin = psu_characters:character_tuple_to_binary(Character),
@@ -71,7 +71,7 @@ character_user_to_binary(User) ->
 	<<	TypeID:32, CharGID:32/little-unsigned-integer, 0:64, CharLID:32/little-unsigned-integer, NPCStuff:32, QuestID:32/little-unsigned-integer,
 		ZoneID:32/little-unsigned-integer, MapID:32/little-unsigned-integer, EntryID:32/little-unsigned-integer,
 		16#0100:16, IntDir:16/little-unsigned-integer, X:32/little-float, Y:32/little-float, Z:32/little-float, 0:64,
-		QuestID:32/little-unsigned-integer, ZoneID:32/little-unsigned-integer, MapID:32/little-unsigned-integer, EntryID:32/little-unsigned-integer,
+		PrevQuestID:32/little-unsigned-integer, PrevZoneID:32/little-unsigned-integer, PrevMapID:32/little-unsigned-integer, PrevEntryID:32/little-unsigned-integer,
 		CharBin/binary, EXPNextLevel:32/little-unsigned-integer, EXPPreviousLevel:32/little-unsigned-integer, MaxHP:32/little-unsigned-integer, % not sure if this one is current or max
 		StatsBin/binary, 0:32, SEBin/binary, 0:32, LV:32/little-unsigned-integer, StatsBin/binary, CurrentHP:32/little-unsigned-integer, MaxHP:32/little-unsigned-integer,
 		0:1344, 16#0000803f:32, 0:64, 16#0000803f:32, 0:64, 16#0000803f:32, 0:64, 16#0000803f:32, 0:64, 16#0000803f:32, 0:160, 16#0000803f:32, 0:352 >>.

src/psu/psu_game.erl

@@ -191,7 +191,8 @@ char_select_load(Number) ->
 	Appearance = psu_appearance:binary_to_tuple(Race, AppearanceBin),
 	Options = psu_characters:options_binary_to_tuple(OptionsBin),
 	Character = #characters{slot=Number, name=Name, race=Race, gender=Gender, class=Class, appearance=Appearance, options=Options}, % TODO: temporary set the slot here, won't be needed later
-	User = OldUser#egs_user_model{state=online, character=Character, area=#psu_area{questid=undefined, zoneid=undefined, mapid=undefined}, pos=#pos{x=0.0, y=0.0, z=0.0, dir=0.0}, setid=0},
+	User = OldUser#egs_user_model{state=online, character=Character, area=#psu_area{questid=undefined, zoneid=undefined, mapid=undefined},
+		prev_area={psu_area, 0, 0, 0}, prev_entryid=0, pos=#pos{x=0.0, y=0.0, z=0.0, dir=0.0}, setid=0},
 	egs_user_model:write(User),
 	char_load(User),
 	send_021b(),
@@ -226,41 +227,6 @@ char_load(User) ->
 	% 0303
 	send_1602().
 
-%% @doc Load the given map as a mission counter.
-counter_load(QuestID, ZoneID, MapID, EntryID) ->
-	{ok, OldUser} = egs_user_model:read(get(gid)),
-	OldArea = OldUser#egs_user_model.area,
-	User = OldUser#egs_user_model{areatype=counter, area={psu_area, QuestID, ZoneID, MapID}, entryid=EntryID, prev_entryid=MapID,
-		prev_area={psu_area, OldArea#psu_area.questid, OldArea#psu_area.zoneid, ZoneID}},
-	egs_user_model:write(User),
-	AreaName = "Mission counter",
-	QuestFile = "data/lobby/counter.quest.nbl",
-	ZoneFile = "data/lobby/counter.zone.nbl",
-	% broadcast unspawn to other people
-	{ok, UnspawnList} = egs_user_model:select({neighbors, OldUser}),
-	lists:foreach(fun(Other) -> Other#egs_user_model.pid ! {psu_player_unspawn, User} end, UnspawnList),
-	% load counter
-	send_0c00(16#7fffffff),
-	send_020e(QuestFile),
-	send_0a05(),
-	send_010d(User#egs_user_model{lid=0}),
-	send_0200(mission),
-	send_020f(ZoneFile, 0, 16#ff),
-	send_0205(0, 0, 0, 0),
-	send_100e(16#7fffffff, 0, 0, AreaName, EntryID),
-	send_0215(0),
-	send_0215(0),
-	send_020c(),
-	send_1202(),
-	send_1204(),
-	send_1206(),
-	send_1207(),
-	send_1212(),
-	send_0201(User#egs_user_model{lid=0}),
-	send_0a06(),
-	send_0208(),
-	send_0236().
-
 %% @doc Return the current season information.
 area_get_season(QuestID) ->
 	{{_, Month, Day}, _} = calendar:universal_time(),
@@ -333,7 +299,7 @@ area_load(QuestID, ZoneID, MapID, EntryID) ->
 			{RetPid, RetSetID};
 		true -> {OldUser#egs_user_model.instancepid, OldUser#egs_user_model.setid}
 	end,
-	User = OldUser#egs_user_model{instancepid=InstancePid, areatype=AreaType, area={psu_area, QuestID, RealZoneID, RealMapID}, entryid=RealEntryID},
+	User = OldUser#egs_user_model{instancepid=InstancePid, areatype=AreaType, area={psu_area, QuestID, RealZoneID, RealMapID}, entryid=RealEntryID, counterid=undefined},
 	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).
@@ -561,6 +527,43 @@ event({area_change, QuestID, ZoneID, MapID, EntryID}) ->
 	log("area change (~b,~b,~b,~b)", [QuestID, ZoneID, MapID, EntryID]),
 	area_load(QuestID, ZoneID, MapID, EntryID);
 
+%% @todo Make sure non-mission counters follow the same loading process.
+%% @todo Probably validate the From* values, to not send the player back inside a mission.
+event({counter_enter, CounterID, FromZoneID, FromMapID, FromEntryID}) ->
+	log("counter load ~b", [CounterID]),
+	{ok, OldUser} = egs_user_model:read(get(gid)),
+	OldArea = OldUser#egs_user_model.area,
+	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, counterid=CounterID, 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
+	{ok, UnspawnList} = egs_user_model:select({neighbors, OldUser}),
+	lists:foreach(fun(Other) -> Other#egs_user_model.pid ! {psu_player_unspawn, User} end, UnspawnList),
+	%% load counter
+	send_0c00(16#7fffffff),
+	send_020e(QuestFile),
+	send_0a05(),
+	send_010d(User#egs_user_model{lid=0}),
+	send_0200(mission),
+	send_020f(ZoneFile, 0, 16#ff),
+	send_0205(0, 0, 0, 0),
+	send_100e(16#7fffffff, 0, 0, AreaName, CounterID),
+	send_0215(0),
+	send_0215(0),
+	send_020c(),
+	send_1202(),
+	send_1204(),
+	send_1206(),
+	send_1207(),
+	send_1212(),
+	send_0201(User#egs_user_model{lid=0}),
+	send_0a06(),
+	send_0208(),
+	send_0236();
+
 %% @todo A and B are unknown.
 %%      Melee uses a format similar to: AAAA--BBCCCC----DDDDDDDDEE----FF with
 %%      AAAA the attack sound effect, BB the range, CCCC and DDDDDDDD unknown but related to angular range or similar, EE number of targets and FF the model.
@@ -743,19 +746,11 @@ handle(16#0404, Data) ->
 	log("unknown command 0404: eventid ~b blockid ~b value ~b", [EventID, BlockID, Value]),
 	send_1205(EventID, BlockID, Value);
 
-%% @doc Mission counter handler.
-handle(16#0811, Data) ->
-	<< QuestID:32/little-unsigned-integer, ZoneID:16/little-unsigned-integer,
-		MapID:16/little-unsigned-integer, EntryID:16/little-unsigned-integer, _/bits >> = Data,
-	log("mission counter (~b,~b,~b,~b)", [QuestID, ZoneID, MapID, EntryID]),
-	counter_load(QuestID, ZoneID, MapID, EntryID);
-
 %% @doc Leave mission counter handler. Lobby values depend on which counter was entered.
 handle(16#0812, _) ->
 	{ok, User} = egs_user_model:read(get(gid)),
-	Area = User#egs_user_model.area,
 	PrevArea = User#egs_user_model.prev_area,
-	area_load(PrevArea#psu_area.questid, PrevArea#psu_area.zoneid, Area#psu_area.zoneid, Area#psu_area.mapid);
+	area_load(PrevArea#psu_area.questid, PrevArea#psu_area.zoneid, PrevArea#psu_area.mapid, User#egs_user_model.prev_entryid);
 
 %% @doc NPC invite.
 %% @todo Also happening a 1506 -> 1507? Only on first selection from menu.
@@ -808,7 +803,7 @@ handle(16#0c01, << QuestID:32/little-unsigned-integer >>) ->
 %% @todo Handle correctly.
 handle(16#0c05, _) ->
 	{ok, User} = egs_user_model:read(get(gid)),
-	[{quests, Filename}, {bg, _}, {options, _}] = proplists:get_value(User#egs_user_model.entryid, ?COUNTERS),
+	[{quests, Filename}, {bg, _}, {options, _}] = proplists:get_value(User#egs_user_model.counterid, ?COUNTERS),
 	send_0c06(Filename);
 
 %% @doc Lobby transport handler? Just ignore the meseta price for now and send the player where he wanna be!
@@ -839,7 +834,7 @@ handle(16#0c0e, _) ->
 %% @doc Counter available mission list request handler.
 handle(16#0c0f, _) ->
 	{ok, User} = egs_user_model:read(get(gid)),
-	[{quests, _}, {bg, _}, {options, Options}] = proplists:get_value(User#egs_user_model.entryid, ?COUNTERS),
+	[{quests, _}, {bg, _}, {options, Options}] = proplists:get_value(User#egs_user_model.counterid, ?COUNTERS),
 	send_0c10(Options);
 
 %% @doc Set flag handler. Associate a new flag with the character.
@@ -1015,7 +1010,7 @@ handle(16#170b, _) ->
 %% @todo Handle correctly.
 handle(16#1710, _) ->
 	{ok, User} = egs_user_model:read(get(gid)),
-	[{quests, _}, {bg, Background}, {options, _}] = proplists:get_value(User#egs_user_model.entryid, ?COUNTERS),
+	[{quests, _}, {bg, Background}, {options, _}] = proplists:get_value(User#egs_user_model.counterid, ?COUNTERS),
 	send_1711(Background);
 
 %% @doc Dialog request handler. Do what we can.

src/psu/psu_proto.erl

@@ -169,6 +169,24 @@ parse(Size, 16#0807, Channel, Data) ->
 	?ASSERT_EQ(VarJ, 16#ffffffff),
 	{area_change, QuestID, ZoneID, MapID, EntryID};
 
+parse(Size, 16#0811, 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,
+		_CounterType:8, VarJ:8, FromZoneID:16/little, FromMapID:16/little, FromEntryID:16/little, CounterID:32/little, VarK:32/little >> = Data,
+	?ASSERT_EQ(Size, 60),
+	?ASSERT_EQ(Channel, 2),
+	?ASSERT_EQ(VarA, 0),
+	?ASSERT_EQ(VarB, 0),
+	?ASSERT_EQ(VarC, 0),
+	?ASSERT_EQ(VarD, 0),
+	?ASSERT_EQ(VarE, 0),
+	?ASSERT_EQ(VarF, 0),
+	?ASSERT_EQ(VarG, 0),
+	?ASSERT_EQ(VarH, 0),
+	?ASSERT_EQ(VarI, 0),
+	?ASSERT_EQ(VarJ, 41),
+	?ASSERT_EQ(VarK, 16#ffffffff),
+	{counter_enter, CounterID, FromZoneID, FromMapID, FromEntryID};
+
 parse(Size, 16#0b05, _Channel, _Data) ->
 	?ASSERT_EQ(Size, 8),
 	ignore;