psu_missions: Add Fight for Food, fix key handling for gates with N>1 keys and many gates per block.
This commit is contained in:
Loïc Hoguin
parent
51c2c1ad3e
commit
9546237ea5
@ -39,7 +39,27 @@
|
||||
{1000023, [{type, mission}, {file, "data/missions/unsafe-passage.3.s.quest.nbl"}, {start, [0, 1200, 0]}]},
|
||||
{1000024, [{type, mission}, {file, "data/missions/unsafe-passage.3.s2.quest.nbl"}, {start, [0, 1200, 0]}]},
|
||||
|
||||
% Phantom Ruins
|
||||
% Fight for Food
|
||||
|
||||
{1000100, [{type, mission}, {file, "data/missions/fight-for-food.1.c.quest.nbl"}, {start, [0, 1200, 0]}]},
|
||||
{1000101, [{type, mission}, {file, "data/missions/fight-for-food.1.b.quest.nbl"}, {start, [0, 1200, 0]}]},
|
||||
{1000102, [{type, mission}, {file, "data/missions/fight-for-food.1.a.quest.nbl"}, {start, [0, 1200, 0]}]},
|
||||
{1000103, [{type, mission}, {file, "data/missions/fight-for-food.1.s.quest.nbl"}, {start, [0, 1200, 0]}]},
|
||||
{1000104, [{type, mission}, {file, "data/missions/fight-for-food.1.s2.quest.nbl"}, {start, [0, 1200, 0]}]},
|
||||
|
||||
{1000110, [{type, mission}, {file, "data/missions/fight-for-food.2.c.quest.nbl"}, {start, [0, 1301, 0]}]},
|
||||
{1000111, [{type, mission}, {file, "data/missions/fight-for-food.2.b.quest.nbl"}, {start, [0, 1301, 0]}]},
|
||||
{1000112, [{type, mission}, {file, "data/missions/fight-for-food.2.a.quest.nbl"}, {start, [0, 1301, 0]}]},
|
||||
{1000113, [{type, mission}, {file, "data/missions/fight-for-food.2.s.quest.nbl"}, {start, [0, 1301, 0]}]},
|
||||
{1000114, [{type, mission}, {file, "data/missions/fight-for-food.2.s2.quest.nbl"}, {start, [0, 1301, 0]}]},
|
||||
|
||||
{1000120, [{type, mission}, {file, "data/missions/fight-for-food.3.c.quest.nbl"}, {start, [0, 1301, 0]}]},
|
||||
{1000121, [{type, mission}, {file, "data/missions/fight-for-food.3.b.quest.nbl"}, {start, [0, 1301, 0]}]},
|
||||
{1000122, [{type, mission}, {file, "data/missions/fight-for-food.3.a.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]}]},
|
||||
|
||||
% Phantom Ruins (Linear Line counter)
|
||||
|
||||
{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]}]},
|
||||
@ -92,7 +112,27 @@
|
||||
{[1000023, 0], [{file, "data/missions/unsafe-passage.3.s.zone.nbl"}]},
|
||||
{[1000024, 0], [{file, "data/missions/unsafe-passage.3.s2.zone.nbl"}]},
|
||||
|
||||
% Phantom Ruins
|
||||
% Fight for Food
|
||||
|
||||
{[1000100, 0], [{file, "data/missions/fight-for-food.1.c.zone.nbl"}]},
|
||||
{[1000101, 0], [{file, "data/missions/fight-for-food.1.b.zone.nbl"}]},
|
||||
%~ {[1000102, 0], [{file, "data/missions/fight-for-food.1.a.zone.nbl"}]},
|
||||
%~ {[1000103, 0], [{file, "data/missions/fight-for-food.1.s.zone.nbl"}]},
|
||||
{[1000104, 0], [{file, "data/missions/fight-for-food.1.s2.zone.nbl"}]},
|
||||
|
||||
{[1000110, 0], [{file, "data/missions/fight-for-food.2.c.zone.nbl"}]},
|
||||
%~ {[1000111, 0], [{file, "data/missions/fight-for-food.2.b.zone.nbl"}]},
|
||||
%~ {[1000112, 0], [{file, "data/missions/fight-for-food.2.a.zone.nbl"}]},
|
||||
%~ {[1000113, 0], [{file, "data/missions/fight-for-food.2.s.zone.nbl"}]},
|
||||
{[1000114, 0], [{file, "data/missions/fight-for-food.2.s2.zone.nbl"}]},
|
||||
|
||||
{[1000120, 0], [{file, "data/missions/fight-for-food.3.c.zone.nbl"}]},
|
||||
%~ {[1000121, 0], [{file, "data/missions/fight-for-food.3.b.zone.nbl"}]},
|
||||
{[1000122, 0], [{file, "data/missions/fight-for-food.3.a.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"}]},
|
||||
|
||||
% Phantom Ruins (Linear Line counter)
|
||||
|
||||
{[1060300, 0], [{file, "data/missions/phantom-ruins.c-0.zone.nbl"}]},
|
||||
{[1060300, 1], [{file, "data/missions/phantom-ruins.c-1.zone.nbl"}]},
|
||||
@ -393,15 +433,24 @@
|
||||
|
||||
% Transfer Terminal (entry 1): Phantom Ruins, Fight for Food, Fight for Food (AOTI, missing)
|
||||
|
||||
{ 11, [{quests, "data/counters/colony.terminal-1.pack"}, {bg, 255}, {options, << 16#01fc2800:32, 3, 3, 0,
|
||||
3, 3, 3, 3, 0, % Phantom Ruins C-S
|
||||
3, 3, 3, % Fight for Food C-A variant 1
|
||||
3, 3, 3, % Fight for Food C-A variant 2
|
||||
3, 3, 3, % Fight for Food C-A variant 3
|
||||
3, 3, 3, % Fight for Food S variant 1-3
|
||||
{ 11, [{quests, "data/counters/colony.terminal-1.pack"}, {bg, 255}, {options, << 16#01fc2800:32, 0, 3, 0,
|
||||
0, 0, 0, 0, 0, % Phantom Ruins C-S
|
||||
3, 3, 0, % Fight for Food C-A variant 1
|
||||
3, 0, 0, % Fight for Food C-A variant 2
|
||||
3, 0, 3, % Fight for Food C-A variant 3
|
||||
0, 0, 0, % Fight for Food S variant 1-3
|
||||
3, 3, 3, % Fight for Food S2 variant 1-3
|
||||
0:136 >>}]},
|
||||
|
||||
%~ { 11, [{quests, "data/counters/colony.terminal-1.pack"}, {bg, 255}, {options, << 16#01fc2800:32, 3, 3, 0,
|
||||
%~ 3, 3, 3, 3, 0, % Phantom Ruins C-S
|
||||
%~ 3, 3, 3, % Fight for Food C-A variant 1
|
||||
%~ 3, 3, 3, % Fight for Food C-A variant 2
|
||||
%~ 3, 3, 3, % Fight for Food C-A variant 3
|
||||
%~ 3, 3, 3, % Fight for Food S variant 1-3
|
||||
%~ 3, 3, 3, % Fight for Food S2 variant 1-3
|
||||
%~ 0:136 >>}]},
|
||||
|
||||
% Aurorey
|
||||
|
||||
{ 15, [{quests, "data/counters/colony.aurorey.pack"}, {bg, 255}, {options, << 16#01010400:32, 0:32 >>}]},
|
||||
|
||||
@ -45,12 +45,12 @@ object_init(InstanceID, BlockID, [{box, _Model, Breakable, TrigEventID}|Tail], O
|
||||
end,
|
||||
object_init(InstanceID, BlockID, Tail, ObjectID + 1, TargetID + 1);
|
||||
%% @todo key and key_console event handling will have to be fixed.
|
||||
object_init(InstanceID, BlockID, [{key, TrigEventID, _ReqEventID}|Tail], ObjectID, TargetID) ->
|
||||
object_init(InstanceID, BlockID, [{key, _KeySet, TrigEventID, _ReqEventID}|Tail], ObjectID, TargetID) ->
|
||||
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);
|
||||
%% @todo Maybe separate key from key_console in its handling?
|
||||
object_init(InstanceID, BlockID, [{key_console, _NoKeyEventID, TrigEventID}|Tail], ObjectID, TargetID) ->
|
||||
egs_db:objects_insert(#objects{id=[InstanceID, {key, ObjectID}], instanceid=InstanceID, objectid=ObjectID, type=key, blockid=BlockID, triggereventid=[244, 202, TrigEventID]}),
|
||||
object_init(InstanceID, BlockID, [{key_console, KeySet, _ReqKeyEventsID, TrigEventID}|Tail], 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]}),
|
||||
object_init(InstanceID, BlockID, Tail, ObjectID + 1, TargetID);
|
||||
%% @todo save enemies individually, do something, etc.
|
||||
%% @todo temporarily save the spawn to handle events properly
|
||||
|
||||
@ -24,7 +24,7 @@
|
||||
-define(NBL, "./nbl").
|
||||
|
||||
run() ->
|
||||
List = [parse_zone(QuestID, Filename) || {[QuestID, _ZoneID], [{file, Filename}]} <- ?ZONES, QuestID =< 1000024],
|
||||
List = [parse_zone(QuestID, Filename) || {[QuestID, _ZoneID], [{file, Filename}]} <- ?ZONES, QuestID =< 1000124],
|
||||
Begin = "%% This file is automatically generated by EGS.
|
||||
%% Please do not edit it manually, as you would risk losing your changes.
|
||||
|
||||
@ -100,8 +100,9 @@ parse_object_list_headers(BasePtr, Data, NbHeaders, Ptr) ->
|
||||
parse_object_list_headers_rec(_Data, 0, Acc) ->
|
||||
lists:reverse(Acc);
|
||||
parse_object_list_headers_rec(Data, NbHeaders, Acc) ->
|
||||
<< 16#ffffffff:32, 0:16, UnknownA:16/little-unsigned-integer, 0:80, UnknownB:32/little-unsigned-integer, 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,
|
||||
log("object list headers: a(~b) b(~b) list nb(~b) nb obj(~b) obj list ptr(~b)", [UnknownA, UnknownB, ObjListNumber, NbObjects, ObjListPtr]),
|
||||
<< 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,
|
||||
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]),
|
||||
parse_object_list_headers_rec(Rest, NbHeaders - 1, [{ObjListNumber, NbObjects, ObjListPtr}|Acc]).
|
||||
|
||||
parse_object_list(BasePtr, Data, NbObjects, Ptr) ->
|
||||
@ -132,14 +133,15 @@ parse_object_args(10, _Data) ->
|
||||
|
||||
parse_object_args(12, 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,
|
||||
16#0000ff00:32, 16#ffffffff:32, 16#ffffffff:32, 16#ffffffff:32, 16#ffffffff:32, RawTrigEvent: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, 16#ffffffff:32, 16#ffffffff:32, 16#ffffffff:32, 16#ffffffff:32, 16#ffffffff:32, 0:16, _/bits >> = Data,
|
||||
Breakable = case UnknownB of
|
||||
0 -> false;
|
||||
1 -> true
|
||||
end,
|
||||
TrigEvent = convert_eventid(RawTrigEvent),
|
||||
log("box: model(~b) a(~b) breakable(~p) c(~b) scale(~b) trigevent(~p)", [Model, UnknownA, Breakable, UnknownC, Scale, 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};
|
||||
|
||||
parse_object_args(17, _Data) ->
|
||||
@ -149,13 +151,14 @@ parse_object_args(20, _Data) ->
|
||||
door;
|
||||
|
||||
parse_object_args(22, Data) ->
|
||||
<< 16#00000101:32, 16#00000100:32, 0:16, UnknownA:16/little-unsigned-integer, RawNoKeyEvent:16/little-unsigned-integer, 16#ffff:16,
|
||||
16#ffffffff:32, 16#ffffffff:32, 16#ffffffff:32, RawTrigEvent:16/little-unsigned-integer, UnknownB:16/little-unsigned-integer,
|
||||
<< 0:16, 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,
|
||||
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,
|
||||
NoKeyEvent = convert_eventid(RawNoKeyEvent),
|
||||
ReqKeyEvents = [convert_eventid(RawReqKey1Event), convert_eventid(RawReqKey2Event), convert_eventid(RawReqKey3Event), convert_eventid(RawReqKey4Event)],
|
||||
TrigEvent = convert_eventid(RawTrigEvent),
|
||||
log("key_console: a(~b) nokeyevent(~p) trigevent(~p) b(~b)", [UnknownA, NoKeyEvent, TrigEvent, UnknownB]),
|
||||
{key_console, NoKeyEvent, TrigEvent};
|
||||
log("key_console: keyset(~b) b(~b) c(~b) reqkeyevents(~p) trigevent(~p) d(~b)", [KeySet, UnknownB, UnknownC, ReqKeyEvents, TrigEvent, UnknownD]),
|
||||
{key_console, KeySet, ReqKeyEvents, TrigEvent};
|
||||
|
||||
parse_object_args(24, Data) ->
|
||||
%% @todo return meaningful information
|
||||
@ -172,12 +175,12 @@ parse_object_args(27, _Data) ->
|
||||
'exit';
|
||||
|
||||
parse_object_args(31, Data) ->
|
||||
<< 16#01000001:32, 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,
|
||||
TrigEvent = convert_eventid(RawTrigEvent),
|
||||
ReqEvent = convert_eventid(RawReqEvent),
|
||||
log("key: trigevent(~p) reqevent(~p)", [TrigEvent, ReqEvent]),
|
||||
{key, TrigEvent, ReqEvent};
|
||||
log("key: keyset(~b) b(~b) trigevent(~p) reqevent(~p)", [KeySet, UnknownB, TrigEvent, ReqEvent]),
|
||||
{key, KeySet, TrigEvent, ReqEvent};
|
||||
|
||||
parse_object_args(35, _Data) ->
|
||||
boss;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user