Skip to content

Commit

Permalink
Destination arrived updated to fix an escape character issue.
Browse files Browse the repository at this point in the history
Noted change to escape character rendering.
Resolves EDCD#2614.
  • Loading branch information
Tkael authored and bcthund committed Jun 26, 2024
1 parent 4f6b220 commit 28072c7
Show file tree
Hide file tree
Showing 9 changed files with 14 additions and 11 deletions.
9 changes: 6 additions & 3 deletions ChangeLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,13 @@ Full details of the variables available for each noted event, and VoiceAttack in

## 4.0.4-b2
* Speech Responder
* Core
* (Accidentally omitted from 4.0.4-b1 change notes): Fixed a rendering issue which had previously required doubled escape characters in some scripts. Note: You can minimize your use of escape characters by alternating between single and double quoted strings in nested function calls.
* Scripts
* `Body volcanism report` updated to fix an escape character issue. (#2618, o7 johnny2trayz)
* `Entered normal space` updated to fix a typo / missing quote mark. (o7 Darkcyde, GJ51/Skip Intro)
* `Ship targeted` updated to fix an escape character issue. (o7 Darkcyde).
* `Body volcanism report` updated to fix an escape character issue. (#2618)
* `Destination arrived` updated to fix an escape character issue (#2614)
* `Entered normal space` updated to fix a typo / missing quote mark.
* `Ship targeted` updated to fix an escape character issue.

## 4.0.4-b1
* Core
Expand Down
2 changes: 1 addition & 1 deletion SpeechResponder/eddi.cs.json
Original file line number Diff line number Diff line change
Expand Up @@ -788,7 +788,7 @@
"enabled": true,
"priority": 3,
"responder": true,
"script": "{if event.name = carrier.name:\r\n Welcome back to \r\n {OneOf(\"your carrier\", carrier.name)}, \r\n {F(\"Honorific\")}.\r\n|else:\r\n\r\n {set reportSystem to SystemDetails(system.systemname)}\r\n {if find(reportSystem.carriersignalsources, event.name) > -1:\r\n {Occasionally(2, \"The\")} Fleet Carrier\r\n {event.name} is\r\n {OneOf(\"{OneOf('located', 'orbiting', 'stationed')} here\",\r\n \"{OneOf('orbiting', 'stationed')} at this location\",\r\n \"in orbit {OneOf('here', 'at this location')}\")}.\r\n |else:\r\n {set entering to cat(OneOf(\"Arriving \", \"Dropping \"), OneOf(\"near \", \"at \"))}\r\n \r\n {set warninglevel to:\r\n {if event.threat < 2:\r\n {entering}\r\n |elif event.threat = 2:\r\n Caution: {entering} medium threat\r\n |elif event.threat = 3:\r\n Warning: {entering} high-threat\r\n |elif event.threat = 4:\r\n Danger: {entering} very high-threat\r\n |elif event.threat = 5:\r\n Extreme Danger: {Occasionally(2, entering)} very high-threat\r\n |elif event.threat = 6:\r\n Extreme Danger: {Occasionally(2, entering)} extremely high-threat\r\n |elif event.threat = 7:\r\n Extreme Danger: {Occasionally(2, entering)} ultra high-threat\r\n |else:\r\n Extreme Danger: {Occasionally(2, entering)} Unprecedented level {event.threat} threat\r\n }\r\n }\r\n \r\n {warninglevel} {event.name}\r\n {if event.isSignalSource:\r\n signal source\r\n }.\r\n \r\n {if system.state = \"Anarchy\" && event.name = \"Degraded Emissions\" && system.population > 0: \r\n {Pause(2000)}\r\n {Occasionally(2, \"\r\n Caution:\r\n {set local to OneOf('local', 'nearby')}\r\n {set chatter to OneOf('chatter', 'gossip', 'rumor')}\r\n {set indicate to OneOf('claims', 'suggests', 'implies', 'reports')}\r\n {OneOf('{local} transmissions {indicate}', \r\n '{chatter} in {local} transmissions {indicate}')}\r\n {Occasionally(3, 'that there is')}\r\n {OneOf('increased', 'elevated', 'heightened')}\r\n {OneOf('criminal {Occasionally(2, \\\\'syndicate\\\\')}', \r\n 'pirate {Occasionally(2, OneOf(\\\\'gang\\\\', \\\\'clan\\\\'))}' )}\r\n {OneOf('activity', 'presence')}\r\n in {OneOf('the area', 'the vicinity', 'this sector', 'this system')}.\r\n {OneOf('Remain', 'Stay', 'Keep')} {OneOf('vigilant', 'alert', 'frosty', 'sharp')} \r\n {Occasionally(3,' {F(\\\\'Honorific\\\\')}' )}.\r\n \")}\r\n }\r\n }\r\n}\r\n\r\n",
"script": "{if event.name = carrier.name:\r\n Welcome back to \r\n {OneOf(\"your carrier\", carrier.name)}, \r\n {F(\"Honorific\")}.\r\n|else:\r\n\r\n {set reportSystem to SystemDetails(system.systemname)}\r\n {if find(reportSystem.carriersignalsources, event.name) > -1:\r\n {Occasionally(2, \"The\")} Fleet Carrier\r\n {event.name} is\r\n {OneOf(\"{OneOf('located', 'orbiting', 'stationed')} here\",\r\n \"{OneOf('orbiting', 'stationed')} at this location\",\r\n \"in orbit {OneOf('here', 'at this location')}\")}.\r\n |else:\r\n {set entering to cat(OneOf(\"Arriving \", \"Dropping \"), OneOf(\"near \", \"at \"))}\r\n \r\n {set warninglevel to:\r\n {if event.threat < 2:\r\n {entering}\r\n |elif event.threat = 2:\r\n Caution: {entering} medium threat\r\n |elif event.threat = 3:\r\n Warning: {entering} high-threat\r\n |elif event.threat = 4:\r\n Danger: {entering} very high-threat\r\n |elif event.threat = 5:\r\n Extreme Danger: {Occasionally(2, entering)} very high-threat\r\n |elif event.threat = 6:\r\n Extreme Danger: {Occasionally(2, entering)} extremely high-threat\r\n |elif event.threat = 7:\r\n Extreme Danger: {Occasionally(2, entering)} ultra high-threat\r\n |else:\r\n Extreme Danger: {Occasionally(2, entering)} Unprecedented level {event.threat} threat\r\n }\r\n }\r\n \r\n {warninglevel} {event.name}\r\n {if event.isSignalSource:\r\n signal source\r\n }.\r\n \r\n {if system.state = \"Anarchy\" && event.name = \"Degraded Emissions\" && system.population > 0: \r\n {Pause(2000)}\r\n {Occasionally(2, \"\r\n Caution:\r\n {set local to OneOf('local', 'nearby')}\r\n {set chatter to OneOf('chatter', 'gossip', 'rumor')}\r\n {set indicate to OneOf('claims', 'suggests', 'implies', 'reports')}\r\n {OneOf('{local} transmissions {indicate}', \r\n '{chatter} in {local} transmissions {indicate}')}\r\n {Occasionally(3, 'that there is')}\r\n {OneOf('increased', 'elevated', 'heightened')}\r\n {OneOf('criminal {Occasionally(2, \\\"syndicate\\\")}', \r\n 'pirate {Occasionally(2, OneOf(\\\"gang\\\", \\\"clan\\\"))}' )}\r\n {OneOf('activity', 'presence')}\r\n in {OneOf('the area', 'the vicinity', 'this sector', 'this system')}.\r\n {OneOf('Remain', 'Stay', 'Keep')} {OneOf('vigilant', 'alert', 'frosty', 'sharp')} \r\n {Occasionally(3,' {F(\\\"Honorific\\\")}' )}.\r\n \")}\r\n }\r\n }\r\n}\r\n\r\n",
"default": true,
"name": "Destination arrived",
"description": "Triggered when you drop into normal space at your selected destination"
Expand Down
2 changes: 1 addition & 1 deletion SpeechResponder/eddi.de.json
Original file line number Diff line number Diff line change
Expand Up @@ -788,7 +788,7 @@
"enabled": true,
"priority": 3,
"responder": true,
"script": "{if event.name = carrier.name:\r\n Welcome back to \r\n {OneOf(\"your carrier\", carrier.name)}, \r\n {F(\"Honorific\")}.\r\n|else:\r\n\r\n {set reportSystem to SystemDetails(system.systemname)}\r\n {if find(reportSystem.carriersignalsources, event.name) > -1:\r\n {Occasionally(2, \"The\")} Fleet Carrier\r\n {event.name} is\r\n {OneOf(\"{OneOf('located', 'orbiting', 'stationed')} here\",\r\n \"{OneOf('orbiting', 'stationed')} at this location\",\r\n \"in orbit {OneOf('here', 'at this location')}\")}.\r\n |else:\r\n {set entering to cat(OneOf(\"Arriving \", \"Dropping \"), OneOf(\"near \", \"at \"))}\r\n \r\n {set warninglevel to:\r\n {if event.threat < 2:\r\n {entering}\r\n |elif event.threat = 2:\r\n Caution: {entering} medium threat\r\n |elif event.threat = 3:\r\n Warning: {entering} high-threat\r\n |elif event.threat = 4:\r\n Danger: {entering} very high-threat\r\n |elif event.threat = 5:\r\n Extreme Danger: {Occasionally(2, entering)} very high-threat\r\n |elif event.threat = 6:\r\n Extreme Danger: {Occasionally(2, entering)} extremely high-threat\r\n |elif event.threat = 7:\r\n Extreme Danger: {Occasionally(2, entering)} ultra high-threat\r\n |else:\r\n Extreme Danger: {Occasionally(2, entering)} Unprecedented level {event.threat} threat\r\n }\r\n }\r\n \r\n {warninglevel} {event.name}\r\n {if event.isSignalSource:\r\n signal source\r\n }.\r\n \r\n {if system.state = \"Anarchy\" && event.name = \"Degraded Emissions\" && system.population > 0: \r\n {Pause(2000)}\r\n {Occasionally(2, \"\r\n Caution:\r\n {set local to OneOf('local', 'nearby')}\r\n {set chatter to OneOf('chatter', 'gossip', 'rumor')}\r\n {set indicate to OneOf('claims', 'suggests', 'implies', 'reports')}\r\n {OneOf('{local} transmissions {indicate}', \r\n '{chatter} in {local} transmissions {indicate}')}\r\n {Occasionally(3, 'that there is')}\r\n {OneOf('increased', 'elevated', 'heightened')}\r\n {OneOf('criminal {Occasionally(2, \\\\'syndicate\\\\')}', \r\n 'pirate {Occasionally(2, OneOf(\\\\'gang\\\\', \\\\'clan\\\\'))}' )}\r\n {OneOf('activity', 'presence')}\r\n in {OneOf('the area', 'the vicinity', 'this sector', 'this system')}.\r\n {OneOf('Remain', 'Stay', 'Keep')} {OneOf('vigilant', 'alert', 'frosty', 'sharp')} \r\n {Occasionally(3,' {F(\\\\'Honorific\\\\')}' )}.\r\n \")}\r\n }\r\n }\r\n}\r\n\r\n",
"script": "{if event.name = carrier.name:\r\n Welcome back to \r\n {OneOf(\"your carrier\", carrier.name)}, \r\n {F(\"Honorific\")}.\r\n|else:\r\n\r\n {set reportSystem to SystemDetails(system.systemname)}\r\n {if find(reportSystem.carriersignalsources, event.name) > -1:\r\n {Occasionally(2, \"The\")} Fleet Carrier\r\n {event.name} is\r\n {OneOf(\"{OneOf('located', 'orbiting', 'stationed')} here\",\r\n \"{OneOf('orbiting', 'stationed')} at this location\",\r\n \"in orbit {OneOf('here', 'at this location')}\")}.\r\n |else:\r\n {set entering to cat(OneOf(\"Arriving \", \"Dropping \"), OneOf(\"near \", \"at \"))}\r\n \r\n {set warninglevel to:\r\n {if event.threat < 2:\r\n {entering}\r\n |elif event.threat = 2:\r\n Caution: {entering} medium threat\r\n |elif event.threat = 3:\r\n Warning: {entering} high-threat\r\n |elif event.threat = 4:\r\n Danger: {entering} very high-threat\r\n |elif event.threat = 5:\r\n Extreme Danger: {Occasionally(2, entering)} very high-threat\r\n |elif event.threat = 6:\r\n Extreme Danger: {Occasionally(2, entering)} extremely high-threat\r\n |elif event.threat = 7:\r\n Extreme Danger: {Occasionally(2, entering)} ultra high-threat\r\n |else:\r\n Extreme Danger: {Occasionally(2, entering)} Unprecedented level {event.threat} threat\r\n }\r\n }\r\n \r\n {warninglevel} {event.name}\r\n {if event.isSignalSource:\r\n signal source\r\n }.\r\n \r\n {if system.state = \"Anarchy\" && event.name = \"Degraded Emissions\" && system.population > 0: \r\n {Pause(2000)}\r\n {Occasionally(2, \"\r\n Caution:\r\n {set local to OneOf('local', 'nearby')}\r\n {set chatter to OneOf('chatter', 'gossip', 'rumor')}\r\n {set indicate to OneOf('claims', 'suggests', 'implies', 'reports')}\r\n {OneOf('{local} transmissions {indicate}', \r\n '{chatter} in {local} transmissions {indicate}')}\r\n {Occasionally(3, 'that there is')}\r\n {OneOf('increased', 'elevated', 'heightened')}\r\n {OneOf('criminal {Occasionally(2, \\\"syndicate\\\")}', \r\n 'pirate {Occasionally(2, OneOf(\\\"gang\\\", \\\"clan\\\"))}' )}\r\n {OneOf('activity', 'presence')}\r\n in {OneOf('the area', 'the vicinity', 'this sector', 'this system')}.\r\n {OneOf('Remain', 'Stay', 'Keep')} {OneOf('vigilant', 'alert', 'frosty', 'sharp')} \r\n {Occasionally(3,' {F(\\\"Honorific\\\")}' )}.\r\n \")}\r\n }\r\n }\r\n}\r\n\r\n",
"default": true,
"name": "Destination arrived",
"description": "Triggered when you drop into normal space at your selected destination"
Expand Down
2 changes: 1 addition & 1 deletion SpeechResponder/eddi.hu.json
Original file line number Diff line number Diff line change
Expand Up @@ -788,7 +788,7 @@
"enabled": true,
"priority": 3,
"responder": true,
"script": "{if event.name = carrier.name:\r\n Welcome back to \r\n {OneOf(\"your carrier\", carrier.name)}, \r\n {F(\"Honorific\")}.\r\n|else:\r\n\r\n {set reportSystem to SystemDetails(system.systemname)}\r\n {if find(reportSystem.carriersignalsources, event.name) > -1:\r\n {Occasionally(2, \"The\")} Fleet Carrier\r\n {event.name} is\r\n {OneOf(\"{OneOf('located', 'orbiting', 'stationed')} here\",\r\n \"{OneOf('orbiting', 'stationed')} at this location\",\r\n \"in orbit {OneOf('here', 'at this location')}\")}.\r\n |else:\r\n {set entering to cat(OneOf(\"Arriving \", \"Dropping \"), OneOf(\"near \", \"at \"))}\r\n \r\n {set warninglevel to:\r\n {if event.threat < 2:\r\n {entering}\r\n |elif event.threat = 2:\r\n Caution: {entering} medium threat\r\n |elif event.threat = 3:\r\n Warning: {entering} high-threat\r\n |elif event.threat = 4:\r\n Danger: {entering} very high-threat\r\n |elif event.threat = 5:\r\n Extreme Danger: {Occasionally(2, entering)} very high-threat\r\n |elif event.threat = 6:\r\n Extreme Danger: {Occasionally(2, entering)} extremely high-threat\r\n |elif event.threat = 7:\r\n Extreme Danger: {Occasionally(2, entering)} ultra high-threat\r\n |else:\r\n Extreme Danger: {Occasionally(2, entering)} Unprecedented level {event.threat} threat\r\n }\r\n }\r\n \r\n {warninglevel} {event.name}\r\n {if event.isSignalSource:\r\n signal source\r\n }.\r\n \r\n {if system.state = \"Anarchy\" && event.name = \"Degraded Emissions\" && system.population > 0: \r\n {Pause(2000)}\r\n {Occasionally(2, \"\r\n Caution:\r\n {set local to OneOf('local', 'nearby')}\r\n {set chatter to OneOf('chatter', 'gossip', 'rumor')}\r\n {set indicate to OneOf('claims', 'suggests', 'implies', 'reports')}\r\n {OneOf('{local} transmissions {indicate}', \r\n '{chatter} in {local} transmissions {indicate}')}\r\n {Occasionally(3, 'that there is')}\r\n {OneOf('increased', 'elevated', 'heightened')}\r\n {OneOf('criminal {Occasionally(2, \\\\'syndicate\\\\')}', \r\n 'pirate {Occasionally(2, OneOf(\\\\'gang\\\\', \\\\'clan\\\\'))}' )}\r\n {OneOf('activity', 'presence')}\r\n in {OneOf('the area', 'the vicinity', 'this sector', 'this system')}.\r\n {OneOf('Remain', 'Stay', 'Keep')} {OneOf('vigilant', 'alert', 'frosty', 'sharp')} \r\n {Occasionally(3,' {F(\\\\'Honorific\\\\')}' )}.\r\n \")}\r\n }\r\n }\r\n}\r\n\r\n",
"script": "{if event.name = carrier.name:\r\n Welcome back to \r\n {OneOf(\"your carrier\", carrier.name)}, \r\n {F(\"Honorific\")}.\r\n|else:\r\n\r\n {set reportSystem to SystemDetails(system.systemname)}\r\n {if find(reportSystem.carriersignalsources, event.name) > -1:\r\n {Occasionally(2, \"The\")} Fleet Carrier\r\n {event.name} is\r\n {OneOf(\"{OneOf('located', 'orbiting', 'stationed')} here\",\r\n \"{OneOf('orbiting', 'stationed')} at this location\",\r\n \"in orbit {OneOf('here', 'at this location')}\")}.\r\n |else:\r\n {set entering to cat(OneOf(\"Arriving \", \"Dropping \"), OneOf(\"near \", \"at \"))}\r\n \r\n {set warninglevel to:\r\n {if event.threat < 2:\r\n {entering}\r\n |elif event.threat = 2:\r\n Caution: {entering} medium threat\r\n |elif event.threat = 3:\r\n Warning: {entering} high-threat\r\n |elif event.threat = 4:\r\n Danger: {entering} very high-threat\r\n |elif event.threat = 5:\r\n Extreme Danger: {Occasionally(2, entering)} very high-threat\r\n |elif event.threat = 6:\r\n Extreme Danger: {Occasionally(2, entering)} extremely high-threat\r\n |elif event.threat = 7:\r\n Extreme Danger: {Occasionally(2, entering)} ultra high-threat\r\n |else:\r\n Extreme Danger: {Occasionally(2, entering)} Unprecedented level {event.threat} threat\r\n }\r\n }\r\n \r\n {warninglevel} {event.name}\r\n {if event.isSignalSource:\r\n signal source\r\n }.\r\n \r\n {if system.state = \"Anarchy\" && event.name = \"Degraded Emissions\" && system.population > 0: \r\n {Pause(2000)}\r\n {Occasionally(2, \"\r\n Caution:\r\n {set local to OneOf('local', 'nearby')}\r\n {set chatter to OneOf('chatter', 'gossip', 'rumor')}\r\n {set indicate to OneOf('claims', 'suggests', 'implies', 'reports')}\r\n {OneOf('{local} transmissions {indicate}', \r\n '{chatter} in {local} transmissions {indicate}')}\r\n {Occasionally(3, 'that there is')}\r\n {OneOf('increased', 'elevated', 'heightened')}\r\n {OneOf('criminal {Occasionally(2, \\\"syndicate\\\")}', \r\n 'pirate {Occasionally(2, OneOf(\\\"gang\\\", \\\"clan\\\"))}' )}\r\n {OneOf('activity', 'presence')}\r\n in {OneOf('the area', 'the vicinity', 'this sector', 'this system')}.\r\n {OneOf('Remain', 'Stay', 'Keep')} {OneOf('vigilant', 'alert', 'frosty', 'sharp')} \r\n {Occasionally(3,' {F(\\\"Honorific\\\")}' )}.\r\n \")}\r\n }\r\n }\r\n}\r\n\r\n",
"default": true,
"name": "Destination arrived",
"description": "Triggered when you drop into normal space at your selected destination"
Expand Down
Loading

0 comments on commit 28072c7

Please sign in to comment.