Merge pull request #4 from d41k4n/dev/0.4-beta.1

d41k4n · Nov 22, 2021 · a482c86 · a482c86
2 parents 72c53ca + 8d96b09
commit a482c86
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 34 deletions.
diff --git a/Custom Scenery/missionx/HEMS_Mission_Generator/template.xml b/Custom Scenery/missionx/HEMS_Mission_Generator/template.xml
@@ -60,13 +60,13 @@
 	<!-- [plane | xy] {element name that holds points} -->
 	<briefer_and_start_location location_type="plane" start_cold_and_dark="yes" />
 
-	<datarefs_start_cold_and_dark>%datarefs_start_cold_and_dark%,sim/flightmodel/misc/jett_len:0,sim/aircraft/overflow/acf_jett_is_slung:0</datarefs_start_cold_and_dark>
+	<datarefs_start_cold_and_dark>sim/flightmodel/misc/jett_len:0,sim/aircraft/overflow/acf_jett_is_slung:0,%datarefs_start_cold_and_dark%</datarefs_start_cold_and_dark>
 
 	<medevac_hover_test_set is_set_of_flight_legs="yes" >
 		<!-- Road accident, mountain accident -->
 		<leg template="hover" name="leg_1_target" pick_location_based_on_same_template_b="true" disable_auto_message_b="true">
 			<desc>Extraction of an injured person by winch. Location: {navaid_loc_desc}. Target coordinates: {navaid_lat}, {navaid_lon}. Route has been uploaded to your FMS. Good flight.</desc>
-			<fire_commands_at_leg_start commands="%fire_commands_at_leg_start%,FlyWithLua/hoist/winch_remove_patient,FlyWithLua/hoist/winch_release" />
+			<fire_commands_at_leg_start commands="FlyWithLua/hoist/winch_disable,FlyWithLua/hoist/winch_reset,%fire_commands_at_leg_start%" />
 			<expected_location location_type="xy" location_value="tag=loc_acc_test|nm_between=2-30" override_trigger_name="trig_hover_goal_1_target_1"/>
 			<display_object_set random_tag="object_sets" set_name="medevac_slope" />
 			<special_leg_directives add_tasks_from_template="leg_1_tasks_winch_ops" add_triggers_from_template="leg_1_triggers_winch_ops" add_messages_from_template="leg_1_msgs_winch_ops" base_on_external_plugin="" />
@@ -79,7 +79,7 @@
 		<!-- Hospital -->
 		<leg template="land" name="leg_2_dropoff" disable_auto_message_b="true">
 			<desc>Proceed to hospital: {navaid_loc_desc}.</desc>
-			<fire_commands_at_leg_start commands="%fire_commands_at_leg_start%,FlyWithLua/hoist/winch_remove_patient,FlyWithLua/hoist/winch_release" />
+			<fire_commands_at_leg_start commands="FlyWithLua/hoist/winch_disable,FlyWithLua/hoist/winch_reset,%fire_commands_at_leg_start%" />
 			<expected_location location_type="near" location_value="tag=loc_hospitals|nm_between=2-30" override_trigger_name="trig_hover_goal_2_target_1" />
 			<special_leg_directives add_tasks_from_template="leg_2_tasks_dropoff_winch_op" add_triggers_from_template="leg_2_triggers_dropoff" add_messages_from_template="leg_2_msgs_dropoff" base_on_external_plugin="" />
 			<dynamic_message relative_to_trigger="trig_hover_goal_2_target_1" message_name_to_call="5nm_alert" length_mt="9260"/>
@@ -103,7 +103,7 @@
 		<!-- Road accident, mountain accident -->
 		<leg template="hover" name="leg_1_target" pick_location_based_on_same_template_b="true" disable_auto_message_b="true">
 			<desc>Extraction of an injured person by winch. Location: {navaid_loc_desc}. Target coordinates: {navaid_lat}, {navaid_lon}. Route has been uploaded to your FMS. Good flight.</desc>
