Prep v3.7.1

EDCD · Nov 13, 2020 · 9ae59a9 · 9ae59a9
1 parent ffe2c23
commit 9ae59a9
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 8 deletions.
diff --git a/EDDI/ChangeLog.md b/EDDI/ChangeLog.md
@@ -2,7 +2,7 @@
 
 Full details of the variables available for each noted event, and VoiceAttack integrations, are available in the individual [event pages](https://github.com/EDCD/EDDI/wiki/Events).
 
-### 3.7.1-b2
+### 3.7.1
   * Core
     Fixed an exception when calculating distances if the second system were null (for example if a home star system were not set).
   * Mission monitor
@@ -12,7 +12,7 @@ Full details of the variables available for each noted event, and VoiceAttack in
     * Scripts
       * Updated the `Location` script to fix reporting station crimes and missions when it should be instead reporting system crimes and missions.
   * VoiceAttack responder
-    * Updated EDDI.vap to correct an issue with landing pads not being reported correctly.
+    * Updated EDDI.vap to correct an issue with landing pads not being reported correctly when queried.
 
 ### 3.7.1-b1
   * Core

diff --git a/Installer.iss b/Installer.iss
@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "EDDI"
-#define MyAppVersion "3.7.1-b2"
+#define MyAppVersion "3.7.1"
 #define MyAppPublisher "Elite Dangerous Community Developers (EDCD)"
 #define MyAppURL "https://github.com/EDCD/EDDI/"
 #define MyAppExeName "EDDI.exe"

diff --git a/SpeechResponder/eddi.de.json b/SpeechResponder/eddi.de.json
@@ -1138,7 +1138,7 @@
       "enabled": true,
       "priority": 3,
       "responder": true,
-      "script": "{_ Context _}\r\n{SetState('eddi_context_last_subject', 'location')}\r\n{SetState('eddi_context_system_name', event.system)}\r\n{SetState('eddi_context_body_name', event.body)}\r\n{SetState('eddi_context_body_type', event.bodytype)}\r\n{SetState('eddi_context_body_system', event.system)}\r\n\r\n\r\nYou are\r\n{if event.docked || event.station = event.body:\r\n    {set station to StationDetails(event.station, event.system)}\r\n    {set station_missions to F(\"Mission check station\")}\r\n    {set station_crimes to F(\"Crime check station\")}\r\n\r\n    {if event.docked:\r\n        docked at\r\n    |else:\r\n        {OneOf(\"near\", \"close to\", \"in the vicinity of\")}\r\n    }\r\n    {P(station.model)}, {P(event.station)},\r\n    {if event.station != event.body:\r\n        on {P(event.body)},\r\n    }\r\n|elif event.body:\r\n    {set system_missions to F(\"Mission check system\")}\r\n    {set system_crimes to F(\"Crime check system\")}\r\n    {OneOf(\"near\", \"close to\", \"in the vicinity of\")} {P(event.body)},\r\n}\r\nin the {P(event.system)} system.\r\n\r\n{if station_missions || station_crimes ||system_missions || system_crimes:\r\n    {Pause(500)}\r\n    Information:\r\n    {if station_missions:\r\n        {Pause(500)}\r\n        {station_missions}\r\n    }\r\n    {if station_crimes:\r\n        {Pause(500)}\r\n        {station_crimes}\r\n    }\r\n    {if system_missions:\r\n        {Pause(500)}\r\n        {station_missions}\r\n    }\r\n    {if system_crimes:\r\n        {Pause(500)}\r\n        {station_crimes}\r\n    }\r\n}",
+      "script": "{_ Context _}\r\n{SetState('eddi_context_last_subject', 'location')}\r\n{SetState('eddi_context_system_name', event.system)}\r\n{SetState('eddi_context_body_name', event.body)}\r\n{SetState('eddi_context_body_type', event.bodytype)}\r\n{SetState('eddi_context_body_system', event.system)}\r\n\r\n\r\nYou are\r\n{if event.docked || event.station = event.body:\r\n    {set station to StationDetails(event.station, event.system)}\r\n    {set station_missions to F(\"Mission check station\")}\r\n    {set station_crimes to F(\"Crime check station\")}\r\n\r\n    {if event.docked:\r\n        docked at\r\n    |else:\r\n        {OneOf(\"near\", \"close to\", \"in the vicinity of\")}\r\n    }\r\n    {P(station.model)}, {P(event.station)},\r\n    {if event.station != event.body:\r\n        on {P(event.body)},\r\n    }\r\n|elif event.body:\r\n    {set system_missions to F(\"Mission check system\")}\r\n    {set system_crimes to F(\"Crime check system\")}\r\n    {OneOf(\"near\", \"close to\", \"in the vicinity of\")} {P(event.body)},\r\n}\r\nin the {P(event.system)} system.\r\n\r\n{if station_missions || station_crimes ||system_missions || system_crimes:\r\n    {Pause(500)}\r\n    Information:\r\n    {if station_missions:\r\n        {Pause(500)}\r\n        {station_missions}\r\n    }\r\n    {if station_crimes:\r\n        {Pause(500)}\r\n        {station_crimes}\r\n    }\r\n    {if system_missions:\r\n        {Pause(500)}\r\n        {system_missions}\r\n    }\r\n    {if system_crimes:\r\n        {Pause(500)}\r\n        {system_crimes}\r\n    }\r\n}",
       "default": true,
       "name": "Location",
       "description": "Triggered when the commander's location is reported, usually when they reload their game."

diff --git a/SpeechResponder/eddi.hu.json b/SpeechResponder/eddi.hu.json
@@ -1138,7 +1138,7 @@
       "enabled": true,
       "priority": 3,
       "responder": true,
-      "script": "{_ Context _}\r\n{SetState('eddi_context_last_subject', 'location')}\r\n{SetState('eddi_context_system_name', event.system)}\r\n{SetState('eddi_context_body_name', event.body)}\r\n{SetState('eddi_context_body_type', event.bodytype)}\r\n{SetState('eddi_context_body_system', event.system)}\r\n\r\n\r\nYou are\r\n{if event.docked || event.station = event.body:\r\n    {set station to StationDetails(event.station, event.system)}\r\n    {set station_missions to F(\"Mission check station\")}\r\n    {set station_crimes to F(\"Crime check station\")}\r\n\r\n    {if event.docked:\r\n        docked at\r\n    |else:\r\n        {OneOf(\"near\", \"close to\", \"in the vicinity of\")}\r\n    }\r\n    {P(station.model)}, {P(event.station)},\r\n    {if event.station != event.body:\r\n        on {P(event.body)},\r\n    }\r\n|elif event.body:\r\n    {set system_missions to F(\"Mission check system\")}\r\n    {set system_crimes to F(\"Crime check system\")}\r\n    {OneOf(\"near\", \"close to\", \"in the vicinity of\")} {P(event.body)},\r\n}\r\nin the {P(event.system)} system.\r\n\r\n{if station_missions || station_crimes ||system_missions || system_crimes:\r\n    {Pause(500)}\r\n    Information:\r\n    {if station_missions:\r\n        {Pause(500)}\r\n        {station_missions}\r\n    }\r\n    {if station_crimes:\r\n        {Pause(500)}\r\n        {station_crimes}\r\n    }\r\n    {if system_missions:\r\n        {Pause(500)}\r\n        {station_missions}\r\n    }\r\n    {if system_crimes:\r\n        {Pause(500)}\r\n        {station_crimes}\r\n    }\r\n}",
+      "script": "{_ Context _}\r\n{SetState('eddi_context_last_subject', 'location')}\r\n{SetState('eddi_context_system_name', event.system)}\r\n{SetState('eddi_context_body_name', event.body)}\r\n{SetState('eddi_context_body_type', event.bodytype)}\r\n{SetState('eddi_context_body_system', event.system)}\r\n\r\n\r\nYou are\r\n{if event.docked || event.station = event.body:\r\n    {set station to StationDetails(event.station, event.system)}\r\n    {set station_missions to F(\"Mission check station\")}\r\n    {set station_crimes to F(\"Crime check station\")}\r\n\r\n    {if event.docked:\r\n        docked at\r\n    |else:\r\n        {OneOf(\"near\", \"close to\", \"in the vicinity of\")}\r\n    }\r\n    {P(station.model)}, {P(event.station)},\r\n    {if event.station != event.body:\r\n        on {P(event.body)},\r\n    }\r\n|elif event.body:\r\n    {set system_missions to F(\"Mission check system\")}\r\n    {set system_crimes to F(\"Crime check system\")}\r\n    {OneOf(\"near\", \"close to\", \"in the vicinity of\")} {P(event.body)},\r\n}\r\nin the {P(event.system)} system.\r\n\r\n{if station_missions || station_crimes ||system_missions || system_crimes:\r\n    {Pause(500)}\r\n    Information:\r\n    {if station_missions:\r\n        {Pause(500)}\r\n        {station_missions}\r\n    }\r\n    {if station_crimes:\r\n        {Pause(500)}\r\n        {station_crimes}\r\n    }\r\n    {if system_missions:\r\n        {Pause(500)}\r\n        {system_missions}\r\n    }\r\n    {if system_crimes:\r\n        {Pause(500)}\r\n        {system_crimes}\r\n    }\r\n}",
       "default": true,
       "name": "Location",
       "description": "Triggered when the commander's location is reported, usually when they reload their game."

diff --git a/SpeechResponder/eddi.it.json b/SpeechResponder/eddi.it.json
@@ -1138,7 +1138,7 @@
       "enabled": true,
       "priority": 3,
       "responder": true,
-      "script": "{_ Context _}\r\n{SetState('eddi_context_last_subject', 'location')}\r\n{SetState('eddi_context_system_name', event.system)}\r\n{SetState('eddi_context_body_name', event.body)}\r\n{SetState('eddi_context_body_type', event.bodytype)}\r\n{SetState('eddi_context_body_system', event.system)}\r\n\r\n\r\nYou are\r\n{if event.docked || event.station = event.body:\r\n    {set station to StationDetails(event.station, event.system)}\r\n    {set station_missions to F(\"Mission check station\")}\r\n    {set station_crimes to F(\"Crime check station\")}\r\n\r\n    {if event.docked:\r\n        docked at\r\n    |else:\r\n        {OneOf(\"near\", \"close to\", \"in the vicinity of\")}\r\n    }\r\n    {P(station.model)}, {P(event.station)},\r\n    {if event.station != event.body:\r\n        on {P(event.body)},\r\n    }\r\n|elif event.body:\r\n    {set system_missions to F(\"Mission check system\")}\r\n    {set system_crimes to F(\"Crime check system\")}\r\n    {OneOf(\"near\", \"close to\", \"in the vicinity of\")} {P(event.body)},\r\n}\r\nin the {P(event.system)} system.\r\n\r\n{if station_missions || station_crimes ||system_missions || system_crimes:\r\n    {Pause(500)}\r\n    Information:\r\n    {if station_missions:\r\n        {Pause(500)}\r\n        {station_missions}\r\n    }\r\n    {if station_crimes:\r\n        {Pause(500)}\r\n        {station_crimes}\r\n    }\r\n    {if system_missions:\r\n        {Pause(500)}\r\n        {station_missions}\r\n    }\r\n    {if system_crimes:\r\n        {Pause(500)}\r\n        {station_crimes}\r\n    }\r\n}",
+      "script": "{_ Context _}\r\n{SetState('eddi_context_last_subject', 'location')}\r\n{SetState('eddi_context_system_name', event.system)}\r\n{SetState('eddi_context_body_name', event.body)}\r\n{SetState('eddi_context_body_type', event.bodytype)}\r\n{SetState('eddi_context_body_system', event.system)}\r\n\r\n\r\nYou are\r\n{if event.docked || event.station = event.body:\r\n    {set station to StationDetails(event.station, event.system)}\r\n    {set station_missions to F(\"Mission check station\")}\r\n    {set station_crimes to F(\"Crime check station\")}\r\n\r\n    {if event.docked:\r\n        docked at\r\n    |else:\r\n        {OneOf(\"near\", \"close to\", \"in the vicinity of\")}\r\n    }\r\n    {P(station.model)}, {P(event.station)},\r\n    {if event.station != event.body:\r\n        on {P(event.body)},\r\n    }\r\n|elif event.body:\r\n    {set system_missions to F(\"Mission check system\")}\r\n    {set system_crimes to F(\"Crime check system\")}\r\n    {OneOf(\"near\", \"close to\", \"in the vicinity of\")} {P(event.body)},\r\n}\r\nin the {P(event.system)} system.\r\n\r\n{if station_missions || station_crimes ||system_missions || system_crimes:\r\n    {Pause(500)}\r\n    Information:\r\n    {if station_missions:\r\n        {Pause(500)}\r\n        {station_missions}\r\n    }\r\n    {if station_crimes:\r\n        {Pause(500)}\r\n        {station_crimes}\r\n    }\r\n    {if system_missions:\r\n        {Pause(500)}\r\n        {system_missions}\r\n    }\r\n    {if system_crimes:\r\n        {Pause(500)}\r\n        {system_crimes}\r\n    }\r\n}",
       "default": true,
       "name": "Location",
       "description": "Triggered when the commander's location is reported, usually when they reload their game."

diff --git a/SpeechResponder/eddi.ru.json b/SpeechResponder/eddi.ru.json
@@ -1138,7 +1138,7 @@
       "enabled": true,
       "priority": 3,
       "responder": true,
-      "script": "{_ Context _}\r\n{SetState('eddi_context_last_subject', 'location')}\r\n{SetState('eddi_context_system_name', event.system)}\r\n{SetState('eddi_context_body_name', event.body)}\r\n{SetState('eddi_context_body_type', event.bodytype)}\r\n{SetState('eddi_context_body_system', event.system)}\r\n\r\n\r\nYou are\r\n{if event.docked || event.station = event.body:\r\n    {set station to StationDetails(event.station, event.system)}\r\n    {set station_missions to F(\"Mission check station\")}\r\n    {set station_crimes to F(\"Crime check station\")}\r\n\r\n    {if event.docked:\r\n        docked at\r\n    |else:\r\n        {OneOf(\"near\", \"close to\", \"in the vicinity of\")}\r\n    }\r\n    {P(station.model)}, {P(event.station)},\r\n    {if event.station != event.body:\r\n        on {P(event.body)},\r\n    }\r\n|elif event.body:\r\n    {set system_missions to F(\"Mission check system\")}\r\n    {set system_crimes to F(\"Crime check system\")}\r\n    {OneOf(\"near\", \"close to\", \"in the vicinity of\")} {P(event.body)},\r\n}\r\nin the {P(event.system)} system.\r\n\r\n{if station_missions || station_crimes ||system_missions || system_crimes:\r\n    {Pause(500)}\r\n    Information:\r\n    {if station_missions:\r\n        {Pause(500)}\r\n        {station_missions}\r\n    }\r\n    {if station_crimes:\r\n        {Pause(500)}\r\n        {station_crimes}\r\n    }\r\n    {if system_missions:\r\n        {Pause(500)}\r\n        {station_missions}\r\n    }\r\n    {if system_crimes:\r\n        {Pause(500)}\r\n        {station_crimes}\r\n    }\r\n}",
+      "script": "{_ Context _}\r\n{SetState('eddi_context_last_subject', 'location')}\r\n{SetState('eddi_context_system_name', event.system)}\r\n{SetState('eddi_context_body_name', event.body)}\r\n{SetState('eddi_context_body_type', event.bodytype)}\r\n{SetState('eddi_context_body_system', event.system)}\r\n\r\n\r\nYou are\r\n{if event.docked || event.station = event.body:\r\n    {set station to StationDetails(event.station, event.system)}\r\n    {set station_missions to F(\"Mission check station\")}\r\n    {set station_crimes to F(\"Crime check station\")}\r\n\r\n    {if event.docked:\r\n        docked at\r\n    |else:\r\n        {OneOf(\"near\", \"close to\", \"in the vicinity of\")}\r\n    }\r\n    {P(station.model)}, {P(event.station)},\r\n    {if event.station != event.body:\r\n        on {P(event.body)},\r\n    }\r\n|elif event.body:\r\n    {set system_missions to F(\"Mission check system\")}\r\n    {set system_crimes to F(\"Crime check system\")}\r\n    {OneOf(\"near\", \"close to\", \"in the vicinity of\")} {P(event.body)},\r\n}\r\nin the {P(event.system)} system.\r\n\r\n{if station_missions || station_crimes ||system_missions || system_crimes:\r\n    {Pause(500)}\r\n    Information:\r\n    {if station_missions:\r\n        {Pause(500)}\r\n        {station_missions}\r\n    }\r\n    {if station_crimes:\r\n        {Pause(500)}\r\n        {station_crimes}\r\n    }\r\n    {if system_missions:\r\n        {Pause(500)}\r\n        {system_missions}\r\n    }\r\n    {if system_crimes:\r\n        {Pause(500)}\r\n        {system_crimes}\r\n    }\r\n}",
       "default": true,
       "name": "Location",
       "description": "Triggered when the commander's location is reported, usually when they reload their game."

diff --git a/Utilities/Constants.cs b/Utilities/Constants.cs
@@ -10,7 +10,7 @@ public class Constants
     {
         public const string EDDI_NAME = "EDDI";
         public const string EDDI_URL_PROTOCOL = "eddi";
-        public static Version EDDI_VERSION = new Version(3, 7, 1, Version.TestPhase.b, 2);
+        public static Version EDDI_VERSION = new Version(3, 7, 1, Version.TestPhase.final, 0);
         public const string EDDI_SERVER_URL = "https://edcd.github.io/EDDP/";
         public static readonly string EDDI_SYSTEM_MUTEX_NAME = $"{EDDI_SERVER_URL}/{EDDI_NAME}/{Environment.GetEnvironmentVariable("UserName")}";