Fix error with updated Entered normal space event.

SpeechResponder/eddi.cs.json

@@ -937,7 +937,7 @@
       "enabled": true,
       "priority": 3,
       "responder": true,
-      "script": "{_ Context }\r\n{SetState('eddi_context_last_subject', 'fsd')}\r\n{SetState('eddi_context_last_action', 'disengage')}\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{set station_notifications to:\r\n    {set station_missions to F(\"Mission check station\")}\r\n    {set station_crimes to F(\"Crime check station\")}\r\n    {if station_missions || station_crimes:\r\n        {_ Pause for station ATC before speaking again _}\r\n        {Pause(5000)}\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    }\r\n}\r\n\r\n{Pause(500)}\r\n\r\n{OneOf(\"{ShipName()} has\", \"\")} \r\n{OneOf(\"left supercruise\", \"{OneOf(\"left supercruise\", \"{OneOf(\"left supercruise\", \"{OneOf('entered', 'returned to', 'dropped to')} normal space\")}\r\n\r\n{if event.bodytype_invariant = 'Planet':\r\n    {OneOf(\"near\", \"close to\", \"in the vicinity of\")}\r\n    {set time to SecondsSince(0) - state.eddi_context_approach_time}\r\n    {if time < 60:\r\n        {set settlement to state.eddi_context_last_settlement}\r\n        {set reportStation to StationDetails(settlement, event.system)}\r\n        {if reportStation:\r\n            {SetState('eddi_context_body_name', settlement)}\r\n            {if reportStation.Model.invariantName != \"Unknown Station\":\r\n                {P(reportStation.model, \"station\")},\r\n            } \r\n            {P(settlement, \"station\")}\r\n            {station_notifications}\r\n        |else:\r\n            {P(settlement, \"station\")}\r\n        }\r\n    |else:\r\n        {set reportBody to BodyDetails(event.body, event.system)}\r\n        {reportBody.bodytype)} {P(reportBody.name, \"body\")}\r\n    }\r\n|elif event.bodytype_invariant = 'Star':\r\n    {set reportBody to BodyDetails(event.body, event.system)}\r\n    {OneOf(\"near\", \"close to\", \"in the vicinity of\")} {reportBody.bodytype)} {P(reportBody.name, \"body\")}\r\n|elif event.bodytype_invariant = 'Station':\r\n    {set reportStation to StationDetails(event.body, event.system)}\r\n    {OneOf(\"near\", \"close to\", \"in the vicinity of\")}\r\n    {P(reportStation.model, \"station\")}, {P(event.body, \"body\")}\r\n    {station_notifications}\r\n|elif event.bodytype_invariant = 'Planetary Ring':\r\n    {OneOf(\"near\", \"close to\", \"in the vicinity of\")} \r\n    {event.bodytype} {P(token(event.body,\" Ring\",0), \"body\")}\r\n}.",
+      "script": "{_ Context }\r\n{SetState('eddi_context_last_subject', 'fsd')}\r\n{SetState('eddi_context_last_action', 'disengage')}\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{set station_notifications to:\r\n    {set station_missions to F(\"Mission check station\")}\r\n    {set station_crimes to F(\"Crime check station\")}\r\n    {if station_missions || station_crimes:\r\n        {_ Pause for station ATC before speaking again _}\r\n        {Pause(5000)}\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    }\r\n}\r\n\r\n{Pause(500)}\r\n\r\n{OneOf(\"{ShipName()} has\", \"\")} \r\n{OneOf(\"left supercruise\", \"{OneOf('entered', 'returned to', 'dropped to')} normal space\")}\r\n\r\n{if event.bodytype_invariant = 'Planet':\r\n    {OneOf(\"near\", \"close to\", \"in the vicinity of\")}\r\n    {set time to SecondsSince(0) - state.eddi_context_approach_time}\r\n    {if time < 60:\r\n        {set settlement to state.eddi_context_last_settlement}\r\n        {set reportStation to StationDetails(settlement, event.system)}\r\n        {if reportStation:\r\n            {SetState('eddi_context_body_name', settlement)}\r\n            {if reportStation.Model.invariantName != \"Unknown Station\":\r\n                {P(reportStation.model, \"station\")},\r\n            } \r\n            {P(settlement, \"station\")}\r\n            {station_notifications}\r\n        |else:\r\n            {P(settlement, \"station\")}\r\n        }\r\n    |else:\r\n        {set reportBody to BodyDetails(event.body, event.system)}\r\n        {reportBody.bodytype)} {P(reportBody.name, \"body\")}\r\n    }\r\n|elif event.bodytype_invariant = 'Star':\r\n    {set reportBody to BodyDetails(event.body, event.system)}\r\n    {OneOf(\"near\", \"close to\", \"in the vicinity of\")} {reportBody.bodytype)} {P(reportBody.name, \"body\")}\r\n|elif event.bodytype_invariant = 'Station':\r\n    {set reportStation to StationDetails(event.body, event.system)}\r\n    {OneOf(\"near\", \"close to\", \"in the vicinity of\")}\r\n    {P(reportStation.model, \"station\")}, {P(event.body, \"body\")}\r\n    {station_notifications}\r\n|elif event.bodytype_invariant = 'Planetary Ring':\r\n    {OneOf(\"near\", \"close to\", \"in the vicinity of\")} \r\n    {event.bodytype} {P(token(event.body,\" Ring\",0), \"body\")}\r\n}.",
       "default": true,
       "name": "Entered normal space",
       "description": "Triggered when your ship enters normal space"