-			<fire_commands_at_leg_start commands="%fire_commands_at_leg_start%,FlyWithLua/hoist/winch_remove_patient,FlyWithLua/hoist/winch_release" />
+			<fire_commands_at_leg_start commands="FlyWithLua/hoist/winch_disable,FlyWithLua/hoist/winch_reset,%fire_commands_at_leg_start%" />
 			<expected_location location_type="xy" location_value="tag=loc_acc|nm_between=5-30" override_trigger_name="trig_hover_goal_1_target_1"/>
 			<display_object_set random_tag="object_sets" set_name="medevac_slope" />
 			<special_leg_directives add_tasks_from_template="leg_1_tasks_winch_ops" add_triggers_from_template="leg_1_triggers_winch_ops" add_messages_from_template="leg_1_msgs_winch_ops" base_on_external_plugin="" />
@@ -116,7 +116,7 @@
 		<!-- Hospital -->
 		<leg template="land" name="leg_2_dropoff" disable_auto_message_b="true">
 			<desc>Proceed to hospital: {navaid_loc_desc}.</desc>
-			<fire_commands_at_leg_start commands="%fire_commands_at_leg_start%,FlyWithLua/hoist/winch_remove_patient,FlyWithLua/hoist/winch_release" />
+			<fire_commands_at_leg_start commands="FlyWithLua/hoist/winch_disable,FlyWithLua/hoist/winch_reset,%fire_commands_at_leg_start%" />
 			<expected_location location_type="near" location_value="tag=loc_hospitals|nm_between=5-30" override_trigger_name="trig_hover_goal_2_target_1" />
 			<special_leg_directives add_tasks_from_template="leg_2_tasks_dropoff_winch_op" add_triggers_from_template="leg_2_triggers_dropoff" add_messages_from_template="leg_2_msgs_dropoff" base_on_external_plugin="" />
 			<dynamic_message relative_to_trigger="trig_hover_goal_2_target_1" message_name_to_call="5nm_alert" length_mt="9260"/>
@@ -140,7 +140,7 @@
 		<!-- Accident or hospital transfer -->
 		<leg template="land" name="leg_1_target" pick_location_based_on_same_template_b="true" disable_auto_message_b="true">
 			<desc>Extraction of an injured person. Location: {navaid_loc_desc}. Landing area coordinates: {navaid_lat}, {navaid_lon}. Route has been uploaded to your FMS. Good flight.</desc>
-			<fire_commands_at_leg_start commands="%fire_commands_at_leg_start%,FlyWithLua/hoist/winch_remove_patient,FlyWithLua/hoist/winch_release" />			
+			<fire_commands_at_leg_start commands="FlyWithLua/hoist/winch_disable,FlyWithLua/hoist/winch_reset,%fire_commands_at_leg_start%" />			
 			<expected_location location_type="xy" location_value="tag=loc_acc|nm_between=5-30" override_trigger_name="trig_land_goal_1_target_1" />
 			<display_object_set random_tag="object_sets" set_name="medevac" />
 			<special_leg_directives add_tasks_from_template="leg_1_tasks_patient_boarding" add_triggers_from_template="leg_1_triggers_patient_boarding" add_messages_from_template="leg_1_msgs_patient_boarding" base_on_external_plugin="" />
@@ -177,7 +177,7 @@
 		<!-- Hospital transfer -->
 		<leg template="land" name="leg_1_target" pick_location_based_on_same_template_b="true" disable_auto_message_b="true">
 			<desc>Urgent hospital transfer of a patient. Pickup location: {navaid_loc_desc}. Helipad coordinates: {navaid_lat}, {navaid_lon}. Route has been uploaded to your FMS. Good flight.</desc>
