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

psu_missions: Handle warps. Correctly handle coords, direction. Add Dark Satellite.

Browse Source 
Currently only Dark Satellite B1 and B2 work.
There might be a regression about the sit state of others when connecting.
This commit is contained in:
Loïc Hoguin 2010-07-16 16:25:31 +02:00
parent 9546237ea5
commit db3a10188b
7 changed files with 195 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
include/maps.hrl
View File

@ -59,12 +59,35 @@
{1000123, [{type, mission}, {file, "data/missions/fight-for-food.3.s.quest.nbl"}, {start, [0, 1301, 0]}]}, {1000123, [{type, mission}, {file, "data/missions/fight-for-food.3.s.quest.nbl"}, {start, [0, 1301, 0]}]},
{1000124, [{type, mission}, {file, "data/missions/fight-for-food.3.s2.quest.nbl"}, {start, [0, 1301, 0]}]}, {1000124, [{type, mission}, {file, "data/missions/fight-for-food.3.s2.quest.nbl"}, {start, [0, 1301, 0]}]},
% Dark Satellite
{1001000, [{type, mission}, {file, "data/missions/dark-satellite.1.c.quest.nbl"}, {start, [0, 101, 0]}]},
{1001001, [{type, mission}, {file, "data/missions/dark-satellite.1.b.quest.nbl"}, {start, [0, 101, 0]}]},
{1001002, [{type, mission}, {file, "data/missions/dark-satellite.1.a.quest.nbl"}, {start, [0, 101, 0]}]},
%~ {1001003, [{type, mission}, {file, "data/missions/dark-satellite.1.s.quest.nbl"}, {start, [0, 101, 0]}]},
{1001004, [{type, mission}, {file, "data/missions/dark-satellite.1.s2.quest.nbl"}, {start, [0, 101, 0]}]},
{1001005, [{type, mission}, {file, "data/missions/dark-satellite.1.s3.quest.nbl"}, {start, [0, 101, 0]}]},
{1001010, [{type, mission}, {file, "data/missions/dark-satellite.2.c.quest.nbl"}, {start, [0, 102, 0]}]},
{1001011, [{type, mission}, {file, "data/missions/dark-satellite.2.b.quest.nbl"}, {start, [0, 102, 0]}]},
{1001012, [{type, mission}, {file, "data/missions/dark-satellite.2.a.quest.nbl"}, {start, [0, 102, 0]}]},
{1001013, [{type, mission}, {file, "data/missions/dark-satellite.2.s.quest.nbl"}, {start, [0, 102, 0]}]},
%~ {1001014, [{type, mission}, {file, "data/missions/dark-satellite.2.s2.quest.nbl"}, {start, [0, 102, 0]}]},
%~ {1001015, [{type, mission}, {file, "data/missions/dark-satellite.2.s3.quest.nbl"}, {start, [0, 102, 0]}]},
{1001020, [{type, mission}, {file, "data/missions/dark-satellite.3.c.quest.nbl"}, {start, [0, 103, 0]}]},
%~ {1001021, [{type, mission}, {file, "data/missions/dark-satellite.3.b.quest.nbl"}, {start, [0, 103, 0]}]},
{1001022, [{type, mission}, {file, "data/missions/dark-satellite.3.a.quest.nbl"}, {start, [0, 103, 0]}]},
%~ {1001023, [{type, mission}, {file, "data/missions/dark-satellite.3.s.quest.nbl"}, {start, [0, 103, 0]}]},
{1001024, [{type, mission}, {file, "data/missions/dark-satellite.3.s2.quest.nbl"}, {start, [0, 103, 0]}]},
{1001025, [{type, mission}, {file, "data/missions/dark-satellite.3.s3.quest.nbl"}, {start, [0, 103, 0]}]},
% Phantom Ruins (Linear Line counter) % Phantom Ruins (Linear Line counter)
{1060300, [{type, mission}, {file, "data/missions/phantom-ruins.c.quest.nbl"}, {start, [0, 8002, 0]}]}, %~ {1060300, [{type, mission}, {file, "data/missions/phantom-ruins.c.quest.nbl"}, {start, [0, 8002, 0]}]},
{1060301, [{type, mission}, {file, "data/missions/phantom-ruins.b.quest.nbl"}, {start, [0, 8002, 0]}]}, %~ {1060301, [{type, mission}, {file, "data/missions/phantom-ruins.b.quest.nbl"}, {start, [0, 8002, 0]}]},
{1060302, [{type, mission}, {file, "data/missions/phantom-ruins.a.quest.nbl"}, {start, [0, 8002, 0]}]}, %~ {1060302, [{type, mission}, {file, "data/missions/phantom-ruins.a.quest.nbl"}, {start, [0, 8002, 0]}]},
{1060303, [{type, mission}, {file, "data/missions/phantom-ruins.s.quest.nbl"}, {start, [0, 8002, 0]}]}, %~ {1060303, [{type, mission}, {file, "data/missions/phantom-ruins.s.quest.nbl"}, {start, [0, 8002, 0]}]},
% Planetary lobbies % Planetary lobbies
@ -132,16 +155,39 @@
%~ {[1000123, 0], [{file, "data/missions/fight-for-food.3.s.zone.nbl"}]}, %~ {[1000123, 0], [{file, "data/missions/fight-for-food.3.s.zone.nbl"}]},
{[1000124, 0], [{file, "data/missions/fight-for-food.3.s2.zone.nbl"}]}, {[1000124, 0], [{file, "data/missions/fight-for-food.3.s2.zone.nbl"}]},
% Dark Satellite
{[1001000, 0], [{file, "data/missions/dark-satellite.1.c.zone.nbl"}]},
{[1001001, 0], [{file, "data/missions/dark-satellite.1.b.zone.nbl"}]},
{[1001002, 0], [{file, "data/missions/dark-satellite.1.a.zone.nbl"}]},
%~ {[1001003, 0], [{file, "data/missions/dark-satellite.1.s.zone.nbl"}]},
{[1001004, 0], [{file, "data/missions/dark-satellite.1.s2.zone.nbl"}]},
{[1001005, 0], [{file, "data/missions/dark-satellite.1.s3.zone.nbl"}]},
{[1001010, 0], [{file, "data/missions/dark-satellite.2.c.zone.nbl"}]},
{[1001011, 0], [{file, "data/missions/dark-satellite.2.b.zone.nbl"}]},
{[1001012, 0], [{file, "data/missions/dark-satellite.2.a.zone.nbl"}]},
{[1001013, 0], [{file, "data/missions/dark-satellite.2.s.zone.nbl"}]},
%~ {[1001014, 0], [{file, "data/missions/dark-satellite.2.s2.zone.nbl"}]},
%~ {[1001015, 0], [{file, "data/missions/dark-satellite.2.s3.zone.nbl"}]},
{[1001020, 0], [{file, "data/missions/dark-satellite.3.c.zone.nbl"}]},
%~ {[1001021, 0], [{file, "data/missions/dark-satellite.3.b.zone.nbl"}]},
{[1001022, 0], [{file, "data/missions/dark-satellite.3.a.zone.nbl"}]},
%~ {[1001023, 0], [{file, "data/missions/dark-satellite.3.s.zone.nbl"}]},
{[1001024, 0], [{file, "data/missions/dark-satellite.3.s2.zone.nbl"}]},
{[1001025, 0], [{file, "data/missions/dark-satellite.3.s3.zone.nbl"}]},
% Phantom Ruins (Linear Line counter) % Phantom Ruins (Linear Line counter)
{[1060300, 0], [{file, "data/missions/phantom-ruins.c-0.zone.nbl"}]}, %~ {[1060300, 0], [{file, "data/missions/phantom-ruins.c-0.zone.nbl"}]},
{[1060300, 1], [{file, "data/missions/phantom-ruins.c-1.zone.nbl"}]}, %~ {[1060300, 1], [{file, "data/missions/phantom-ruins.c-1.zone.nbl"}]},
{[1060301, 0], [{file, "data/missions/phantom-ruins.b-0.zone.nbl"}]}, %~ {[1060301, 0], [{file, "data/missions/phantom-ruins.b-0.zone.nbl"}]},
{[1060301, 1], [{file, "data/missions/phantom-ruins.b-1.zone.nbl"}]}, %~ {[1060301, 1], [{file, "data/missions/phantom-ruins.b-1.zone.nbl"}]},
{[1060302, 0], [{file, "data/missions/phantom-ruins.a-0.zone.nbl"}]}, %~ {[1060302, 0], [{file, "data/missions/phantom-ruins.a-0.zone.nbl"}]},
{[1060302, 1], [{file, "data/missions/phantom-ruins.a-1.zone.nbl"}]}, %~ {[1060302, 1], [{file, "data/missions/phantom-ruins.a-1.zone.nbl"}]},
{[1060303, 0], [{file, "data/missions/phantom-ruins.s-0.zone.nbl"}]}, %~ {[1060303, 0], [{file, "data/missions/phantom-ruins.s-0.zone.nbl"}]},
{[1060303, 1], [{file, "data/missions/phantom-ruins.s-1.zone.nbl"}]}, %~ {[1060303, 1], [{file, "data/missions/phantom-ruins.s-1.zone.nbl"}]},
% Colony % Colony
@ -348,15 +394,24 @@
% Space docks: Phantom Ruins, Dark Satellite, Familiar Trees (missing), Boss quest category (missing), Unit category (missing), Enemy category (missing) % Space docks: Phantom Ruins, Dark Satellite, Familiar Trees (missing), Boss quest category (missing), Unit category (missing), Enemy category (missing)
{ 1, [{quests, "data/counters/colony.docks.pack"}, {bg, 255}, {options, << 16#01805400:32, 3, 3, 0, 0, 0, 0, { 1, [{quests, "data/counters/colony.docks.pack"}, {bg, 255}, {options, << 16#01805400:32, 0, 3, 0, 0, 0, 0,
3, 3, 3, 3, 0, % Phantom Ruins C-S 0, 0, 0, 0, 0, % Phantom Ruins C-S
3, 3, 3, 3, % Dark Satellite C-S variant 1 3, 3, 3, 0, % Dark Satellite C-S variant 1
3, 3, 3, 3, % Dark Satellite C-S variant 2 3, 3, 3, 3, % Dark Satellite C-S variant 2
3, 3, 3, 3, % Dark Satellite C-S variant 3 3, 0, 3, 0, % Dark Satellite C-S variant 3
3, 3, 3, % Dark Satellite S2 variant 1-3 3, 0, 3, % Dark Satellite S2 variant 1-3
3, 3, 3, % Dark Satellite S3 variant 1-3 3, 0, 3, % Dark Satellite S3 variant 1-3
0:440 >>}]}, 0:440 >>}]},
%~ { 1, [{quests, "data/counters/colony.docks.pack"}, {bg, 255}, {options, << 16#01805400:32, 3, 3, 0, 0, 0, 0,
%~ 3, 3, 3, 3, 0, % Phantom Ruins C-S
%~ 3, 3, 3, 3, % Dark Satellite C-S variant 1
%~ 3, 3, 3, 3, % Dark Satellite C-S variant 2
%~ 3, 3, 3, 3, % Dark Satellite C-S variant 3
%~ 3, 3, 3, % Dark Satellite S2 variant 1-3
%~ 3, 3, 3, % Dark Satellite S3 variant 1-3
%~ 0:440 >>}]},
% Parum East: Illusionary Shaft, Mad Creatures, Fire purification (missing), Scarred Planet (missing), Scarred Planet % Parum East: Illusionary Shaft, Mad Creatures, Fire purification (missing), Scarred Planet (missing), Scarred Planet
{ 2, [{quests, "data/counters/parum.east.pack"}, {bg, 1}, {options, << 16#01003c00:32, 3, 3, 0, 0, 3, { 2, [{quests, "data/counters/parum.east.pack"}, {bg, 1}, {options, << 16#01003c00:32, 3, 3, 0, 0, 3,

9
include/records.hrl
View File

@ -20,6 +20,10 @@
-record(ids, {type, id}). -record(ids, {type, id}).
%% @doc Character position data structure.
-record(pos, {x, y, z, dir}).
%% @doc Table containing the users currently logged in. %% @doc Table containing the users currently logged in.
-record(users, { -record(users, {
@ -41,8 +45,7 @@
savedzoneid, savedzoneid,
savedmapid, savedmapid,
savedentryid, savedentryid,
direction= << 0:32 >>, pos
coords= << 0:96 >>
}). }).
%% @doc Character main or class level data structure. %% @doc Character main or class level data structure.
@ -104,7 +107,7 @@
%% @doc Table containing all mission objects. %% @doc Table containing all mission objects.
-record(objects, {id, instanceid, objectid, type, targetid, blockid, triggereventid}). % id = [instanceid, objectid] -record(objects, {id, instanceid, objectid, type, targetid, blockid, triggereventid, args}). % id = [instanceid, objectid]
%% @doc Hit response data. %% @doc Hit response data.

2
src/egs.erl
View File

@ -21,7 +21,7 @@
-include("include/records.hrl"). -include("include/records.hrl").
-define(MODULES, [egs, egs_cron, egs_db, egs_game, egs_login, egs_patch, egs_proto, psu_appearance, psu_characters, psu_missions]). -define(MODULES, [egs, egs_cron, egs_db, egs_game, egs_login, egs_patch, egs_proto, psu_appearance, psu_characters, psu_missions, psu_parser]).
%% @doc Start all the application servers. Return the PIDs of the listening processes. %% @doc Start all the application servers. Return the PIDs of the listening processes.

46
src/egs_game.erl
View File

@ -212,11 +212,11 @@ char_select_load(Number) ->
Appearance = psu_appearance:binary_to_tuple(Race, AppearanceBin), Appearance = psu_appearance:binary_to_tuple(Race, AppearanceBin),
Options = psu_characters:options_binary_to_tuple(OptionsBin), 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 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#users{character=Character}, User = OldUser#users{character=Character, pos=#pos{x=0.0, y=0.0, z=0.0, dir=0.0}},
egs_db:users_insert(User), egs_db:users_insert(User),
char_load(User), char_load(User),
send_021b(), send_021b(),
area_load(1100000, 0, 4, 6), area_load(1100000, 0, 4, 5),
ssl:setopts(get(socket), [{active, true}]), ssl:setopts(get(socket), [{active, true}]),
?MODULE:loop(<< >>). ?MODULE:loop(<< >>).
@ -500,21 +500,23 @@ dispatch(Orig) ->
%% @doc Position change broadcast handler. Save the position and then dispatch it. %% @doc Position change broadcast handler. Save the position and then dispatch it.
broadcast(16#0503, Orig) -> broadcast(16#0503, Orig) ->
<< 100:32/little-unsigned-integer, 16#050301:24/unsigned-integer, _:360, Direction:32/bits, Coords:96/bits, _:96, << _:424, Dir:24/little-unsigned-integer, X:32/little-float, Y:32/little-float, Z:32/little-float,
QuestID:32/little-unsigned-integer, ZoneID:32/little-unsigned-integer, MapID:32/little-unsigned-integer, _:96, QuestID:32/little-unsigned-integer, ZoneID:32/little-unsigned-integer, MapID:32/little-unsigned-integer, EntryID:32/little-unsigned-integer, _:32 >> = Orig,
EntryID:32/little-unsigned-integer, _:32 >> = Orig, FloatDir = Dir / 46603.375,
User = egs_db:users_select(get(gid)), User = egs_db:users_select(get(gid)),
NewUser = User#users{direction=Direction, coords=Coords, questid=QuestID, zoneid=ZoneID, mapid=MapID, entryid=EntryID}, NewUser = User#users{pos=#pos{x=X, y=Y, z=Z, dir=FloatDir}, questid=QuestID, zoneid=ZoneID, mapid=MapID, entryid=EntryID},
egs_db:users_insert(NewUser), egs_db:users_insert(NewUser),
broadcast(default, Orig); broadcast(default, Orig);
%% @doc Stand still broadcast handler. Save the position and then dispatch it. %% @doc Stand still broadcast handler. Save the position and then dispatch it.
broadcast(16#0514, Orig) -> broadcast(16#0514, Orig) ->
<< _:320, _:96, Direction:32/bits, Coords:96/bits, QuestID:32/little-unsigned-integer, ZoneID:32/little-unsigned-integer, << _:424, Dir:24/little-unsigned-integer, X:32/little-float, Y:32/little-float, Z:32/little-float,
QuestID:32/little-unsigned-integer, ZoneID:32/little-unsigned-integer,
MapID:32/little-unsigned-integer, EntryID:32/little-unsigned-integer, _/bits >> = Orig, MapID:32/little-unsigned-integer, EntryID:32/little-unsigned-integer, _/bits >> = Orig,
FloatDir = Dir / 46603.375,
User = egs_db:users_select(get(gid)), User = egs_db:users_select(get(gid)),
NewUser = User#users{direction=Direction, coords=Coords, questid=QuestID, zoneid=ZoneID, mapid=MapID, entryid=EntryID}, NewUser = User#users{pos=#pos{x=X, y=Y, z=Z, dir=FloatDir}, questid=QuestID, zoneid=ZoneID, mapid=MapID, entryid=EntryID},
egs_db:users_insert(NewUser), egs_db:users_insert(NewUser),
broadcast(default, Orig); broadcast(default, Orig);
@ -833,13 +835,21 @@ handle(16#0e00, Data) ->
%% @doc Object event handler. %% @doc Object event handler.
%% @todo Handle all events appropriately. %% @todo Handle all events appropriately.
%% @todo B should be the ObjType.
handle(16#0f0a, Data) -> handle(16#0f0a, Data) ->
<< _:48, _MapID:16/little-unsigned-integer, ObjectID:16/little-unsigned-integer, _:16, A:32/little-unsigned-integer, _:64, B:32/little-unsigned-integer, _:272, Action:8, _/bits >> = Data, << BlockID:16/little-unsigned-integer, _:16, ObjectNb:16/little-unsigned-integer, _MapID:16/little-unsigned-integer, ObjectID:16/little-unsigned-integer,
log("object event handler: action ~b object ~b", [Action, ObjectID]), _:16, A:32/little-unsigned-integer, B:32/little-unsigned-integer, _:32, C:32/little-unsigned-integer, _:272, Action:8, _/bits >> = Data,
log("~p", [Data]),
log("object event handler: action ~b object ~b a ~b b ~b c ~b", [Action, ObjectID, A, B, C]),
case Action of case Action of
0 -> % warp 0 -> % warp
ignore; User = egs_db:users_select(get(gid)),
{X, Y, Z, Dir} = psu_missions:warp_event(User#users.instanceid, BlockID, ObjectNb),
NewUser = User#users{pos=#pos{x=X, y=Y, z=Z, dir=Dir}},
egs_db:users_insert(NewUser),
send_0503(User#users.pos),
send_1211(A, C, B, 0);
3 -> % crystal activation 3 -> % crystal activation
send_1213(ObjectID, 1); send_1213(ObjectID, 1);
12 -> % pick/use key 12 -> % pick/use key
@ -865,9 +875,9 @@ handle(16#0f0a, Data) ->
send_1205(EventID, BlockID, 0), send_1205(EventID, BlockID, 0),
send_1213(ObjectID, 1); send_1213(ObjectID, 1);
25 -> % sit on chair 25 -> % sit on chair
send_1211(A, B, 8, 0); send_1211(A, C, 8, 0);
26 -> % sit out of chair 26 -> % sit out of chair
send_1211(A, B, 8, 2); send_1211(A, C, 8, 2);
%~ 30 -> % @todo (phantom ruins block 4) %~ 30 -> % @todo (phantom ruins block 4)
%~ ignore; %~ ignore;
_ -> _ ->
@ -1223,6 +1233,16 @@ send_0304(FromGID, FromName, Modifiers, Message) ->
_ -> send(<< 16#03040300:32, 0:288, 16#00001200:32, FromGID:32/little-unsigned-integer, Modifiers:128/bits, FromName:512/bits, Message/bits >>) _ -> send(<< 16#03040300:32, 0:288, 16#00001200:32, FromGID:32/little-unsigned-integer, Modifiers:128/bits, FromName:512/bits, Message/bits >>)
end. end.
%% @todo Force send a new player location. Used for warps.
%% @todo The value before IntDir seems to be the player's current animation. 01 stand up, 08 ?, 17 normal sit
send_0503(#pos{x=PrevX, y=PrevY, z=PrevZ, dir=_}) ->
#users{gid=GID, pos=#pos{x=X, y=Y, z=Z, dir=Dir}, questid=QuestID, zoneid=ZoneID, mapid=MapID, entryid=EntryID} = egs_db:users_select(get(gid)),
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,
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,
QuestID:32/little-unsigned-integer, ZoneID:32/little-unsigned-integer, MapID:32/little-unsigned-integer, EntryID:32/little-unsigned-integer, 1:32/little-unsigned-integer >>).
%% @todo Inventory related. No idea what it does. %% @todo Inventory related. No idea what it does.
send_0a05() -> send_0a05() ->

7
src/psu_characters.erl
View File

@ -47,9 +47,10 @@ character_tuple_to_binary(Tuple) ->
%% @todo One of the two QuestID lists has a different use. No idea what though. %% @todo One of the two QuestID lists has a different use. No idea what though.
%% @todo The second StatsBin seems unused. Not sure what it's for. %% @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 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) -> character_user_to_binary(User) ->
#users{gid=CharGID, lid=CharLID, character=Character, direction=Direction, coords=Coords, questid=QuestID, zoneid=ZoneID, mapid=MapID, entryid=EntryID} = User, #users{gid=CharGID, lid=CharLID, character=Character, pos=#pos{x=X, y=Y, z=Z, dir=Dir}, questid=QuestID, zoneid=ZoneID, mapid=MapID, entryid=EntryID} = User,
#characters{mainlevel=Level, stats=Stats, se=SE, currenthp=CurrentHP, maxhp=MaxHP} = Character, #characters{mainlevel=Level, stats=Stats, se=SE, currenthp=CurrentHP, maxhp=MaxHP} = Character,
#level{number=LV} = Level, #level{number=LV} = Level,
CharBin = psu_characters:character_tuple_to_binary(Character), CharBin = psu_characters:character_tuple_to_binary(Character),
@ -57,8 +58,10 @@ character_user_to_binary(User) ->
SEBin = psu_characters:se_list_to_binary(SE), SEBin = psu_characters:se_list_to_binary(SE),
EXPNextLevel = 100, EXPNextLevel = 100,
EXPPreviousLevel = 0, EXPPreviousLevel = 0,
IntDir = trunc(Dir * 182.0416),
<< 16#00001200:32, CharGID:32/little-unsigned-integer, 0:64, CharLID:32/little-unsigned-integer, 16#0000ffff:32, QuestID:32/little-unsigned-integer, << 16#00001200:32, CharGID:32/little-unsigned-integer, 0:64, CharLID:32/little-unsigned-integer, 16#0000ffff:32, QuestID:32/little-unsigned-integer,
ZoneID:32/little-unsigned-integer, MapID:32/little-unsigned-integer, EntryID:32/little-unsigned-integer, Direction/binary, Coords/binary, 0:64, 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, QuestID:32/little-unsigned-integer, ZoneID:32/little-unsigned-integer, MapID:32/little-unsigned-integer, EntryID: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 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:2304 >>. 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:2304 >>.

49
src/psu_missions.erl
View File

@ -18,7 +18,7 @@
-module(psu_missions). -module(psu_missions).
-export([ -export([
start/3, stop/1, key_event/2, object_hit/3, spawn_cleared/2 start/3, stop/1, key_event/2, warp_event/3, object_hit/3, spawn_cleared/2
]). ]).
-include("include/missions.hrl"). -include("include/missions.hrl").
@ -32,45 +32,54 @@ map_init(_InstanceID, [], _BlockID, _ObjectID, _TargetID) ->
ok; ok;
map_init(InstanceID, [Map|Tail], BlockID, ObjectID, TargetID) -> map_init(InstanceID, [Map|Tail], BlockID, ObjectID, TargetID) ->
{_MapID, Objects} = Map, {_MapID, Objects} = Map,
{ok, NewObjectID, NewTargetID} = object_init(InstanceID, BlockID, Objects, ObjectID, TargetID), {ok, NewObjectID, NewTargetID} = object_init(InstanceID, BlockID, Objects, 0, ObjectID, TargetID),
map_init(InstanceID, Tail, BlockID + 1, NewObjectID, NewTargetID). map_init(InstanceID, Tail, BlockID + 1, NewObjectID, NewTargetID).
object_init(_InstanceID, _BlockID, [], ObjectID, TargetID) -> object_init(_InstanceID, _BlockID, [], _ObjectNb, ObjectID, TargetID) ->
{ok, ObjectID, TargetID}; {ok, ObjectID, TargetID};
object_init(InstanceID, BlockID, [{box, _Model, Breakable, TrigEventID}|Tail], ObjectID, TargetID) -> object_init(InstanceID, BlockID, [{box, _Model, Breakable, TrigEventID}|Tail], ObjectNb, ObjectID, TargetID) ->
case Breakable of case Breakable of
false -> ignore; false -> ignore;
true -> true ->
egs_db:objects_insert(#objects{id=[InstanceID, ObjectID], instanceid=InstanceID, objectid=ObjectID, type=box, targetid=TargetID, blockid=BlockID, triggereventid=TrigEventID}) egs_db:objects_insert(#objects{id=[InstanceID, ObjectID], instanceid=InstanceID, objectid=ObjectID, type=box, targetid=TargetID, blockid=BlockID, triggereventid=TrigEventID})
end, end,
object_init(InstanceID, BlockID, Tail, ObjectID + 1, TargetID + 1); object_init(InstanceID, BlockID, Tail, ObjectNb + 1, ObjectID + 1, TargetID + 1);
%% @todo key and key_console event handling will have to be fixed. %% @todo key and key_console event handling will have to be fixed.
object_init(InstanceID, BlockID, [{key, _KeySet, TrigEventID, _ReqEventID}|Tail], ObjectID, TargetID) -> object_init(InstanceID, BlockID, [{key, _KeySet, TrigEventID, _ReqEventID}|Tail], ObjectNb, ObjectID, TargetID) ->
egs_db:objects_insert(#objects{id=[InstanceID, {key, ObjectID}], instanceid=InstanceID, objectid=ObjectID, type=key, blockid=BlockID, triggereventid=[TrigEventID]}), egs_db:objects_insert(#objects{id=[InstanceID, {key, ObjectID}], instanceid=InstanceID, objectid=ObjectID, type=key, blockid=BlockID, triggereventid=[TrigEventID]}),
object_init(InstanceID, BlockID, Tail, ObjectID + 1, TargetID); object_init(InstanceID, BlockID, Tail, ObjectNb + 1, ObjectID + 1, TargetID);
%% @todo Maybe separate key from key_console in its handling? %% @todo Maybe separate key from key_console in its handling?
object_init(InstanceID, BlockID, [{key_console, KeySet, _ReqKeyEventsID, TrigEventID}|Tail], ObjectID, TargetID) -> object_init(InstanceID, BlockID, [{key_console, KeySet, _ReqKeyEventsID, TrigEventID}|Tail], ObjectNb, ObjectID, TargetID) ->
egs_db:objects_insert(#objects{id=[InstanceID, {key, ObjectID}], instanceid=InstanceID, objectid=ObjectID, type=key, blockid=BlockID, triggereventid=[243 + KeySet, 201 + KeySet, TrigEventID]}), egs_db:objects_insert(#objects{id=[InstanceID, {key, ObjectID}], instanceid=InstanceID, objectid=ObjectID, type=key, blockid=BlockID, triggereventid=[243 + KeySet, 201 + KeySet, TrigEventID]}),
object_init(InstanceID, BlockID, Tail, ObjectID + 1, TargetID); object_init(InstanceID, BlockID, Tail, ObjectNb + 1, ObjectID + 1, TargetID);
%% @todo save enemies individually, do something, etc. %% @todo save enemies individually, do something, etc.
%% @todo temporarily save the spawn to handle events properly %% @todo temporarily save the spawn to handle events properly
object_init(InstanceID, BlockID, [{'spawn', TrigEventID, _ReqEventID}|Tail], ObjectID, TargetID) -> object_init(InstanceID, BlockID, [{'spawn', TrigEventID, _ReqEventID}|Tail], ObjectNb, ObjectID, TargetID) ->
egs_db:objects_insert(#objects{id=[InstanceID, {'spawn', TargetID - 1024}], instanceid=InstanceID, type='spawn', blockid=BlockID, triggereventid=TrigEventID}), egs_db:objects_insert(#objects{id=[InstanceID, {'spawn', TargetID - 1024}], instanceid=InstanceID, type='spawn', blockid=BlockID, triggereventid=TrigEventID}),
object_init(InstanceID, BlockID, Tail, ObjectID + 1, TargetID + 30); object_init(InstanceID, BlockID, Tail, ObjectNb + 1, ObjectID + 1, TargetID + 30);
object_init(InstanceID, BlockID, [{warp, DestX, DestY, DestZ, DestDir}|Tail], ObjectNb, ObjectID, TargetID) ->
egs_db:objects_insert(#objects{id=[InstanceID, {warp, BlockID, ObjectNb}], instanceid=InstanceID, type=warp, blockid=BlockID, args={DestX, DestY, DestZ, DestDir}}),
object_init(InstanceID, BlockID, Tail, ObjectNb + 1, ObjectID, TargetID);
%% @todo Not sure where these 2 come from yet, assuming crystal but might not be that. %% @todo Not sure where these 2 come from yet, assuming crystal but might not be that.
object_init(InstanceID, BlockID, [crystal|Tail], ObjectID, TargetID) -> object_init(InstanceID, BlockID, [crystal|Tail], ObjectNb, ObjectID, TargetID) ->
object_init(InstanceID, BlockID, Tail, ObjectID + 1, TargetID + 2); object_init(InstanceID, BlockID, Tail, ObjectNb + 1, ObjectID + 1, TargetID + 2);
%~ %% @todo Not sure where these 9 come from yet, assuming healing pad + pp cube but might not be that.
%~ object_init(InstanceID, BlockID, [healing_pad|Tail], ObjectID, TargetID) ->
%~ object_init(InstanceID, BlockID, Tail, ObjectID + 1, TargetID + 9);
%~ object_init(InstanceID, BlockID, [pp_cube|Tail], ObjectID, TargetID) ->
%~ object_init(InstanceID, BlockID, Tail, ObjectID + 1, TargetID + 1);
%% A few object types don't have an ObjectID nor a TargetID. Disregard them completely. %% A few object types don't have an ObjectID nor a TargetID. Disregard them completely.
object_init(InstanceID, BlockID, [ObjType|Tail], ObjectID, TargetID) object_init(InstanceID, BlockID, [ObjType|Tail], ObjectNb, ObjectID, TargetID)
when ObjType =:= static_model; when ObjType =:= static_model;
ObjType =:= invisible_block; ObjType =:= invisible_block;
ObjType =:= entrance; ObjType =:= entrance;
ObjType =:= 'exit'; ObjType =:= 'exit';
ObjType =:= label -> ObjType =:= label;
object_init(InstanceID, BlockID, Tail, ObjectID, TargetID); ObjType =:= hidden_minimap_section ->
object_init(InstanceID, BlockID, Tail, ObjectNb + 1, ObjectID, TargetID);
%% Others are normal objects, we don't handle them but they have an ObjectID. %% Others are normal objects, we don't handle them but they have an ObjectID.
object_init(InstanceID, BlockID, [_|Tail], ObjectID, TargetID) -> object_init(InstanceID, BlockID, [_|Tail], ObjectNb, ObjectID, TargetID) ->
object_init(InstanceID, BlockID, Tail, ObjectID + 1, TargetID). object_init(InstanceID, BlockID, Tail, ObjectNb + 1, ObjectID + 1, TargetID).
stop(InstanceID) -> stop(InstanceID) ->
egs_db:objects_delete(InstanceID). egs_db:objects_delete(InstanceID).
@ -79,6 +88,10 @@ key_event(InstanceID, ObjectID) ->
#objects{triggereventid=EventID, blockid=BlockID} = egs_db:objects_select([InstanceID, {key, ObjectID}]), #objects{triggereventid=EventID, blockid=BlockID} = egs_db:objects_select([InstanceID, {key, ObjectID}]),
[EventID, BlockID]. [EventID, BlockID].
warp_event(InstanceID, BlockID, ObjectNb) ->
#objects{args=Args} = egs_db:objects_select([InstanceID, {warp, BlockID, ObjectNb}]),
Args.
object_hit(User, _SourceID, TargetID) -> object_hit(User, _SourceID, TargetID) ->
try try
Object = egs_db:objects_select_by_targetid(User#users.instanceid, TargetID), Object = egs_db:objects_select_by_targetid(User#users.instanceid, TargetID),

72
src/psu_parser.erl
View File

@ -24,7 +24,7 @@
-define(NBL, "./nbl"). -define(NBL, "./nbl").
run() -> run() ->
List = [parse_zone(QuestID, Filename) || {[QuestID, _ZoneID], [{file, Filename}]} <- ?ZONES, QuestID =< 1000124], List = [parse_zone(QuestID, Filename) || {[QuestID, _ZoneID], [{file, Filename}]} <- ?ZONES, QuestID < 1100000],
Begin = "%% This file is automatically generated by EGS. Begin = "%% This file is automatically generated by EGS.
%% Please do not edit it manually, as you would risk losing your changes. %% Please do not edit it manually, as you would risk losing your changes.
@ -100,38 +100,39 @@ parse_object_list_headers(BasePtr, Data, NbHeaders, Ptr) ->
parse_object_list_headers_rec(_Data, 0, Acc) -> parse_object_list_headers_rec(_Data, 0, Acc) ->
lists:reverse(Acc); lists:reverse(Acc);
parse_object_list_headers_rec(Data, NbHeaders, Acc) -> parse_object_list_headers_rec(Data, NbHeaders, Acc) ->
<< 16#ffffffff:32, 0:16, UnknownA:16/little-unsigned-integer, 0:48, UnknownB:16/little-unsigned-integer, 0:16, UnknownC:32/little-unsigned-integer, 16#ffff:16, 0:32, << 16#ffffffff:32, UnknownBinary:144/bits, 16#ffff:16, 0:32,
ObjListNumber:16/little-unsigned-integer, 0:32, NbObjects:16/little-unsigned-integer, ObjListPtr:32/little-unsigned-integer, Rest/bits >> = Data, ObjListNumber:16/little-unsigned-integer, 0:32, NbObjects:16/little-unsigned-integer, ObjListPtr:32/little-unsigned-integer, Rest/bits >> = Data,
log("object list headers: a(~b) b(~b) c(~b) list nb(~b) nb obj(~b) obj list ptr(~b)", [UnknownA, UnknownB, UnknownC, ObjListNumber, NbObjects, ObjListPtr]), log("object list headers: bin(~p) list nb(~b) nb obj(~b) obj list ptr(~b)", [UnknownBinary, ObjListNumber, NbObjects, ObjListPtr]),
parse_object_list_headers_rec(Rest, NbHeaders - 1, [{ObjListNumber, NbObjects, ObjListPtr}|Acc]). parse_object_list_headers_rec(Rest, NbHeaders - 1, [{ObjListNumber, NbObjects, ObjListPtr}|Acc]).
parse_object_list(BasePtr, Data, NbObjects, Ptr) -> parse_object_list(BasePtr, Data, NbObjects, Ptr) ->
Bits = Ptr * 8, Bits = Ptr * 8,
<< _:Bits/bits, Rest/bits >> = Data, << _:Bits/bits, Rest/bits >> = Data,
List = parse_object_list_rec(Rest, NbObjects, []), List = parse_object_list_rec(Rest, NbObjects, []),
[parse_object_args(ObjType, Data, ArgPtr - BasePtr - 16) || {ObjType, _ArgSize, ArgPtr} <- List]. [parse_object_args(ObjType, Params, Data, ArgPtr - BasePtr - 16) || {ObjType, Params, _ArgSize, ArgPtr} <- List].
parse_object_list_rec(_Data, 0, Acc) -> parse_object_list_rec(_Data, 0, Acc) ->
lists:reverse(Acc); lists:reverse(Acc);
parse_object_list_rec(Data, NbObjects, Acc) -> parse_object_list_rec(Data, NbObjects, Acc) ->
% todo x z y ?? % todo x z y ??
<< 16#ffffffff:32, Unknown:32/little-unsigned-integer, 16#ffffffff:32, 16#ffff:16, ObjType:16/little-unsigned-integer, 0:32, << 16#ffffffff:32, UnknownA:32/little-unsigned-integer, 16#ffffffff:32, 16#ffff:16, ObjType:16/little-unsigned-integer, 0:32,
_PosX:32, _PosZ:32, _PosY:32, _RotX:32, _RotZ:32, _RotY:32, ArgSize:32/little-unsigned-integer, ArgPtr:32/little-unsigned-integer, Rest/bits >> = Data, PosX:32/little-float, PosY:32/little-float, PosZ:32/little-float, RotX:32/little-float, RotY:32/little-float, RotZ:32/little-float,
log("object entry: unknown(~b) nb(~b) argsize(~b) argptr(~b)", [Unknown, ObjType, ArgSize, ArgPtr]), ArgSize:32/little-unsigned-integer, ArgPtr:32/little-unsigned-integer, Rest/bits >> = Data,
parse_object_list_rec(Rest, NbObjects - 1, [{ObjType, ArgSize, ArgPtr}|Acc]). log("object entry: a(~b) nb(~b) pos[x(~p) y(~p) z(~p)] rot[x(~p) y(~p) z(~p)] argsize(~b) argptr(~b)", [UnknownA, ObjType, PosX, PosY, PosZ, RotX, RotY, RotZ, ArgSize, ArgPtr]),
parse_object_list_rec(Rest, NbObjects - 1, [{ObjType, {params, {pos, PosX, PosY, PosZ}, {rot, RotX, RotY, RotZ}}, ArgSize, ArgPtr}|Acc]).
parse_object_args(ObjType, Data, Ptr) -> parse_object_args(ObjType, Params, Data, Ptr) ->
Bits = Ptr * 8, Bits = Ptr * 8,
<< _:Bits/bits, Rest/bits >> = Data, << _:Bits/bits, Rest/bits >> = Data,
parse_object_args(ObjType, Rest). parse_object_args(ObjType, Params, Rest).
parse_object_args(4, _Data) -> parse_object_args(4, _Params, _Data) ->
static_model; static_model;
parse_object_args(10, _Data) -> parse_object_args(10, _Params, _Data) ->
invisible_block; invisible_block;
parse_object_args(12, Data) -> parse_object_args(12, _Params, Data) ->
<< Model:16/little-unsigned-integer, UnknownA:16/little-unsigned-integer, UnknownB:32/little-unsigned-integer, UnknownC:16/little-unsigned-integer, Scale:16/little-unsigned-integer, << Model:16/little-unsigned-integer, UnknownA:16/little-unsigned-integer, UnknownB:32/little-unsigned-integer, UnknownC:16/little-unsigned-integer, Scale:16/little-unsigned-integer,
UnknownD:16/little-unsigned-integer, 16#ff00:16, UnknownE:16/little-unsigned-integer, UnknownF:16/little-unsigned-integer, UnknownD:16/little-unsigned-integer, 16#ff00:16, UnknownE:16/little-unsigned-integer, UnknownF:16/little-unsigned-integer,
16#ffffffff:32, 16#ffffffff:32, 16#ffffffff:32, RawTrigEvent:16/little-unsigned-integer, 16#ffffffff:32, 16#ffffffff:32, 16#ffffffff:32, RawTrigEvent:16/little-unsigned-integer,
@ -144,23 +145,33 @@ parse_object_args(12, Data) ->
log("box: model(~b) a(~b) breakable(~p) c(~b) scale(~b) d(~b) e(~b) f(~b) trigevent(~p)", [Model, UnknownA, Breakable, UnknownC, Scale, UnknownD, UnknownE, UnknownF, TrigEvent]), log("box: model(~b) a(~b) breakable(~p) c(~b) scale(~b) d(~b) e(~b) f(~b) trigevent(~p)", [Model, UnknownA, Breakable, UnknownC, Scale, UnknownD, UnknownE, UnknownF, TrigEvent]),
{box, Model, Breakable, TrigEvent}; {box, Model, Breakable, TrigEvent};
parse_object_args(17, _Data) -> parse_object_args(14, {params, {pos, PosX, PosY, PosZ}, _Rot}, Data) ->
<< _:96, DiffX:32/little-float, DiffY:32/little-float, DiffZ:32/little-float, DestDir:32/little-float, _/bits >> = Data,
log("warp: diffpos[x(~p) y(~p) z(~p)] destdir(~p)", [DiffX, DiffY, DiffZ, DestDir]),
{warp, PosX + DiffX, PosY + DiffY, PosZ + DiffZ, DestDir};
parse_object_args(17, _Params, _Data) ->
fence; fence;
parse_object_args(20, _Data) -> parse_object_args(20, _Params, _Data) ->
door; door;
parse_object_args(22, Data) -> parse_object_args(22, _Params, Data) ->
<< 0:16, KeySet:8, 1, 0:16, UnknownB:8, 0, 0:16, UnknownC:16/little-unsigned-integer, RawReqKey1Event:16/little-unsigned-integer, << UnknownA:8, 0, KeySet:8, 1, 0:16, UnknownB:8, 0, 0:16, UnknownC:16/little-unsigned-integer, RawReqKey1Event:16/little-unsigned-integer,
RawReqKey2Event:16/little-unsigned-integer, RawReqKey3Event:16/little-unsigned-integer, RawReqKey4Event:16/little-unsigned-integer, RawReqKey2Event:16/little-unsigned-integer, RawReqKey3Event:16/little-unsigned-integer, RawReqKey4Event:16/little-unsigned-integer,
16#ffffffff:32, 16#ffffffff:32, RawTrigEvent:16/little-unsigned-integer, UnknownD:16/little-unsigned-integer, 16#ffffffff:32, 16#ffffffff:32, RawTrigEvent:16/little-unsigned-integer, UnknownD:16/little-unsigned-integer,
16#ffffffff:32, 16#ffffffff:32, 16#ffffffff:32, _/bits >> = Data, 16#ffffffff:32, 16#ffffffff:32, 16#ffffffff:32, _/bits >> = Data,
ReqKeyEvents = [convert_eventid(RawReqKey1Event), convert_eventid(RawReqKey2Event), convert_eventid(RawReqKey3Event), convert_eventid(RawReqKey4Event)], ReqKeyEvents = [convert_eventid(RawReqKey1Event), convert_eventid(RawReqKey2Event), convert_eventid(RawReqKey3Event), convert_eventid(RawReqKey4Event)],
TrigEvent = convert_eventid(RawTrigEvent), TrigEvent = convert_eventid(RawTrigEvent),
log("key_console: keyset(~b) b(~b) c(~b) reqkeyevents(~p) trigevent(~p) d(~b)", [KeySet, UnknownB, UnknownC, ReqKeyEvents, TrigEvent, UnknownD]), log("key_console: a(~b) keyset(~b) b(~b) c(~b) reqkeyevents(~p) trigevent(~p) d(~b)", [UnknownA, KeySet, UnknownB, UnknownC, ReqKeyEvents, TrigEvent, UnknownD]),
{key_console, KeySet, ReqKeyEvents, TrigEvent}; {key_console, KeySet, ReqKeyEvents, TrigEvent};
parse_object_args(24, Data) -> %% @todo Find out what this object number is.
parse_object_args(23, _Params, _Data) ->
unknown_object;
parse_object_args(24, _Params, Data) ->
%% @todo return meaningful information %% @todo return meaningful information
<< _:704, UnknownA:32/little-unsigned-integer, RawTrigEvent:16/little-unsigned-integer, RawReqEvent:16/little-unsigned-integer, 16#ffff:16, UnknownB:8, SpawnNb:8, _/bits >> = Data, << _:704, UnknownA:32/little-unsigned-integer, RawTrigEvent:16/little-unsigned-integer, RawReqEvent:16/little-unsigned-integer, 16#ffff:16, UnknownB:8, SpawnNb:8, _/bits >> = Data,
TrigEvent = convert_eventid(RawTrigEvent), TrigEvent = convert_eventid(RawTrigEvent),
@ -168,13 +179,13 @@ parse_object_args(24, Data) ->
log("spawn: a(~b) trigevent(~p) reqevent(~p) b(~b) spawnnb(~b)", [UnknownA, TrigEvent, ReqEvent, UnknownB, SpawnNb]), log("spawn: a(~b) trigevent(~p) reqevent(~p) b(~b) spawnnb(~b)", [UnknownA, TrigEvent, ReqEvent, UnknownB, SpawnNb]),
{'spawn', TrigEvent, ReqEvent}; {'spawn', TrigEvent, ReqEvent};
parse_object_args(26, _Data) -> parse_object_args(26, _Params, _Data) ->
entrance; entrance;
parse_object_args(27, _Data) -> parse_object_args(27, _Params, _Data) ->
'exit'; 'exit';
parse_object_args(31, Data) -> parse_object_args(31, _Params, Data) ->
<< KeySet:8, UnknownB:8, 16#0001:16, 16#ffff:16, RawTrigEvent:16/little-unsigned-integer, RawReqEvent:16/little-unsigned-integer, 16#ffff:16, << KeySet:8, UnknownB:8, 16#0001:16, 16#ffff:16, RawTrigEvent:16/little-unsigned-integer, RawReqEvent:16/little-unsigned-integer, 16#ffff:16,
16#ffffffff:32, 16#ffffffff:32, 16#ffffffff:32, _/bits >> = Data, 16#ffffffff:32, 16#ffffffff:32, 16#ffffffff:32, _/bits >> = Data,
TrigEvent = convert_eventid(RawTrigEvent), TrigEvent = convert_eventid(RawTrigEvent),
@ -182,14 +193,23 @@ parse_object_args(31, Data) ->
log("key: keyset(~b) b(~b) trigevent(~p) reqevent(~p)", [KeySet, UnknownB, TrigEvent, ReqEvent]), log("key: keyset(~b) b(~b) trigevent(~p) reqevent(~p)", [KeySet, UnknownB, TrigEvent, ReqEvent]),
{key, KeySet, TrigEvent, ReqEvent}; {key, KeySet, TrigEvent, ReqEvent};
parse_object_args(35, _Data) -> parse_object_args(35, _Params, _Data) ->
boss; boss;
parse_object_args(49, _Data) -> parse_object_args(49, _Params, _Data) ->
crystal; crystal;
parse_object_args(53, _Data) -> parse_object_args(50, _Params, _Data) ->
label. healing_pad;
parse_object_args(53, _Params, _Data) ->
label;
parse_object_args(62, _Params, _Data) ->
pp_cube;
parse_object_args(64, _Params, _Data) ->
hidden_minimap_section.
convert_eventid(16#ffff) -> convert_eventid(16#ffff) ->
false; false;