From 579b1b69d88137a199db06647108624a03524db1 Mon Sep 17 00:00:00 2001 From: Slawek Mikula Date: Tue, 10 Oct 2017 09:35:13 +0200 Subject: [PATCH] - first changes to make missions addon compatible (can load) --- {mission/GUI => GUI}/mission_browser.xml | 6 +- .../Example}/Sounds/Welcome.wav | Bin .../Example}/Sounds/glassbell.wav | Bin .../Example}/Sounds/msg1.wav | Bin .../Example}/Sounds/msg2.wav | Bin .../Example}/Sounds/msg3.wav | Bin .../Example}/Sounds/msg3a.wav | Bin .../Example}/Sounds/msg4.wav | Bin .../Example}/Sounds/msg4a.wav | Bin .../Example}/Sounds/pop.wav | Bin .../Example}/image.png | Bin .../Example}/metadata.xml | 0 .../Example}/mission.xml | 0 .../KHAF-tour}/Models/scientist.ac | 0 .../KHAF-tour}/Models/scientist.png | Bin .../KHAF-tour}/Models/scientist.xml | 0 .../KHAF-tour}/Sounds/Intro1.wav | Bin .../KHAF-tour}/Sounds/effects.aup | 0 .../Sounds/effects_data/e00/d00/e00002f7.au | Bin .../Sounds/effects_data/e00/d00/e0000663.au | Bin .../KHAF-tour}/image.png | Bin .../KHAF-tour}/metadata.xml | 0 .../KHAF-tour}/mission.xml | 0 .../KHAF-tour}/preferences.xml | 0 .../{ => Tours}/PHLI-tour/Models/scientist.ac | 0 .../PHLI-tour/Models/scientist.png | Bin .../PHLI-tour/Models/scientist.xml | 0 .../{ => Tours}/PHLI-tour/Sounds/Intro1.wav | Bin .../PHLI-tour/Sounds/cleared_to_take_off.wav | Bin .../PHLI-tour/Sounds/follow_compass.wav | Bin .../PHLI-tour}/Sounds/glassbell.wav | Bin .../PHLI-tour/Sounds/start_the_engines.wav | Bin Missions/{ => Tours}/PHLI-tour/image.png | Bin Missions/{ => Tours}/PHLI-tour/metadata.xml | 0 Missions/{ => Tours}/PHLI-tour/mission.xml | 0 .../{ => Tours}/PHLI-tour/preferences.xml | 0 .../extensions/adjust_payload.nas | 0 .../extensions/airport_landing_trigger.nas | 0 .../extensions/area_landing_trigger.nas | 0 {mission => Nasal}/extensions/goal.nas | 0 .../extensions/goal_handler.nas | 0 .../extensions/goal_resolution.nas | 0 .../extensions/menu_prompt_trigger.nas | 0 {mission => Nasal}/extensions/message.nas | 0 .../extensions/message_handler.nas | 0 .../extensions/mission_compass_handler.nas | 0 {mission => Nasal}/extensions/model.nas | 0 .../extensions/object_activation.nas | 0 .../extensions/point_of_interest.nas | 0 .../extensions/point_of_interest_handler.nas | 0 .../extensions/property_trigger.nas | 0 .../extensions/proximity_trigger.nas | 0 .../extensions/random_action.nas | 0 .../extensions/rectangle_area.nas | 0 .../extensions/refuel_action.nas | 0 .../extensions/single_shot_sound.nas | 0 .../extensions/timer_handler.nas | 0 .../extensions/timer_trigger.nas | 0 {mission => Nasal}/mission.nas | 65 ++++++++++++------ config.xml | 3 + main.nas | 19 +++++ .../Hoops-mission-Copy}/Sounds/Welcome.wav | Bin .../Hoops-mission-Copy}/Sounds/glassbell.wav | Bin .../Hoops-mission-Copy}/Sounds/msg1.wav | Bin .../Hoops-mission-Copy}/Sounds/msg2.wav | Bin .../Hoops-mission-Copy}/Sounds/msg3.wav | Bin .../Hoops-mission-Copy}/Sounds/msg3a.wav | Bin .../Hoops-mission-Copy}/Sounds/msg4.wav | Bin .../Hoops-mission-Copy}/Sounds/msg4a.wav | Bin .../Hoops-mission-Copy}/Sounds/pop.wav | Bin .../Hoops-mission-Copy/image.png | Bin .../Hoops-mission-Copy/metadata.xml | 0 .../Hoops-mission-Copy/mission.xml | 0 73 files changed, 69 insertions(+), 24 deletions(-) rename {mission/GUI => GUI}/mission_browser.xml (95%) rename Missions/{Hoops-mission-Copy => Hoops/Example}/Sounds/Welcome.wav (100%) rename Missions/{Hoops-mission-Copy => Hoops/Example}/Sounds/glassbell.wav (100%) rename Missions/{Hoops-mission-Copy => Hoops/Example}/Sounds/msg1.wav (100%) rename Missions/{Hoops-mission-Copy => Hoops/Example}/Sounds/msg2.wav (100%) rename Missions/{Hoops-mission-Copy => Hoops/Example}/Sounds/msg3.wav (100%) rename Missions/{Hoops-mission-Copy => Hoops/Example}/Sounds/msg3a.wav (100%) rename Missions/{Hoops-mission-Copy => Hoops/Example}/Sounds/msg4.wav (100%) rename Missions/{Hoops-mission-Copy => Hoops/Example}/Sounds/msg4a.wav (100%) rename Missions/{Hoops-mission-Copy => Hoops/Example}/Sounds/pop.wav (100%) rename Missions/{Hoops-mission => Hoops/Example}/image.png (100%) rename Missions/{Hoops-mission => Hoops/Example}/metadata.xml (100%) rename Missions/{Hoops-mission => Hoops/Example}/mission.xml (100%) rename Missions/{Flight-to-KHAF => Tours/KHAF-tour}/Models/scientist.ac (100%) rename Missions/{Flight-to-KHAF => Tours/KHAF-tour}/Models/scientist.png (100%) rename Missions/{Flight-to-KHAF => Tours/KHAF-tour}/Models/scientist.xml (100%) rename Missions/{Flight-to-KHAF => Tours/KHAF-tour}/Sounds/Intro1.wav (100%) rename Missions/{Flight-to-KHAF => Tours/KHAF-tour}/Sounds/effects.aup (100%) rename Missions/{Flight-to-KHAF => Tours/KHAF-tour}/Sounds/effects_data/e00/d00/e00002f7.au (100%) rename Missions/{Flight-to-KHAF => Tours/KHAF-tour}/Sounds/effects_data/e00/d00/e0000663.au (100%) rename Missions/{Flight-to-KHAF => Tours/KHAF-tour}/image.png (100%) rename Missions/{Flight-to-KHAF => Tours/KHAF-tour}/metadata.xml (100%) rename Missions/{Flight-to-KHAF => Tours/KHAF-tour}/mission.xml (100%) rename Missions/{Flight-to-KHAF => Tours/KHAF-tour}/preferences.xml (100%) rename Missions/{ => Tours}/PHLI-tour/Models/scientist.ac (100%) rename Missions/{ => Tours}/PHLI-tour/Models/scientist.png (100%) rename Missions/{ => Tours}/PHLI-tour/Models/scientist.xml (100%) rename Missions/{ => Tours}/PHLI-tour/Sounds/Intro1.wav (100%) rename Missions/{ => Tours}/PHLI-tour/Sounds/cleared_to_take_off.wav (100%) rename Missions/{ => Tours}/PHLI-tour/Sounds/follow_compass.wav (100%) rename Missions/{Hoops-mission => Tours/PHLI-tour}/Sounds/glassbell.wav (100%) rename Missions/{ => Tours}/PHLI-tour/Sounds/start_the_engines.wav (100%) rename Missions/{ => Tours}/PHLI-tour/image.png (100%) rename Missions/{ => Tours}/PHLI-tour/metadata.xml (100%) rename Missions/{ => Tours}/PHLI-tour/mission.xml (100%) rename Missions/{ => Tours}/PHLI-tour/preferences.xml (100%) rename {mission => Nasal}/extensions/adjust_payload.nas (100%) rename {mission => Nasal}/extensions/airport_landing_trigger.nas (100%) rename {mission => Nasal}/extensions/area_landing_trigger.nas (100%) rename {mission => Nasal}/extensions/goal.nas (100%) rename {mission => Nasal}/extensions/goal_handler.nas (100%) rename {mission => Nasal}/extensions/goal_resolution.nas (100%) rename {mission => Nasal}/extensions/menu_prompt_trigger.nas (100%) rename {mission => Nasal}/extensions/message.nas (100%) rename {mission => Nasal}/extensions/message_handler.nas (100%) rename {mission => Nasal}/extensions/mission_compass_handler.nas (100%) rename {mission => Nasal}/extensions/model.nas (100%) rename {mission => Nasal}/extensions/object_activation.nas (100%) rename {mission => Nasal}/extensions/point_of_interest.nas (100%) rename {mission => Nasal}/extensions/point_of_interest_handler.nas (100%) rename {mission => Nasal}/extensions/property_trigger.nas (100%) rename {mission => Nasal}/extensions/proximity_trigger.nas (100%) rename {mission => Nasal}/extensions/random_action.nas (100%) rename {mission => Nasal}/extensions/rectangle_area.nas (100%) rename {mission => Nasal}/extensions/refuel_action.nas (100%) rename {mission => Nasal}/extensions/single_shot_sound.nas (100%) rename {mission => Nasal}/extensions/timer_handler.nas (100%) rename {mission => Nasal}/extensions/timer_trigger.nas (100%) rename {mission => Nasal}/mission.nas (84%) create mode 100644 config.xml create mode 100644 main.nas rename {Missions/Hoops-mission => old/Hoops-mission-Copy}/Sounds/Welcome.wav (100%) rename {Missions/PHLI-tour => old/Hoops-mission-Copy}/Sounds/glassbell.wav (100%) rename {Missions/Hoops-mission => old/Hoops-mission-Copy}/Sounds/msg1.wav (100%) rename {Missions/Hoops-mission => old/Hoops-mission-Copy}/Sounds/msg2.wav (100%) rename {Missions/Hoops-mission => old/Hoops-mission-Copy}/Sounds/msg3.wav (100%) rename {Missions/Hoops-mission => old/Hoops-mission-Copy}/Sounds/msg3a.wav (100%) rename {Missions/Hoops-mission => old/Hoops-mission-Copy}/Sounds/msg4.wav (100%) rename {Missions/Hoops-mission => old/Hoops-mission-Copy}/Sounds/msg4a.wav (100%) rename {Missions/Hoops-mission => old/Hoops-mission-Copy}/Sounds/pop.wav (100%) rename {Missions => old}/Hoops-mission-Copy/image.png (100%) rename {Missions => old}/Hoops-mission-Copy/metadata.xml (100%) rename {Missions => old}/Hoops-mission-Copy/mission.xml (100%) diff --git a/mission/GUI/mission_browser.xml b/GUI/mission_browser.xml similarity index 95% rename from mission/GUI/mission_browser.xml rename to GUI/mission_browser.xml index 8d7e509..8775ff9 100644 --- a/mission/GUI/mission_browser.xml +++ b/GUI/mission_browser.xml @@ -137,7 +137,7 @@ var update_list = func { list.removeChildren("value"); - var dir = directory(getprop("/sim/fg-root") ~ "/Missions"); + var dir = directory(getprop("/sim/mission/root_path") ~ "/Missions"); foreach (var a; dir) if (a != "." and a != ".." and a != "Generic") list.addChild("value").setValue(a); @@ -147,7 +147,7 @@ var select_mission = func { selected_mission = getprop("/sim/mission/gui/selected-mission"); - mission_root = getprop("/sim/fg-root") ~ "/Missions/" ~ selected_mission; + mission_root = getprop("/sim/mission/root_path") ~ "/Missions/" ~ selected_mission; data_node.setValues({description: ""}); io.read_properties(mission_root ~ "/metadata.xml", data_node); @@ -155,7 +155,7 @@ img.set("src", mission_root ~ "/image.png").setSize(250, 250); - + } update_list(); diff --git a/Missions/Hoops-mission-Copy/Sounds/Welcome.wav b/Missions/Hoops/Example/Sounds/Welcome.wav similarity index 100% rename from Missions/Hoops-mission-Copy/Sounds/Welcome.wav rename to Missions/Hoops/Example/Sounds/Welcome.wav diff --git a/Missions/Hoops-mission-Copy/Sounds/glassbell.wav b/Missions/Hoops/Example/Sounds/glassbell.wav similarity index 100% rename from Missions/Hoops-mission-Copy/Sounds/glassbell.wav rename to Missions/Hoops/Example/Sounds/glassbell.wav diff --git a/Missions/Hoops-mission-Copy/Sounds/msg1.wav b/Missions/Hoops/Example/Sounds/msg1.wav similarity index 100% rename from Missions/Hoops-mission-Copy/Sounds/msg1.wav rename to Missions/Hoops/Example/Sounds/msg1.wav diff --git a/Missions/Hoops-mission-Copy/Sounds/msg2.wav b/Missions/Hoops/Example/Sounds/msg2.wav similarity index 100% rename from Missions/Hoops-mission-Copy/Sounds/msg2.wav rename to Missions/Hoops/Example/Sounds/msg2.wav diff --git a/Missions/Hoops-mission-Copy/Sounds/msg3.wav b/Missions/Hoops/Example/Sounds/msg3.wav similarity index 100% rename from Missions/Hoops-mission-Copy/Sounds/msg3.wav rename to Missions/Hoops/Example/Sounds/msg3.wav diff --git a/Missions/Hoops-mission-Copy/Sounds/msg3a.wav b/Missions/Hoops/Example/Sounds/msg3a.wav similarity index 100% rename from Missions/Hoops-mission-Copy/Sounds/msg3a.wav rename to Missions/Hoops/Example/Sounds/msg3a.wav diff --git a/Missions/Hoops-mission-Copy/Sounds/msg4.wav b/Missions/Hoops/Example/Sounds/msg4.wav similarity index 100% rename from Missions/Hoops-mission-Copy/Sounds/msg4.wav rename to Missions/Hoops/Example/Sounds/msg4.wav diff --git a/Missions/Hoops-mission-Copy/Sounds/msg4a.wav b/Missions/Hoops/Example/Sounds/msg4a.wav similarity index 100% rename from Missions/Hoops-mission-Copy/Sounds/msg4a.wav rename to Missions/Hoops/Example/Sounds/msg4a.wav diff --git a/Missions/Hoops-mission-Copy/Sounds/pop.wav b/Missions/Hoops/Example/Sounds/pop.wav similarity index 100% rename from Missions/Hoops-mission-Copy/Sounds/pop.wav rename to Missions/Hoops/Example/Sounds/pop.wav diff --git a/Missions/Hoops-mission/image.png b/Missions/Hoops/Example/image.png similarity index 100% rename from Missions/Hoops-mission/image.png rename to Missions/Hoops/Example/image.png diff --git a/Missions/Hoops-mission/metadata.xml b/Missions/Hoops/Example/metadata.xml similarity index 100% rename from Missions/Hoops-mission/metadata.xml rename to Missions/Hoops/Example/metadata.xml diff --git a/Missions/Hoops-mission/mission.xml b/Missions/Hoops/Example/mission.xml similarity index 100% rename from Missions/Hoops-mission/mission.xml rename to Missions/Hoops/Example/mission.xml diff --git a/Missions/Flight-to-KHAF/Models/scientist.ac b/Missions/Tours/KHAF-tour/Models/scientist.ac similarity index 100% rename from Missions/Flight-to-KHAF/Models/scientist.ac rename to Missions/Tours/KHAF-tour/Models/scientist.ac diff --git a/Missions/Flight-to-KHAF/Models/scientist.png b/Missions/Tours/KHAF-tour/Models/scientist.png similarity index 100% rename from Missions/Flight-to-KHAF/Models/scientist.png rename to Missions/Tours/KHAF-tour/Models/scientist.png diff --git a/Missions/Flight-to-KHAF/Models/scientist.xml b/Missions/Tours/KHAF-tour/Models/scientist.xml similarity index 100% rename from Missions/Flight-to-KHAF/Models/scientist.xml rename to Missions/Tours/KHAF-tour/Models/scientist.xml diff --git a/Missions/Flight-to-KHAF/Sounds/Intro1.wav b/Missions/Tours/KHAF-tour/Sounds/Intro1.wav similarity index 100% rename from Missions/Flight-to-KHAF/Sounds/Intro1.wav rename to Missions/Tours/KHAF-tour/Sounds/Intro1.wav diff --git a/Missions/Flight-to-KHAF/Sounds/effects.aup b/Missions/Tours/KHAF-tour/Sounds/effects.aup similarity index 100% rename from Missions/Flight-to-KHAF/Sounds/effects.aup rename to Missions/Tours/KHAF-tour/Sounds/effects.aup diff --git a/Missions/Flight-to-KHAF/Sounds/effects_data/e00/d00/e00002f7.au b/Missions/Tours/KHAF-tour/Sounds/effects_data/e00/d00/e00002f7.au similarity index 100% rename from Missions/Flight-to-KHAF/Sounds/effects_data/e00/d00/e00002f7.au rename to Missions/Tours/KHAF-tour/Sounds/effects_data/e00/d00/e00002f7.au diff --git a/Missions/Flight-to-KHAF/Sounds/effects_data/e00/d00/e0000663.au b/Missions/Tours/KHAF-tour/Sounds/effects_data/e00/d00/e0000663.au similarity index 100% rename from Missions/Flight-to-KHAF/Sounds/effects_data/e00/d00/e0000663.au rename to Missions/Tours/KHAF-tour/Sounds/effects_data/e00/d00/e0000663.au diff --git a/Missions/Flight-to-KHAF/image.png b/Missions/Tours/KHAF-tour/image.png similarity index 100% rename from Missions/Flight-to-KHAF/image.png rename to Missions/Tours/KHAF-tour/image.png diff --git a/Missions/Flight-to-KHAF/metadata.xml b/Missions/Tours/KHAF-tour/metadata.xml similarity index 100% rename from Missions/Flight-to-KHAF/metadata.xml rename to Missions/Tours/KHAF-tour/metadata.xml diff --git a/Missions/Flight-to-KHAF/mission.xml b/Missions/Tours/KHAF-tour/mission.xml similarity index 100% rename from Missions/Flight-to-KHAF/mission.xml rename to Missions/Tours/KHAF-tour/mission.xml diff --git a/Missions/Flight-to-KHAF/preferences.xml b/Missions/Tours/KHAF-tour/preferences.xml similarity index 100% rename from Missions/Flight-to-KHAF/preferences.xml rename to Missions/Tours/KHAF-tour/preferences.xml diff --git a/Missions/PHLI-tour/Models/scientist.ac b/Missions/Tours/PHLI-tour/Models/scientist.ac similarity index 100% rename from Missions/PHLI-tour/Models/scientist.ac rename to Missions/Tours/PHLI-tour/Models/scientist.ac diff --git a/Missions/PHLI-tour/Models/scientist.png b/Missions/Tours/PHLI-tour/Models/scientist.png similarity index 100% rename from Missions/PHLI-tour/Models/scientist.png rename to Missions/Tours/PHLI-tour/Models/scientist.png diff --git a/Missions/PHLI-tour/Models/scientist.xml b/Missions/Tours/PHLI-tour/Models/scientist.xml similarity index 100% rename from Missions/PHLI-tour/Models/scientist.xml rename to Missions/Tours/PHLI-tour/Models/scientist.xml diff --git a/Missions/PHLI-tour/Sounds/Intro1.wav b/Missions/Tours/PHLI-tour/Sounds/Intro1.wav similarity index 100% rename from Missions/PHLI-tour/Sounds/Intro1.wav rename to Missions/Tours/PHLI-tour/Sounds/Intro1.wav diff --git a/Missions/PHLI-tour/Sounds/cleared_to_take_off.wav b/Missions/Tours/PHLI-tour/Sounds/cleared_to_take_off.wav similarity index 100% rename from Missions/PHLI-tour/Sounds/cleared_to_take_off.wav rename to Missions/Tours/PHLI-tour/Sounds/cleared_to_take_off.wav diff --git a/Missions/PHLI-tour/Sounds/follow_compass.wav b/Missions/Tours/PHLI-tour/Sounds/follow_compass.wav similarity index 100% rename from Missions/PHLI-tour/Sounds/follow_compass.wav rename to Missions/Tours/PHLI-tour/Sounds/follow_compass.wav diff --git a/Missions/Hoops-mission/Sounds/glassbell.wav b/Missions/Tours/PHLI-tour/Sounds/glassbell.wav similarity index 100% rename from Missions/Hoops-mission/Sounds/glassbell.wav rename to Missions/Tours/PHLI-tour/Sounds/glassbell.wav diff --git a/Missions/PHLI-tour/Sounds/start_the_engines.wav b/Missions/Tours/PHLI-tour/Sounds/start_the_engines.wav similarity index 100% rename from Missions/PHLI-tour/Sounds/start_the_engines.wav rename to Missions/Tours/PHLI-tour/Sounds/start_the_engines.wav diff --git a/Missions/PHLI-tour/image.png b/Missions/Tours/PHLI-tour/image.png similarity index 100% rename from Missions/PHLI-tour/image.png rename to Missions/Tours/PHLI-tour/image.png diff --git a/Missions/PHLI-tour/metadata.xml b/Missions/Tours/PHLI-tour/metadata.xml similarity index 100% rename from Missions/PHLI-tour/metadata.xml rename to Missions/Tours/PHLI-tour/metadata.xml diff --git a/Missions/PHLI-tour/mission.xml b/Missions/Tours/PHLI-tour/mission.xml similarity index 100% rename from Missions/PHLI-tour/mission.xml rename to Missions/Tours/PHLI-tour/mission.xml diff --git a/Missions/PHLI-tour/preferences.xml b/Missions/Tours/PHLI-tour/preferences.xml similarity index 100% rename from Missions/PHLI-tour/preferences.xml rename to Missions/Tours/PHLI-tour/preferences.xml diff --git a/mission/extensions/adjust_payload.nas b/Nasal/extensions/adjust_payload.nas similarity index 100% rename from mission/extensions/adjust_payload.nas rename to Nasal/extensions/adjust_payload.nas diff --git a/mission/extensions/airport_landing_trigger.nas b/Nasal/extensions/airport_landing_trigger.nas similarity index 100% rename from mission/extensions/airport_landing_trigger.nas rename to Nasal/extensions/airport_landing_trigger.nas diff --git a/mission/extensions/area_landing_trigger.nas b/Nasal/extensions/area_landing_trigger.nas similarity index 100% rename from mission/extensions/area_landing_trigger.nas rename to Nasal/extensions/area_landing_trigger.nas diff --git a/mission/extensions/goal.nas b/Nasal/extensions/goal.nas similarity index 100% rename from mission/extensions/goal.nas rename to Nasal/extensions/goal.nas diff --git a/mission/extensions/goal_handler.nas b/Nasal/extensions/goal_handler.nas similarity index 100% rename from mission/extensions/goal_handler.nas rename to Nasal/extensions/goal_handler.nas diff --git a/mission/extensions/goal_resolution.nas b/Nasal/extensions/goal_resolution.nas similarity index 100% rename from mission/extensions/goal_resolution.nas rename to Nasal/extensions/goal_resolution.nas diff --git a/mission/extensions/menu_prompt_trigger.nas b/Nasal/extensions/menu_prompt_trigger.nas similarity index 100% rename from mission/extensions/menu_prompt_trigger.nas rename to Nasal/extensions/menu_prompt_trigger.nas diff --git a/mission/extensions/message.nas b/Nasal/extensions/message.nas similarity index 100% rename from mission/extensions/message.nas rename to Nasal/extensions/message.nas diff --git a/mission/extensions/message_handler.nas b/Nasal/extensions/message_handler.nas similarity index 100% rename from mission/extensions/message_handler.nas rename to Nasal/extensions/message_handler.nas diff --git a/mission/extensions/mission_compass_handler.nas b/Nasal/extensions/mission_compass_handler.nas similarity index 100% rename from mission/extensions/mission_compass_handler.nas rename to Nasal/extensions/mission_compass_handler.nas diff --git a/mission/extensions/model.nas b/Nasal/extensions/model.nas similarity index 100% rename from mission/extensions/model.nas rename to Nasal/extensions/model.nas diff --git a/mission/extensions/object_activation.nas b/Nasal/extensions/object_activation.nas similarity index 100% rename from mission/extensions/object_activation.nas rename to Nasal/extensions/object_activation.nas diff --git a/mission/extensions/point_of_interest.nas b/Nasal/extensions/point_of_interest.nas similarity index 100% rename from mission/extensions/point_of_interest.nas rename to Nasal/extensions/point_of_interest.nas diff --git a/mission/extensions/point_of_interest_handler.nas b/Nasal/extensions/point_of_interest_handler.nas similarity index 100% rename from mission/extensions/point_of_interest_handler.nas rename to Nasal/extensions/point_of_interest_handler.nas diff --git a/mission/extensions/property_trigger.nas b/Nasal/extensions/property_trigger.nas similarity index 100% rename from mission/extensions/property_trigger.nas rename to Nasal/extensions/property_trigger.nas diff --git a/mission/extensions/proximity_trigger.nas b/Nasal/extensions/proximity_trigger.nas similarity index 100% rename from mission/extensions/proximity_trigger.nas rename to Nasal/extensions/proximity_trigger.nas diff --git a/mission/extensions/random_action.nas b/Nasal/extensions/random_action.nas similarity index 100% rename from mission/extensions/random_action.nas rename to Nasal/extensions/random_action.nas diff --git a/mission/extensions/rectangle_area.nas b/Nasal/extensions/rectangle_area.nas similarity index 100% rename from mission/extensions/rectangle_area.nas rename to Nasal/extensions/rectangle_area.nas diff --git a/mission/extensions/refuel_action.nas b/Nasal/extensions/refuel_action.nas similarity index 100% rename from mission/extensions/refuel_action.nas rename to Nasal/extensions/refuel_action.nas diff --git a/mission/extensions/single_shot_sound.nas b/Nasal/extensions/single_shot_sound.nas similarity index 100% rename from mission/extensions/single_shot_sound.nas rename to Nasal/extensions/single_shot_sound.nas diff --git a/mission/extensions/timer_handler.nas b/Nasal/extensions/timer_handler.nas similarity index 100% rename from mission/extensions/timer_handler.nas rename to Nasal/extensions/timer_handler.nas diff --git a/mission/extensions/timer_trigger.nas b/Nasal/extensions/timer_trigger.nas similarity index 100% rename from mission/extensions/timer_trigger.nas rename to Nasal/extensions/timer_trigger.nas diff --git a/mission/mission.nas b/Nasal/mission.nas similarity index 84% rename from mission/mission.nas rename to Nasal/mission.nas index d03c6d1..2df039e 100644 --- a/mission/mission.nas +++ b/Nasal/mission.nas @@ -10,20 +10,28 @@ var handlers = []; var hasmember = view.hasmember; var addExtension = func (type, h) { - if (type == "MissionObject") + if (type == "MissionObject") { append (objects, h); - elsif (type == "Handler") + } elsif (type == "Handler") { append (handlers, h); + } } var extension_list = func { var v = []; - var path = getprop("/sim/fg-root") ~ "/Nasal/mission/extensions"; - if((var dir = directory(path)) == nil) return; - foreach(var file; sort(dir, cmp)) - if(size(file) > 4) - if (substr(file, -4) == ".nas") + var path = getprop("/sim/mission/root_path") ~ "/Nasal/extensions"; + if((var dir = directory(path)) == nil) { + return; + } + + foreach(var file; sort(dir, cmp)) { + if(size(file) > 4) { + if (substr(file, -4) == ".nas") { append(v, file); + } + } + } + return v; } @@ -33,11 +41,13 @@ var load_nasal = func(file, module) { # (copy-paste from io.nas) if (size(err)) { if (substr(err[0], 0, 12) == "Parse error:") { # hack around Nasal feature var e = split(" at line ", err[0]); - if (size(e) == 2) + if (size(e) == 2) { err[0] = string.join("", [e[0], "\n at ", file, ", line ", e[1], "\n "]); + } } - for (var i = 1; (var c = caller(i)) != nil; i += 1) + for (var i = 1; (var c = caller(i)) != nil; i += 1) { err ~= subvec(c, 2, 2); + } debug.printerror(err); return 0; } @@ -56,8 +66,11 @@ var load_preferences = func() { var start_mission = func(name) { if (mission_started) return; - mission_root = resolvepath("Missions/" ~ name); - if (mission_root == "") return; + # FIXME - ResourceLoader in FG Source + mission_root = resolvepath("/Aircraft/Missions/" ~ name); + if (mission_root == "") { + return; + } load_preferences(); @@ -71,9 +84,9 @@ var start_mission = func(name) { } var timeofday = mission_node.getChild("timeofday"); - if (timeofday != nil) + if (timeofday != nil) { fgcommand("timeofday", props.Node.new({ "timeofday" : timeofday.getValue() })); - + } globals["__mission"] = {}; @@ -101,14 +114,19 @@ var _start_mission = func { return; } - foreach (var h; handlers) - if( hasmember(h, "init") ) + foreach (var h; handlers) { + if( hasmember(h, "init") ) { h.init(); + } + } - foreach(var c; mission_node.getChildren("object")) - foreach(var obj; objects) - if (c.getValue("type") == obj.type) + foreach(var c; mission_node.getChildren("object")) { + foreach(var obj; objects) { + if (c.getValue("type") == obj.type) { append(mission_objects, obj.new(c)); + } + } + } foreach(var obj; mission_objects) if( hasmember(obj, "init") ) @@ -231,7 +249,7 @@ var scr_x = func getprop("/sim/startup/xsize"); var scr_y = func getprop("/sim/startup/ysize"); var init_gui = func { - gui.Dialog.new("/sim/gui/dialogs/mission-browser/dialog", "Nasal/mission/GUI/mission_browser.xml"); + gui.Dialog.new("/sim/gui/dialogs/mission-browser/dialog", getprop("/sim/mission/root_path") ~ "/GUI/mission_browser.xml"); #reset handling foreach(var menu; props.getNode("/sim/menubar/default").getChildren("menu")) @@ -294,8 +312,13 @@ var load_data = func { ### -_setlistener("/nasal/mission/loaded", func { +var fdm_init_listener = _setlistener("/sim/signals/fdm-initialized", func { + removelistener(fdm_init_listener); setprop("/sim/sound/chatter/enabled", 1); setprop("/sim/sound/chatter/volume", 1.0); init_gui(); -}); \ No newline at end of file + + print("Mission initalized"); +}); + +print("Mission loaded"); \ No newline at end of file diff --git a/config.xml b/config.xml new file mode 100644 index 0000000..9fcac4e --- /dev/null +++ b/config.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/main.nas b/main.nas new file mode 100644 index 0000000..e88887f --- /dev/null +++ b/main.nas @@ -0,0 +1,19 @@ +# +# Missions addon +# +# Started by Marius_A +# Started on November 2016 +# +# Converted to a FlightGear addon by +# Slawek Mikula, October 2017 + +var main = func( root ) { + # setting root path to addon + setprop("/sim/mission/root_path", root); + + # load scripts + foreach(var f; ['mission.nas'] ) { + io.load_nasal( root ~ "/Nasal/" ~ f, "missions" ); + } +} + diff --git a/Missions/Hoops-mission/Sounds/Welcome.wav b/old/Hoops-mission-Copy/Sounds/Welcome.wav similarity index 100% rename from Missions/Hoops-mission/Sounds/Welcome.wav rename to old/Hoops-mission-Copy/Sounds/Welcome.wav diff --git a/Missions/PHLI-tour/Sounds/glassbell.wav b/old/Hoops-mission-Copy/Sounds/glassbell.wav similarity index 100% rename from Missions/PHLI-tour/Sounds/glassbell.wav rename to old/Hoops-mission-Copy/Sounds/glassbell.wav diff --git a/Missions/Hoops-mission/Sounds/msg1.wav b/old/Hoops-mission-Copy/Sounds/msg1.wav similarity index 100% rename from Missions/Hoops-mission/Sounds/msg1.wav rename to old/Hoops-mission-Copy/Sounds/msg1.wav diff --git a/Missions/Hoops-mission/Sounds/msg2.wav b/old/Hoops-mission-Copy/Sounds/msg2.wav similarity index 100% rename from Missions/Hoops-mission/Sounds/msg2.wav rename to old/Hoops-mission-Copy/Sounds/msg2.wav diff --git a/Missions/Hoops-mission/Sounds/msg3.wav b/old/Hoops-mission-Copy/Sounds/msg3.wav similarity index 100% rename from Missions/Hoops-mission/Sounds/msg3.wav rename to old/Hoops-mission-Copy/Sounds/msg3.wav diff --git a/Missions/Hoops-mission/Sounds/msg3a.wav b/old/Hoops-mission-Copy/Sounds/msg3a.wav similarity index 100% rename from Missions/Hoops-mission/Sounds/msg3a.wav rename to old/Hoops-mission-Copy/Sounds/msg3a.wav diff --git a/Missions/Hoops-mission/Sounds/msg4.wav b/old/Hoops-mission-Copy/Sounds/msg4.wav similarity index 100% rename from Missions/Hoops-mission/Sounds/msg4.wav rename to old/Hoops-mission-Copy/Sounds/msg4.wav diff --git a/Missions/Hoops-mission/Sounds/msg4a.wav b/old/Hoops-mission-Copy/Sounds/msg4a.wav similarity index 100% rename from Missions/Hoops-mission/Sounds/msg4a.wav rename to old/Hoops-mission-Copy/Sounds/msg4a.wav diff --git a/Missions/Hoops-mission/Sounds/pop.wav b/old/Hoops-mission-Copy/Sounds/pop.wav similarity index 100% rename from Missions/Hoops-mission/Sounds/pop.wav rename to old/Hoops-mission-Copy/Sounds/pop.wav diff --git a/Missions/Hoops-mission-Copy/image.png b/old/Hoops-mission-Copy/image.png similarity index 100% rename from Missions/Hoops-mission-Copy/image.png rename to old/Hoops-mission-Copy/image.png diff --git a/Missions/Hoops-mission-Copy/metadata.xml b/old/Hoops-mission-Copy/metadata.xml similarity index 100% rename from Missions/Hoops-mission-Copy/metadata.xml rename to old/Hoops-mission-Copy/metadata.xml diff --git a/Missions/Hoops-mission-Copy/mission.xml b/old/Hoops-mission-Copy/mission.xml similarity index 100% rename from Missions/Hoops-mission-Copy/mission.xml rename to old/Hoops-mission-Copy/mission.xml