-			<fire_commands_at_leg_start commands="%fire_commands_at_leg_start%,FlyWithLua/hoist/winch_remove_patient,FlyWithLua/hoist/winch_release" />
+			<fire_commands_at_leg_start commands="FlyWithLua/hoist/winch_disable,FlyWithLua/hoist/winch_reset,%fire_commands_at_leg_start%" />
 			<expected_location location_type="xy" location_value="tag=loc_hospitals_pickup" override_trigger_name="trig_land_goal_1_target_1" />
 			<special_leg_directives add_tasks_from_template="leg_1_tasks_patient_boarding" add_triggers_from_template="leg_1_triggers_patient_boarding" add_messages_from_template="leg_1_msgs_patient_boarding" base_on_external_plugin="" />
 			<dynamic_message relative_to_trigger="trig_land_goal_1_target_1" message_name_to_call="5nm_alert" length_mt="9260"/>
@@ -213,7 +213,7 @@
 		<!-- Pickup hospital -->
 		<leg template="land" name="leg_1_target" pick_location_based_on_same_template_b="true" disable_auto_message_b="true">
 			<desc>Urgent hospital transfer of a patient. Location: {navaid_loc_desc}. Helipad coordinates: {navaid_lat}, {navaid_lon}. Route has been uploaded to your FMS. Good flight.</desc>
-			<fire_commands_at_leg_start commands="%fire_commands_at_leg_start%,FlyWithLua/hoist/winch_remove_patient,FlyWithLua/hoist/winch_release" />
+			<fire_commands_at_leg_start commands="FlyWithLua/hoist/winch_disable,FlyWithLua/hoist/winch_reset,%fire_commands_at_leg_start%" />
 			<expected_location location_type="xy" location_value="tag=loc_hospitals_pickup_germany" override_trigger_name="trig_land_goal_1_target_1"  />
 			<special_leg_directives add_tasks_from_template="leg_1_tasks_patient_boarding" add_triggers_from_template="leg_1_triggers_patient_boarding" add_messages_from_template="leg_1_msgs_patient_boarding" base_on_external_plugin="" />
 			<dynamic_message relative_to_trigger="trig_land_goal_1_target_1" message_name_to_call="5nm_alert" length_mt="9260"/>
@@ -249,7 +249,7 @@
 		<!-- Ski accident -->
 		<leg template="hover" name="leg_1_target" pick_location_based_on_same_template_b="true" disable_auto_message_b="true">
 			<desc>Extraction of an injured skier by winch. Location: {navaid_loc_desc}. Target coordinates: {navaid_lat}, {navaid_lon}. Route has been uploaded to your FMS. Good flight.</desc>
-			<fire_commands_at_leg_start commands="%fire_commands_at_leg_start%,FlyWithLua/hoist/winch_remove_patient,FlyWithLua/hoist/winch_release" />
+			<fire_commands_at_leg_start commands="FlyWithLua/hoist/winch_disable,FlyWithLua/hoist/winch_reset,%fire_commands_at_leg_start%" />
 			<expected_location location_type="webosm" location_value="tag=webosm_piste_filter|nm_between=5-30|keyname=piste:name|keydesc=piste:name|webosm_optimize=n" force_sloped_terrain="3" max_slope_to_land="14" override_trigger_name="trig_hover_goal_1_target_1"/>
 			<display_object_set random_tag="object_sets" set_name="medevac_slope" />
 			<special_leg_directives add_tasks_from_template="leg_1_tasks_winch_ops" add_triggers_from_template="leg_1_triggers_winch_ops" add_messages_from_template="leg_1_msgs_winch_ops" base_on_external_plugin="" />
@@ -262,7 +262,7 @@
 		<!-- Hospital -->
 		<leg template="land" name="leg_2_dropoff" disable_auto_message_b="true">
 			<desc>Proceed to hospital: {navaid_loc_desc}.</desc>