SpeechResponder/eddi.de.json

@@ -937,7 +937,7 @@
       "enabled": true,
       "priority": 3,
       "responder": true,
-      "script": "{_ Context }\r\n{SetState('eddi_context_last_subject', 'fsd')}\r\n{SetState('eddi_context_last_action', 'disengage')}\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{set station_notifications to:\r\n    {set station_missions to F(\"Mission check station\")}\r\n    {set station_crimes to F(\"Crime check station\")}\r\n    {if station_missions || station_crimes:\r\n        {_ Pause for station ATC before speaking again _}\r\n        {Pause(5000)}\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    }\r\n}\r\n\r\n{Pause(500)}\r\n\r\n{OneOf(\"{ShipName()} has\", \"\")} \r\n{OneOf(\"left supercruise\", \"{OneOf(\"left supercruise\", \"{OneOf(\"left supercruise\", \"{OneOf('entered', 'returned to', 'dropped to')} normal space\")}\r\n\r\n{if event.bodytype_invariant = 'Planet':\r\n    {OneOf(\"near\", \"close to\", \"in the vicinity of\")}\r\n    {set time to SecondsSince(0) - state.eddi_context_approach_time}\r\n    {if time < 60:\r\n        {set settlement to state.eddi_context_last_settlement}\r\n        {set reportStation to StationDetails(settlement, event.system)}\r\n        {if reportStation:\r\n            {SetState('eddi_context_body_name', settlement)}\r\n            {if reportStation.Model.invariantName != \"Unknown Station\":\r\n                {P(reportStation.model, \"station\")},\r\n            } \r\n            {P(settlement, \"station\")}\r\n            {station_notifications}\r\n        |else:\r\n            {P(settlement, \"station\")}\r\n        }\r\n    |else:\r\n        {set reportBody to BodyDetails(event.body, event.system)}\r\n        {reportBody.bodytype)} {P(reportBody.name, \"body\")}\r\n    }\r\n|elif event.bodytype_invariant = 'Star':\r\n    {set reportBody to BodyDetails(event.body, event.system)}\r\n    {OneOf(\"near\", \"close to\", \"in the vicinity of\")} {reportBody.bodytype)} {P(reportBody.name, \"body\")}\r\n|elif event.bodytype_invariant = 'Station':\r\n    {set reportStation to StationDetails(event.body, event.system)}\r\n    {OneOf(\"near\", \"close to\", \"in the vicinity of\")}\r\n    {P(reportStation.model, \"station\")}, {P(event.body, \"body\")}\r\n    {station_notifications}\r\n|elif event.bodytype_invariant = 'Planetary Ring':\r\n    {OneOf(\"near\", \"close to\", \"in the vicinity of\")} \r\n    {event.bodytype} {P(token(event.body,\" Ring\",0), \"body\")}\r\n}.",
+      "script": "{_ Context }\r\n{SetState('eddi_context_last_subject', 'fsd')}\r\n{SetState('eddi_context_last_action', 'disengage')}\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{set station_notifications to:\r\n    {set station_missions to F(\"Mission check station\")}\r\n    {set station_crimes to F(\"Crime check station\")}\r\n    {if station_missions || station_crimes:\r\n        {_ Pause for station ATC before speaking again _}\r\n        {Pause(5000)}\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    }\r\n}\r\n\r\n{Pause(500)}\r\n\r\n{OneOf(\"{ShipName()} has\", \"\")} \r\n{OneOf(\"left supercruise\", \"{OneOf('entered', 'returned to', 'dropped to')} normal space\")}\r\n\r\n{if event.bodytype_invariant = 'Planet':\r\n    {OneOf(\"near\", \"close to\", \"in the vicinity of\")}\r\n    {set time to SecondsSince(0) - state.eddi_context_approach_time}\r\n    {if time < 60:\r\n        {set settlement to state.eddi_context_last_settlement}\r\n        {set reportStation to StationDetails(settlement, event.system)}\r\n        {if reportStation:\r\n            {SetState('eddi_context_body_name', settlement)}\r\n            {if reportStation.Model.invariantName != \"Unknown Station\":\r\n                {P(reportStation.model, \"station\")},\r\n            } \r\n            {P(settlement, \"station\")}\r\n            {station_notifications}\r\n        |else:\r\n            {P(settlement, \"station\")}\r\n        }\r\n    |else:\r\n        {set reportBody to BodyDetails(event.body, event.system)}\r\n        {reportBody.bodytype)} {P(reportBody.name, \"body\")}\r\n    }\r\n|elif event.bodytype_invariant = 'Star':\r\n    {set reportBody to BodyDetails(event.body, event.system)}\r\n    {OneOf(\"near\", \"close to\", \"in the vicinity of\")} {reportBody.bodytype)} {P(reportBody.name, \"body\")}\r\n|elif event.bodytype_invariant = 'Station':\r\n    {set reportStation to StationDetails(event.body, event.system)}\r\n    {OneOf(\"near\", \"close to\", \"in the vicinity of\")}\r\n    {P(reportStation.model, \"station\")}, {P(event.body, \"body\")}\r\n    {station_notifications}\r\n|elif event.bodytype_invariant = 'Planetary Ring':\r\n    {OneOf(\"near\", \"close to\", \"in the vicinity of\")} \r\n    {event.bodytype} {P(token(event.body,\" Ring\",0), \"body\")}\r\n}.",
       "default": true,
       "name": "Entered normal space",
       "description": "Triggered when your ship enters normal space"

