diff --git a/decompiler/ObjectFile/ObjectFileDB.cpp b/decompiler/ObjectFile/ObjectFileDB.cpp index 7d201a3753..222680c39d 100644 --- a/decompiler/ObjectFile/ObjectFileDB.cpp +++ b/decompiler/ObjectFile/ObjectFileDB.cpp @@ -376,7 +376,7 @@ std::string pad_string(const std::string& in, size_t length) { } } // namespace -std::string ObjectFileDB::generate_obj_listing() { +std::string ObjectFileDB::generate_obj_listing(const std::unordered_set& merged_objs) { std::string result = "["; std::set all_unique_names; int unique_count = 0; @@ -391,23 +391,25 @@ std::string ObjectFileDB::generate_obj_listing() { dgos.pop_back(); dgos.pop_back(); dgos += "]"; - result += "[\"" + pad_string(x.to_unique_name() + "\", ", 50) + "\"" + + auto name = x.to_unique_name(); + result += "[\"" + pad_string(name + "\", ", 50) + "\"" + pad_string(x.name_in_dgo + "\", ", 50) + std::to_string(x.obj_version) + ", " + dgos + ", \"\"],\n"; unique_count++; - if (all_unique_names.find(x.to_unique_name()) != all_unique_names.end()) { - lg::error("Object file {} appears multiple times with the same name.", x.to_unique_name()); + if (all_unique_names.find(name) != all_unique_names.end() && + merged_objs.find(name) == merged_objs.end()) { + lg::error("Object file {} appears multiple times with the same name.", name); } - all_unique_names.insert(x.to_unique_name()); - } - // this check is extremely important. It makes sure we don't have any repeat names. This could - // be caused by two files with the same name, in the same DGOs, but different data. - if (int(all_unique_names.size()) != unique_count) { - lg::error("Object files are not named properly, data will be lost!"); + all_unique_names.insert(name); } } + // this check is extremely important. It makes sure we don't have any repeat names. This could + // be caused by two files with the same name, in the same DGOs, but different data. + if (int(all_unique_names.size()) != unique_count) { + lg::error("Object files are not named properly, data will be lost!"); + } - if (result.length() >= 2) { + if (unique_count > 0) { result.pop_back(); // kill last new line result.pop_back(); // kill last comma } diff --git a/decompiler/ObjectFile/ObjectFileDB.h b/decompiler/ObjectFile/ObjectFileDB.h index 092ce0b793..db652bec27 100644 --- a/decompiler/ObjectFile/ObjectFileDB.h +++ b/decompiler/ObjectFile/ObjectFileDB.h @@ -54,7 +54,7 @@ class ObjectFileDB { const std::vector& str_files, const Config& config); std::string generate_dgo_listing(); - std::string generate_obj_listing(); + std::string generate_obj_listing(const std::unordered_set& merged_objs); void process_link_data(const Config& config); void process_labels(); void find_code(const Config& config); @@ -81,7 +81,7 @@ class ObjectFileDB { void ir2_register_usage_pass(int seg, ObjectFileData& data); void ir2_variable_pass(int seg, ObjectFileData& data); void ir2_cfg_build_pass(int seg, ObjectFileData& data); - void ir2_store_current_forms(int seg); + // void ir2_store_current_forms(int seg); void ir2_build_expressions(int seg, const Config& config, ObjectFileData& data); void ir2_insert_lets(int seg, ObjectFileData& data); void ir2_rewrite_inline_asm_instructions(int seg, ObjectFileData& data); diff --git a/decompiler/config.cpp b/decompiler/config.cpp index fdc9f29a96..69b9679972 100644 --- a/decompiler/config.cpp +++ b/decompiler/config.cpp @@ -202,6 +202,12 @@ Config read_config_file(const std::string& path_to_config_file) { config.bad_format_strings = hacks_json.at("bad_format_strings").get>(); + + auto merged = hacks_json.at("expected_merged_objs").get>(); + for (const auto& x : merged) { + config.merged_objects.insert(x); + } + config.levels_to_extract = cfg.at("levels_to_extract").get>(); return config; } diff --git a/decompiler/config.h b/decompiler/config.h index e870fcb2fe..d0c11063c3 100644 --- a/decompiler/config.h +++ b/decompiler/config.h @@ -115,6 +115,7 @@ struct Config { std::unordered_set allowed_objects; std::unordered_set banned_objects; + std::unordered_set merged_objects; std::unordered_map>> register_type_casts_by_function_by_atomic_op_idx; std::unordered_map> diff --git a/decompiler/config/all-types.gc b/decompiler/config/all-types.gc index 5c7e121370..252353491f 100644 --- a/decompiler/config/all-types.gc +++ b/decompiler/config/all-types.gc @@ -30424,6 +30424,10 @@ :size-assert #x200 :heap-base #x190 :flag-assert #x4c01900200 + (:states + muse-idle + muse-caught + ) ) (deftype point-on-path-segment-info (structure) @@ -30450,8 +30454,6 @@ (define-extern *muse-sg* skeleton-group) (define-extern *muse-nav-enemy-info* nav-enemy-info) -(define-extern muse-idle (state muse)) ;; unknown type -(define-extern muse-caught (state muse)) ;; unknown type ;; ---------------------- diff --git a/decompiler/config/jak1_ntsc_black_label/hacks.jsonc b/decompiler/config/jak1_ntsc_black_label/hacks.jsonc index 9345c6d0a5..d48e46e5f7 100644 --- a/decompiler/config/jak1_ntsc_black_label/hacks.jsonc +++ b/decompiler/config/jak1_ntsc_black_label/hacks.jsonc @@ -474,7 +474,7 @@ "draw-drawable-tree-dirt-tfrag": [6, 8, 13, 15], "draw-drawable-tree-ice-tfrag": [6, 8, 13, 15], "draw-drawable-tree-instance-tie": [10, 12, 18, 20, 26, 28, 37, 39], - + "birth-pickup-at-point": [0], "draw-bones": [0, 1, 2, 8, 81], "draw-bones-hud": [7, 8], @@ -533,6 +533,40 @@ // the format for entries is [level, tpage, index] "missing_textures": [ ["finalboss", 1419, 3] + ], + + // some object files have garbage pad data at the end which makes the decompiler + // assume they must be different files, such as the art group for orb-cache-top. + // this just suppresses a message. + "expected_merged_objs": [ + "orb-cache-top-ag", + "ecovalve-ag", + "barrel-ag", + "sack-ag", + "sharkey-ag", + "warp-gate-switch-ag", + "baby-spider-ag", + "cavetrapdoor-ag", + "spider-egg-ag", + "darkvine-ag", + "jng-iris-door-ag", + "eichar-fish+0-ag", + "launcherdoor-ag", + "plat-eco-ag", + "eichar-tube+0-ag", + "eichar-pole+0-ag", + "crate-darkeco-cluster-ag", + "ef-plane-ag", + "racer-ag", + "flut-saddle-ag", + "shover-ag", + "steam-cap-ag", + "sunkencam-ag", + "swampcam-ag", + "pontoonfive-ag", + "oracle-ag", + "village-cam-ag", + "plat-ag" ] } diff --git a/decompiler/main.cpp b/decompiler/main.cpp index 5504820ce7..988ad9682d 100644 --- a/decompiler/main.cpp +++ b/decompiler/main.cpp @@ -74,7 +74,7 @@ int main(int argc, char** argv) { db.generate_dgo_listing()); // write out object file map (used for future decompilations, if desired) file_util::write_text_file(file_util::combine_path(out_folder, "obj.txt"), - db.generate_obj_listing()); + db.generate_obj_listing(config.merged_objects)); // dump raw objs if (config.dump_objs) { diff --git a/game/fake_iso.txt b/game/fake_iso.txt index ad706bb464..0af542426a 100644 --- a/game/fake_iso.txt +++ b/game/fake_iso.txt @@ -28,6 +28,7 @@ VI1.DGO out/iso/VI1.DGO VI2.DGO out/iso/VI2.DGO VI3.DGO out/iso/VI3.DGO TRA.DGO out/iso/TRA.DGO +MIS.DGO out/iso/MIS.DGO FIC.DGO out/iso/FIC.DGO ROL.DGO out/iso/ROL.DGO SUN.DGO out/iso/SUN.DGO @@ -42,12 +43,14 @@ BEA.DGO out/iso/BEA.DGO LAV.DGO out/iso/LAV.DGO CIT.DGO out/iso/CIT.DGO FIN.DGO out/iso/FIN.DGO +INT.DGO out/iso/INT.DGO ;; Level VIS VI1.VIS out/iso/VI1.VIS VI2.VIS out/iso/VI2.VIS VI3.VIS out/iso/VI3.VIS TRA.VIS out/iso/TRA.VIS +MIS.VIS out/iso/MIS.VIS FIC.VIS out/iso/FIC.VIS ROL.VIS out/iso/ROL.VIS SUN.VIS out/iso/SUN.VIS @@ -62,6 +65,7 @@ BEA.VIS out/iso/BEA.VIS LAV.VIS out/iso/LAV.VIS CIT.VIS out/iso/CIT.VIS FIN.VIS out/iso/FIN.VIS +INT.VIS out/iso/INT.VIS ;; Streaming Animations FUCVICTO.STR out/iso/FUCVICTO.STR diff --git a/game/graphics/opengl_renderer/DirectRenderer.cpp b/game/graphics/opengl_renderer/DirectRenderer.cpp index 58e9662c1e..e0f0f7297b 100644 --- a/game/graphics/opengl_renderer/DirectRenderer.cpp +++ b/game/graphics/opengl_renderer/DirectRenderer.cpp @@ -180,7 +180,8 @@ void DirectRenderer::flush_pending(SharedRenderState* render_state, ScopedProfil // update buffers: u32 vertex_offset = m_ogl.last_vertex_offset; if (vertex_offset + m_prim_buffer.vert_count >= m_ogl.vertex_buffer_max_verts) { - lg::warn("Buffer wrapped in {} (upcoming size is {}, {} bytes)\n", m_name, + lg::warn("Buffer wrapped in {} ({}/{} (+ {}) verts, {} bytes)", m_name, + vertex_offset + m_prim_buffer.vert_count, m_ogl.vertex_buffer_max_verts, m_prim_buffer.vert_count, m_prim_buffer.vert_count * sizeof(Vertex)); vertex_offset = 0; } diff --git a/game/graphics/opengl_renderer/OpenGLRenderer.cpp b/game/graphics/opengl_renderer/OpenGLRenderer.cpp index ee03197c90..bdb84396cc 100644 --- a/game/graphics/opengl_renderer/OpenGLRenderer.cpp +++ b/game/graphics/opengl_renderer/OpenGLRenderer.cpp @@ -99,9 +99,9 @@ void OpenGLRenderer::init_bucket_renderers() { init_bucket_renderer("water-tex-1", BucketId::WATER_TEX_LEVEL1); init_bucket_renderer("pre-sprite-tex", BucketId::PRE_SPRITE_TEX); init_bucket_renderer("sprite", BucketId::SPRITE); - init_bucket_renderer("debug-draw-0", BucketId::DEBUG_DRAW_0, 1024, + init_bucket_renderer("debug-draw-0", BucketId::DEBUG_DRAW_0, 0x8000, DirectRenderer::Mode::NORMAL); - init_bucket_renderer("debug-draw-1", BucketId::DEBUG_DRAW_1, 4096, + init_bucket_renderer("debug-draw-1", BucketId::DEBUG_DRAW_1, 0x8000, DirectRenderer::Mode::NORMAL); // for now, for any unset renderers, just set them to an EmptyBucketRenderer. diff --git a/goal_src/build/all_files.gc b/goal_src/build/all_files.gc index 3024a5e641..6daff52d5a 100644 --- a/goal_src/build/all_files.gc +++ b/goal_src/build/all_files.gc @@ -321,8 +321,8 @@ "goal_src/levels/common/plat-eco.gc" "goal_src/levels/common/ropebridge.gc" "goal_src/levels/common/ticky.gc" - "goal_src/levels/common/mistycannon.gc" - "goal_src/levels/common/babak-with-cannon.gc" + "goal_src/levels/misty/mistycannon.gc" + "goal_src/levels/misty/babak-with-cannon.gc" "goal_src/levels/beach/air-h.gc" "goal_src/levels/beach/air.gc" "goal_src/levels/beach/wobbler.gc" diff --git a/goal_src/build/all_objs.json b/goal_src/build/all_objs.json index deadb0a3e1..f2f467b29d 100644 --- a/goal_src/build/all_objs.json +++ b/goal_src/build/all_objs.json @@ -308,20 +308,7 @@ ["fuel-cell-ag", "fuel-cell", 4, ["GAME", "ART"], "levels/common"], ["money-ag", "money", 4, ["GAME", "ART"], "levels/common"], ["buzzer-ag", "buzzer", 4, ["GAME", "ART"], "levels/common"], -["ecovalve-ag-ART-GAME", "ecovalve", 4, ["GAME", "ART"], "levels/common"], -["ecovalve-ag-BEA", "ecovalve", 4, ["BEA"], "levels/beach"], -["ecovalve-ag-CIT", "ecovalve", 4, ["CIT"], "levels/citadel"], -["ecovalve-ag-FIN", "ecovalve", 4, ["FIN"], "levels/finalboss"], -["ecovalve-ag-JUB-JUN", "ecovalve", 4, ["JUB", "JUN"], "levels/jungle_common"], -["ecovalve-ag-FIC-OGR", "ecovalve", 4, ["FIC", "OGR"], "levels/common"], -["ecovalve-ag-LAV", "ecovalve", 4, ["LAV"], "levels/lavatube"], -["ecovalve-ag-MAI", "ecovalve", 4, ["MAI"], "levels/maincave"], -["ecovalve-ag-ROB", "ecovalve", 4, ["ROB"], "levels/robocave"], -["ecovalve-ag-ROL", "ecovalve", 4, ["ROL"], "levels/rolling"], -["ecovalve-ag-SNO", "ecovalve", 4, ["SNO"], "levels/snow"], -["ecovalve-ag-SUB", "ecovalve", 4, ["SUB"], "levels/sunkenb"], -["ecovalve-ag-SWA", "ecovalve", 4, ["SWA"], "levels/swamp"], -["ecovalve-ag-TRA", "ecovalve", 4, ["TRA"], "levels/training"], +["ecovalve-ag", "ecovalve", 4, ["GAME", "ART", "BEA", "CIT", "FIN", "JUB", "JUN", "FIC", "OGR", "LAV", "MAI", "ROB", "ROL", "SNO", "SUB", "SWA", "TRA"], "levels/common"], ["crate-ag", "crate", 4, ["GAME", "ART"], "levels/common"], ["speaker-ag", "speaker", 4, ["GAME", "ART"], "levels/common"], ["fuelcell-naked-ag", "fuelcell-naked", 4, ["GAME", "ART"], "levels/common"], @@ -347,8 +334,8 @@ ["plat-eco", "plat-eco", 3, ["GAME", "COMMON", "L1"], "levels/common"], ["ropebridge", "ropebridge", 3, ["GAME", "COMMON", "L1"], "levels/common"], ["ticky", "ticky", 3, ["GAME", "COMMON", "L1"], "levels/common"], -["mistycannon", "mistycannon", 3, ["BEA", "L1", "MIS"], "levels/common"], -["babak-with-cannon", "babak-with-cannon", 3, ["BEA", "L1", "MIS"], "levels/common"], +["mistycannon", "mistycannon", 3, ["BEA", "L1", "MIS"], "levels/misty"], +["babak-with-cannon", "babak-with-cannon", 3, ["BEA", "L1", "MIS"], "levels/misty"], ["air-h", "air-h", 3, ["BEA", "L1"], "levels/beach"], ["air", "air", 3, ["BEA", "L1"], "levels/beach"], ["wobbler", "wobbler", 3, ["BEA", "L1"], "levels/beach"], @@ -370,8 +357,7 @@ ["tpage-213", "tpage-213", 4, ["BEA"], "levels/beach"], ["tpage-215", "tpage-215", 4, ["BEA"], "levels/beach"], ["babak-ag", "babak", 4, ["BEA", "CIT", "JUN", "FIC", "MIS", "ROB", "ROL", "SNO", "SUB", "SUN", "SWA"], "levels/common"], -["barrel-ag-BEA", "barrel", 4, ["BEA"], "levels/beach"], -["barrel-ag-VI2", "barrel", 4, ["VI2"], "levels/village2"], +["barrel-ag", "barrel", 4, ["BEA", "VI2"], "levels/beach"], ["beachcam-ag", "beachcam", 4, ["BEA"], "levels/beach"], ["bird-lady-ag", "bird-lady", 4, ["BEA"], "levels/beach"], ["bird-lady-beach-ag", "bird-lady-beach", 4, ["BEA"], "levels/beach"], @@ -387,25 +373,14 @@ ["lurkerpuppy-ag", "lurkerpuppy", 4, ["BEA"], "levels/beach"], ["lurkerworm-ag", "lurkerworm", 4, ["BEA"], "levels/beach"], ["mayor-ag", "mayor", 4, ["BEA"], "levels/beach"], -["mistycannon-ag", "mistycannon", 4, ["BEA", "MIS"], "levels/common"], -["orb-cache-top-ag-BEA", "orb-cache-top", 4, ["BEA"], "levels/beach"], -["orb-cache-top-ag-CIT", "orb-cache-top", 4, ["CIT"], "levels/citadel"], -["orb-cache-top-ag-JUN", "orb-cache-top", 4, ["JUN"], "levels/jungle"], -["orb-cache-top-ag-MIS", "orb-cache-top", 4, ["MIS"], "levels/misty"], -["orb-cache-top-ag-SNO", "orb-cache-top", 4, ["SNO"], "levels/snow"], -["orb-cache-top-ag-SUN", "orb-cache-top", 4, ["SUN"], "levels/sunken"], -["orb-cache-top-ag-VI1", "orb-cache-top", 4, ["VI1"], "levels/village1"], -["orb-cache-top-ag-VI2", "orb-cache-top", 4, ["VI2"], "levels/village2"], +["mistycannon-ag", "mistycannon", 4, ["BEA", "MIS"], "levels/misty"], +["orb-cache-top-ag", "orb-cache-top", 4, ["BEA", "CIT", "JUN", "MIS", "SNO", "SUN", "VI1", "VI2"], "levels/common"], ["pelican-ag", "pelican", 4, ["BEA"], "levels/beach"], -["sack-ag-BEA", "sack", 4, ["BEA"], "levels/beach"], -["sack-ag-MIS", "sack", 4, ["MIS"], "levels/misty"], +["sack-ag", "sack", 4, ["BEA", "MIS"], "levels/misty"], ["sculptor-ag", "sculptor", 4, ["BEA"], "levels/beach"], ["sculptor-muse-ag", "sculptor-muse", 4, ["BEA"], "levels/beach"], ["seagull-ag", "seagull", 4, ["BEA"], "levels/beach"], -["sharkey-ag-BEA-TRA-VI2", "sharkey", 4, ["BEA", "TRA", "VI2"], "levels/common"], -["sharkey-ag-JUN-MIS", "sharkey", 4, ["JUN", "MIS"], "levels/common"], -["sharkey-ag-SWA", "sharkey", 4, ["SWA"], "levels/swamp"], -["sharkey-ag-VI1", "sharkey", 4, ["VI1"], "levels/village1"], +["sharkey-ag", "sharkey", 4, ["BEA", "TRA", "VI2", "JUN", "MIS", "SWA", "VI1"], "levels/common"], ["windmill-one-ag", "windmill-one", 4, ["BEA"], "levels/beach"], ["beach-vis", "beach-vis", 4, ["BEA"], "levels/beach"], ["villagep-obs", "villagep-obs", 3, ["CIT", "L1", "VI1", "VI2", "VI3", "VILLAGEP"], "levels/village_common"], @@ -453,10 +428,7 @@ ["plat-citb-ag", "plat-citb", 4, ["CIT"], "levels/citadel"], ["plat-eco-citb-ag", "plat-eco-citb", 4, ["CIT"], "levels/citadel"], ["redsage-ag", "redsage", 4, ["CIT"], "levels/citadel"], -["warp-gate-switch-ag-CIT", "warp-gate-switch", 4, ["CIT"], "levels/citadel"], -["warp-gate-switch-ag-TRA", "warp-gate-switch", 4, ["TRA"], "levels/training"], -["warp-gate-switch-ag-VI1-VI3", "warp-gate-switch", 4, ["VI1", "VI3"], "levels/common"], -["warp-gate-switch-ag-VI2", "warp-gate-switch", 4, ["VI2"], "levels/village2"], +["warp-gate-switch-ag", "warp-gate-switch", 4, ["VI1", "VI2", "VI3", "CIT", "TRA"], "levels/village_common"], ["warpgate-ag", "warpgate", 4, ["CIT", "TRA", "VI1", "VI2", "VI3"], "levels/common"], ["yellowsage-ag", "yellowsage", 4, ["CIT"], "levels/citadel"], ["citadel-vis", "citadel-vis", 4, ["CIT"], "levels/citadel"], @@ -466,19 +438,14 @@ ["tpage-1305", "tpage-1305", 4, ["DAR"], "levels/darkcave"], ["tpage-1304", "tpage-1304", 4, ["DAR"], "levels/darkcave"], ["tpage-1352", "tpage-1352", 4, ["DAR"], "levels/darkcave"], -["baby-spider-ag-DAR", "baby-spider", 4, ["DAR"], "levels/darkcave"], -["baby-spider-ag-MAI", "baby-spider", 4, ["MAI"], "levels/maincave"], -["baby-spider-ag-ROB", "baby-spider", 4, ["ROB"], "levels/robocave"], +["baby-spider-ag", "baby-spider", 4, ["MAI", "DAR", "ROB"], "levels/cave_common"], ["cavecrystal-ag", "cavecrystal", 4, ["DAR"], "levels/darkcave"], ["caveelevator-ag", "caveelevator", 4, ["DAR", "ROB"], "levels/cave_common"], ["cavespatula-darkcave-ag", "cavespatula-darkcave", 4, ["DAR"], "levels/darkcave"], -["cavetrapdoor-ag-DAR", "cavetrapdoor", 4, ["DAR"], "levels/darkcave"], -["cavetrapdoor-ag-MAI", "cavetrapdoor", 4, ["MAI"], "levels/maincave"], -["cavetrapdoor-ag-ROB", "cavetrapdoor", 4, ["ROB"], "levels/robocave"], +["cavetrapdoor-ag", "cavetrapdoor", 4, ["MAI", "DAR", "ROB"], "levels/cave_common"], ["dark-crystal-ag", "dark-crystal", 4, ["DAR", "MAI"], "levels/cave_common"], ["mother-spider-ag", "mother-spider", 4, ["DAR", "MAI"], "levels/cave_common"], -["spider-egg-ag-DAR-MAI", "spider-egg", 4, ["DAR", "MAI"], "levels/cave_common"], -["spider-egg-ag-ROB", "spider-egg", 4, ["ROB"], "levels/robocave"], +["spider-egg-ag", "spider-egg", 4, ["DAR", "MAI", "ROB"], "levels/cave_common"], ["water-anim-darkcave-ag", "water-anim-darkcave", 4, ["DAR"], "levels/darkcave"], ["darkcave-vis", "darkcave-vis", 4, ["DAR"], "levels/darkcave"], ["demo-obs", "demo-obs", 3, ["DEM", "L1"], "levels/demo"], @@ -552,18 +519,14 @@ ["tpage-507", "tpage-507", 4, ["JUB"], "levels/jungleb"], ["tpage-966", "tpage-966", 4, ["JUB"], "levels/jungleb"], ["aphid-lurker-ag", "aphid-lurker", 4, ["JUB"], "levels/jungleb"], -["darkvine-ag-JUB", "darkvine", 4, ["JUB"], "levels/jungleb"], -["darkvine-ag-JUN", "darkvine", 4, ["JUN"], "levels/jungle"], +["darkvine-ag", "darkvine", 4, ["JUN", "JUB"], "levels/jungle"], ["eggtop-ag", "eggtop", 4, ["JUB"], "levels/jungleb"], -["jng-iris-door-ag-JUB", "jng-iris-door", 4, ["JUB"], "levels/jungleb"], -["jng-iris-door-ag-TRA", "jng-iris-door", 4, ["TRA"], "levels/training"], +["jng-iris-door-ag", "jng-iris-door", 4, ["JUB", "TRA"], "levels/jungleb"], ["plant-boss-ag", "plant-boss", 4, ["JUB"], "levels/jungleb"], ["plat-flip-ag", "plat-flip", 4, ["JUB"], "levels/jungleb"], ["plat-jungleb-ag", "plat-jungleb", 4, ["JUB"], "levels/jungleb"], ["jungleb-vis", "jungleb-vis", 4, ["JUB"], "levels/jungleb"], -["eichar-fish+0-ag-JUN", "eichar-fish+0", 4, ["JUN"], "levels/jungle"], -["eichar-fish+0-ag-JUNGLE", "eichar-fish+0", 4, ["JUNGLE"], "levels/l1_only"], -["eichar-fish+0-ag-L1", "eichar-fish+0", 4, ["L1"], "levels/l1_only"], +["eichar-fish+0-ag", "eichar-fish+0", 4, ["JUN", "JUNGLE", "L1"], "levels/jungle"], ["jungle-elevator", "jungle-elevator", 3, ["JUN", "JUNGLE", "L1"], "levels/jungle"], ["bouncer", "bouncer", 3, ["JUN", "JUNGLE", "L1"], "levels/jungle"], ["hopper", "hopper", 3, ["JUN", "JUNGLE", "L1"], "levels/jungle"], @@ -592,8 +555,7 @@ ["junglecam-ag", "junglecam", 4, ["JUN"], "levels/jungle"], ["junglefish-ag", "junglefish", 4, ["JUN"], "levels/jungle"], ["junglesnake-ag", "junglesnake", 4, ["JUN"], "levels/jungle"], -["launcherdoor-ag-JUN", "launcherdoor", 4, ["JUN"], "levels/jungle"], -["launcherdoor-ag-SUN", "launcherdoor", 4, ["SUN"], "levels/sunken"], +["launcherdoor-ag", "launcherdoor", 4, ["JUN", "SUN"], "levels/jungle"], ["logtrap-ag", "logtrap", 4, ["JUN"], "levels/jungle"], ["lurkerm-piston-ag", "lurkerm-piston", 4, ["JUN"], "levels/jungle"], ["lurkerm-tall-sail-ag", "lurkerm-tall-sail", 4, ["JUN"], "levels/jungle"], @@ -601,10 +563,7 @@ ["medres-firecanyon-ag", "medres-firecanyon", 4, ["JUN"], "levels/jungle"], ["periscope-ag", "periscope", 4, ["JUN"], "levels/jungle"], ["plat-button-ag", "plat-button", 4, ["JUN"], "levels/jungle"], -["plat-eco-ag-JUN", "plat-eco", 4, ["JUN"], "levels/jungle"], -["plat-eco-ag-MIS", "plat-eco", 4, ["MIS"], "levels/misty"], -["plat-eco-ag-ROB", "plat-eco", 4, ["ROB"], "levels/robocave"], -["plat-eco-ag-TRA", "plat-eco", 4, ["TRA"], "levels/training"], +["plat-eco-ag", "plat-eco", 4, ["JUN", "MIS", "ROB", "TRA"], "levels/common"], ["precurbridge-ag", "precurbridge", 4, ["JUN"], "levels/jungle"], ["reflector-mirror-ag", "reflector-mirror", 4, ["JUN"], "levels/jungle"], ["ropebridge-52-ag", "ropebridge-52", 4, ["JUN"], "levels/jungle"], @@ -691,8 +650,7 @@ ["sunken-part4", "sunken-part4", 3, ["L1", "SUN", "SUNKEN"], "levels/sunken"], ["sunken-part5", "sunken-part5", 3, ["L1", "SUN", "SUNKEN"], "levels/sunken"], ["target-tube", "target-tube", 3, ["L1", "SUN", "SUNKEN"], "levels/sunken"], -["eichar-tube+0-ag-L1-SUNKEN", "eichar-tube+0", 4, ["L1", "SUNKEN"], "levels/l1_only"], -["eichar-tube+0-ag-SUN", "eichar-tube+0", 4, ["SUN"], "levels/sunken"], +["eichar-tube+0-ag", "eichar-tube+0", 4, ["L1", "SUN", "SUNKEN"], "levels/sunken"], ["sunken-obs", "sunken-obs", 3, ["L1", "SUN", "SUNKEN"], "levels/sunken"], ["shover", "shover", 3, ["L1", "SUN", "SUNKEN"], "levels/sunken"], ["square-platform", "square-platform", 3, ["L1", "SUN", "SUNKEN"], "levels/sunken"], @@ -742,10 +700,7 @@ ["snow-ram", "snow-ram", 3, ["L1", "SNO"], "levels/snow"], ["snow-part", "snow-part", 3, ["L1", "SNO"], "levels/snow"], ["yeti", "yeti", 3, ["L1", "SNO"], "levels/snow"], -["eichar-pole+0-ag-L1", "eichar-pole+0", 4, ["L1"], "levels/l1_only"], -["eichar-pole+0-ag-ROB", "eichar-pole+0", 4, ["ROB"], "levels/rolling"], -["eichar-pole+0-ag-SNO", "eichar-pole+0", 4, ["SNO"], "levels/snow"], -["eichar-pole+0-ag-SWA", "eichar-pole+0", 4, ["SWA"], "levels/swamp"], +["eichar-pole+0-ag", "eichar-pole+0", 4, ["L1", "SNO", "SWA", "ROB"], "levels/swamp"], ["eichar-ice+0-ag", "eichar-ice+0", 4, ["L1", "SNO"], "levels/snow"], ["lavatube-obs", "lavatube-obs", 3, ["L1", "LAV"], "levels/lavatube"], ["lavatube-energy", "lavatube-energy", 3, ["L1", "LAV"], "levels/lavatube"], @@ -757,14 +712,9 @@ ["tpage-1123", "tpage-1123", 4, ["FIC"], "levels/firecanyon"], ["assistant-firecanyon-ag", "assistant-firecanyon", 4, ["FIC"], "levels/firecanyon"], ["balloon-ag", "balloon", 4, ["FIC"], "levels/firecanyon"], -["crate-darkeco-cluster-ag-FIC", "crate-darkeco-cluster", 4, ["FIC"], "levels/firecanyon"], -["crate-darkeco-cluster-ag-OGR", "crate-darkeco-cluster", 4, ["OGR"], "levels/ogre"], -["ef-plane-ag-FIC-LAV-OGR-ROL-SNO-SWA", "ef-plane", 4, ["FIC", "LAV", "OGR", "ROL", "SNO", "SWA"], "levels/common"], -["ef-plane-ag-MIS", "ef-plane", 4, ["MIS"], "levels/misty"], -["racer-ag-FIC-ROL", "racer", 4, ["FIC", "ROL"], "levels/common"], -["racer-ag-LAV", "racer", 4, ["LAV"], "levels/lavatube"], -["racer-ag-MIS", "racer", 4, ["MIS"], "levels/misty"], -["racer-ag-OGR", "racer", 4, ["OGR"], "levels/ogre"], +["crate-darkeco-cluster-ag", "crate-darkeco-cluster", 4, ["FIC", "OGR"], "levels/firecanyon"], +["ef-plane-ag", "ef-plane", 4, ["FIC", "LAV", "OGR", "ROL", "SNO", "SWA", "MIS"], "levels/racer_common"], +["racer-ag", "racer", 4, ["FIC", "ROL", "LAV", "MIS", "OGR"], "levels/racer_common"], ["spike-ag", "spike", 4, ["FIC"], "levels/firecanyon"], ["firecanyon-vis", "firecanyon-vis", 4, ["FIC"], "levels/firecanyon"], ["tpage-1338", "tpage-1338", 4, ["LAV"], "levels/lavatube"], @@ -797,8 +747,7 @@ ["gnawer-ag", "gnawer", 4, ["MAI"], "levels/maincave"], ["launcherdoor-maincave-ag", "launcherdoor-maincave", 4, ["MAI"], "levels/maincave"], ["maincavecam-ag", "maincavecam", 4, ["MAI"], "levels/maincave"], -["plat-ag-MAI", "plat", 4, ["MAI"], "levels/maincave"], -["plat-ag-ROB", "plat", 4, ["ROB"], "levels/robocave"], +["plat-ag", "plat", 4, ["MAI", "ROB"], "levels/common"], ["spiderwebs-ag", "spiderwebs", 4, ["MAI", "ROB"], "levels/cave_common"], ["water-anim-maincave-ag", "water-anim-maincave", 4, ["MAI"], "levels/maincave"], ["water-anim-maincave-water-ag", "water-anim-maincave-water", 4, ["MAI"], "levels/maincave"], @@ -875,8 +824,7 @@ ["tpage-842", "tpage-842", 4, ["SNO"], "levels/snow"], ["tpage-711", "tpage-711", 4, ["SNO"], "levels/snow"], ["tpage-712", "tpage-712", 4, ["SNO"], "levels/snow"], -["flut-saddle-ag-SNO", "flut-saddle", 4, ["SNO"], "levels/snow"], -["flut-saddle-ag-SWA", "flut-saddle", 4, ["SWA"], "levels/swamp"], +["flut-saddle-ag", "flut-saddle", 4, ["SNO", "SWA"], "levels/flut_common"], ["flutflut-plat-large-ag", "flutflut-plat-large", 4, ["SNO"], "levels/snow"], ["flutflut-plat-med-ag", "flutflut-plat-med", 4, ["SNO"], "levels/snow"], ["flutflut-plat-small-ag", "flutflut-plat-small", 4, ["SNO"], "levels/snow"], @@ -906,20 +854,17 @@ ["tpage-764", "tpage-764", 4, ["SUB"], "levels/sunkenb"], ["blue-eco-charger-ag", "blue-eco-charger", 4, ["SUB"], "levels/sunkenb"], ["blue-eco-charger-orb-ag", "blue-eco-charger-orb", 4, ["SUB"], "levels/sunkenb"], -["bully-ag", "bully", 4, ["SUB", "SUN"], "levels/sunken_common"], +["bully-ag", "bully", 4, ["SUB", "SUN"], "levels/sunken"], ["floating-launcher-ag", "floating-launcher", 4, ["SUB"], "levels/sunkenb"], ["helix-button-ag", "helix-button", 4, ["SUB"], "levels/sunkenb"], ["helix-slide-door-ag", "helix-slide-door", 4, ["SUB"], "levels/sunkenb"], -["shover-ag-SUB", "shover", 4, ["SUB"], "levels/sunkenb"], -["shover-ag-SUN", "shover", 4, ["SUN"], "levels/sunken"], -["steam-cap-ag-SUB", "steam-cap", 4, ["SUB"], "levels/sunkenb"], -["steam-cap-ag-SUN", "steam-cap", 4, ["SUN"], "levels/sunken"], -["sunkencam-ag-SUB", "sunkencam", 4, ["SUB"], "levels/sunkenb"], -["sunkencam-ag-SUN", "sunkencam", 4, ["SUN"], "levels/sunken"], -["sunkenfisha-ag", "sunkenfisha", 4, ["SUB", "SUN"], "levels/sunken_common"], -["wall-plat-ag", "wall-plat", 4, ["SUB", "SUN"], "levels/sunken_common"], -["water-anim-sunken-ag", "water-anim-sunken", 4, ["SUB", "SUN"], "levels/sunken_common"], -["water-anim-sunken-dark-eco-ag", "water-anim-sunken-dark-eco", 4, ["SUB", "SUN"], "levels/sunken_common"], +["shover-ag", "shover", 4, ["SUN", "SUB"], "levels/sunken"], +["steam-cap-ag", "steam-cap", 4, ["SUN", "SUB"], "levels/sunken"], +["sunkencam-ag", "sunkencam", 4, ["SUN", "SUB"], "levels/sunken"], +["sunkenfisha-ag", "sunkenfisha", 4, ["SUB", "SUN"], "levels/sunken"], +["wall-plat-ag", "wall-plat", 4, ["SUB", "SUN"], "levels/sunken"], +["water-anim-sunken-ag", "water-anim-sunken", 4, ["SUB", "SUN"], "levels/sunken"], +["water-anim-sunken-dark-eco-ag", "water-anim-sunken-dark-eco", 4, ["SUB", "SUN"], "levels/sunken"], ["sunkenb-vis", "sunkenb-vis", 4, ["SUB"], "levels/sunkenb"], ["tpage-661", "tpage-661", 4, ["SUN"], "levels/sunken"], ["tpage-663", "tpage-663", 4, ["SUN"], "levels/sunken"], @@ -958,8 +903,7 @@ ["swamp-rat-nest-ag", "swamp-rat-nest", 4, ["SWA"], "levels/swamp"], ["swamp-rock-ag", "swamp-rock", 4, ["SWA"], "levels/swamp"], ["swamp-spike-ag", "swamp-spike", 4, ["SWA"], "levels/swamp"], -["swampcam-ag-SWA", "swampcam", 4, ["SWA"], "levels/swamp"], -["swampcam-ag-VI2", "swampcam", 4, ["VI2"], "levels/village2"], +["swampcam-ag", "swampcam", 4, ["SWA", "VI2"], "levels/swamp"], ["tar-plat-ag", "tar-plat", 4, ["SWA"], "levels/swamp"], ["swamp-vis", "swamp-vis", 4, ["SWA"], "levels/swamp"], ["title-obs", "title-obs", 3, ["TIT"], "levels/title"], @@ -981,8 +925,7 @@ ["tpage-1310", "tpage-1310", 4, ["TRA"], "levels/training"], ["tpage-1308", "tpage-1308", 4, ["TRA"], "levels/training"], ["tpage-775", "tpage-775", 4, ["TRA"], "levels/training"], -["pontoonfive-ag-TRA", "pontoonfive", 4, ["TRA"], "levels/training"], -["pontoonfive-ag-VI2", "pontoonfive", 4, ["VI2"], "levels/village2"], +["pontoonfive-ag", "pontoonfive", 4, ["VI2", "TRA"], "levels/village2"], ["scarecrow-a-ag", "scarecrow-a", 4, ["TRA"], "levels/training"], ["scarecrow-b-ag", "scarecrow-b", 4, ["TRA"], "levels/training"], ["trainingcam-ag", "trainingcam", 4, ["TRA"], "levels/training"], @@ -1012,9 +955,7 @@ ["medres-village11-ag", "medres-village11", 4, ["VI1"], "levels/village1"], ["medres-village12-ag", "medres-village12", 4, ["VI1"], "levels/village1"], ["medres-village13-ag", "medres-village13", 4, ["VI1"], "levels/village1"], -["oracle-ag-VI1", "oracle", 4, ["VI1"], "levels/village1"], -["oracle-ag-VI2", "oracle", 4, ["VI2"], "levels/village2"], -["oracle-ag-VI3", "oracle", 4, ["VI3"], "levels/village3"], +["oracle-ag", "oracle", 4, ["VI1", "VI2", "VI3"], "levels/village_common"], ["reflector-middle-ag", "reflector-middle", 4, ["VI1"], "levels/village1"], ["revcycle-ag", "revcycle", 4, ["VI1"], "levels/village1"], ["revcycleprop-ag", "revcycleprop", 4, ["VI1"], "levels/village1"], @@ -1022,9 +963,7 @@ ["sage-ag", "sage", 4, ["VI1"], "levels/village1"], ["sagesail-ag", "sagesail", 4, ["VI1"], "levels/village1"], ["villa-starfish-ag", "villa-starfish", 4, ["VI1"], "levels/village1"], -["village-cam-ag-VI1", "village-cam", 4, ["VI1"], "levels/village1"], -["village-cam-ag-VI2", "village-cam", 4, ["VI2"], "levels/village2"], -["village-cam-ag-VI3", "village-cam", 4, ["VI3"], "levels/village3"], +["village-cam-ag", "village-cam", 4, ["VI1", "VI2", "VI3"], "levels/village_common"], ["village1cam-ag", "village1cam", 4, ["VI1"], "levels/village1"], ["water-anim-village1-ag", "water-anim-village1", 4, ["VI1"], "levels/village1"], ["windmill-sail-ag", "windmill-sail", 4, ["VI1"], "levels/village1"], diff --git a/goal_src/build/game_dgos.gc b/goal_src/build/game_dgos.gc index ee3cb31769..c13dd0d872 100644 --- a/goal_src/build/game_dgos.gc +++ b/goal_src/build/game_dgos.gc @@ -30,7 +30,7 @@ ("fuel-cell-ag.go" "fuel-cell") ("money-ag.go" "money") ("buzzer-ag.go" "buzzer") - ("ecovalve-ag-ART-GAME.go" "ecovalve") + ("ecovalve-ag.go" "ecovalve") ("crate-ag.go" "crate") ("speaker-ag.go" "speaker") ("fuelcell-naked-ag.go" "fuelcell-naked") @@ -64,12 +64,12 @@ ("tpage-213.go" "tpage-213") ("tpage-215.go" "tpage-215") ("babak-ag.go" "babak") - ("barrel-ag-BEA.go" "barrel") + ("barrel-ag.go" "barrel") ("beachcam-ag.go" "beachcam") ("bird-lady-ag.go" "bird-lady") ("bird-lady-beach-ag.go" "bird-lady-beach") ("bladeassm-ag.go" "bladeassm") - ("ecovalve-ag-BEA.go" "ecovalve") + ("ecovalve-ag.go" "ecovalve") ("ecoventrock-ag.go" "ecoventrock") ("flutflut-ag.go" "flutflut") ("flutflutegg-ag.go" "flutflutegg") @@ -82,13 +82,13 @@ ("lurkerworm-ag.go" "lurkerworm") ("mayor-ag.go" "mayor") ("mistycannon-ag.go" "mistycannon") - ("orb-cache-top-ag-BEA.go" "orb-cache-top") + ("orb-cache-top-ag.go" "orb-cache-top") ("pelican-ag.go" "pelican") - ("sack-ag-BEA.go" "sack") + ("sack-ag.go" "sack") ("sculptor-ag.go" "sculptor") ("sculptor-muse-ag.go" "sculptor-muse") ("seagull-ag.go" "seagull") - ("sharkey-ag-BEA-TRA-VI2.go" "sharkey") + ("sharkey-ag.go" "sharkey") ("windmill-one-ag.go" "windmill-one") ("beach-vis.go" "beach-vis") ) @@ -133,15 +133,15 @@ ("citb-rotatebox-ag.go" "citb-rotatebox") ("citb-sagecage-ag.go" "citb-sagecage") ("citb-stopbox-ag.go" "citb-stopbox") - ("ecovalve-ag-CIT.go" "ecovalve") + ("ecovalve-ag.go" "ecovalve") ("evilbro-citadel-ag.go" "evilbro-citadel") ("evilsis-citadel-ag.go" "evilsis-citadel") ("green-sagecage-ag.go" "green-sagecage") - ("orb-cache-top-ag-CIT.go" "orb-cache-top") + ("orb-cache-top-ag.go" "orb-cache-top") ("plat-citb-ag.go" "plat-citb") ("plat-eco-citb-ag.go" "plat-eco-citb") ("redsage-ag.go" "redsage") - ("warp-gate-switch-ag-CIT.go" "warp-gate-switch") + ("warp-gate-switch-ag.go" "warp-gate-switch") ("warpgate-ag.go" "warpgate") ("yellowsage-ag.go" "yellowsage") ("citadel-vis.go" "citadel-vis") @@ -175,14 +175,14 @@ ("tpage-1305.go" "tpage-1305") ("tpage-1304.go" "tpage-1304") ("tpage-1352.go" "tpage-1352") - ("baby-spider-ag-DAR.go" "baby-spider") + ("baby-spider-ag.go" "baby-spider") ("cavecrystal-ag.go" "cavecrystal") ("caveelevator-ag.go" "caveelevator") ("cavespatula-darkcave-ag.go" "cavespatula-darkcave") - ("cavetrapdoor-ag-DAR.go" "cavetrapdoor") + ("cavetrapdoor-ag.go" "cavetrapdoor") ("dark-crystal-ag.go" "dark-crystal") ("mother-spider-ag.go" "mother-spider") - ("spider-egg-ag-DAR-MAI.go" "spider-egg") + ("spider-egg-ag.go" "spider-egg") ("water-anim-darkcave-ag.go" "water-anim-darkcave") ("darkcave-vis.go" "darkcave-vis") ) @@ -525,10 +525,10 @@ ("assistant-firecanyon-ag.go" "assistant-firecanyon") ("babak-ag.go" "babak") ("balloon-ag.go" "balloon") - ("crate-darkeco-cluster-ag-FIC.go" "crate-darkeco-cluster") - ("ecovalve-ag-FIC-OGR.go" "ecovalve") - ("ef-plane-ag-FIC-LAV-OGR-ROL-SNO-SWA.go" "ef-plane") - ("racer-ag-FIC-ROL.go" "racer") + ("crate-darkeco-cluster-ag.go" "crate-darkeco-cluster") + ("ecovalve-ag.go" "ecovalve") + ("ef-plane-ag.go" "ef-plane") + ("racer-ag.go" "racer") ("spike-ag.go" "spike") ("firecanyon-vis.go" "firecanyon-vis") ) @@ -551,7 +551,7 @@ ("tpage-545.go" "tpage-545") ("darkecobomb-ag.go" "darkecobomb") ("ecoclaw-ag.go" "ecoclaw") - ("ecovalve-ag-FIN.go" "ecovalve") + ("ecovalve-ag.go" "ecovalve") ("finalbosscam-ag.go" "finalbosscam") ("green-eco-lurker-ag.go" "green-eco-lurker") ("green-sagecage-ag.go" "green-sagecage") @@ -878,7 +878,7 @@ ("fuel-cell-ag.go" "fuel-cell") ("money-ag.go" "money") ("buzzer-ag.go" "buzzer") - ("ecovalve-ag-ART-GAME.go" "ecovalve") + ("ecovalve-ag.go" "ecovalve") ("crate-ag.go" "crate") ("speaker-ag.go" "speaker") ("fuelcell-naked-ag.go" "fuelcell-naked") @@ -928,10 +928,10 @@ ("tpage-507.go" "tpage-507") ("tpage-966.go" "tpage-966") ("aphid-lurker-ag.go" "aphid-lurker") - ("darkvine-ag-JUB.go" "darkvine") - ("ecovalve-ag-JUB-JUN.go" "ecovalve") + ("darkvine-ag.go" "darkvine") + ("ecovalve-ag.go" "ecovalve") ("eggtop-ag.go" "eggtop") - ("jng-iris-door-ag-JUB.go" "jng-iris-door") + ("jng-iris-door-ag.go" "jng-iris-door") ("plant-boss-ag.go" "plant-boss") ("plat-flip-ag.go" "plat-flip") ("plat-jungleb-ag.go" "plat-jungleb") @@ -939,7 +939,7 @@ ) ("JUN.DGO" - ("eichar-fish+0-ag-JUN.go" "eichar-fish+0") + ("eichar-fish+0-ag.go" "eichar-fish+0") ("jungle-elevator.o" "jungle-elevator") ("bouncer.o" "bouncer") ("hopper.o" "hopper") @@ -962,29 +962,29 @@ ("catch-fisha-ag.go" "catch-fisha") ("catch-fishb-ag.go" "catch-fishb") ("catch-fishc-ag.go" "catch-fishc") - ("darkvine-ag-JUN.go" "darkvine") - ("ecovalve-ag-JUB-JUN.go" "ecovalve") + ("darkvine-ag.go" "darkvine") + ("ecovalve-ag.go" "ecovalve") ("fish-net-ag.go" "fish-net") ("fisher-ag.go" "fisher") ("hopper-ag.go" "hopper") ("junglecam-ag.go" "junglecam") ("junglefish-ag.go" "junglefish") ("junglesnake-ag.go" "junglesnake") - ("launcherdoor-ag-JUN.go" "launcherdoor") + ("launcherdoor-ag.go" "launcherdoor") ("logtrap-ag.go" "logtrap") ("lurkerm-piston-ag.go" "lurkerm-piston") ("lurkerm-tall-sail-ag.go" "lurkerm-tall-sail") ("maindoor-ag.go" "maindoor") ("medres-firecanyon-ag.go" "medres-firecanyon") - ("orb-cache-top-ag-JUN.go" "orb-cache-top") + ("orb-cache-top-ag.go" "orb-cache-top") ("periscope-ag.go" "periscope") ("plat-button-ag.go" "plat-button") - ("plat-eco-ag-JUN.go" "plat-eco") + ("plat-eco-ag.go" "plat-eco") ("precurbridge-ag.go" "precurbridge") ("reflector-mirror-ag.go" "reflector-mirror") ("ropebridge-52-ag.go" "ropebridge-52") ("ropebridge-70-ag.go" "ropebridge-70") - ("sharkey-ag-JUN-MIS.go" "sharkey") + ("sharkey-ag.go" "sharkey") ("sidedoor-ag.go" "sidedoor") ("towertop-ag.go" "towertop") ("water-anim-jungle-ag.go" "water-anim-jungle") @@ -992,7 +992,7 @@ ) ("JUNGLE.CGO" - ("eichar-fish+0-ag-JUNGLE.go" "eichar-fish+0") + ("eichar-fish+0-ag.go" "eichar-fish+0") ("jungle-elevator.o" "jungle-elevator") ("bouncer.o" "bouncer") ("hopper.o" "hopper") @@ -1071,7 +1071,7 @@ ("beach-rocks.o" "beach-rocks") ("seagull.o" "seagull") ("beach-part.o" "beach-part") - ("eichar-fish+0-ag-L1.go" "eichar-fish+0") + ("eichar-fish+0-ag.go" "eichar-fish+0") ("jungle-elevator.o" "jungle-elevator") ("bouncer.o" "bouncer") ("hopper.o" "hopper") @@ -1146,7 +1146,7 @@ ("sunken-part4.o" "sunken-part4") ("sunken-part5.o" "sunken-part5") ("target-tube.o" "target-tube") - ("eichar-tube+0-ag-L1-SUNKEN.go" "eichar-tube+0") + ("eichar-tube+0-ag.go" "eichar-tube+0") ("sunken-obs.o" "sunken-obs") ("shover.o" "shover") ("launcherdoor.o" "launcherdoor") @@ -1198,7 +1198,7 @@ ("snow-ram.o" "snow-ram") ("snow-part.o" "snow-part") ("yeti.o" "yeti") - ("eichar-pole+0-ag-L1.go" "eichar-pole+0") + ("eichar-pole+0-ag.go" "eichar-pole+0") ("eichar-ice+0-ag.go" "eichar-ice+0") ("lavatube-obs.o" "lavatube-obs") ("lavatube-energy.o" "lavatube-energy") @@ -1250,8 +1250,8 @@ ("assistant-lavatube-start-ag.go" "assistant-lavatube-start") ("chainmine-ag.go" "chainmine") ("darkecobarrel-ag.go" "darkecobarrel") - ("ecovalve-ag-LAV.go" "ecovalve") - ("ef-plane-ag-FIC-LAV-OGR-ROL-SNO-SWA.go" "ef-plane") + ("ecovalve-ag.go" "ecovalve") + ("ef-plane-ag.go" "ef-plane") ("energyarm-ag.go" "energyarm") ("energyball-ag.go" "energyball") ("energybase-ag.go" "energybase") @@ -1264,7 +1264,7 @@ ("lavafallsewerb-ag.go" "lavafallsewerb") ("lavashortcut-ag.go" "lavashortcut") ("lavayellowtarp-ag.go" "lavayellowtarp") - ("racer-ag-LAV.go" "racer") + ("racer-ag.go" "racer") ("water-anim-lavatube-ag.go" "water-anim-lavatube") ("lavatube-vis.go" "lavatube-vis") ) @@ -1288,17 +1288,17 @@ ("tpage-1314.go" "tpage-1314") ("tpage-1312.go" "tpage-1312") ("tpage-767.go" "tpage-767") - ("baby-spider-ag-MAI.go" "baby-spider") - ("cavetrapdoor-ag-MAI.go" "cavetrapdoor") + ("baby-spider-ag.go" "baby-spider") + ("cavetrapdoor-ag.go" "cavetrapdoor") ("dark-crystal-ag.go" "dark-crystal") ("driller-lurker-ag.go" "driller-lurker") - ("ecovalve-ag-MAI.go" "ecovalve") + ("ecovalve-ag.go" "ecovalve") ("gnawer-ag.go" "gnawer") ("launcherdoor-maincave-ag.go" "launcherdoor-maincave") ("maincavecam-ag.go" "maincavecam") ("mother-spider-ag.go" "mother-spider") - ("plat-ag-MAI.go" "plat") - ("spider-egg-ag-DAR-MAI.go" "spider-egg") + ("plat-ag.go" "plat") + ("spider-egg-ag.go" "spider-egg") ("spiderwebs-ag.go" "spiderwebs") ("water-anim-maincave-ag.go" "water-anim-maincave") ("water-anim-maincave-water-ag.go" "water-anim-maincave-water") @@ -1357,7 +1357,7 @@ ("breakaway-mid-ag.go" "breakaway-mid") ("breakaway-right-ag.go" "breakaway-right") ("darkecocan-ag.go" "darkecocan") - ("ef-plane-ag-MIS.go" "ef-plane") + ("ef-plane-ag.go" "ef-plane") ("keg-ag.go" "keg") ("keg-conveyor-ag.go" "keg-conveyor") ("keg-conveyor-paddle-ag.go" "keg-conveyor-paddle") @@ -1366,14 +1366,14 @@ ("mistycam-ag.go" "mistycam") ("mistycannon-ag.go" "mistycannon") ("muse-ag.go" "muse") - ("orb-cache-top-ag-MIS.go" "orb-cache-top") - ("plat-eco-ag-MIS.go" "plat-eco") + ("orb-cache-top-ag.go" "orb-cache-top") + ("plat-eco-ag.go" "plat-eco") ("quicksandlurker-ag.go" "quicksandlurker") - ("racer-ag-MIS.go" "racer") + ("racer-ag.go" "racer") ("ropebridge-36-ag.go" "ropebridge-36") ("rounddoor-ag.go" "rounddoor") - ("sack-ag-MIS.go" "sack") - ("sharkey-ag-JUN-MIS.go" "sharkey") + ("sack-ag.go" "sack") + ("sharkey-ag.go" "sharkey") ("sidekick-human-ag.go" "sidekick-human") ("silostep-ag.go" "silostep") ("teetertotter-ag.go" "teetertotter") @@ -1402,9 +1402,9 @@ ("tpage-967.go" "tpage-967") ("tpage-884.go" "tpage-884") ("tpage-1117.go" "tpage-1117") - ("crate-darkeco-cluster-ag-OGR.go" "crate-darkeco-cluster") - ("ecovalve-ag-FIC-OGR.go" "ecovalve") - ("ef-plane-ag-FIC-LAV-OGR-ROL-SNO-SWA.go" "ef-plane") + ("crate-darkeco-cluster-ag.go" "crate-darkeco-cluster") + ("ecovalve-ag.go" "ecovalve") + ("ef-plane-ag.go" "ef-plane") ("flying-lurker-ag.go" "flying-lurker") ("medres-snow-ag.go" "medres-snow") ("ogre-bridge-ag.go" "ogre-bridge") @@ -1414,7 +1414,7 @@ ("ogreboss-ag.go" "ogreboss") ("ogrecam-ag.go" "ogrecam") ("plunger-lurker-ag.go" "plunger-lurker") - ("racer-ag-OGR.go" "racer") + ("racer-ag.go" "racer") ("shortcut-boulder-ag.go" "shortcut-boulder") ("tntbarrel-ag.go" "tntbarrel") ("water-anim-ogre-ag.go" "water-anim-ogre") @@ -1437,22 +1437,22 @@ ("cave-trap.o" "cave-trap") ("spider-egg.o" "spider-egg") ("robocave-part.o" "robocave-part") - ("eichar-pole+0-ag-ROB.go" "eichar-pole+0") + ("eichar-pole+0-ag.go" "eichar-pole+0") ("tpage-1318.go" "tpage-1318") ("tpage-1319.go" "tpage-1319") ("tpage-1317.go" "tpage-1317") ("tpage-1316.go" "tpage-1316") ("babak-ag.go" "babak") - ("baby-spider-ag-ROB.go" "baby-spider") + ("baby-spider-ag.go" "baby-spider") ("cavecrusher-ag.go" "cavecrusher") ("caveelevator-ag.go" "caveelevator") ("cavespatulatwo-ag.go" "cavespatulatwo") - ("cavetrapdoor-ag-ROB.go" "cavetrapdoor") + ("cavetrapdoor-ag.go" "cavetrapdoor") ("driller-lurker-ag.go" "driller-lurker") - ("ecovalve-ag-ROB.go" "ecovalve") - ("plat-ag-ROB.go" "plat") - ("plat-eco-ag-ROB.go" "plat-eco") - ("spider-egg-ag-ROB.go" "spider-egg") + ("ecovalve-ag.go" "ecovalve") + ("plat-ag.go" "plat") + ("plat-eco-ag.go" "plat-eco") + ("spider-egg-ag.go" "spider-egg") ("spiderwebs-ag.go" "spiderwebs") ("water-anim-robocave-ag.go" "water-anim-robocave") ("robocave-vis.go" "robocave-vis") @@ -1479,13 +1479,13 @@ ("tpage-1353.go" "tpage-1353") ("babak-ag.go" "babak") ("dark-plant-ag.go" "dark-plant") - ("ecovalve-ag-ROL.go" "ecovalve") - ("ef-plane-ag-FIC-LAV-OGR-ROL-SNO-SWA.go" "ef-plane") + ("ecovalve-ag.go" "ecovalve") + ("ef-plane-ag.go" "ef-plane") ("happy-plant-ag.go" "happy-plant") ("lightning-mole-ag.go" "lightning-mole") ("pusher-ag.go" "pusher") ("race-ring-ag.go" "race-ring") - ("racer-ag-FIC-ROL.go" "racer") + ("racer-ag.go" "racer") ("robber-ag.go" "robber") ("rolling-start-ag.go" "rolling-start") ("rollingcam-ag.go" "rollingcam") @@ -1511,7 +1511,7 @@ ("snow-ram.o" "snow-ram") ("snow-part.o" "snow-part") ("yeti.o" "yeti") - ("eichar-pole+0-ag-SNO.go" "eichar-pole+0") + ("eichar-pole+0-ag.go" "eichar-pole+0") ("eichar-ice+0-ag.go" "eichar-ice+0") ("snow-bunny.o" "snow-bunny") ("tpage-710.go" "tpage-710") @@ -1519,15 +1519,15 @@ ("tpage-711.go" "tpage-711") ("tpage-712.go" "tpage-712") ("babak-ag.go" "babak") - ("ecovalve-ag-SNO.go" "ecovalve") - ("ef-plane-ag-FIC-LAV-OGR-ROL-SNO-SWA.go" "ef-plane") - ("flut-saddle-ag-SNO.go" "flut-saddle") + ("ecovalve-ag.go" "ecovalve") + ("ef-plane-ag.go" "ef-plane") + ("flut-saddle-ag.go" "flut-saddle") ("flutflut-plat-large-ag.go" "flutflut-plat-large") ("flutflut-plat-med-ag.go" "flutflut-plat-med") ("flutflut-plat-small-ag.go" "flutflut-plat-small") ("ice-cube-ag.go" "ice-cube") ("ice-cube-break-ag.go" "ice-cube-break") - ("orb-cache-top-ag-SNO.go" "orb-cache-top") + ("orb-cache-top-ag.go" "orb-cache-top") ("ram-ag.go" "ram") ("ram-boss-ag.go" "ram-boss") ("snow-ball-ag.go" "snow-ball") @@ -1557,13 +1557,13 @@ ("blue-eco-charger-ag.go" "blue-eco-charger") ("blue-eco-charger-orb-ag.go" "blue-eco-charger-orb") ("bully-ag.go" "bully") - ("ecovalve-ag-SUB.go" "ecovalve") + ("ecovalve-ag.go" "ecovalve") ("floating-launcher-ag.go" "floating-launcher") ("helix-button-ag.go" "helix-button") ("helix-slide-door-ag.go" "helix-slide-door") - ("shover-ag-SUB.go" "shover") - ("steam-cap-ag-SUB.go" "steam-cap") - ("sunkencam-ag-SUB.go" "sunkencam") + ("shover-ag.go" "shover") + ("steam-cap-ag.go" "steam-cap") + ("sunkencam-ag.go" "sunkencam") ("sunkenfisha-ag.go" "sunkenfisha") ("wall-plat-ag.go" "wall-plat") ("water-anim-sunken-ag.go" "water-anim-sunken") @@ -1578,7 +1578,7 @@ ("sunken-part4.o" "sunken-part4") ("sunken-part5.o" "sunken-part5") ("target-tube.o" "target-tube") - ("eichar-tube+0-ag-SUN.go" "eichar-tube+0") + ("eichar-tube+0-ag.go" "eichar-tube+0") ("sunken-obs.o" "sunken-obs") ("shover.o" "shover") ("launcherdoor.o" "launcherdoor") @@ -1610,8 +1610,8 @@ ("double-lurker-top-ag.go" "double-lurker-top") ("exit-chamber-ag.go" "exit-chamber") ("generic-button-ag.go" "generic-button") - ("launcherdoor-ag-SUN.go" "launcherdoor") - ("orb-cache-top-ag-SUN.go" "orb-cache-top") + ("launcherdoor-ag.go" "launcherdoor") + ("orb-cache-top-ag.go" "orb-cache-top") ("orbit-plat-ag.go" "orbit-plat") ("orbit-plat-bottom-ag.go" "orbit-plat-bottom") ("plat-sunken-ag.go" "plat-sunken") @@ -1619,12 +1619,12 @@ ("qbert-plat-ag.go" "qbert-plat") ("qbert-plat-on-ag.go" "qbert-plat-on") ("seaweed-ag.go" "seaweed") - ("shover-ag-SUN.go" "shover") + ("shover-ag.go" "shover") ("side-to-side-plat-ag.go" "side-to-side-plat") ("square-platform-ag.go" "square-platform") - ("steam-cap-ag-SUN.go" "steam-cap") + ("steam-cap-ag.go" "steam-cap") ("sun-iris-door-ag.go" "sun-iris-door") - ("sunkencam-ag-SUN.go" "sunkencam") + ("sunkencam-ag.go" "sunkencam") ("sunkenfisha-ag.go" "sunkenfisha") ("wall-plat-ag.go" "wall-plat") ("water-anim-sunken-ag.go" "water-anim-sunken") @@ -1642,7 +1642,7 @@ ("sunken-part4.o" "sunken-part4") ("sunken-part5.o" "sunken-part5") ("target-tube.o" "target-tube") - ("eichar-tube+0-ag-L1-SUNKEN.go" "eichar-tube+0") + ("eichar-tube+0-ag.go" "eichar-tube+0") ("sunken-obs.o" "sunken-obs") ("shover.o" "shover") ("launcherdoor.o" "launcherdoor") @@ -1679,7 +1679,7 @@ ("kermit.o" "kermit") ("swamp-part.o" "swamp-part") ("billy.o" "billy") - ("eichar-pole+0-ag-SWA.go" "eichar-pole+0") + ("eichar-pole+0-ag.go" "eichar-pole+0") ("tpage-358.go" "tpage-358") ("tpage-659.go" "tpage-659") ("tpage-629.go" "tpage-629") @@ -1688,18 +1688,18 @@ ("balance-plat-ag.go" "balance-plat") ("billy-ag.go" "billy") ("billy-sidekick-ag.go" "billy-sidekick") - ("ecovalve-ag-SWA.go" "ecovalve") - ("ef-plane-ag-FIC-LAV-OGR-ROL-SNO-SWA.go" "ef-plane") + ("ecovalve-ag.go" "ecovalve") + ("ef-plane-ag.go" "ef-plane") ("farthy-snack-ag.go" "farthy-snack") - ("flut-saddle-ag-SWA.go" "flut-saddle") + ("flut-saddle-ag.go" "flut-saddle") ("kermit-ag.go" "kermit") - ("sharkey-ag-SWA.go" "sharkey") + ("sharkey-ag.go" "sharkey") ("swamp-bat-ag.go" "swamp-bat") ("swamp-rat-ag.go" "swamp-rat") ("swamp-rat-nest-ag.go" "swamp-rat-nest") ("swamp-rock-ag.go" "swamp-rock") ("swamp-spike-ag.go" "swamp-spike") - ("swampcam-ag-SWA.go" "swampcam") + ("swampcam-ag.go" "swampcam") ("tar-plat-ag.go" "tar-plat") ("swamp-vis.go" "swamp-vis") ) @@ -1730,15 +1730,15 @@ ("tpage-1310.go" "tpage-1310") ("tpage-1308.go" "tpage-1308") ("tpage-775.go" "tpage-775") - ("ecovalve-ag-TRA.go" "ecovalve") - ("jng-iris-door-ag-TRA.go" "jng-iris-door") - ("plat-eco-ag-TRA.go" "plat-eco") - ("pontoonfive-ag-TRA.go" "pontoonfive") + ("ecovalve-ag.go" "ecovalve") + ("jng-iris-door-ag.go" "jng-iris-door") + ("plat-eco-ag.go" "plat-eco") + ("pontoonfive-ag.go" "pontoonfive") ("scarecrow-a-ag.go" "scarecrow-a") ("scarecrow-b-ag.go" "scarecrow-b") - ("sharkey-ag-BEA-TRA-VI2.go" "sharkey") + ("sharkey-ag.go" "sharkey") ("trainingcam-ag.go" "trainingcam") - ("warp-gate-switch-ag-TRA.go" "warp-gate-switch") + ("warp-gate-switch-ag.go" "warp-gate-switch") ("warpgate-ag.go" "warpgate") ("water-anim-training-ag.go" "water-anim-training") ("training-vis.go" "training-vis") @@ -1781,19 +1781,19 @@ ("medres-village11-ag.go" "medres-village11") ("medres-village12-ag.go" "medres-village12") ("medres-village13-ag.go" "medres-village13") - ("oracle-ag-VI1.go" "oracle") - ("orb-cache-top-ag-VI1.go" "orb-cache-top") + ("oracle-ag.go" "oracle") + ("orb-cache-top-ag.go" "orb-cache-top") ("reflector-middle-ag.go" "reflector-middle") ("revcycle-ag.go" "revcycle") ("revcycleprop-ag.go" "revcycleprop") ("ropebridge-32-ag.go" "ropebridge-32") ("sage-ag.go" "sage") ("sagesail-ag.go" "sagesail") - ("sharkey-ag-VI1.go" "sharkey") + ("sharkey-ag.go" "sharkey") ("villa-starfish-ag.go" "villa-starfish") - ("village-cam-ag-VI1.go" "village-cam") + ("village-cam-ag.go" "village-cam") ("village1cam-ag.go" "village1cam") - ("warp-gate-switch-ag-VI1-VI3.go" "warp-gate-switch") + ("warp-gate-switch-ag.go" "warp-gate-switch") ("warpgate-ag.go" "warpgate") ("water-anim-village1-ag.go" "water-anim-village1") ("windmill-sail-ag.go" "windmill-sail") @@ -1823,7 +1823,7 @@ ("tpage-1476.go" "tpage-1476") ("allpontoons-ag.go" "allpontoons") ("assistant-village2-ag.go" "assistant-village2") - ("barrel-ag-VI2.go" "barrel") + ("barrel-ag.go" "barrel") ("ceilingflag-ag.go" "ceilingflag") ("exit-chamber-dummy-ag.go" "exit-chamber-dummy") ("fireboulder-ag.go" "fireboulder") @@ -1835,22 +1835,22 @@ ("medres-rolling1-ag.go" "medres-rolling1") ("medres-village2-ag.go" "medres-village2") ("ogreboss-village2-ag.go" "ogreboss-village2") - ("oracle-ag-VI2.go" "oracle") - ("orb-cache-top-ag-VI2.go" "orb-cache-top") - ("pontoonfive-ag-VI2.go" "pontoonfive") + ("oracle-ag.go" "oracle") + ("orb-cache-top-ag.go" "orb-cache-top") + ("pontoonfive-ag.go" "pontoonfive") ("pontoonten-ag.go" "pontoonten") ("precursor-arm-ag.go" "precursor-arm") ("sage-bluehut-ag.go" "sage-bluehut") - ("sharkey-ag-BEA-TRA-VI2.go" "sharkey") + ("sharkey-ag.go" "sharkey") ("sunken-elevator-ag.go" "sunken-elevator") ("swamp-blimp-ag.go" "swamp-blimp") ("swamp-rope-ag.go" "swamp-rope") ("swamp-tetherrock-ag.go" "swamp-tetherrock") ("swamp-tetherrock-explode-ag.go" "swamp-tetherrock-explode") - ("swampcam-ag-VI2.go" "swampcam") - ("village-cam-ag-VI2.go" "village-cam") + ("swampcam-ag.go" "swampcam") + ("village-cam-ag.go" "village-cam") ("village2cam-ag.go" "village2cam") - ("warp-gate-switch-ag-VI2.go" "warp-gate-switch") + ("warp-gate-switch-ag.go" "warp-gate-switch") ("warpgate-ag.go" "warpgate") ("warrior-ag.go" "warrior") ("water-anim-village2-ag.go" "water-anim-village2") @@ -1884,12 +1884,12 @@ ("minecartsteel-ag.go" "minecartsteel") ("minershort-ag.go" "minershort") ("minertall-ag.go" "minertall") - ("oracle-ag-VI3.go" "oracle") + ("oracle-ag.go" "oracle") ("pistons-ag.go" "pistons") ("sage-village3-ag.go" "sage-village3") ("vil3-bridge-36-ag.go" "vil3-bridge-36") - ("village-cam-ag-VI3.go" "village-cam") - ("warp-gate-switch-ag-VI1-VI3.go" "warp-gate-switch") + ("village-cam-ag.go" "village-cam") + ("warp-gate-switch-ag.go" "warp-gate-switch") ("warpgate-ag.go" "warpgate") ("water-anim-village3-ag.go" "water-anim-village3") ("village3-vis.go" "village3-vis") diff --git a/goal_src/dgos/bea.gd b/goal_src/dgos/bea.gd index 7d12048cda..256483eba7 100644 --- a/goal_src/dgos/bea.gd +++ b/goal_src/dgos/bea.gd @@ -23,12 +23,12 @@ ("tpage-213.go" "tpage-213") ("tpage-215.go" "tpage-215") ("babak-ag.go" "babak") - ("barrel-ag-BEA.go" "barrel") + ("barrel-ag.go" "barrel") ("beachcam-ag.go" "beachcam") ("bird-lady-ag.go" "bird-lady") ("bird-lady-beach-ag.go" "bird-lady-beach") ("bladeassm-ag.go" "bladeassm") - ("ecovalve-ag-BEA.go" "ecovalve") + ("ecovalve-ag.go" "ecovalve") ("ecoventrock-ag.go" "ecoventrock") ("flutflut-ag.go" "flutflut") ("flutflutegg-ag.go" "flutflutegg") @@ -41,13 +41,13 @@ ("lurkerworm-ag.go" "lurkerworm") ("mayor-ag.go" "mayor") ("mistycannon-ag.go" "mistycannon") - ("orb-cache-top-ag-BEA.go" "orb-cache-top") + ("orb-cache-top-ag.go" "orb-cache-top") ("pelican-ag.go" "pelican") - ("sack-ag-BEA.go" "sack") + ("sack-ag.go" "sack") ("sculptor-ag.go" "sculptor") ("sculptor-muse-ag.go" "sculptor-muse") ("seagull-ag.go" "seagull") - ("sharkey-ag-BEA-TRA-VI2.go" "sharkey") + ("sharkey-ag.go" "sharkey") ("windmill-one-ag.go" "windmill-one") ("beach-vis.go" "beach-vis") ) diff --git a/goal_src/dgos/cit.gd b/goal_src/dgos/cit.gd index 89606f88e9..ca51c41e7b 100644 --- a/goal_src/dgos/cit.gd +++ b/goal_src/dgos/cit.gd @@ -39,15 +39,15 @@ ("citb-rotatebox-ag.go" "citb-rotatebox") ("citb-sagecage-ag.go" "citb-sagecage") ("citb-stopbox-ag.go" "citb-stopbox") - ("ecovalve-ag-CIT.go" "ecovalve") + ("ecovalve-ag.go" "ecovalve") ("evilbro-citadel-ag.go" "evilbro-citadel") ("evilsis-citadel-ag.go" "evilsis-citadel") ("green-sagecage-ag.go" "green-sagecage") - ("orb-cache-top-ag-CIT.go" "orb-cache-top") + ("orb-cache-top-ag.go" "orb-cache-top") ("plat-citb-ag.go" "plat-citb") ("plat-eco-citb-ag.go" "plat-eco-citb") ("redsage-ag.go" "redsage") - ("warp-gate-switch-ag-CIT.go" "warp-gate-switch") + ("warp-gate-switch-ag.go" "warp-gate-switch") ("warpgate-ag.go" "warpgate") ("yellowsage-ag.go" "yellowsage") ("citadel-vis.go" "citadel-vis") diff --git a/goal_src/dgos/fic.gd b/goal_src/dgos/fic.gd index d6aea0f9f7..7f04d451cf 100644 --- a/goal_src/dgos/fic.gd +++ b/goal_src/dgos/fic.gd @@ -19,10 +19,10 @@ ("assistant-firecanyon-ag.go" "assistant-firecanyon") ("babak-ag.go" "babak") ("balloon-ag.go" "balloon") - ("crate-darkeco-cluster-ag-FIC.go" "crate-darkeco-cluster") - ("ecovalve-ag-FIC-OGR.go" "ecovalve") - ("ef-plane-ag-FIC-LAV-OGR-ROL-SNO-SWA.go" "ef-plane") - ("racer-ag-FIC-ROL.go" "racer") + ("crate-darkeco-cluster-ag.go" "crate-darkeco-cluster") + ("ecovalve-ag.go" "ecovalve") + ("ef-plane-ag.go" "ef-plane") + ("racer-ag.go" "racer") ("spike-ag.go" "spike") ("firecanyon-vis.go" "firecanyon-vis") ) \ No newline at end of file diff --git a/goal_src/dgos/fin.gd b/goal_src/dgos/fin.gd index c00a997012..a9154c709a 100644 --- a/goal_src/dgos/fin.gd +++ b/goal_src/dgos/fin.gd @@ -17,7 +17,7 @@ ("tpage-545.go" "tpage-545") ("darkecobomb-ag.go" "darkecobomb") ("ecoclaw-ag.go" "ecoclaw") - ("ecovalve-ag-FIN.go" "ecovalve") + ("ecovalve-ag.go" "ecovalve") ("finalbosscam-ag.go" "finalbosscam") ("green-eco-lurker-ag.go" "green-eco-lurker") ("green-sagecage-ag.go" "green-sagecage") diff --git a/goal_src/dgos/game.gd b/goal_src/dgos/game.gd index cd7445c47e..badfca5bcb 100644 --- a/goal_src/dgos/game.gd +++ b/goal_src/dgos/game.gd @@ -303,7 +303,7 @@ ("fuel-cell-ag.go" "fuel-cell") ("money-ag.go" "money") ("buzzer-ag.go" "buzzer") - ("ecovalve-ag-ART-GAME.go" "ecovalve") + ("ecovalve-ag.go" "ecovalve") ("crate-ag.go" "crate") ("speaker-ag.go" "speaker") ("fuelcell-naked-ag.go" "fuelcell-naked") diff --git a/goal_src/dgos/int.gd b/goal_src/dgos/int.gd new file mode 100644 index 0000000000..77eef135e9 --- /dev/null +++ b/goal_src/dgos/int.gd @@ -0,0 +1,11 @@ + +("INT.DGO" + ("evilbro.o" "evilbro") + ("tpage-1455.go" "tpage-1455") + ("tpage-1457.go" "tpage-1457") + ("tpage-1456.go" "tpage-1456") + ("tpage-1454.go" "tpage-1454") + ("evilbro-ag.go" "evilbro") + ("evilsis-ag.go" "evilsis") + ("intro-vis.go" "intro-vis") + ) \ No newline at end of file diff --git a/goal_src/dgos/jub.gd b/goal_src/dgos/jub.gd index 93a12ce281..b140e9a552 100644 --- a/goal_src/dgos/jub.gd +++ b/goal_src/dgos/jub.gd @@ -10,10 +10,10 @@ ("tpage-507.go" "tpage-507") ("tpage-966.go" "tpage-966") ("aphid-lurker-ag.go" "aphid-lurker") - ("darkvine-ag-JUB.go" "darkvine") - ("ecovalve-ag-JUB-JUN.go" "ecovalve") + ("darkvine-ag.go" "darkvine") + ("ecovalve-ag.go" "ecovalve") ("eggtop-ag.go" "eggtop") - ("jng-iris-door-ag-JUB.go" "jng-iris-door") + ("jng-iris-door-ag.go" "jng-iris-door") ("plant-boss-ag.go" "plant-boss") ("plat-flip-ag.go" "plat-flip") ("plat-jungleb-ag.go" "plat-jungleb") diff --git a/goal_src/dgos/jun.gd b/goal_src/dgos/jun.gd index a5f9992bf2..f72904894b 100644 --- a/goal_src/dgos/jun.gd +++ b/goal_src/dgos/jun.gd @@ -1,5 +1,5 @@ ("JUN.DGO" - ("eichar-fish+0-ag-JUN.go" "eichar-fish+0") + ("eichar-fish+0-ag.go" "eichar-fish+0") ("jungle-elevator.o" "jungle-elevator") ("bouncer.o" "bouncer") ("hopper.o" "hopper") @@ -22,29 +22,29 @@ ("catch-fisha-ag.go" "catch-fisha") ("catch-fishb-ag.go" "catch-fishb") ("catch-fishc-ag.go" "catch-fishc") - ("darkvine-ag-JUN.go" "darkvine") - ("ecovalve-ag-JUB-JUN.go" "ecovalve") + ("darkvine-ag.go" "darkvine") + ("ecovalve-ag.go" "ecovalve") ("fish-net-ag.go" "fish-net") ("fisher-ag.go" "fisher") ("hopper-ag.go" "hopper") ("junglecam-ag.go" "junglecam") ("junglefish-ag.go" "junglefish") ("junglesnake-ag.go" "junglesnake") - ("launcherdoor-ag-JUN.go" "launcherdoor") + ("launcherdoor-ag.go" "launcherdoor") ("logtrap-ag.go" "logtrap") ("lurkerm-piston-ag.go" "lurkerm-piston") ("lurkerm-tall-sail-ag.go" "lurkerm-tall-sail") ("maindoor-ag.go" "maindoor") ("medres-firecanyon-ag.go" "medres-firecanyon") - ("orb-cache-top-ag-JUN.go" "orb-cache-top") + ("orb-cache-top-ag.go" "orb-cache-top") ("periscope-ag.go" "periscope") ("plat-button-ag.go" "plat-button") - ("plat-eco-ag-JUN.go" "plat-eco") + ("plat-eco-ag.go" "plat-eco") ("precurbridge-ag.go" "precurbridge") ("reflector-mirror-ag.go" "reflector-mirror") ("ropebridge-52-ag.go" "ropebridge-52") ("ropebridge-70-ag.go" "ropebridge-70") - ("sharkey-ag-JUN-MIS.go" "sharkey") + ("sharkey-ag.go" "sharkey") ("sidedoor-ag.go" "sidedoor") ("towertop-ag.go" "towertop") ("water-anim-jungle-ag.go" "water-anim-jungle") diff --git a/goal_src/dgos/lav.gd b/goal_src/dgos/lav.gd index 1d0bf5b546..0f17ee0244 100644 --- a/goal_src/dgos/lav.gd +++ b/goal_src/dgos/lav.gd @@ -20,8 +20,8 @@ ("assistant-lavatube-start-ag.go" "assistant-lavatube-start") ("chainmine-ag.go" "chainmine") ("darkecobarrel-ag.go" "darkecobarrel") - ("ecovalve-ag-LAV.go" "ecovalve") - ("ef-plane-ag-FIC-LAV-OGR-ROL-SNO-SWA.go" "ef-plane") + ("ecovalve-ag.go" "ecovalve") + ("ef-plane-ag.go" "ef-plane") ("energyarm-ag.go" "energyarm") ("energyball-ag.go" "energyball") ("energybase-ag.go" "energybase") @@ -34,7 +34,7 @@ ("lavafallsewerb-ag.go" "lavafallsewerb") ("lavashortcut-ag.go" "lavashortcut") ("lavayellowtarp-ag.go" "lavayellowtarp") - ("racer-ag-LAV.go" "racer") + ("racer-ag.go" "racer") ("water-anim-lavatube-ag.go" "water-anim-lavatube") ("lavatube-vis.go" "lavatube-vis") ) \ No newline at end of file diff --git a/goal_src/dgos/mai.gd b/goal_src/dgos/mai.gd index 7bae2691ae..e291a10913 100644 --- a/goal_src/dgos/mai.gd +++ b/goal_src/dgos/mai.gd @@ -18,17 +18,17 @@ ("tpage-1314.go" "tpage-1314") ("tpage-1312.go" "tpage-1312") ("tpage-767.go" "tpage-767") - ("baby-spider-ag-MAI.go" "baby-spider") - ("cavetrapdoor-ag-MAI.go" "cavetrapdoor") + ("baby-spider-ag.go" "baby-spider") + ("cavetrapdoor-ag.go" "cavetrapdoor") ("dark-crystal-ag.go" "dark-crystal") ("driller-lurker-ag.go" "driller-lurker") - ("ecovalve-ag-MAI.go" "ecovalve") + ("ecovalve-ag.go" "ecovalve") ("gnawer-ag.go" "gnawer") ("launcherdoor-maincave-ag.go" "launcherdoor-maincave") ("maincavecam-ag.go" "maincavecam") ("mother-spider-ag.go" "mother-spider") - ("plat-ag-MAI.go" "plat") - ("spider-egg-ag-DAR-MAI.go" "spider-egg") + ("plat-ag.go" "plat") + ("spider-egg-ag.go" "spider-egg") ("spiderwebs-ag.go" "spiderwebs") ("water-anim-maincave-ag.go" "water-anim-maincave") ("water-anim-maincave-water-ag.go" "water-anim-maincave-water") diff --git a/goal_src/dgos/mis.gd b/goal_src/dgos/mis.gd new file mode 100644 index 0000000000..8d2e1a7989 --- /dev/null +++ b/goal_src/dgos/mis.gd @@ -0,0 +1,62 @@ + +("MIS.DGO" + ("target-racer-h-FIC-LAV-MIS-OGR-ROL.o" "target-racer-h") + ("racer-part.o" "racer-part") + ("racer.o" "racer") + ("target-racer-FIC-LAV-MIS-OGR-ROL.o" "target-racer") + ("racer-states-FIC-LAV-MIS-OGR-ROL.o" "racer-states") + ("collide-reaction-racer.o" "collide-reaction-racer") + ("eichar-racer+0-ag.go" "eichar-racer+0") + ("tpage-1119.go" "tpage-1119") + ("battlecontroller.o" "battlecontroller") + ("mistycannon.o" "mistycannon") + ("babak-with-cannon.o" "babak-with-cannon") + ("blocking-plane.o" "blocking-plane") + ("misty-obs.o" "misty-obs") + ("misty-warehouse.o" "misty-warehouse") + ("misty-conveyor.o" "misty-conveyor") + ("mud.o" "mud") + ("muse.o" "muse") + ("bonelurker.o" "bonelurker") + ("quicksandlurker.o" "quicksandlurker") + ("misty-teetertotter.o" "misty-teetertotter") + ("balloonlurker.o" "balloonlurker") + ("misty-part.o" "misty-part") + ("sidekick-human.o" "sidekick-human") + ("tpage-516.go" "tpage-516") + ("tpage-521.go" "tpage-521") + ("tpage-518.go" "tpage-518") + ("tpage-520.go" "tpage-520") + ("babak-ag.go" "babak") + ("balloonlurker-ag.go" "balloonlurker") + ("boatpaddle-ag.go" "boatpaddle") + ("bonelurker-ag.go" "bonelurker") + ("breakaway-left-ag.go" "breakaway-left") + ("breakaway-mid-ag.go" "breakaway-mid") + ("breakaway-right-ag.go" "breakaway-right") + ("darkecocan-ag.go" "darkecocan") + ("ef-plane-ag.go" "ef-plane") + ("keg-ag.go" "keg") + ("keg-conveyor-ag.go" "keg-conveyor") + ("keg-conveyor-paddle-ag.go" "keg-conveyor-paddle") + ("mis-bone-bridge-ag.go" "mis-bone-bridge") + ("mis-bone-platform-ag.go" "mis-bone-platform") + ("mistycam-ag.go" "mistycam") + ("mistycannon-ag.go" "mistycannon") + ("muse-ag.go" "muse") + ("orb-cache-top-ag.go" "orb-cache-top") + ("plat-eco-ag.go" "plat-eco") + ("quicksandlurker-ag.go" "quicksandlurker") + ("racer-ag.go" "racer") + ("ropebridge-36-ag.go" "ropebridge-36") + ("rounddoor-ag.go" "rounddoor") + ("sack-ag.go" "sack") + ("sharkey-ag.go" "sharkey") + ("sidekick-human-ag.go" "sidekick-human") + ("silostep-ag.go" "silostep") + ("teetertotter-ag.go" "teetertotter") + ("water-anim-misty-ag.go" "water-anim-misty") + ("wheel-ag.go" "wheel") + ("windturbine-ag.go" "windturbine") + ("misty-vis.go" "misty-vis") + ) \ No newline at end of file diff --git a/goal_src/dgos/ogr.gd b/goal_src/dgos/ogr.gd index c078934303..9ef62fdf4d 100644 --- a/goal_src/dgos/ogr.gd +++ b/goal_src/dgos/ogr.gd @@ -18,9 +18,9 @@ ("tpage-967.go" "tpage-967") ("tpage-884.go" "tpage-884") ("tpage-1117.go" "tpage-1117") - ("crate-darkeco-cluster-ag-OGR.go" "crate-darkeco-cluster") - ("ecovalve-ag-FIC-OGR.go" "ecovalve") - ("ef-plane-ag-FIC-LAV-OGR-ROL-SNO-SWA.go" "ef-plane") + ("crate-darkeco-cluster-ag.go" "crate-darkeco-cluster") + ("ecovalve-ag.go" "ecovalve") + ("ef-plane-ag.go" "ef-plane") ("flying-lurker-ag.go" "flying-lurker") ("medres-snow-ag.go" "medres-snow") ("ogre-bridge-ag.go" "ogre-bridge") @@ -30,7 +30,7 @@ ("ogreboss-ag.go" "ogreboss") ("ogrecam-ag.go" "ogrecam") ("plunger-lurker-ag.go" "plunger-lurker") - ("racer-ag-OGR.go" "racer") + ("racer-ag.go" "racer") ("shortcut-boulder-ag.go" "shortcut-boulder") ("tntbarrel-ag.go" "tntbarrel") ("water-anim-ogre-ag.go" "water-anim-ogre") diff --git a/goal_src/dgos/rol.gd b/goal_src/dgos/rol.gd index ac41957e71..5f8989b8a9 100644 --- a/goal_src/dgos/rol.gd +++ b/goal_src/dgos/rol.gd @@ -20,13 +20,13 @@ ("tpage-1353.go" "tpage-1353") ("babak-ag.go" "babak") ("dark-plant-ag.go" "dark-plant") - ("ecovalve-ag-ROL.go" "ecovalve") - ("ef-plane-ag-FIC-LAV-OGR-ROL-SNO-SWA.go" "ef-plane") + ("ecovalve-ag.go" "ecovalve") + ("ef-plane-ag.go" "ef-plane") ("happy-plant-ag.go" "happy-plant") ("lightning-mole-ag.go" "lightning-mole") ("pusher-ag.go" "pusher") ("race-ring-ag.go" "race-ring") - ("racer-ag-FIC-ROL.go" "racer") + ("racer-ag.go" "racer") ("robber-ag.go" "robber") ("rolling-start-ag.go" "rolling-start") ("rollingcam-ag.go" "rollingcam") diff --git a/goal_src/dgos/sno.gd b/goal_src/dgos/sno.gd index 058d423f0a..36227e51f3 100644 --- a/goal_src/dgos/sno.gd +++ b/goal_src/dgos/sno.gd @@ -17,7 +17,7 @@ ("snow-ram.o" "snow-ram") ("snow-part.o" "snow-part") ("yeti.o" "yeti") - ("eichar-pole+0-ag-SNO.go" "eichar-pole+0") + ("eichar-pole+0-ag.go" "eichar-pole+0") ("eichar-ice+0-ag.go" "eichar-ice+0") ("snow-bunny.o" "snow-bunny") ("tpage-710.go" "tpage-710") @@ -25,15 +25,15 @@ ("tpage-711.go" "tpage-711") ("tpage-712.go" "tpage-712") ("babak-ag.go" "babak") - ("ecovalve-ag-SNO.go" "ecovalve") - ("ef-plane-ag-FIC-LAV-OGR-ROL-SNO-SWA.go" "ef-plane") - ("flut-saddle-ag-SNO.go" "flut-saddle") + ("ecovalve-ag.go" "ecovalve") + ("ef-plane-ag.go" "ef-plane") + ("flut-saddle-ag.go" "flut-saddle") ("flutflut-plat-large-ag.go" "flutflut-plat-large") ("flutflut-plat-med-ag.go" "flutflut-plat-med") ("flutflut-plat-small-ag.go" "flutflut-plat-small") ("ice-cube-ag.go" "ice-cube") ("ice-cube-break-ag.go" "ice-cube-break") - ("orb-cache-top-ag-SNO.go" "orb-cache-top") + ("orb-cache-top-ag.go" "orb-cache-top") ("ram-ag.go" "ram") ("ram-boss-ag.go" "ram-boss") ("snow-ball-ag.go" "snow-ball") diff --git a/goal_src/dgos/sub.gd b/goal_src/dgos/sub.gd index a3fd766907..c8263ec863 100644 --- a/goal_src/dgos/sub.gd +++ b/goal_src/dgos/sub.gd @@ -9,13 +9,13 @@ ("blue-eco-charger-ag.go" "blue-eco-charger") ("blue-eco-charger-orb-ag.go" "blue-eco-charger-orb") ("bully-ag.go" "bully") - ("ecovalve-ag-SUB.go" "ecovalve") + ("ecovalve-ag.go" "ecovalve") ("floating-launcher-ag.go" "floating-launcher") ("helix-button-ag.go" "helix-button") ("helix-slide-door-ag.go" "helix-slide-door") - ("shover-ag-SUB.go" "shover") - ("steam-cap-ag-SUB.go" "steam-cap") - ("sunkencam-ag-SUB.go" "sunkencam") + ("shover-ag.go" "shover") + ("steam-cap-ag.go" "steam-cap") + ("sunkencam-ag.go" "sunkencam") ("sunkenfisha-ag.go" "sunkenfisha") ("wall-plat-ag.go" "wall-plat") ("water-anim-sunken-ag.go" "water-anim-sunken") diff --git a/goal_src/dgos/sun.gd b/goal_src/dgos/sun.gd index 76a8c5c7f0..e3778959fb 100644 --- a/goal_src/dgos/sun.gd +++ b/goal_src/dgos/sun.gd @@ -5,7 +5,7 @@ ("sunken-part4.o" "sunken-part4") ("sunken-part5.o" "sunken-part5") ("target-tube.o" "target-tube") - ("eichar-tube+0-ag-SUN.go" "eichar-tube+0") + ("eichar-tube+0-ag.go" "eichar-tube+0") ("sunken-obs.o" "sunken-obs") ("shover.o" "shover") ("launcherdoor.o" "launcherdoor") @@ -37,8 +37,8 @@ ("double-lurker-top-ag.go" "double-lurker-top") ("exit-chamber-ag.go" "exit-chamber") ("generic-button-ag.go" "generic-button") - ("launcherdoor-ag-SUN.go" "launcherdoor") - ("orb-cache-top-ag-SUN.go" "orb-cache-top") + ("launcherdoor-ag.go" "launcherdoor") + ("orb-cache-top-ag.go" "orb-cache-top") ("orbit-plat-ag.go" "orbit-plat") ("orbit-plat-bottom-ag.go" "orbit-plat-bottom") ("plat-sunken-ag.go" "plat-sunken") @@ -46,12 +46,12 @@ ("qbert-plat-ag.go" "qbert-plat") ("qbert-plat-on-ag.go" "qbert-plat-on") ("seaweed-ag.go" "seaweed") - ("shover-ag-SUN.go" "shover") + ("shover-ag.go" "shover") ("side-to-side-plat-ag.go" "side-to-side-plat") ("square-platform-ag.go" "square-platform") - ("steam-cap-ag-SUN.go" "steam-cap") + ("steam-cap-ag.go" "steam-cap") ("sun-iris-door-ag.go" "sun-iris-door") - ("sunkencam-ag-SUN.go" "sunkencam") + ("sunkencam-ag.go" "sunkencam") ("sunkenfisha-ag.go" "sunkenfisha") ("wall-plat-ag.go" "wall-plat") ("water-anim-sunken-ag.go" "water-anim-sunken") diff --git a/goal_src/dgos/swa.gd b/goal_src/dgos/swa.gd index dd11fceaca..ebd822a8a5 100644 --- a/goal_src/dgos/swa.gd +++ b/goal_src/dgos/swa.gd @@ -13,7 +13,7 @@ ("kermit.o" "kermit") ("swamp-part.o" "swamp-part") ("billy.o" "billy") - ("eichar-pole+0-ag-SWA.go" "eichar-pole+0") + ("eichar-pole+0-ag.go" "eichar-pole+0") ("tpage-358.go" "tpage-358") ("tpage-659.go" "tpage-659") ("tpage-629.go" "tpage-629") @@ -22,18 +22,18 @@ ("balance-plat-ag.go" "balance-plat") ("billy-ag.go" "billy") ("billy-sidekick-ag.go" "billy-sidekick") - ("ecovalve-ag-SWA.go" "ecovalve") - ("ef-plane-ag-FIC-LAV-OGR-ROL-SNO-SWA.go" "ef-plane") + ("ecovalve-ag.go" "ecovalve") + ("ef-plane-ag.go" "ef-plane") ("farthy-snack-ag.go" "farthy-snack") - ("flut-saddle-ag-SWA.go" "flut-saddle") + ("flut-saddle-ag.go" "flut-saddle") ("kermit-ag.go" "kermit") - ("sharkey-ag-SWA.go" "sharkey") + ("sharkey-ag.go" "sharkey") ("swamp-bat-ag.go" "swamp-bat") ("swamp-rat-ag.go" "swamp-rat") ("swamp-rat-nest-ag.go" "swamp-rat-nest") ("swamp-rock-ag.go" "swamp-rock") ("swamp-spike-ag.go" "swamp-spike") - ("swampcam-ag-SWA.go" "swampcam") + ("swampcam-ag.go" "swampcam") ("tar-plat-ag.go" "tar-plat") ("swamp-vis.go" "swamp-vis") ) \ No newline at end of file diff --git a/goal_src/dgos/tra.gd b/goal_src/dgos/tra.gd index 9fb8d47ece..c9b7faad91 100644 --- a/goal_src/dgos/tra.gd +++ b/goal_src/dgos/tra.gd @@ -6,15 +6,15 @@ ("tpage-1310.go" "tpage-1310") ("tpage-1308.go" "tpage-1308") ("tpage-775.go" "tpage-775") - ("ecovalve-ag-TRA.go" "ecovalve") - ("jng-iris-door-ag-TRA.go" "jng-iris-door") - ("plat-eco-ag-TRA.go" "plat-eco") - ("pontoonfive-ag-TRA.go" "pontoonfive") + ("ecovalve-ag.go" "ecovalve") + ("jng-iris-door-ag.go" "jng-iris-door") + ("plat-eco-ag.go" "plat-eco") + ("pontoonfive-ag.go" "pontoonfive") ("scarecrow-a-ag.go" "scarecrow-a") ("scarecrow-b-ag.go" "scarecrow-b") - ("sharkey-ag-BEA-TRA-VI2.go" "sharkey") + ("sharkey-ag.go" "sharkey") ("trainingcam-ag.go" "trainingcam") - ("warp-gate-switch-ag-TRA.go" "warp-gate-switch") + ("warp-gate-switch-ag.go" "warp-gate-switch") ("warpgate-ag.go" "warpgate") ("water-anim-training-ag.go" "water-anim-training") ("training-vis.go" "training-vis") diff --git a/goal_src/dgos/vi1.gd b/goal_src/dgos/vi1.gd index 150358c84c..36a440b90f 100644 --- a/goal_src/dgos/vi1.gd +++ b/goal_src/dgos/vi1.gd @@ -35,19 +35,19 @@ ("medres-village11-ag.go" "medres-village11") ("medres-village12-ag.go" "medres-village12") ("medres-village13-ag.go" "medres-village13") - ("oracle-ag-VI1.go" "oracle") - ("orb-cache-top-ag-VI1.go" "orb-cache-top") + ("oracle-ag.go" "oracle") + ("orb-cache-top-ag.go" "orb-cache-top") ("reflector-middle-ag.go" "reflector-middle") ("revcycle-ag.go" "revcycle") ("revcycleprop-ag.go" "revcycleprop") ("ropebridge-32-ag.go" "ropebridge-32") ("sage-ag.go" "sage") ("sagesail-ag.go" "sagesail") - ("sharkey-ag-VI1.go" "sharkey") + ("sharkey-ag.go" "sharkey") ("villa-starfish-ag.go" "villa-starfish") - ("village-cam-ag-VI1.go" "village-cam") + ("village-cam-ag.go" "village-cam") ("village1cam-ag.go" "village1cam") - ("warp-gate-switch-ag-VI1-VI3.go" "warp-gate-switch") + ("warp-gate-switch-ag.go" "warp-gate-switch") ("warpgate-ag.go" "warpgate") ("water-anim-village1-ag.go" "water-anim-village1") ("windmill-sail-ag.go" "windmill-sail") diff --git a/goal_src/dgos/vi2.gd b/goal_src/dgos/vi2.gd index 32c0e0aa4b..8e57e2adf9 100644 --- a/goal_src/dgos/vi2.gd +++ b/goal_src/dgos/vi2.gd @@ -19,7 +19,7 @@ ("tpage-1476.go" "tpage-1476") ("allpontoons-ag.go" "allpontoons") ("assistant-village2-ag.go" "assistant-village2") - ("barrel-ag-VI2.go" "barrel") + ("barrel-ag.go" "barrel") ("ceilingflag-ag.go" "ceilingflag") ("exit-chamber-dummy-ag.go" "exit-chamber-dummy") ("fireboulder-ag.go" "fireboulder") @@ -31,22 +31,22 @@ ("medres-rolling1-ag.go" "medres-rolling1") ("medres-village2-ag.go" "medres-village2") ("ogreboss-village2-ag.go" "ogreboss-village2") - ("oracle-ag-VI2.go" "oracle") - ("orb-cache-top-ag-VI2.go" "orb-cache-top") - ("pontoonfive-ag-VI2.go" "pontoonfive") + ("oracle-ag.go" "oracle") + ("orb-cache-top-ag.go" "orb-cache-top") + ("pontoonfive-ag.go" "pontoonfive") ("pontoonten-ag.go" "pontoonten") ("precursor-arm-ag.go" "precursor-arm") ("sage-bluehut-ag.go" "sage-bluehut") - ("sharkey-ag-BEA-TRA-VI2.go" "sharkey") + ("sharkey-ag.go" "sharkey") ("sunken-elevator-ag.go" "sunken-elevator") ("swamp-blimp-ag.go" "swamp-blimp") ("swamp-rope-ag.go" "swamp-rope") ("swamp-tetherrock-ag.go" "swamp-tetherrock") ("swamp-tetherrock-explode-ag.go" "swamp-tetherrock-explode") - ("swampcam-ag-VI2.go" "swampcam") - ("village-cam-ag-VI2.go" "village-cam") + ("swampcam-ag.go" "swampcam") + ("village-cam-ag.go" "village-cam") ("village2cam-ag.go" "village2cam") - ("warp-gate-switch-ag-VI2.go" "warp-gate-switch") + ("warp-gate-switch-ag.go" "warp-gate-switch") ("warpgate-ag.go" "warpgate") ("warrior-ag.go" "warrior") ("water-anim-village2-ag.go" "water-anim-village2") diff --git a/goal_src/dgos/vi3.gd b/goal_src/dgos/vi3.gd index 01be98499c..92cca31148 100644 --- a/goal_src/dgos/vi3.gd +++ b/goal_src/dgos/vi3.gd @@ -25,12 +25,12 @@ ("minecartsteel-ag.go" "minecartsteel") ("minershort-ag.go" "minershort") ("minertall-ag.go" "minertall") - ("oracle-ag-VI3.go" "oracle") + ("oracle-ag.go" "oracle") ("pistons-ag.go" "pistons") ("sage-village3-ag.go" "sage-village3") ("vil3-bridge-36-ag.go" "vil3-bridge-36") - ("village-cam-ag-VI3.go" "village-cam") - ("warp-gate-switch-ag-VI1-VI3.go" "warp-gate-switch") + ("village-cam-ag.go" "village-cam") + ("warp-gate-switch-ag.go" "warp-gate-switch") ("warpgate-ag.go" "warpgate") ("water-anim-village3-ag.go" "water-anim-village3") ("village3-vis.go" "village3-vis") diff --git a/goal_src/game.gp b/goal_src/game.gp index 3db4a53951..5c40ad41fe 100644 --- a/goal_src/game.gp +++ b/goal_src/game.gp @@ -215,7 +215,7 @@ "fuel-cell-ag" "money-ag" "buzzer-ag" - "ecovalve-ag-ART-GAME" + "ecovalve-ag" "crate-ag" "speaker-ag" "fuelcell-naked-ag" @@ -254,6 +254,8 @@ "out/iso/VI2.DGO" "out/iso/VI3.DGO" "out/iso/TRA.DGO" + "out/iso/INT.DGO" + "out/iso/MIS.DGO" "out/iso/FIC.DGO" "out/iso/ROL.DGO" "out/iso/SUN.DGO" @@ -273,6 +275,8 @@ "out/iso/VI2.VIS" "out/iso/VI3.VIS" "out/iso/TRA.VIS" + "out/iso/INT.VIS" + "out/iso/MIS.VIS" "out/iso/FIC.VIS" "out/iso/ROL.VIS" "out/iso/SUN.VIS" @@ -287,7 +291,7 @@ "out/iso/LAV.VIS" "out/iso/CIT.VIS" "out/iso/FIN.VIS" - + ;; streamed anims "out/iso/FUCVICTO.STR" "out/iso/FUCV2.STR" "out/iso/FUCV3.STR" @@ -334,13 +338,20 @@ ;; as we find objects that exist in multiple levels, put them here (copy-gos + "sharkey-ag" + "orb-cache-top-ag" + "warp-gate-switch-ag" "warpgate-ag" - "sharkey-ag-BEA-TRA-VI2" - "eichar-racer+0-ag" - "babak-ag" + "oracle-ag" + "village-cam-ag" + + "eichar-racer+0-ag" + "ef-plane-ag" + "racer-ag" "eichar-flut+0-ag" + "flut-saddle-ag" ) @@ -358,8 +369,6 @@ "common/blocking-plane.gc" "common/launcherdoor.gc" - "common/mistycannon.gc" - "common/babak-with-cannon.gc" "common/snow-bunny.gc" "common/battlecontroller.gc" @@ -375,7 +384,6 @@ "flut_common/target-flut.gc" ) - ;;;;;;;;;;;;;;;;;;;;; ;; Village 1 ;;;;;;;;;;;;;;;;;;;;; @@ -430,19 +438,14 @@ "medres-village11-ag" "medres-village12-ag" "medres-village13-ag" - "oracle-ag-VI1" - "orb-cache-top-ag-VI1" "reflector-middle-ag" "revcycle-ag" "revcycleprop-ag" "ropebridge-32-ag" "sage-ag" "sagesail-ag" - "sharkey-ag-VI1" "villa-starfish-ag" - "village-cam-ag-VI1" "village1cam-ag" - "warp-gate-switch-ag-VI1-VI3" "water-anim-village1-ag" "windmill-sail-ag" "windspinner-ag" @@ -480,35 +483,32 @@ (copy-textures 385 531 386 388 765) (copy-gos - "eichar-fish+0-ag-JUN" + "eichar-fish+0-ag" "accordian-ag" "bounceytarp-ag" "catch-fisha-ag" "catch-fishb-ag" "catch-fishc-ag" - "darkvine-ag-JUN" - "ecovalve-ag-JUB-JUN" + "darkvine-ag" "fish-net-ag" "fisher-ag" "hopper-ag" "junglecam-ag" "junglefish-ag" "junglesnake-ag" - "launcherdoor-ag-JUN" + "launcherdoor-ag" "logtrap-ag" "lurkerm-piston-ag" "lurkerm-tall-sail-ag" "maindoor-ag" "medres-firecanyon-ag" - "orb-cache-top-ag-JUN" "periscope-ag" "plat-button-ag" - "plat-eco-ag-JUN" + "plat-eco-ag" "precurbridge-ag" "reflector-mirror-ag" "ropebridge-52-ag" "ropebridge-70-ag" - "sharkey-ag-JUN-MIS" "sidedoor-ag" "towertop-ag" "water-anim-jungle-ag" @@ -540,9 +540,8 @@ (copy-gos "plant-boss-main+0-ag" "aphid-lurker-ag" - "darkvine-ag-JUB" "eggtop-ag" - "jng-iris-door-ag-JUB" + "jng-iris-door-ag" "plant-boss-ag" "plat-flip-ag" "plat-jungleb-ag" @@ -550,6 +549,89 @@ ) +;;;;;;;;;;;;;;;;;;;;; +;; intro only +;;;;;;;;;;;;;;;;;;;;; + +(cgo "INT.DGO" "int.gd") + +(copy-vis-files "INT") + +(goal-src-sequence + "levels/intro/" + :deps ;; no idea what these depend on, make it depend on the whole engine + ("out/obj/default-menu.o") + + "evilbro.gc" + ) + +(copy-textures 1455 1457 1456 1454) + +(copy-gos + "evilbro-ag" + "evilsis-ag" + "intro-vis" + ) + + +;;;;;;;;;;;;;;;;;;;;; +;; misty island +;;;;;;;;;;;;;;;;;;;;; + +(cgo "MIS.DGO" "mis.gd") + +(copy-vis-files "MIS") + +(goal-src-sequence + "levels/misty/" + :deps ("out/obj/default-menu.o") + "mistycannon.gc" + "babak-with-cannon.gc" + "misty-obs.gc" + "misty-warehouse.gc" + "misty-conveyor.gc" + "mud.gc" + "muse.gc" + "bonelurker.gc" + "quicksandlurker.gc" + "misty-teetertotter.gc" + "balloonlurker.gc" + "misty-part.gc" + "sidekick-human.gc" + ) + +(copy-textures 516 521 518 520) + +(copy-gos + "mistycannon-ag" + "sack-ag" + "balloonlurker-ag" + "boatpaddle-ag" + "bonelurker-ag" + "breakaway-left-ag" + "breakaway-mid-ag" + "breakaway-right-ag" + "darkecocan-ag" + "keg-ag" + "keg-conveyor-ag" + "keg-conveyor-paddle-ag" + "mis-bone-bridge-ag" + "mis-bone-platform-ag" + "mistycam-ag" + "muse-ag" + "quicksandlurker-ag" + "ropebridge-36-ag" + "rounddoor-ag" + "sidekick-human-ag" + "silostep-ag" + "teetertotter-ag" + "water-anim-misty-ag" + "wheel-ag" + "windturbine-ag" + "misty-vis" + ) + + ;;;;;;;;;;;;;;;;;;;;; ;; Beach ;;;;;;;;;;;;;;;;;;;;; @@ -584,12 +666,11 @@ (copy-textures 212 214 213 215) (copy-gos - "barrel-ag-BEA" + "barrel-ag" "beachcam-ag" "bird-lady-ag" "bird-lady-beach-ag" "bladeassm-ag" - "ecovalve-ag-BEA" "ecoventrock-ag" "flutflut-ag" "flutflutegg-ag" @@ -601,10 +682,7 @@ "lurkerpuppy-ag" "lurkerworm-ag" "mayor-ag" - "mistycannon-ag" - "orb-cache-top-ag-BEA" "pelican-ag" - "sack-ag-BEA" "sculptor-ag" "sculptor-muse-ag" "seagull-ag" @@ -640,10 +718,7 @@ (copy-gos "assistant-firecanyon-ag" "balloon-ag" - "crate-darkeco-cluster-ag-FIC" - "ecovalve-ag-FIC-OGR" - "ef-plane-ag-FIC-LAV-OGR-ROL-SNO-SWA" - "racer-ag-FIC-ROL" + "crate-darkeco-cluster-ag" "spike-ag" "firecanyon-vis") @@ -670,14 +745,9 @@ (copy-textures 1309 1311 1310 1308 775) (copy-gos - "ecovalve-ag-TRA" - "jng-iris-door-ag-TRA" - "plat-eco-ag-TRA" - "pontoonfive-ag-TRA" "scarecrow-a-ag" "scarecrow-b-ag" "trainingcam-ag" - "warp-gate-switch-ag-TRA" "water-anim-training-ag" "training-vis" ) @@ -711,7 +781,6 @@ (copy-gos "allpontoons-ag" "assistant-village2-ag" - "barrel-ag-VI2" "ceilingflag-ag" "exit-chamber-dummy-ag" "fireboulder-ag" @@ -723,9 +792,7 @@ "medres-rolling1-ag" "medres-village2-ag" "ogreboss-village2-ag" - "oracle-ag-VI2" - "orb-cache-top-ag-VI2" - "pontoonfive-ag-VI2" + "pontoonfive-ag" "pontoonten-ag" "precursor-arm-ag" "sage-bluehut-ag" @@ -734,10 +801,7 @@ "swamp-rope-ag" "swamp-tetherrock-ag" "swamp-tetherrock-explode-ag" - "swampcam-ag-VI2" - "village-cam-ag-VI2" "village2cam-ag" - "warp-gate-switch-ag-VI2" "warrior-ag" "water-anim-village2-ag" "village2-vis" @@ -764,7 +828,6 @@ (copy-textures 923 926 924 925 1353) (copy-gos - "ecovalve-ag-ROL" "dark-plant-ag" "happy-plant-ag" "lightning-mole-ag" @@ -819,14 +882,12 @@ (copy-textures 661 663 714 662 766) (copy-gos - "eichar-tube+0-ag-SUN" + "eichar-tube+0-ag" "bully-ag" "double-lurker-ag" "double-lurker-top-ag" "exit-chamber-ag" "generic-button-ag" - "launcherdoor-ag-SUN" - "orb-cache-top-ag-SUN" "orbit-plat-ag" "orbit-plat-bottom-ag" "plat-sunken-ag" @@ -834,12 +895,12 @@ "qbert-plat-ag" "qbert-plat-on-ag" "seaweed-ag" - "shover-ag-SUN" + "shover-ag" "side-to-side-plat-ag" "square-platform-ag" - "steam-cap-ag-SUN" + "steam-cap-ag" "sun-iris-door-ag" - "sunkencam-ag-SUN" + "sunkencam-ag" "sunkenfisha-ag" "wall-plat-ag" "water-anim-sunken-ag" @@ -862,16 +923,11 @@ (copy-textures 163 164 166 162 764) (copy-gos - "ecovalve-ag-SUB" - "eichar-tube+0-ag-SUB" "blue-eco-charger-ag" "blue-eco-charger-orb-ag" "floating-launcher-ag" "helix-button-ag" "helix-slide-door-ag" - "shover-ag-SUB" - "steam-cap-ag-SUB" - "sunkencam-ag-SUB" "sunkenb-vis" ) @@ -899,10 +955,7 @@ (copy-textures 358 659 629 630) (copy-gos - "ecovalve-ag-SWA" - "sharkey-ag-SWA" - "eichar-pole+0-ag-SWA" - "flut-saddle-ag-SWA" + "eichar-pole+0-ag" "balance-plat-ag" "billy-ag" "billy-sidekick-ag" @@ -913,7 +966,7 @@ "swamp-rat-nest-ag" "swamp-rock-ag" "swamp-spike-ag" - "swampcam-ag-SWA" + "swampcam-ag" "tar-plat-ag" "swamp-vis" ) @@ -939,8 +992,6 @@ (copy-textures 875 967 884 1117) (copy-gos - "crate-darkeco-cluster-ag-OGR" - "racer-ag-OGR" "flying-lurker-ag" "medres-snow-ag" "ogre-bridge-ag" @@ -996,11 +1047,9 @@ "minecartsteel-ag" "minershort-ag" "minertall-ag" - "oracle-ag-VI3" "pistons-ag" "sage-village3-ag" "vil3-bridge-36-ag" - "village-cam-ag-VI3" "water-anim-village3-ag" "village3-vis" ) @@ -1038,17 +1087,16 @@ (copy-textures 1313 1315 1314 1312 767) (copy-gos - "baby-spider-ag-MAI" - "cavetrapdoor-ag-MAI" + "baby-spider-ag" + "cavetrapdoor-ag" "dark-crystal-ag" "driller-lurker-ag" - "ecovalve-ag-MAI" "gnawer-ag" "launcherdoor-maincave-ag" "maincavecam-ag" "mother-spider-ag" - "plat-ag-MAI" - "spider-egg-ag-DAR-MAI" + "plat-ag" + "spider-egg-ag" "spiderwebs-ag" "water-anim-maincave-ag" "water-anim-maincave-water-ag" @@ -1084,11 +1132,7 @@ (copy-textures 710 842 711 712) (copy-gos - "ecovalve-ag-SNO" - "orb-cache-top-ag-SNO" - "eichar-pole+0-ag-SNO" "eichar-ice+0-ag" - "flut-saddle-ag-SNO" "flutflut-plat-large-ag" "flutflut-plat-med-ag" "flutflut-plat-small-ag" @@ -1135,8 +1179,6 @@ (copy-textures 1338 1340 1339 1337) (copy-gos - "ecovalve-ag-LAV" - "racer-ag-LAV" "assistant-lavatube-start-ag" "chainmine-ag" "darkecobarrel-ag" @@ -1180,9 +1222,6 @@ (copy-textures 1415 1417 1416 1414) (copy-gos - "babak-ag-CIT" - "ecovalve-ag-CIT" - "orb-cache-top-ag-CIT" "assistant-lavatube-end-ag" "bluesage-ag" "citadelcam-ag" @@ -1212,7 +1251,6 @@ "plat-citb-ag" "plat-eco-citb-ag" "redsage-ag" - "warp-gate-switch-ag-CIT" "yellowsage-ag" "citadel-vis" ) @@ -1246,7 +1284,6 @@ (copy-gos "darkecobomb-ag" "ecoclaw-ag" - "ecovalve-ag-FIN" "finalbosscam-ag" "green-eco-lurker-ag" "greenshot-ag" diff --git a/goal_src/levels/beach/barrel-ag-BEA.gd b/goal_src/levels/beach/barrel-ag.gd similarity index 62% rename from goal_src/levels/beach/barrel-ag-BEA.gd rename to goal_src/levels/beach/barrel-ag.gd index 12ce20861b..54d3923f91 100644 --- a/goal_src/levels/beach/barrel-ag-BEA.gd +++ b/goal_src/levels/beach/barrel-ag.gd @@ -1,6 +1,6 @@ ;;-*-Lisp-*- ;; GOAL Data Description File -;; name: barrel-ag-BEA.gd +;; name: barrel-ag.gd ;; name in dgo: barrel -;; dgos: BEA +;; dgos: BEA, VI2 diff --git a/goal_src/levels/beach/ecovalve-ag-BEA.gd b/goal_src/levels/beach/ecovalve-ag-BEA.gd deleted file mode 100644 index e39030d427..0000000000 --- a/goal_src/levels/beach/ecovalve-ag-BEA.gd +++ /dev/null @@ -1,6 +0,0 @@ -;;-*-Lisp-*- -;; GOAL Data Description File - -;; name: ecovalve-ag-BEA.gd -;; name in dgo: ecovalve -;; dgos: BEA diff --git a/goal_src/levels/beach/orb-cache-top-ag-BEA.gd b/goal_src/levels/beach/orb-cache-top-ag-BEA.gd deleted file mode 100644 index 9ccb35efef..0000000000 --- a/goal_src/levels/beach/orb-cache-top-ag-BEA.gd +++ /dev/null @@ -1,6 +0,0 @@ -;;-*-Lisp-*- -;; GOAL Data Description File - -;; name: orb-cache-top-ag-BEA.gd -;; name in dgo: orb-cache-top -;; dgos: BEA diff --git a/goal_src/levels/beach/sack-ag-BEA.gd b/goal_src/levels/beach/sack-ag-BEA.gd deleted file mode 100644 index 12cea44f58..0000000000 --- a/goal_src/levels/beach/sack-ag-BEA.gd +++ /dev/null @@ -1,6 +0,0 @@ -;;-*-Lisp-*- -;; GOAL Data Description File - -;; name: sack-ag-BEA.gd -;; name in dgo: sack -;; dgos: BEA diff --git a/goal_src/levels/darkcave/baby-spider-ag-DAR.gd b/goal_src/levels/cave_common/baby-spider-ag.gd similarity index 59% rename from goal_src/levels/darkcave/baby-spider-ag-DAR.gd rename to goal_src/levels/cave_common/baby-spider-ag.gd index 2578e0c66d..821ddecb49 100644 --- a/goal_src/levels/darkcave/baby-spider-ag-DAR.gd +++ b/goal_src/levels/cave_common/baby-spider-ag.gd @@ -1,6 +1,6 @@ ;;-*-Lisp-*- ;; GOAL Data Description File -;; name: baby-spider-ag-DAR.gd +;; name: baby-spider-ag.gd ;; name in dgo: baby-spider -;; dgos: DAR +;; dgos: MAI, DAR, ROB diff --git a/goal_src/levels/darkcave/cavetrapdoor-ag-DAR.gd b/goal_src/levels/cave_common/cavetrapdoor-ag.gd similarity index 58% rename from goal_src/levels/darkcave/cavetrapdoor-ag-DAR.gd rename to goal_src/levels/cave_common/cavetrapdoor-ag.gd index a4f7160abc..642df26a2d 100644 --- a/goal_src/levels/darkcave/cavetrapdoor-ag-DAR.gd +++ b/goal_src/levels/cave_common/cavetrapdoor-ag.gd @@ -1,6 +1,6 @@ ;;-*-Lisp-*- ;; GOAL Data Description File -;; name: cavetrapdoor-ag-DAR.gd +;; name: cavetrapdoor-ag.gd ;; name in dgo: cavetrapdoor -;; dgos: DAR +;; dgos: MAI, DAR, ROB diff --git a/goal_src/levels/cave_common/spider-egg-ag-DAR-MAI.gd b/goal_src/levels/cave_common/spider-egg-ag-DAR-MAI.gd deleted file mode 100644 index e6ac79b28b..0000000000 --- a/goal_src/levels/cave_common/spider-egg-ag-DAR-MAI.gd +++ /dev/null @@ -1,6 +0,0 @@ -;;-*-Lisp-*- -;; GOAL Data Description File - -;; name: spider-egg-ag-DAR-MAI.gd -;; name in dgo: spider-egg -;; dgos: DAR, MAI diff --git a/goal_src/levels/robocave/spider-egg-ag-ROB.gd b/goal_src/levels/cave_common/spider-egg-ag.gd similarity index 59% rename from goal_src/levels/robocave/spider-egg-ag-ROB.gd rename to goal_src/levels/cave_common/spider-egg-ag.gd index 0ae0b034a4..7f4f15ae8d 100644 --- a/goal_src/levels/robocave/spider-egg-ag-ROB.gd +++ b/goal_src/levels/cave_common/spider-egg-ag.gd @@ -1,6 +1,6 @@ ;;-*-Lisp-*- ;; GOAL Data Description File -;; name: spider-egg-ag-ROB.gd +;; name: spider-egg-ag.gd ;; name in dgo: spider-egg -;; dgos: ROB +;; dgos: DAR, MAI, ROB diff --git a/goal_src/levels/citadel/ecovalve-ag-CIT.gd b/goal_src/levels/citadel/ecovalve-ag-CIT.gd deleted file mode 100644 index 507d723628..0000000000 --- a/goal_src/levels/citadel/ecovalve-ag-CIT.gd +++ /dev/null @@ -1,6 +0,0 @@ -;;-*-Lisp-*- -;; GOAL Data Description File - -;; name: ecovalve-ag-CIT.gd -;; name in dgo: ecovalve -;; dgos: CIT diff --git a/goal_src/levels/citadel/orb-cache-top-ag-CIT.gd b/goal_src/levels/citadel/orb-cache-top-ag-CIT.gd deleted file mode 100644 index df2c97314f..0000000000 --- a/goal_src/levels/citadel/orb-cache-top-ag-CIT.gd +++ /dev/null @@ -1,6 +0,0 @@ -;;-*-Lisp-*- -;; GOAL Data Description File - -;; name: orb-cache-top-ag-CIT.gd -;; name in dgo: orb-cache-top -;; dgos: CIT diff --git a/goal_src/levels/common/ecovalve-ag-ART-GAME.gd b/goal_src/levels/common/ecovalve-ag-ART-GAME.gd deleted file mode 100644 index 1dd6af8bfd..0000000000 --- a/goal_src/levels/common/ecovalve-ag-ART-GAME.gd +++ /dev/null @@ -1,6 +0,0 @@ -;;-*-Lisp-*- -;; GOAL Data Description File - -;; name: ecovalve-ag-ART-GAME.gd -;; name in dgo: ecovalve -;; dgos: GAME, ART diff --git a/goal_src/levels/common/ecovalve-ag-FIC-OGR.gd b/goal_src/levels/common/ecovalve-ag-FIC-OGR.gd deleted file mode 100644 index 0ddd8cf20b..0000000000 --- a/goal_src/levels/common/ecovalve-ag-FIC-OGR.gd +++ /dev/null @@ -1,6 +0,0 @@ -;;-*-Lisp-*- -;; GOAL Data Description File - -;; name: ecovalve-ag-FIC-OGR.gd -;; name in dgo: ecovalve -;; dgos: FIC, OGR diff --git a/goal_src/levels/common/ecovalve-ag.gd b/goal_src/levels/common/ecovalve-ag.gd new file mode 100644 index 0000000000..b0015b8303 --- /dev/null +++ b/goal_src/levels/common/ecovalve-ag.gd @@ -0,0 +1,6 @@ +;;-*-Lisp-*- +;; GOAL Data Description File + +;; name: ecovalve-ag.gd +;; name in dgo: ecovalve +;; dgos: GAME, ART, BEA, CIT, FIN, JUB, JUN, FIC, OGR, LAV, MAI, ROB, ROL, SNO, SUB, SWA, TRA diff --git a/goal_src/levels/common/ef-plane-ag-FIC-LAV-OGR-ROL-SNO-SWA.gd b/goal_src/levels/common/ef-plane-ag-FIC-LAV-OGR-ROL-SNO-SWA.gd deleted file mode 100644 index 87b7e815bc..0000000000 --- a/goal_src/levels/common/ef-plane-ag-FIC-LAV-OGR-ROL-SNO-SWA.gd +++ /dev/null @@ -1,6 +0,0 @@ -;;-*-Lisp-*- -;; GOAL Data Description File - -;; name: ef-plane-ag-FIC-LAV-OGR-ROL-SNO-SWA.gd -;; name in dgo: ef-plane -;; dgos: FIC, LAV, OGR, ROL, SNO, SWA diff --git a/goal_src/levels/common/orb-cache-top-ag.gd b/goal_src/levels/common/orb-cache-top-ag.gd new file mode 100644 index 0000000000..e535b93ef9 --- /dev/null +++ b/goal_src/levels/common/orb-cache-top-ag.gd @@ -0,0 +1,6 @@ +;;-*-Lisp-*- +;; GOAL Data Description File + +;; name: orb-cache-top-ag.gd +;; name in dgo: orb-cache-top +;; dgos: BEA, CIT, JUN, MIS, SNO, SUN, VI1, VI2 diff --git a/goal_src/levels/robocave/plat-ag-ROB.gd b/goal_src/levels/common/plat-ag.gd similarity index 63% rename from goal_src/levels/robocave/plat-ag-ROB.gd rename to goal_src/levels/common/plat-ag.gd index 07288206f7..4aa7630b33 100644 --- a/goal_src/levels/robocave/plat-ag-ROB.gd +++ b/goal_src/levels/common/plat-ag.gd @@ -1,6 +1,6 @@ ;;-*-Lisp-*- ;; GOAL Data Description File -;; name: plat-ag-ROB.gd +;; name: plat-ag.gd ;; name in dgo: plat -;; dgos: ROB +;; dgos: MAI, ROB diff --git a/goal_src/levels/jungle/plat-eco-ag-JUN.gd b/goal_src/levels/common/plat-eco-ag.gd similarity index 57% rename from goal_src/levels/jungle/plat-eco-ag-JUN.gd rename to goal_src/levels/common/plat-eco-ag.gd index 5b5954b7a3..b425f56a99 100644 --- a/goal_src/levels/jungle/plat-eco-ag-JUN.gd +++ b/goal_src/levels/common/plat-eco-ag.gd @@ -1,6 +1,6 @@ ;;-*-Lisp-*- ;; GOAL Data Description File -;; name: plat-eco-ag-JUN.gd +;; name: plat-eco-ag.gd ;; name in dgo: plat-eco -;; dgos: JUN +;; dgos: JUN, MIS, ROB, TRA diff --git a/goal_src/levels/common/sharkey-ag-JUN-MIS.gd b/goal_src/levels/common/sharkey-ag-JUN-MIS.gd deleted file mode 100644 index ccefbf3b0d..0000000000 --- a/goal_src/levels/common/sharkey-ag-JUN-MIS.gd +++ /dev/null @@ -1,6 +0,0 @@ -;;-*-Lisp-*- -;; GOAL Data Description File - -;; name: sharkey-ag-JUN-MIS.gd -;; name in dgo: sharkey -;; dgos: JUN, MIS diff --git a/goal_src/levels/common/sharkey-ag-BEA-TRA-VI2.gd b/goal_src/levels/common/sharkey-ag.gd similarity index 50% rename from goal_src/levels/common/sharkey-ag-BEA-TRA-VI2.gd rename to goal_src/levels/common/sharkey-ag.gd index 2d0caeaf2f..d61717a7db 100644 --- a/goal_src/levels/common/sharkey-ag-BEA-TRA-VI2.gd +++ b/goal_src/levels/common/sharkey-ag.gd @@ -1,6 +1,6 @@ ;;-*-Lisp-*- ;; GOAL Data Description File -;; name: sharkey-ag-BEA-TRA-VI2.gd +;; name: sharkey-ag.gd ;; name in dgo: sharkey -;; dgos: BEA, TRA, VI2 +;; dgos: BEA, TRA, VI2, JUN, MIS, SWA, VI1 diff --git a/goal_src/levels/common/warp-gate-switch-ag-VI1-VI3.gd b/goal_src/levels/common/warp-gate-switch-ag-VI1-VI3.gd deleted file mode 100644 index 45679c0b6a..0000000000 --- a/goal_src/levels/common/warp-gate-switch-ag-VI1-VI3.gd +++ /dev/null @@ -1,6 +0,0 @@ -;;-*-Lisp-*- -;; GOAL Data Description File - -;; name: warp-gate-switch-ag-VI1-VI3.gd -;; name in dgo: warp-gate-switch -;; dgos: VI1, VI3 diff --git a/goal_src/levels/finalboss/ecovalve-ag-FIN.gd b/goal_src/levels/finalboss/ecovalve-ag-FIN.gd deleted file mode 100644 index 5289328c67..0000000000 --- a/goal_src/levels/finalboss/ecovalve-ag-FIN.gd +++ /dev/null @@ -1,6 +0,0 @@ -;;-*-Lisp-*- -;; GOAL Data Description File - -;; name: ecovalve-ag-FIN.gd -;; name in dgo: ecovalve -;; dgos: FIN diff --git a/goal_src/levels/firecanyon/crate-darkeco-cluster-ag-FIC.gd b/goal_src/levels/firecanyon/crate-darkeco-cluster-ag.gd similarity index 59% rename from goal_src/levels/firecanyon/crate-darkeco-cluster-ag-FIC.gd rename to goal_src/levels/firecanyon/crate-darkeco-cluster-ag.gd index 79de55f367..542677bfaf 100644 --- a/goal_src/levels/firecanyon/crate-darkeco-cluster-ag-FIC.gd +++ b/goal_src/levels/firecanyon/crate-darkeco-cluster-ag.gd @@ -1,6 +1,6 @@ ;;-*-Lisp-*- ;; GOAL Data Description File -;; name: crate-darkeco-cluster-ag-FIC.gd +;; name: crate-darkeco-cluster-ag.gd ;; name in dgo: crate-darkeco-cluster -;; dgos: FIC +;; dgos: FIC, OGR diff --git a/goal_src/levels/snow/flut-saddle-ag-SNO.gd b/goal_src/levels/flut_common/flut-saddle-ag.gd similarity index 61% rename from goal_src/levels/snow/flut-saddle-ag-SNO.gd rename to goal_src/levels/flut_common/flut-saddle-ag.gd index 428b887e86..0dc8fde60a 100644 --- a/goal_src/levels/snow/flut-saddle-ag-SNO.gd +++ b/goal_src/levels/flut_common/flut-saddle-ag.gd @@ -1,6 +1,6 @@ ;;-*-Lisp-*- ;; GOAL Data Description File -;; name: flut-saddle-ag-SNO.gd +;; name: flut-saddle-ag.gd ;; name in dgo: flut-saddle -;; dgos: SNO +;; dgos: SWA, SNO diff --git a/goal_src/levels/jungle/darkvine-ag-JUN.gd b/goal_src/levels/jungle/darkvine-ag.gd similarity index 62% rename from goal_src/levels/jungle/darkvine-ag-JUN.gd rename to goal_src/levels/jungle/darkvine-ag.gd index aadebb107c..acba961eba 100644 --- a/goal_src/levels/jungle/darkvine-ag-JUN.gd +++ b/goal_src/levels/jungle/darkvine-ag.gd @@ -1,6 +1,6 @@ ;;-*-Lisp-*- ;; GOAL Data Description File -;; name: darkvine-ag-JUN.gd +;; name: darkvine-ag.gd ;; name in dgo: darkvine -;; dgos: JUN +;; dgos: JUN, JUB diff --git a/goal_src/levels/jungle/eichar-fish+0-ag-JUN.gd b/goal_src/levels/jungle/eichar-fish+0-ag.gd similarity index 72% rename from goal_src/levels/jungle/eichar-fish+0-ag-JUN.gd rename to goal_src/levels/jungle/eichar-fish+0-ag.gd index 2ac70a47e1..579a5b8d84 100644 --- a/goal_src/levels/jungle/eichar-fish+0-ag-JUN.gd +++ b/goal_src/levels/jungle/eichar-fish+0-ag.gd @@ -1,6 +1,6 @@ ;;-*-Lisp-*- ;; GOAL Data Description File -;; name: eichar-fish+0-ag-JUN.gd +;; name: eichar-fish+0-ag.gd ;; name in dgo: eichar-fish+0 ;; dgos: JUN diff --git a/goal_src/levels/jungle/launcherdoor-ag-JUN.gd b/goal_src/levels/jungle/launcherdoor-ag.gd similarity index 61% rename from goal_src/levels/jungle/launcherdoor-ag-JUN.gd rename to goal_src/levels/jungle/launcherdoor-ag.gd index 32f37b3b50..0e6ed55726 100644 --- a/goal_src/levels/jungle/launcherdoor-ag-JUN.gd +++ b/goal_src/levels/jungle/launcherdoor-ag.gd @@ -1,6 +1,6 @@ ;;-*-Lisp-*- ;; GOAL Data Description File -;; name: launcherdoor-ag-JUN.gd +;; name: launcherdoor-ag.gd ;; name in dgo: launcherdoor -;; dgos: JUN +;; dgos: JUN, SUN diff --git a/goal_src/levels/jungle/orb-cache-top-ag-JUN.gd b/goal_src/levels/jungle/orb-cache-top-ag-JUN.gd deleted file mode 100644 index 5ed62dcfe7..0000000000 --- a/goal_src/levels/jungle/orb-cache-top-ag-JUN.gd +++ /dev/null @@ -1,6 +0,0 @@ -;;-*-Lisp-*- -;; GOAL Data Description File - -;; name: orb-cache-top-ag-JUN.gd -;; name in dgo: orb-cache-top -;; dgos: JUN diff --git a/goal_src/levels/jungle_common/ecovalve-ag-JUB-JUN.gd b/goal_src/levels/jungle_common/ecovalve-ag-JUB-JUN.gd deleted file mode 100644 index a94667342a..0000000000 --- a/goal_src/levels/jungle_common/ecovalve-ag-JUB-JUN.gd +++ /dev/null @@ -1,6 +0,0 @@ -;;-*-Lisp-*- -;; GOAL Data Description File - -;; name: ecovalve-ag-JUB-JUN.gd -;; name in dgo: ecovalve -;; dgos: JUB, JUN diff --git a/goal_src/levels/jungleb/darkvine-ag-JUB.gd b/goal_src/levels/jungleb/darkvine-ag-JUB.gd deleted file mode 100644 index 716870a874..0000000000 --- a/goal_src/levels/jungleb/darkvine-ag-JUB.gd +++ /dev/null @@ -1,6 +0,0 @@ -;;-*-Lisp-*- -;; GOAL Data Description File - -;; name: darkvine-ag-JUB.gd -;; name in dgo: darkvine -;; dgos: JUB diff --git a/goal_src/levels/jungleb/jng-iris-door-ag-JUB.gd b/goal_src/levels/jungleb/jng-iris-door-ag.gd similarity index 61% rename from goal_src/levels/jungleb/jng-iris-door-ag-JUB.gd rename to goal_src/levels/jungleb/jng-iris-door-ag.gd index 81553826fd..76d26cc0eb 100644 --- a/goal_src/levels/jungleb/jng-iris-door-ag-JUB.gd +++ b/goal_src/levels/jungleb/jng-iris-door-ag.gd @@ -1,6 +1,6 @@ ;;-*-Lisp-*- ;; GOAL Data Description File -;; name: jng-iris-door-ag-JUB.gd +;; name: jng-iris-door-ag.gd ;; name in dgo: jng-iris-door -;; dgos: JUB +;; dgos: JUB, TRA diff --git a/goal_src/levels/l1_only/eichar-fish+0-ag-JUNGLE.gd b/goal_src/levels/l1_only/eichar-fish+0-ag-JUNGLE.gd deleted file mode 100644 index ff57aaaf68..0000000000 --- a/goal_src/levels/l1_only/eichar-fish+0-ag-JUNGLE.gd +++ /dev/null @@ -1,6 +0,0 @@ -;;-*-Lisp-*- -;; GOAL Data Description File - -;; name: eichar-fish+0-ag-JUNGLE.gd -;; name in dgo: eichar-fish+0 -;; dgos: JUNGLE diff --git a/goal_src/levels/l1_only/eichar-fish+0-ag-L1.gd b/goal_src/levels/l1_only/eichar-fish+0-ag-L1.gd deleted file mode 100644 index d7f96ae263..0000000000 --- a/goal_src/levels/l1_only/eichar-fish+0-ag-L1.gd +++ /dev/null @@ -1,6 +0,0 @@ -;;-*-Lisp-*- -;; GOAL Data Description File - -;; name: eichar-fish+0-ag-L1.gd -;; name in dgo: eichar-fish+0 -;; dgos: L1 diff --git a/goal_src/levels/l1_only/eichar-pole+0-ag-L1.gd b/goal_src/levels/l1_only/eichar-pole+0-ag-L1.gd deleted file mode 100644 index 92cdba851a..0000000000 --- a/goal_src/levels/l1_only/eichar-pole+0-ag-L1.gd +++ /dev/null @@ -1,6 +0,0 @@ -;;-*-Lisp-*- -;; GOAL Data Description File - -;; name: eichar-pole+0-ag-L1.gd -;; name in dgo: eichar-pole+0 -;; dgos: L1 diff --git a/goal_src/levels/l1_only/eichar-tube+0-ag-L1-SUNKEN.gd b/goal_src/levels/l1_only/eichar-tube+0-ag-L1-SUNKEN.gd deleted file mode 100644 index 1227417b4b..0000000000 --- a/goal_src/levels/l1_only/eichar-tube+0-ag-L1-SUNKEN.gd +++ /dev/null @@ -1,6 +0,0 @@ -;;-*-Lisp-*- -;; GOAL Data Description File - -;; name: eichar-tube+0-ag-L1-SUNKEN.gd -;; name in dgo: eichar-tube+0 -;; dgos: L1, SUNKEN diff --git a/goal_src/levels/lavatube/ecovalve-ag-LAV.gd b/goal_src/levels/lavatube/ecovalve-ag-LAV.gd deleted file mode 100644 index 282756a211..0000000000 --- a/goal_src/levels/lavatube/ecovalve-ag-LAV.gd +++ /dev/null @@ -1,6 +0,0 @@ -;;-*-Lisp-*- -;; GOAL Data Description File - -;; name: ecovalve-ag-LAV.gd -;; name in dgo: ecovalve -;; dgos: LAV diff --git a/goal_src/levels/lavatube/racer-ag-LAV.gd b/goal_src/levels/lavatube/racer-ag-LAV.gd deleted file mode 100644 index 3ffc96f31e..0000000000 --- a/goal_src/levels/lavatube/racer-ag-LAV.gd +++ /dev/null @@ -1,6 +0,0 @@ -;;-*-Lisp-*- -;; GOAL Data Description File - -;; name: racer-ag-LAV.gd -;; name in dgo: racer -;; dgos: LAV diff --git a/goal_src/levels/maincave/baby-spider-ag-MAI.gd b/goal_src/levels/maincave/baby-spider-ag-MAI.gd deleted file mode 100644 index ef450fa713..0000000000 --- a/goal_src/levels/maincave/baby-spider-ag-MAI.gd +++ /dev/null @@ -1,6 +0,0 @@ -;;-*-Lisp-*- -;; GOAL Data Description File - -;; name: baby-spider-ag-MAI.gd -;; name in dgo: baby-spider -;; dgos: MAI diff --git a/goal_src/levels/maincave/cavetrapdoor-ag-MAI.gd b/goal_src/levels/maincave/cavetrapdoor-ag-MAI.gd deleted file mode 100644 index 049369897c..0000000000 --- a/goal_src/levels/maincave/cavetrapdoor-ag-MAI.gd +++ /dev/null @@ -1,6 +0,0 @@ -;;-*-Lisp-*- -;; GOAL Data Description File - -;; name: cavetrapdoor-ag-MAI.gd -;; name in dgo: cavetrapdoor -;; dgos: MAI diff --git a/goal_src/levels/maincave/ecovalve-ag-MAI.gd b/goal_src/levels/maincave/ecovalve-ag-MAI.gd deleted file mode 100644 index efc4d4d584..0000000000 --- a/goal_src/levels/maincave/ecovalve-ag-MAI.gd +++ /dev/null @@ -1,6 +0,0 @@ -;;-*-Lisp-*- -;; GOAL Data Description File - -;; name: ecovalve-ag-MAI.gd -;; name in dgo: ecovalve -;; dgos: MAI diff --git a/goal_src/levels/maincave/plat-ag-MAI.gd b/goal_src/levels/maincave/plat-ag-MAI.gd deleted file mode 100644 index f51839c4fc..0000000000 --- a/goal_src/levels/maincave/plat-ag-MAI.gd +++ /dev/null @@ -1,6 +0,0 @@ -;;-*-Lisp-*- -;; GOAL Data Description File - -;; name: plat-ag-MAI.gd -;; name in dgo: plat -;; dgos: MAI diff --git a/goal_src/levels/common/babak-with-cannon.gc b/goal_src/levels/misty/babak-with-cannon.gc similarity index 100% rename from goal_src/levels/common/babak-with-cannon.gc rename to goal_src/levels/misty/babak-with-cannon.gc diff --git a/goal_src/levels/common/mistycannon-ag.gd b/goal_src/levels/misty/mistycannon-ag.gd similarity index 100% rename from goal_src/levels/common/mistycannon-ag.gd rename to goal_src/levels/misty/mistycannon-ag.gd diff --git a/goal_src/levels/common/mistycannon.gc b/goal_src/levels/misty/mistycannon.gc similarity index 100% rename from goal_src/levels/common/mistycannon.gc rename to goal_src/levels/misty/mistycannon.gc diff --git a/goal_src/levels/misty/muse.gc b/goal_src/levels/misty/muse.gc index 90f6fad318..915893d325 100644 --- a/goal_src/levels/misty/muse.gc +++ b/goal_src/levels/misty/muse.gc @@ -5,9 +5,6 @@ ;; name in dgo: muse ;; dgos: L1, MIS -(define-extern muse-idle (state muse)) ;; unknown type -(define-extern muse-caught (state muse)) ;; unknown type - ;; DECOMP BEGINS (deftype muse (nav-enemy) @@ -27,6 +24,10 @@ :method-count-assert 76 :size-assert #x200 :flag-assert #x4c01900200 + (:states + muse-caught + muse-idle + ) ) diff --git a/goal_src/levels/misty/orb-cache-top-ag-MIS.gd b/goal_src/levels/misty/orb-cache-top-ag-MIS.gd deleted file mode 100644 index f32106989d..0000000000 --- a/goal_src/levels/misty/orb-cache-top-ag-MIS.gd +++ /dev/null @@ -1,6 +0,0 @@ -;;-*-Lisp-*- -;; GOAL Data Description File - -;; name: orb-cache-top-ag-MIS.gd -;; name in dgo: orb-cache-top -;; dgos: MIS diff --git a/goal_src/levels/misty/plat-eco-ag-MIS.gd b/goal_src/levels/misty/plat-eco-ag-MIS.gd deleted file mode 100644 index 7738bb5bcb..0000000000 --- a/goal_src/levels/misty/plat-eco-ag-MIS.gd +++ /dev/null @@ -1,6 +0,0 @@ -;;-*-Lisp-*- -;; GOAL Data Description File - -;; name: plat-eco-ag-MIS.gd -;; name in dgo: plat-eco -;; dgos: MIS diff --git a/goal_src/levels/misty/racer-ag-MIS.gd b/goal_src/levels/misty/racer-ag-MIS.gd deleted file mode 100644 index 91a0a54577..0000000000 --- a/goal_src/levels/misty/racer-ag-MIS.gd +++ /dev/null @@ -1,6 +0,0 @@ -;;-*-Lisp-*- -;; GOAL Data Description File - -;; name: racer-ag-MIS.gd -;; name in dgo: racer -;; dgos: MIS diff --git a/goal_src/levels/misty/sack-ag-MIS.gd b/goal_src/levels/misty/sack-ag.gd similarity index 63% rename from goal_src/levels/misty/sack-ag-MIS.gd rename to goal_src/levels/misty/sack-ag.gd index 0bf1856385..7ccee1d33c 100644 --- a/goal_src/levels/misty/sack-ag-MIS.gd +++ b/goal_src/levels/misty/sack-ag.gd @@ -1,6 +1,6 @@ ;;-*-Lisp-*- ;; GOAL Data Description File -;; name: sack-ag-MIS.gd +;; name: sack-ag.gd ;; name in dgo: sack -;; dgos: MIS +;; dgos: MIS, BEA diff --git a/goal_src/levels/ogre/crate-darkeco-cluster-ag-OGR.gd b/goal_src/levels/ogre/crate-darkeco-cluster-ag-OGR.gd deleted file mode 100644 index 374f4ce6d7..0000000000 --- a/goal_src/levels/ogre/crate-darkeco-cluster-ag-OGR.gd +++ /dev/null @@ -1,6 +0,0 @@ -;;-*-Lisp-*- -;; GOAL Data Description File - -;; name: crate-darkeco-cluster-ag-OGR.gd -;; name in dgo: crate-darkeco-cluster -;; dgos: OGR diff --git a/goal_src/levels/ogre/racer-ag-OGR.gd b/goal_src/levels/ogre/racer-ag-OGR.gd deleted file mode 100644 index e27d9854aa..0000000000 --- a/goal_src/levels/ogre/racer-ag-OGR.gd +++ /dev/null @@ -1,6 +0,0 @@ -;;-*-Lisp-*- -;; GOAL Data Description File - -;; name: racer-ag-OGR.gd -;; name in dgo: racer -;; dgos: OGR diff --git a/goal_src/levels/misty/ef-plane-ag-MIS.gd b/goal_src/levels/racer_common/ef-plane-ag.gd similarity index 50% rename from goal_src/levels/misty/ef-plane-ag-MIS.gd rename to goal_src/levels/racer_common/ef-plane-ag.gd index 473fc40156..36e855f8e9 100644 --- a/goal_src/levels/misty/ef-plane-ag-MIS.gd +++ b/goal_src/levels/racer_common/ef-plane-ag.gd @@ -1,6 +1,6 @@ ;;-*-Lisp-*- ;; GOAL Data Description File -;; name: ef-plane-ag-MIS.gd +;; name: ef-plane-ag.gd ;; name in dgo: ef-plane -;; dgos: MIS +;; dgos: FIC, LAV, OGR, ROL, SNO, SWA, MIS diff --git a/goal_src/levels/common/racer-ag-FIC-ROL.gd b/goal_src/levels/racer_common/racer-ag.gd similarity index 55% rename from goal_src/levels/common/racer-ag-FIC-ROL.gd rename to goal_src/levels/racer_common/racer-ag.gd index 85133385b1..651a4baa15 100644 --- a/goal_src/levels/common/racer-ag-FIC-ROL.gd +++ b/goal_src/levels/racer_common/racer-ag.gd @@ -1,6 +1,6 @@ ;;-*-Lisp-*- ;; GOAL Data Description File -;; name: racer-ag-FIC-ROL.gd +;; name: racer-ag.gd ;; name in dgo: racer -;; dgos: FIC, ROL +;; dgos: FIC, ROL, MIS, OGR, LAV diff --git a/goal_src/levels/robocave/baby-spider-ag-ROB.gd b/goal_src/levels/robocave/baby-spider-ag-ROB.gd deleted file mode 100644 index 79d41d6478..0000000000 --- a/goal_src/levels/robocave/baby-spider-ag-ROB.gd +++ /dev/null @@ -1,6 +0,0 @@ -;;-*-Lisp-*- -;; GOAL Data Description File - -;; name: baby-spider-ag-ROB.gd -;; name in dgo: baby-spider -;; dgos: ROB diff --git a/goal_src/levels/robocave/cavetrapdoor-ag-ROB.gd b/goal_src/levels/robocave/cavetrapdoor-ag-ROB.gd deleted file mode 100644 index a9975db5ea..0000000000 --- a/goal_src/levels/robocave/cavetrapdoor-ag-ROB.gd +++ /dev/null @@ -1,6 +0,0 @@ -;;-*-Lisp-*- -;; GOAL Data Description File - -;; name: cavetrapdoor-ag-ROB.gd -;; name in dgo: cavetrapdoor -;; dgos: ROB diff --git a/goal_src/levels/robocave/ecovalve-ag-ROB.gd b/goal_src/levels/robocave/ecovalve-ag-ROB.gd deleted file mode 100644 index 9161872372..0000000000 --- a/goal_src/levels/robocave/ecovalve-ag-ROB.gd +++ /dev/null @@ -1,6 +0,0 @@ -;;-*-Lisp-*- -;; GOAL Data Description File - -;; name: ecovalve-ag-ROB.gd -;; name in dgo: ecovalve -;; dgos: ROB diff --git a/goal_src/levels/robocave/plat-eco-ag-ROB.gd b/goal_src/levels/robocave/plat-eco-ag-ROB.gd deleted file mode 100644 index 168934607d..0000000000 --- a/goal_src/levels/robocave/plat-eco-ag-ROB.gd +++ /dev/null @@ -1,6 +0,0 @@ -;;-*-Lisp-*- -;; GOAL Data Description File - -;; name: plat-eco-ag-ROB.gd -;; name in dgo: plat-eco -;; dgos: ROB diff --git a/goal_src/levels/rolling/ecovalve-ag-ROL.gd b/goal_src/levels/rolling/ecovalve-ag-ROL.gd deleted file mode 100644 index ceada8a3b1..0000000000 --- a/goal_src/levels/rolling/ecovalve-ag-ROL.gd +++ /dev/null @@ -1,6 +0,0 @@ -;;-*-Lisp-*- -;; GOAL Data Description File - -;; name: ecovalve-ag-ROL.gd -;; name in dgo: ecovalve -;; dgos: ROL diff --git a/goal_src/levels/rolling/eichar-pole+0-ag-ROB.gd b/goal_src/levels/rolling/eichar-pole+0-ag-ROB.gd deleted file mode 100644 index 8f5f8ddb71..0000000000 --- a/goal_src/levels/rolling/eichar-pole+0-ag-ROB.gd +++ /dev/null @@ -1,6 +0,0 @@ -;;-*-Lisp-*- -;; GOAL Data Description File - -;; name: eichar-pole+0-ag-ROB.gd -;; name in dgo: eichar-pole+0 -;; dgos: ROB diff --git a/goal_src/levels/snow/ecovalve-ag-SNO.gd b/goal_src/levels/snow/ecovalve-ag-SNO.gd deleted file mode 100644 index 82d2880bcb..0000000000 --- a/goal_src/levels/snow/ecovalve-ag-SNO.gd +++ /dev/null @@ -1,6 +0,0 @@ -;;-*-Lisp-*- -;; GOAL Data Description File - -;; name: ecovalve-ag-SNO.gd -;; name in dgo: ecovalve -;; dgos: SNO diff --git a/goal_src/levels/snow/eichar-pole+0-ag-SNO.gd b/goal_src/levels/snow/eichar-pole+0-ag-SNO.gd deleted file mode 100644 index b91e4647da..0000000000 --- a/goal_src/levels/snow/eichar-pole+0-ag-SNO.gd +++ /dev/null @@ -1,6 +0,0 @@ -;;-*-Lisp-*- -;; GOAL Data Description File - -;; name: eichar-pole+0-ag-SNO.gd -;; name in dgo: eichar-pole+0 -;; dgos: SNO diff --git a/goal_src/levels/snow/orb-cache-top-ag-SNO.gd b/goal_src/levels/snow/orb-cache-top-ag-SNO.gd deleted file mode 100644 index caa8051b9b..0000000000 --- a/goal_src/levels/snow/orb-cache-top-ag-SNO.gd +++ /dev/null @@ -1,6 +0,0 @@ -;;-*-Lisp-*- -;; GOAL Data Description File - -;; name: orb-cache-top-ag-SNO.gd -;; name in dgo: orb-cache-top -;; dgos: SNO diff --git a/goal_src/levels/sunken_common/bully-ag.gd b/goal_src/levels/sunken/bully-ag.gd similarity index 100% rename from goal_src/levels/sunken_common/bully-ag.gd rename to goal_src/levels/sunken/bully-ag.gd diff --git a/goal_src/levels/sunken/eichar-tube+0-ag-SUN.gd b/goal_src/levels/sunken/eichar-tube+0-ag.gd similarity index 61% rename from goal_src/levels/sunken/eichar-tube+0-ag-SUN.gd rename to goal_src/levels/sunken/eichar-tube+0-ag.gd index 6ac576bcb1..d24b2416b4 100644 --- a/goal_src/levels/sunken/eichar-tube+0-ag-SUN.gd +++ b/goal_src/levels/sunken/eichar-tube+0-ag.gd @@ -1,6 +1,6 @@ ;;-*-Lisp-*- ;; GOAL Data Description File -;; name: eichar-tube+0-ag-SUN.gd +;; name: eichar-tube+0-ag.gd ;; name in dgo: eichar-tube+0 -;; dgos: SUN +;; dgos: SUN, SUB diff --git a/goal_src/levels/sunken/launcherdoor-ag-SUN.gd b/goal_src/levels/sunken/launcherdoor-ag-SUN.gd deleted file mode 100644 index 16ab9b5df9..0000000000 --- a/goal_src/levels/sunken/launcherdoor-ag-SUN.gd +++ /dev/null @@ -1,6 +0,0 @@ -;;-*-Lisp-*- -;; GOAL Data Description File - -;; name: launcherdoor-ag-SUN.gd -;; name in dgo: launcherdoor -;; dgos: SUN diff --git a/goal_src/levels/sunken/orb-cache-top-ag-SUN.gd b/goal_src/levels/sunken/orb-cache-top-ag-SUN.gd deleted file mode 100644 index f32434a4cc..0000000000 --- a/goal_src/levels/sunken/orb-cache-top-ag-SUN.gd +++ /dev/null @@ -1,6 +0,0 @@ -;;-*-Lisp-*- -;; GOAL Data Description File - -;; name: orb-cache-top-ag-SUN.gd -;; name in dgo: orb-cache-top -;; dgos: SUN diff --git a/goal_src/levels/sunken/shover-ag-SUN.gd b/goal_src/levels/sunken/shover-ag.gd similarity index 62% rename from goal_src/levels/sunken/shover-ag-SUN.gd rename to goal_src/levels/sunken/shover-ag.gd index b58c5b64a2..596bcd0d96 100644 --- a/goal_src/levels/sunken/shover-ag-SUN.gd +++ b/goal_src/levels/sunken/shover-ag.gd @@ -1,6 +1,6 @@ ;;-*-Lisp-*- ;; GOAL Data Description File -;; name: shover-ag-SUN.gd +;; name: shover-ag.gd ;; name in dgo: shover -;; dgos: SUN +;; dgos: SUN, SUB diff --git a/goal_src/levels/sunken/steam-cap-ag-SUN.gd b/goal_src/levels/sunken/steam-cap-ag.gd similarity index 61% rename from goal_src/levels/sunken/steam-cap-ag-SUN.gd rename to goal_src/levels/sunken/steam-cap-ag.gd index d97830e32d..011ca8ebe3 100644 --- a/goal_src/levels/sunken/steam-cap-ag-SUN.gd +++ b/goal_src/levels/sunken/steam-cap-ag.gd @@ -1,6 +1,6 @@ ;;-*-Lisp-*- ;; GOAL Data Description File -;; name: steam-cap-ag-SUN.gd +;; name: steam-cap-ag.gd ;; name in dgo: steam-cap -;; dgos: SUN +;; dgos: SUN, SUB diff --git a/goal_src/levels/sunken/sunkencam-ag-SUN.gd b/goal_src/levels/sunken/sunkencam-ag.gd similarity index 61% rename from goal_src/levels/sunken/sunkencam-ag-SUN.gd rename to goal_src/levels/sunken/sunkencam-ag.gd index 07195299fa..c028517a32 100644 --- a/goal_src/levels/sunken/sunkencam-ag-SUN.gd +++ b/goal_src/levels/sunken/sunkencam-ag.gd @@ -1,6 +1,6 @@ ;;-*-Lisp-*- ;; GOAL Data Description File -;; name: sunkencam-ag-SUN.gd +;; name: sunkencam-ag.gd ;; name in dgo: sunkencam -;; dgos: SUN +;; dgos: SUN, SUB diff --git a/goal_src/levels/sunken_common/sunkenfisha-ag.gd b/goal_src/levels/sunken/sunkenfisha-ag.gd similarity index 100% rename from goal_src/levels/sunken_common/sunkenfisha-ag.gd rename to goal_src/levels/sunken/sunkenfisha-ag.gd diff --git a/goal_src/levels/sunken_common/wall-plat-ag.gd b/goal_src/levels/sunken/wall-plat-ag.gd similarity index 100% rename from goal_src/levels/sunken_common/wall-plat-ag.gd rename to goal_src/levels/sunken/wall-plat-ag.gd diff --git a/goal_src/levels/sunken_common/water-anim-sunken-ag.gd b/goal_src/levels/sunken/water-anim-sunken-ag.gd similarity index 100% rename from goal_src/levels/sunken_common/water-anim-sunken-ag.gd rename to goal_src/levels/sunken/water-anim-sunken-ag.gd diff --git a/goal_src/levels/sunken_common/water-anim-sunken-dark-eco-ag.gd b/goal_src/levels/sunken/water-anim-sunken-dark-eco-ag.gd similarity index 100% rename from goal_src/levels/sunken_common/water-anim-sunken-dark-eco-ag.gd rename to goal_src/levels/sunken/water-anim-sunken-dark-eco-ag.gd diff --git a/goal_src/levels/sunkenb/ecovalve-ag-SUB.gd b/goal_src/levels/sunkenb/ecovalve-ag-SUB.gd deleted file mode 100644 index a5100f6e3f..0000000000 --- a/goal_src/levels/sunkenb/ecovalve-ag-SUB.gd +++ /dev/null @@ -1,6 +0,0 @@ -;;-*-Lisp-*- -;; GOAL Data Description File - -;; name: ecovalve-ag-SUB.gd -;; name in dgo: ecovalve -;; dgos: SUB diff --git a/goal_src/levels/sunkenb/shover-ag-SUB.gd b/goal_src/levels/sunkenb/shover-ag-SUB.gd deleted file mode 100644 index 6d3411fe05..0000000000 --- a/goal_src/levels/sunkenb/shover-ag-SUB.gd +++ /dev/null @@ -1,6 +0,0 @@ -;;-*-Lisp-*- -;; GOAL Data Description File - -;; name: shover-ag-SUB.gd -;; name in dgo: shover -;; dgos: SUB diff --git a/goal_src/levels/sunkenb/steam-cap-ag-SUB.gd b/goal_src/levels/sunkenb/steam-cap-ag-SUB.gd deleted file mode 100644 index 2cce66159b..0000000000 --- a/goal_src/levels/sunkenb/steam-cap-ag-SUB.gd +++ /dev/null @@ -1,6 +0,0 @@ -;;-*-Lisp-*- -;; GOAL Data Description File - -;; name: steam-cap-ag-SUB.gd -;; name in dgo: steam-cap -;; dgos: SUB diff --git a/goal_src/levels/sunkenb/sunkencam-ag-SUB.gd b/goal_src/levels/sunkenb/sunkencam-ag-SUB.gd deleted file mode 100644 index ae371eaab3..0000000000 --- a/goal_src/levels/sunkenb/sunkencam-ag-SUB.gd +++ /dev/null @@ -1,6 +0,0 @@ -;;-*-Lisp-*- -;; GOAL Data Description File - -;; name: sunkencam-ag-SUB.gd -;; name in dgo: sunkencam -;; dgos: SUB diff --git a/goal_src/levels/swamp/ecovalve-ag-SWA.gd b/goal_src/levels/swamp/ecovalve-ag-SWA.gd deleted file mode 100644 index db2fe83aea..0000000000 --- a/goal_src/levels/swamp/ecovalve-ag-SWA.gd +++ /dev/null @@ -1,6 +0,0 @@ -;;-*-Lisp-*- -;; GOAL Data Description File - -;; name: ecovalve-ag-SWA.gd -;; name in dgo: ecovalve -;; dgos: SWA diff --git a/goal_src/levels/swamp/eichar-pole+0-ag-SWA.gd b/goal_src/levels/swamp/eichar-pole+0-ag-SWA.gd deleted file mode 100644 index 19b1406885..0000000000 --- a/goal_src/levels/swamp/eichar-pole+0-ag-SWA.gd +++ /dev/null @@ -1,6 +0,0 @@ -;;-*-Lisp-*- -;; GOAL Data Description File - -;; name: eichar-pole+0-ag-SWA.gd -;; name in dgo: eichar-pole+0 -;; dgos: SWA diff --git a/goal_src/levels/swamp/flut-saddle-ag-SWA.gd b/goal_src/levels/swamp/flut-saddle-ag-SWA.gd deleted file mode 100644 index 60407e4202..0000000000 --- a/goal_src/levels/swamp/flut-saddle-ag-SWA.gd +++ /dev/null @@ -1,6 +0,0 @@ -;;-*-Lisp-*- -;; GOAL Data Description File - -;; name: flut-saddle-ag-SWA.gd -;; name in dgo: flut-saddle -;; dgos: SWA diff --git a/goal_src/levels/swamp/sharkey-ag-SWA.gd b/goal_src/levels/swamp/sharkey-ag-SWA.gd deleted file mode 100644 index 3f35be7849..0000000000 --- a/goal_src/levels/swamp/sharkey-ag-SWA.gd +++ /dev/null @@ -1,6 +0,0 @@ -;;-*-Lisp-*- -;; GOAL Data Description File - -;; name: sharkey-ag-SWA.gd -;; name in dgo: sharkey -;; dgos: SWA diff --git a/goal_src/levels/swamp/swampcam-ag-SWA.gd b/goal_src/levels/swamp/swampcam-ag.gd similarity index 62% rename from goal_src/levels/swamp/swampcam-ag-SWA.gd rename to goal_src/levels/swamp/swampcam-ag.gd index ab19047260..5d5edb372b 100644 --- a/goal_src/levels/swamp/swampcam-ag-SWA.gd +++ b/goal_src/levels/swamp/swampcam-ag.gd @@ -1,6 +1,6 @@ ;;-*-Lisp-*- ;; GOAL Data Description File -;; name: swampcam-ag-SWA.gd +;; name: swampcam-ag.gd ;; name in dgo: swampcam -;; dgos: SWA +;; dgos: SWA, VI2 diff --git a/goal_src/levels/training/ecovalve-ag-TRA.gd b/goal_src/levels/training/ecovalve-ag-TRA.gd deleted file mode 100644 index cdbc5c49f9..0000000000 --- a/goal_src/levels/training/ecovalve-ag-TRA.gd +++ /dev/null @@ -1,6 +0,0 @@ -;;-*-Lisp-*- -;; GOAL Data Description File - -;; name: ecovalve-ag-TRA.gd -;; name in dgo: ecovalve -;; dgos: TRA diff --git a/goal_src/levels/training/jng-iris-door-ag-TRA.gd b/goal_src/levels/training/jng-iris-door-ag-TRA.gd deleted file mode 100644 index 3236d0aeaf..0000000000 --- a/goal_src/levels/training/jng-iris-door-ag-TRA.gd +++ /dev/null @@ -1,6 +0,0 @@ -;;-*-Lisp-*- -;; GOAL Data Description File - -;; name: jng-iris-door-ag-TRA.gd -;; name in dgo: jng-iris-door -;; dgos: TRA diff --git a/goal_src/levels/training/plat-eco-ag-TRA.gd b/goal_src/levels/training/plat-eco-ag-TRA.gd deleted file mode 100644 index 38edddac47..0000000000 --- a/goal_src/levels/training/plat-eco-ag-TRA.gd +++ /dev/null @@ -1,6 +0,0 @@ -;;-*-Lisp-*- -;; GOAL Data Description File - -;; name: plat-eco-ag-TRA.gd -;; name in dgo: plat-eco -;; dgos: TRA diff --git a/goal_src/levels/training/warp-gate-switch-ag-TRA.gd b/goal_src/levels/training/warp-gate-switch-ag-TRA.gd deleted file mode 100644 index 402aa973ea..0000000000 --- a/goal_src/levels/training/warp-gate-switch-ag-TRA.gd +++ /dev/null @@ -1,6 +0,0 @@ -;;-*-Lisp-*- -;; GOAL Data Description File - -;; name: warp-gate-switch-ag-TRA.gd -;; name in dgo: warp-gate-switch -;; dgos: TRA diff --git a/goal_src/levels/village1/orb-cache-top-ag-VI1.gd b/goal_src/levels/village1/orb-cache-top-ag-VI1.gd deleted file mode 100644 index 0401a4c996..0000000000 --- a/goal_src/levels/village1/orb-cache-top-ag-VI1.gd +++ /dev/null @@ -1,6 +0,0 @@ -;;-*-Lisp-*- -;; GOAL Data Description File - -;; name: orb-cache-top-ag-VI1.gd -;; name in dgo: orb-cache-top -;; dgos: VI1 diff --git a/goal_src/levels/village1/sharkey-ag-VI1.gd b/goal_src/levels/village1/sharkey-ag-VI1.gd deleted file mode 100644 index 85dc611ef5..0000000000 --- a/goal_src/levels/village1/sharkey-ag-VI1.gd +++ /dev/null @@ -1,6 +0,0 @@ -;;-*-Lisp-*- -;; GOAL Data Description File - -;; name: sharkey-ag-VI1.gd -;; name in dgo: sharkey -;; dgos: VI1 diff --git a/goal_src/levels/village2/barrel-ag-VI2.gd b/goal_src/levels/village2/barrel-ag-VI2.gd deleted file mode 100644 index 7020ee35db..0000000000 --- a/goal_src/levels/village2/barrel-ag-VI2.gd +++ /dev/null @@ -1,6 +0,0 @@ -;;-*-Lisp-*- -;; GOAL Data Description File - -;; name: barrel-ag-VI2.gd -;; name in dgo: barrel -;; dgos: VI2 diff --git a/goal_src/levels/village2/oracle-ag-VI2.gd b/goal_src/levels/village2/oracle-ag-VI2.gd deleted file mode 100644 index 2d0faf7ad1..0000000000 --- a/goal_src/levels/village2/oracle-ag-VI2.gd +++ /dev/null @@ -1,6 +0,0 @@ -;;-*-Lisp-*- -;; GOAL Data Description File - -;; name: oracle-ag-VI2.gd -;; name in dgo: oracle -;; dgos: VI2 diff --git a/goal_src/levels/village2/orb-cache-top-ag-VI2.gd b/goal_src/levels/village2/orb-cache-top-ag-VI2.gd deleted file mode 100644 index fac4d0199b..0000000000 --- a/goal_src/levels/village2/orb-cache-top-ag-VI2.gd +++ /dev/null @@ -1,6 +0,0 @@ -;;-*-Lisp-*- -;; GOAL Data Description File - -;; name: orb-cache-top-ag-VI2.gd -;; name in dgo: orb-cache-top -;; dgos: VI2 diff --git a/goal_src/levels/village2/pontoonfive-ag-VI2.gd b/goal_src/levels/village2/pontoonfive-ag-VI2.gd deleted file mode 100644 index 0d585ac079..0000000000 --- a/goal_src/levels/village2/pontoonfive-ag-VI2.gd +++ /dev/null @@ -1,6 +0,0 @@ -;;-*-Lisp-*- -;; GOAL Data Description File - -;; name: pontoonfive-ag-VI2.gd -;; name in dgo: pontoonfive -;; dgos: VI2 diff --git a/goal_src/levels/training/pontoonfive-ag-TRA.gd b/goal_src/levels/village2/pontoonfive-ag.gd similarity index 61% rename from goal_src/levels/training/pontoonfive-ag-TRA.gd rename to goal_src/levels/village2/pontoonfive-ag.gd index 209da95f44..87c3effb3b 100644 --- a/goal_src/levels/training/pontoonfive-ag-TRA.gd +++ b/goal_src/levels/village2/pontoonfive-ag.gd @@ -1,6 +1,6 @@ ;;-*-Lisp-*- ;; GOAL Data Description File -;; name: pontoonfive-ag-TRA.gd +;; name: pontoonfive-ag.gd ;; name in dgo: pontoonfive -;; dgos: TRA +;; dgos: VI2, TRA diff --git a/goal_src/levels/village2/swampcam-ag-VI2.gd b/goal_src/levels/village2/swampcam-ag-VI2.gd deleted file mode 100644 index 38cb5b2427..0000000000 --- a/goal_src/levels/village2/swampcam-ag-VI2.gd +++ /dev/null @@ -1,6 +0,0 @@ -;;-*-Lisp-*- -;; GOAL Data Description File - -;; name: swampcam-ag-VI2.gd -;; name in dgo: swampcam -;; dgos: VI2 diff --git a/goal_src/levels/village2/village-cam-ag-VI2.gd b/goal_src/levels/village2/village-cam-ag-VI2.gd deleted file mode 100644 index d7a0775cdc..0000000000 --- a/goal_src/levels/village2/village-cam-ag-VI2.gd +++ /dev/null @@ -1,6 +0,0 @@ -;;-*-Lisp-*- -;; GOAL Data Description File - -;; name: village-cam-ag-VI2.gd -;; name in dgo: village-cam -;; dgos: VI2 diff --git a/goal_src/levels/village2/warp-gate-switch-ag-VI2.gd b/goal_src/levels/village2/warp-gate-switch-ag-VI2.gd deleted file mode 100644 index ed204f91e5..0000000000 --- a/goal_src/levels/village2/warp-gate-switch-ag-VI2.gd +++ /dev/null @@ -1,6 +0,0 @@ -;;-*-Lisp-*- -;; GOAL Data Description File - -;; name: warp-gate-switch-ag-VI2.gd -;; name in dgo: warp-gate-switch -;; dgos: VI2 diff --git a/goal_src/levels/village3/oracle-ag-VI3.gd b/goal_src/levels/village3/oracle-ag-VI3.gd deleted file mode 100644 index b0a20059b3..0000000000 --- a/goal_src/levels/village3/oracle-ag-VI3.gd +++ /dev/null @@ -1,6 +0,0 @@ -;;-*-Lisp-*- -;; GOAL Data Description File - -;; name: oracle-ag-VI3.gd -;; name in dgo: oracle -;; dgos: VI3 diff --git a/goal_src/levels/village3/village-cam-ag-VI3.gd b/goal_src/levels/village3/village-cam-ag-VI3.gd deleted file mode 100644 index 8287525100..0000000000 --- a/goal_src/levels/village3/village-cam-ag-VI3.gd +++ /dev/null @@ -1,6 +0,0 @@ -;;-*-Lisp-*- -;; GOAL Data Description File - -;; name: village-cam-ag-VI3.gd -;; name in dgo: village-cam -;; dgos: VI3 diff --git a/goal_src/levels/village1/oracle-ag-VI1.gd b/goal_src/levels/village_common/oracle-ag.gd similarity index 59% rename from goal_src/levels/village1/oracle-ag-VI1.gd rename to goal_src/levels/village_common/oracle-ag.gd index 2109eefc3e..111c8d8072 100644 --- a/goal_src/levels/village1/oracle-ag-VI1.gd +++ b/goal_src/levels/village_common/oracle-ag.gd @@ -1,6 +1,6 @@ ;;-*-Lisp-*- ;; GOAL Data Description File -;; name: oracle-ag-VI1.gd +;; name: oracle-ag.gd ;; name in dgo: oracle -;; dgos: VI1 +;; dgos: VI1, VI2, VI3 diff --git a/goal_src/levels/village1/village-cam-ag-VI1.gd b/goal_src/levels/village_common/village-cam-ag.gd similarity index 59% rename from goal_src/levels/village1/village-cam-ag-VI1.gd rename to goal_src/levels/village_common/village-cam-ag.gd index 382fce8a1f..9cf1586c83 100644 --- a/goal_src/levels/village1/village-cam-ag-VI1.gd +++ b/goal_src/levels/village_common/village-cam-ag.gd @@ -1,6 +1,6 @@ ;;-*-Lisp-*- ;; GOAL Data Description File -;; name: village-cam-ag-VI1.gd +;; name: village-cam-ag.gd ;; name in dgo: village-cam -;; dgos: VI1 +;; dgos: VI1, VI2, VI3 diff --git a/goal_src/levels/citadel/warp-gate-switch-ag-CIT.gd b/goal_src/levels/village_common/warp-gate-switch-ag.gd similarity index 54% rename from goal_src/levels/citadel/warp-gate-switch-ag-CIT.gd rename to goal_src/levels/village_common/warp-gate-switch-ag.gd index 51fe6ef94c..bafe7922b6 100644 --- a/goal_src/levels/citadel/warp-gate-switch-ag-CIT.gd +++ b/goal_src/levels/village_common/warp-gate-switch-ag.gd @@ -1,6 +1,6 @@ ;;-*-Lisp-*- ;; GOAL Data Description File -;; name: warp-gate-switch-ag-CIT.gd +;; name: warp-gate-switch-ag.gd ;; name in dgo: warp-gate-switch -;; dgos: CIT +;; dgos: VI1, VI2, VI3, CIT, TRA