-			<fire_commands_at_leg_start commands="%fire_commands_at_leg_start%,FlyWithLua/hoist/winch_remove_patient,FlyWithLua/hoist/winch_release" />
+			<fire_commands_at_leg_start commands="FlyWithLua/hoist/winch_disable,FlyWithLua/hoist/winch_reset,%fire_commands_at_leg_start%" />
 			<expected_location location_type="near" location_value="tag=loc_hospitals|nm_between=2-30" override_trigger_name="trig_hover_goal_2_target_1" />
 			<special_leg_directives add_tasks_from_template="leg_2_tasks_dropoff_winch_op" add_triggers_from_template="leg_2_triggers_dropoff" add_messages_from_template="leg_2_msgs_dropoff" base_on_external_plugin="" />
 			<dynamic_message relative_to_trigger="trig_hover_goal_2_target_1" message_name_to_call="5nm_alert" length_mt="9260"/>
@@ -286,7 +286,7 @@
 		<!-- Hiking accident -->
 		<leg template="hover" name="leg_1_target" pick_location_based_on_same_template_b="true" disable_auto_message_b="true">
 			<desc>Extraction of an injured hiker by winch. Location: {navaid_loc_desc}. Target coordinates: {navaid_lat}, {navaid_lon}. Route has been uploaded to your FMS. Good flight.</desc>
-			<fire_commands_at_leg_start commands="%fire_commands_at_leg_start%,FlyWithLua/hoist/winch_remove_patient,FlyWithLua/hoist/winch_release" />
+			<fire_commands_at_leg_start commands="FlyWithLua/hoist/winch_disable,FlyWithLua/hoist/winch_reset,%fire_commands_at_leg_start%" />
 			<expected_location location_type="webosm" location_value="tag=webosm_trail_filter|nm_between=5-30|keyname=name|keydesc=name|webosm_optimize=y" force_sloped_terrain="3" max_slope_to_land="14" override_trigger_name="trig_hover_goal_1_target_1"/>
 			<display_object_set random_tag="object_sets" set_name="medevac_slope" />
 			<special_leg_directives add_tasks_from_template="leg_1_tasks_winch_ops" add_triggers_from_template="leg_1_triggers_winch_ops" add_messages_from_template="leg_1_msgs_winch_ops" base_on_external_plugin="" />
@@ -299,7 +299,7 @@
 		<!-- Hospital -->
 		<leg template="land" name="leg_2_dropoff" disable_auto_message_b="true">
 			<desc>Proceed to hospital: {navaid_loc_desc}.</desc>
-			<fire_commands_at_leg_start commands="%fire_commands_at_leg_start%,FlyWithLua/hoist/winch_remove_patient,FlyWithLua/hoist/winch_release" />
+			<fire_commands_at_leg_start commands="FlyWithLua/hoist/winch_disable,FlyWithLua/hoist/winch_reset,%fire_commands_at_leg_start%" />
 			<expected_location location_type="near" location_value="tag=loc_hospitals|nm_between=2-30" override_trigger_name="trig_hover_goal_2_target_1" />
 			<special_leg_directives add_tasks_from_template="leg_2_tasks_dropoff_winch_op" add_triggers_from_template="leg_2_triggers_dropoff" add_messages_from_template="leg_2_msgs_dropoff" base_on_external_plugin="" />
 			<dynamic_message relative_to_trigger="trig_hover_goal_2_target_1" message_name_to_call="5nm_alert" length_mt="9260"/>
@@ -323,7 +323,7 @@
 		<!-- Accident or hospital transfer -->
 		<leg template="land" name="leg_1_target" pick_location_based_on_same_template_b="true" disable_auto_message_b="true">
 			<desc>Extraction of an injured person due to a traffic accident. Location: {navaid_loc_desc}. Landing area coordinates: {navaid_lat}, {navaid_lon}. Route has been uploaded to your FMS. Good flight.</desc>