SpeechResponder/eddi.hu.json

@@ -937,7 +937,7 @@
       "enabled": true,
       "priority": 3,
       "responder": true,
-      "script": "{_ Context }\r\n{SetState('eddi_context_last_subject', 'fsd')}\r\n{SetState('eddi_context_last_action', 'disengage')}\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{set station_notifications to:\r\n    {set station_missions to F(\"Mission check station\")}\r\n    {set station_crimes to F(\"Crime check station\")}\r\n    {if station_missions || station_crimes:\r\n        {_ Pause for station ATC before speaking again _}\r\n        {Pause(5000)}\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    }\r\n}\r\n\r\n{Pause(500)}\r\n\r\n{OneOf(\"{ShipName()} has\", \"\")} \r\n{OneOf(\"left supercruise\", \"{OneOf(\"left supercruise\", \"{OneOf(\"left supercruise\", \"{OneOf('entered', 'returned to', 'dropped to')} normal space\")}\r\n\r\n{if event.bodytype_invariant = 'Planet':\r\n    {OneOf(\"near\", \"close to\", \"in the vicinity of\")}\r\n    {set time to SecondsSince(0) - state.eddi_context_approach_time}\r\n    {if time < 60:\r\n        {set settlement to state.eddi_context_last_settlement}\r\n        {set reportStation to StationDetails(settlement, event.system)}\r\n        {if reportStation:\r\n            {SetState('eddi_context_body_name', settlement)}\r\n            {if reportStation.Model.invariantName != \"Unknown Station\":\r\n                {P(reportStation.model, \"station\")},\r\n            } \r\n            {P(settlement, \"station\")}\r\n            {station_notifications}\r\n        |else:\r\n            {P(settlement, \"station\")}\r\n        }\r\n    |else:\r\n        {set reportBody to BodyDetails(event.body, event.system)}\r\n        {reportBody.bodytype)} {P(reportBody.name, \"body\")}\r\n    }\r\n|elif event.bodytype_invariant = 'Star':\r\n    {set reportBody to BodyDetails(event.body, event.system)}\r\n    {OneOf(\"near\", \"close to\", \"in the vicinity of\")} {reportBody.bodytype)} {P(reportBody.name, \"body\")}\r\n|elif event.bodytype_invariant = 'Station':\r\n    {set reportStation to StationDetails(event.body, event.system)}\r\n    {OneOf(\"near\", \"close to\", \"in the vicinity of\")}\r\n    {P(reportStation.model, \"station\")}, {P(event.body, \"body\")}\r\n    {station_notifications}\r\n|elif event.bodytype_invariant = 'Planetary Ring':\r\n    {OneOf(\"near\", \"close to\", \"in the vicinity of\")} \r\n    {event.bodytype} {P(token(event.body,\" Ring\",0), \"body\")}\r\n}.",
+      "script": "{_ Context }\r\n{SetState('eddi_context_last_subject', 'fsd')}\r\n{SetState('eddi_context_last_action', 'disengage')}\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{set station_notifications to:\r\n    {set station_missions to F(\"Mission check station\")}\r\n    {set station_crimes to F(\"Crime check station\")}\r\n    {if station_missions || station_crimes:\r\n        {_ Pause for station ATC before speaking again _}\r\n        {Pause(5000)}\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    }\r\n}\r\n\r\n{Pause(500)}\r\n\r\n{OneOf(\"{ShipName()} has\", \"\")} \r\n{OneOf(\"left supercruise\", \"{OneOf('entered', 'returned to', 'dropped to')} normal space\")}\r\n\r\n{if event.bodytype_invariant = 'Planet':\r\n    {OneOf(\"near\", \"close to\", \"in the vicinity of\")}\r\n    {set time to SecondsSince(0) - state.eddi_context_approach_time}\r\n    {if time < 60:\r\n        {set settlement to state.eddi_context_last_settlement}\r\n        {set reportStation to StationDetails(settlement, event.system)}\r\n        {if reportStation:\r\n            {SetState('eddi_context_body_name', settlement)}\r\n            {if reportStation.Model.invariantName != \"Unknown Station\":\r\n                {P(reportStation.model, \"station\")},\r\n            } \r\n            {P(settlement, \"station\")}\r\n            {station_notifications}\r\n        |else:\r\n            {P(settlement, \"station\")}\r\n        }\r\n    |else:\r\n        {set reportBody to BodyDetails(event.body, event.system)}\r\n        {reportBody.bodytype)} {P(reportBody.name, \"body\")}\r\n    }\r\n|elif event.bodytype_invariant = 'Star':\r\n    {set reportBody to BodyDetails(event.body, event.system)}\r\n    {OneOf(\"near\", \"close to\", \"in the vicinity of\")} {reportBody.bodytype)} {P(reportBody.name, \"body\")}\r\n|elif event.bodytype_invariant = 'Station':\r\n    {set reportStation to StationDetails(event.body, event.system)}\r\n    {OneOf(\"near\", \"close to\", \"in the vicinity of\")}\r\n    {P(reportStation.model, \"station\")}, {P(event.body, \"body\")}\r\n    {station_notifications}\r\n|elif event.bodytype_invariant = 'Planetary Ring':\r\n    {OneOf(\"near\", \"close to\", \"in the vicinity of\")} \r\n    {event.bodytype} {P(token(event.body,\" Ring\",0), \"body\")}\r\n}.",
       "default": true,
       "name": "Entered normal space",
       "description": "Triggered when your ship enters normal space"