diff --git a/priv/quests/1100000/quest.conf b/priv/quests/1100000/quest.conf index 568a173..7c523cc 100644 --- a/priv/quests/1100000/quest.conf +++ b/priv/quests/1100000/quest.conf @@ -27,13 +27,13 @@ %% @todo Default enemy_level to 1 if unspecified (lobbies). %% @todo Default sets to [100] if unspecified (lobbies). {zones, [ - { 0, [{areaid, 2}, {enemy_level, 1}, {sets, [100]}, {maps, [1, 2, 3, 4, 103]}]}, + { 0, [{areaid, 2}, {enemy_level, 1}, {sets, [100]}, {maps, [1, 2, 3, 4, 5, 103]}]}, { 1, [{areaid, 2}, {enemy_level, 1}, {sets, [100]}, {maps, [9001]}]}, { 2, [{areaid, 2}, {enemy_level, 1}, {sets, [100]}, {maps, [9000]}]}, { 3, [{areaid, 2}, {enemy_level, 1}, {sets, [100]}, {maps, [9102]}]}, { 4, [{areaid, 2}, {enemy_level, 1}, {sets, [100]}, {maps, [9010]}]}, { 7, [{areaid, 2}, {enemy_level, 1}, {sets, [100]}, {maps, [9200, 9202]}]}, - {11, [{areaid, 2}, {enemy_level, 1}, {sets, [100]}, {maps, [5, 100, 101, 102, 110]}]}, + {11, [{areaid, 2}, {enemy_level, 1}, {sets, [100]}, {maps, [100, 101, 102, 110]}]}, {12, [{areaid, 2}, {enemy_level, 1}, {sets, [100]}, {maps, [100, 101, 102]}]}, {13, [{areaid, 2}, {enemy_level, 1}, {sets, [100]}, {maps, [100, 101, 102]}]} ]}. @@ -100,14 +100,13 @@ {{1100000, 0, 3, 5}, {1100000, 0, 103, 0}}, %% @todo Exit 6. %% 4rd floor. - {{1100000, 0, 4, 0}, {1100000, 0, 3, 1}}, - {{1100000, 0, 4, 1}, {1100000, 11, 5, 0}}, - {{1100000, 0, 4, 2}, {1104000, 0, 900, 0}}, - {{1100000, 0, 4, 3}, {1104000, 0, 900, 0}}, - {{1100000, 0, 4, 4}, {1104000, 0, 900, 0}}, + {{1100000, 0, 4, 0}, {1100000, 0, 3, 1}}, + {{1100000, 0, 4, 1}, {1100000, 0, 5, 0}}, + {{1100000, 0, 4, 2}, {1104000, 0, 900, 0}}, + {{1100000, 0, 4, 3}, {1104000, 0, 900, 0}}, + {{1100000, 0, 4, 4}, {1104000, 0, 900, 0}}, %% 5th floor. - %% @todo Add 5th floor to zone 0. - {{1100000, 11, 5, 0}, {1100000, 0, 4, 1}}, + {{1100000, 0, 5, 0}, {1100000, 0, 4, 1}}, %% 2nd floor shops. {{1100000, 11, 101, 0}, {1100000, 0, 2, 3}}, {{1100000, 12, 101, 1}, {1100000, 0, 2, 4}}, diff --git a/priv/quests/1100000/unit_title_00.bin.en_US.txt b/priv/quests/1100000/unit_title_00.bin.en_US.txt index 5c73422..3534d62 100644 Binary files a/priv/quests/1100000/unit_title_00.bin.en_US.txt and b/priv/quests/1100000/unit_title_00.bin.en_US.txt differ diff --git a/priv/quests/1100000/unit_title_11.bin.en_US.txt b/priv/quests/1100000/unit_title_11.bin.en_US.txt index d21a399..535d9f4 100644 Binary files a/priv/quests/1100000/unit_title_11.bin.en_US.txt and b/priv/quests/1100000/unit_title_11.bin.en_US.txt differ diff --git a/priv/quests/1100000/zone-0/script.es b/priv/quests/1100000/zone-0/script.es index 58528be..dbc8137 100644 --- a/priv/quests/1100000/zone-0/script.es +++ b/priv/quests/1100000/zone-0/script.es @@ -83,6 +83,10 @@ event entr_unit0004 -> push 0, npc.talk_on, %% Linear Line NPC. push 1, npc.talk_on. %% Space Docks NPC. +%% @doc Enter map 5 event. Initialize the labels. +event entr_unit0005 -> + push 6, push 0, obj.set_caption. %% Elevators. + %% @doc Enter map 103 event. Initialize the label. event entr_unit0103 -> push 3, push 0, obj.set_caption. %% Exits to 3rd floor. @@ -118,7 +122,7 @@ function coli_unit0001_elevator -> push 4, %% selected option: 1st floor mes.select_win_b, case - 0 -> push 11, push 5, push 0, player.change_unit; + 0 -> push 0, push 5, num_get nElevatorEntry, player.change_unit; 1 -> push 0, push 4, num_get nElevatorEntry, player.change_unit; 2 -> push 0, push 3, num_get nElevatorEntry, player.change_unit; 3 -> push 0, push 2, num_get nElevatorEntry, player.change_unit @@ -154,7 +158,7 @@ function coli_unit0002_elevator -> push 3, %% selected option: 2nd floor mes.select_win_b, case - 0 -> push 11, push 5, push 0, player.change_unit; + 0 -> push 0, push 5, num_get nElevatorEntry, player.change_unit; 1 -> push 0, push 4, num_get nElevatorEntry, player.change_unit; 2 -> push 0, push 3, num_get nElevatorEntry, player.change_unit; 4 -> push 0, push 1, num_get nElevatorEntry, player.change_unit @@ -204,7 +208,7 @@ function coli_unit0003_elevator -> push 2, %% selected option: 3rd floor mes.select_win_b, case - 0 -> push 11, push 5, push 0, player.change_unit; + 0 -> push 0, push 5, num_get nElevatorEntry, player.change_unit; 1 -> push 0, push 4, num_get nElevatorEntry, player.change_unit; 3 -> push 0, push 2, num_get nElevatorEntry, player.change_unit; 4 -> push 0, push 1, num_get nElevatorEntry, player.change_unit @@ -254,7 +258,7 @@ function coli_unit0004_elevator -> push 1, %% selected option: 4th floor mes.select_win_b, case - 0 -> push 11, push 5, push 0, player.change_unit; + 0 -> push 0, push 5, num_get nElevatorEntry, player.change_unit; 2 -> push 0, push 3, num_get nElevatorEntry, player.change_unit; 3 -> push 0, push 2, num_get nElevatorEntry, player.change_unit; 4 -> push 0, push 1, num_get nElevatorEntry, player.change_unit @@ -289,6 +293,42 @@ event coli_unit0004_obje023 -> num_get nElevatorEntry, obj.coli_end. +%% Map 5. + +function coli_unit0005_elevator -> + player.pad_off, + push 39, %% return + push 29, %% 1st floor + push 31, %% 2nd floor + push 33, %% 3rd floor + push 35, %% 4th floor + push 38, %% 5th floor + push 27, %% stringid question + push 6, %% number of options + push 0, %% selected option: 5th floor + mes.select_win_b, + case + 1 -> push 0, push 4, num_get nElevatorEntry, player.change_unit; + 2 -> push 0, push 3, num_get nElevatorEntry, player.change_unit; + 3 -> push 0, push 2, num_get nElevatorEntry, player.change_unit; + 4 -> push 0, push 1, num_get nElevatorEntry, player.change_unit + end, + player.pad_on. + +event coli_unit0005_obje022 -> + push 22, + num_set nElevatorEntry, + coli_unit0005_elevator, + num_get nElevatorEntry, + obj.coli_end. + +event coli_unit0005_obje023 -> + push 23, + num_set nElevatorEntry, + coli_unit0005_elevator, + num_get nElevatorEntry, + obj.coli_end. + %% NPCs. num_var nTransportNPC. diff --git a/priv/quests/1100000/zone-0/set_r0.conf b/priv/quests/1100000/zone-0/set_r0.conf index fdae6fb..9d58906 100644 --- a/priv/quests/1100000/zone-0/set_r0.conf +++ b/priv/quests/1100000/zone-0/set_r0.conf @@ -1881,6 +1881,53 @@ ] ]}. +{{map, 5}, [ + [ %% Always available. + {chair, { 90.0, 16.0, 197.0}, {0.0, 187.0, 0.0}, [{id, 1}]}, + {chair, { 104.0, 16.0, 194.0}, {0.0, 200.0, 0.0}, [{id, 2}]}, + {chair, { 116.0, 16.0, 187.0}, {0.0, 220.0, 0.0}, [{id, 3}]}, + {chair, { 127.0, 16.0, 177.0}, {0.0, 235.0, 0.0}, [{id, 4}]}, + {chair, { 134.0, 16.0, 164.0}, {0.0, 250.0, 0.0}, [{id, 5}]}, + {chair, { 136.0, 16.0, 150.0}, {0.0, 260.0, 0.0}, [{id, 6}]}, + {chair, { -90.0, 16.0, 197.0}, {0.0, 173.0, 0.0}, [{id, 7}]}, + {chair, {-104.0, 16.0, 194.0}, {0.0, 160.0, 0.0}, [{id, 8}]}, + {chair, {-116.0, 16.0, 187.0}, {0.0, 140.0, 0.0}, [{id, 9}]}, + {chair, {-127.0, 16.0, 177.0}, {0.0, 125.0, 0.0}, [{id, 10}]}, + {chair, {-134.0, 16.0, 164.0}, {0.0, 110.0, 0.0}, [{id, 11}]}, + {chair, {-136.0, 16.0, 150.0}, {0.0, 100.0, 0.0}, [{id, 12}]}, + + {door, { 0.0, 0.0, 640.0}, {0.0, 0.0, 0.0}, [{model, 61}]}, + {door, { 25.0, 30.0, -290.0}, {0.0, 0.0, 0.0}, [{model, 66}]}, + {door, {-25.0, 30.0, -290.0}, {0.0, 0.0, 0.0}, [{model, 66}]}, + + {exit, {0.0, 0.0, 620.0}, {0.0, 0.0, 0.0}, [ + {entryid, 0}, {type, map}, {animation, run}, + {exit_box, {0.0, 70.0, 20.0, 20.0}}, {exit_movement, {0.0, 0.0, 45.0}}, + {camera_box, {0.0, 70.0, 19.0, 90.0}}, {camera_movement, {0.0, 30.0, -100.0}} + ]}, + + {entrance, { 0.0, 0.0, 550.0}, {0.0, 180.0, 0.0}, [{entryid, 0}]}, + {entrance, { 25.0, 30.0, -260.0}, {0.0, 0.0, 0.0}, [{entryid, 23}]}, + {entrance, {-25.0, 30.0, -260.0}, {0.0, 0.0, 0.0}, [{entryid, 22}]}, + + {label, { 25.0, 51.0, -290.0}, {0.0, 0.0, 0.0}, [{id, 0}, {box, {20.0, 60.0, 30.0, 180.0}}]}, + {label, {-25.0, 51.0, -290.0}, {0.0, 0.0, 0.0}, [{id, 0}, {box, {20.0, 60.0, 30.0, 180.0}}]}, + + {npc, { 0.0, 11.0, 85.0}, {0.0, 0.0, 0.0}, [{model, 80}, {id, 0}, {talk_radius, 30.0}]}, + {npc, { 25.0, 11.0, 60.0}, {0.0, 90.0, 0.0}, [{model, 81}, {id, 1}]}, + {npc, {-25.0, 11.0, 60.0}, {0.0, -90.0, 0.0}, [{model, 81}, {id, 2}]}, + {npc, { 0.0, 11.0, 35.0}, {0.0, 180.0, 0.0}, [{model, 81}, {id, 3}]}, + {npc, {-70.0, 0.0, 305.0}, {0.0, 90.0, 0.0}, [{model, 81}, {id, 4}]}, + + {pp_cube, {60.0, 0.0, 285.0}, {0.0, 0.0, 0.0}, []}, + + {sensor, { 25.0, 31.0, -290.0}, {0.0, 0.0, 0.0}, [{id, 23}, {box, {30.0, 40.0, 40.0, 40.0}}]}, + {sensor, {-25.0, 31.0, -290.0}, {0.0, 0.0, 0.0}, [{id, 22}, {box, {30.0, 40.0, 40.0, 40.0}}]}, + + {uni_cube, {-30.0, 0.0, 485.0}, {0.0, 0.0, 0.0}, [{i, 0}, {entryid, 0}]} + ] +]}. + {{map, 103}, [ [ %% Always available. {chair, {-599.0, 186.0, -1049.0}, {0.0, 180.0, 0.0}, [{id, 1}, {stand_dist, 8.0}]},