-			<fire_commands_at_leg_start commands="%fire_commands_at_leg_start%,FlyWithLua/hoist/winch_remove_patient,FlyWithLua/hoist/winch_release" />
+			<fire_commands_at_leg_start commands="FlyWithLua/hoist/winch_disable,FlyWithLua/hoist/winch_reset,%fire_commands_at_leg_start%" />
 			<expected_location location_type="webosm" location_value="tag=webosm_road_filter|nm_between=5-30|keyname=name|keydesc=name|webosm_optimize=y" override_trigger_name="trig_land_goal_1_target_1" force_leveled_terrain="3" max_slope_to_land="12" />
 			<display_object_set random_tag="object_sets" set_name="medevac" />
 			<special_leg_directives add_tasks_from_template="leg_1_tasks_patient_boarding" add_triggers_from_template="leg_1_triggers_patient_boarding" add_messages_from_template="leg_1_msgs_patient_boarding" base_on_external_plugin="" />
@@ -360,7 +360,7 @@
 		<!-- Accident or hospital transfer -->
 		<leg template="land" name="leg_1_target" pick_location_based_on_same_template_b="true" disable_auto_message_b="true">
 			<desc>Extraction of an injured person from a parking area. Location: {navaid_loc_desc}. Landing area coordinates: {navaid_lat}, {navaid_lon}. Route has been uploaded to your FMS. Good flight.</desc>
-			<fire_commands_at_leg_start commands="%fire_commands_at_leg_start%,FlyWithLua/hoist/winch_remove_patient,FlyWithLua/hoist/winch_release" />
+			<fire_commands_at_leg_start commands="FlyWithLua/hoist/winch_disable,FlyWithLua/hoist/winch_reset,%fire_commands_at_leg_start%" />
 			<expected_location location_type="webosm" location_value="tag=webosm_parking_filter|nm_between=5-30|keyname=name|keydesc=name|webosm_optimize=y" override_trigger_name="trig_land_goal_1_target_1" force_leveled_terrain="3"/>
 			<display_object_set random_tag="object_sets" set_name="medevac" />
 			<special_leg_directives add_tasks_from_template="leg_1_tasks_patient_boarding" add_triggers_from_template="leg_1_triggers_patient_boarding" add_messages_from_template="leg_1_msgs_patient_boarding" base_on_external_plugin="" />
@@ -397,7 +397,7 @@
 		<!-- Accident or hospital transfer -->
 		<leg template="land" name="leg_1_target" pick_location_based_on_same_template_b="true" disable_auto_message_b="true">
 			<desc>Extraction of an injured person from an outdoor sports pitch. Location: {navaid_loc_desc}. Landing area coordinates: {navaid_lat}, {navaid_lon}. Route has been uploaded to your FMS. Good flight.</desc>
-			<fire_commands_at_leg_start commands="%fire_commands_at_leg_start%,FlyWithLua/hoist/winch_remove_patient,FlyWithLua/hoist/winch_release" />
+			<fire_commands_at_leg_start commands="FlyWithLua/hoist/winch_disable,FlyWithLua/hoist/winch_reset,%fire_commands_at_leg_start%" />
 			<expected_location location_type="webosm" location_value="tag=webosm_pitches_filter|nm_between=5-30|keyname=name|keydesc=name|webosm_optimize=n" override_trigger_name="trig_land_goal_1_target_1" force_leveled_terrain="3" />
 			<display_object_set random_tag="object_sets" set_name="medevac" />
 			<special_leg_directives add_tasks_from_template="leg_1_tasks_patient_boarding" add_triggers_from_template="leg_1_triggers_patient_boarding" add_messages_from_template="leg_1_msgs_patient_boarding" base_on_external_plugin="" />
@@ -570,7 +570,7 @@
 			</loc_and_elev_data>
 			<outcome message_name_when_fired="msg_1_onboard_patient" 
 			         message_name_when_left=""
-		             commands_to_exec_when_fired="%leg_1_triggers_winch_ops-trig_1_onboard_patient-commands_to_exec_when_fired%,FlyWithLua/hoist/winch_remove_patient" 
+		             commands_to_exec_when_fired="FlyWithLua/hoist/winch_remove_patient,%leg_1_triggers_winch_ops-trig_1_onboard_patient-commands_to_exec_when_fired%" 
 					 commands_to_exec_when_left=""
 		             dataref_to_modify_when_fired="%leg_1_triggers_winch_ops-trig_1_onboard_patient-dataref_to_modify_when_fired%" 
 					 dataref_to_modify_when_left=""  
@@ -584,7 +584,7 @@
 			</loc_and_elev_data>
 			<outcome message_name_when_fired="msg_1_onboard_crew" 
 					 message_name_when_left=""
-					 commands_to_exec_when_fired="FlyWithLua/hoist/winch_release" 
+					 commands_to_exec_when_fired="FlyWithLua/hoist/winch_disable" 
 					 commands_to_exec_when_left=""
 					 dataref_to_modify_when_fired="%leg_1_triggers_winch_ops-trig_1_onboard_crew-dataref_to_modify_when_fired%" 
 					 dataref_to_modify_when_left=""  
@@ -1813,8 +1813,8 @@
 		<find_replace find="%base_info%" replace_with="includes/base_info_Rega1.xml"/>
 	</opt>
 	<opt name="Rega5_LSXU_Untervaz_EC135_TEST">
-		<info title="HEMS mission for Rega 5 EC135 out of LSXU Untervaz - DEBUG ONLY" mission_image_file_name="HMG_Rega5.png" plane_desc="Rotorsim EC135 V5" short_desc="
-			*** THIS IS A STATIC TEST MISSION - USE FOR DEBUGGING PURPOSES ONLY ***
+		<info title="HEMS TEST mission for Rega 5 EC135 out of LSXU Untervaz" mission_image_file_name="HMG_Rega5.png" plane_desc="Rotorsim EC135 V5" short_desc="
+			*** THIS MISSION USES A PREDEFINED DESTINATION LOCATED NEARBY (<2NM) - USE FOR TRAINING OR TESTING PURPOSES ***
 
 			Homebase: LSXU, Rega 5 heliport (lat: 46.91287, lon: 9.55090) 
 			Aircraft: Rotorsim EC135 V5

diff --git a/HEMS_Mission_Generator_npp_project b/HEMS_Mission_Generator_npp_project
@@ -22,6 +22,7 @@
                         <File name="Custom Scenery\missionx\HEMS_Mission_Generator\includes\base_info_Lions1.xml" />
                         <File name="Custom Scenery\missionx\HEMS_Mission_Generator\includes\base_info_Rega1.xml" />
                         <File name="Custom Scenery\missionx\HEMS_Mission_Generator\includes\base_info_Rega5.xml" />
+                        <File name="Custom Scenery\missionx\HEMS_Mission_Generator\includes\content-medevac_hover_test.xml" />
                         <File name="Custom Scenery\missionx\HEMS_Mission_Generator\includes\content-medevac_hospital.xml" />
                         <File name="Custom Scenery\missionx\HEMS_Mission_Generator\includes\content-medevac_hospital_germany.xml" />
                         <File name="Custom Scenery\missionx\HEMS_Mission_Generator\includes\content-medevac_hover.xml" />

diff --git a/README.md b/README.md
@@ -47,7 +47,7 @@ Note that only a _port-side_ mounted hoist is supported for hover missions or ot
  - Working X-Plane installation (Windows/Mac/Linux are supported)
  - X-Plane sound output enabled with system support for speech synthesis (check sound settings)
  - Working internet connection
- - [Mission-X](https://forums.x-plane.org/index.php?/files/file/41874-mission-x/) plugin v3.0.256.4.2 or later incl. "Random Mission Pack"
+ - [Mission-X](https://forums.x-plane.org/index.php?/files/file/41874-mission-x/) plugin v3.0.256.4.3 or later incl. "Random Mission Pack"
  - Latest [FlyWithLUA](https://forums.x-plane.org/index.php?/files/file/38445-flywithlua-ng-next-generation-edition-for-x-plane-11-win-lin-mac/) plugin
  - Latest [Helicopter Sling Load (HSL)](https://github.com/kristian80/HSL) plugin
  - At least one of the following aircraft models installed in X-Plane's home folder under `./Aircraft/Helicopters` using their default folder names i.e.: