Skip to content

Commit 70cd36d

Browse files
committed
Tidy Carrier jumped script
1 parent c28df83 commit 70cd36d

File tree

7 files changed

+7
-7
lines changed

7 files changed

+7
-7
lines changed

SpeechResponder/eddi.cs.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@
366366
"enabled": true,
367367
"priority": 3,
368368
"responder": true,
369-
"script": "{_ Context }\r\n{SetState('eddi_context_last_subject', 'carrier jump')}\r\n{SetState('eddi_context_last_action', 'complete')}\r\n{SetState('eddi_context_carrier_system_name', event.systemname)}\r\n{SetState('eddi_context_system_name', event.systemname)}\r\n{SetState('eddi_context_wanted_list', \"\")}\r\n\r\nFleet carrier {Spacialise(event.carriername)} has arrived at the {P(event.systemname, \"starsystem\")} system\r\n{if event.bodyname && len(event.bodyname) > 0:\r\n , near the {event.bodytype}: {P(event.bodyname, \"body\")}\r\n}.\r\n{Pause(1000)}\r\n\r\n{set reportsystem to SystemDetails(event.systemname)}\r\n\r\n{if reportsystem.systemname = homesystem.systemname:\r\n Welcome home, {F(\"Honorific\")}.\r\n|elif reportsystem.distancefromhome:\r\n {set ReportDistanceFromHome() to:\r\n {return cat(\r\n OneOf(\"You are\", \"Current location is\", \"You are now\"), \" \",\r\n Humanise(reportsystem.distancefromhome), \" lightyears from \",\r\n OneOf(\"home\", \"{P(homesystem.name, 'starsystem')}\"), \".\"\r\n )}\r\n }\r\n {Occasionally(7, ReportDistanceFromHome())}\r\n}\r\n\r\n{_ Report powerplay and faction states only if it's been more than an hour (3600 seconds) since our last visit. _}\r\n{if SecondsSince(reportsystem.lastVisitSeconds) > 3600:\r\n {set state_report to F(\"System state report\")}\r\n {set powerplay_report to F(\"Powerplay report\")}\r\n}\r\n\r\n{set system_engineer to F(\"Engineer report\")}\r\n{set system_missions to F(\"Mission check system\")}\r\n{set system_crimes to F(\"Crime check system\")}\r\n\r\n{if powerplay_report || state_report || system_engineer || system_missions || (system_crimes && find(system_crimes, \"Warning\") < 0):\r\n {Pause(500)}\r\n Information:\r\n}\r\n\r\n{if powerplay_report:\r\n {Pause(500)}\r\n {powerplay_report}\r\n}\r\n{if state_report:\r\n {Pause(500)}\r\n {state_report}\r\n}\r\n{if system_engineer:\r\n {Pause(500)}\r\n {system_engineer}\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\r\n{_ Update if we have arrived at our route plotter's next destination. _}\r\n{if searchsystem && searchsystem.name != \"\":\r\n {RouteDetails(\"update\")}\r\n}",
369+
"script": "{_ Context }\r\n{SetState('eddi_context_last_subject', 'carrier jump')}\r\n{SetState('eddi_context_last_action', 'complete')}\r\n{SetState('eddi_context_carrier_system_name', event.systemname)}\r\n{SetState('eddi_context_system_name', event.systemname)}\r\n{SetState('eddi_context_wanted_list', \"\")}\r\n\r\nFleet carrier {Spacialise(event.carriername)} has arrived at the {P(event.systemname, \"starsystem\")} system\r\n{if event.bodyname && len(event.bodyname) > 0:\r\n , near the {event.bodytype}: {P(event.bodyname, \"body\")}\r\n}.\r\n{Pause(1000)}\r\n\r\n{set reportsystem to SystemDetails(event.systemAddress)}\r\n\r\n{if reportsystem.systemname = homesystem.systemname:\r\n Welcome home, {F(\"Honorific\")}.\r\n|elif reportsystem.distancefromhome:\r\n {set ReportDistanceFromHome() to:\r\n {return cat(\r\n OneOf(\"You are\", \"Current location is\", \"You are now\"), \" \",\r\n Humanise(reportsystem.distancefromhome), \" lightyears from \",\r\n OneOf(\"home\", \"{P(homesystem.name, 'starsystem')}\"), \".\"\r\n )}\r\n }\r\n {Occasionally(7, ReportDistanceFromHome())}\r\n}\r\n\r\n{_ Report powerplay and faction states only if it's been more than an hour (3600 seconds) since our last visit. _}\r\n{if SecondsSince(reportsystem.lastVisitSeconds) > 3600:\r\n {set state_report to F(\"System state report\")}\r\n {set powerplay_report to F(\"Powerplay report\")}\r\n}\r\n\r\n{set system_engineer to F(\"Engineer report\")}\r\n{set system_missions to F(\"Mission check system\")}\r\n{set system_crimes to F(\"Crime check system\")}\r\n\r\n{if powerplay_report || state_report || system_engineer || system_missions || (system_crimes && find(system_crimes, \"Warning\") < 0):\r\n {Pause(500)}\r\n Information:\r\n}\r\n\r\n{if powerplay_report:\r\n {Pause(500)}\r\n {powerplay_report}\r\n}\r\n{if state_report:\r\n {Pause(500)}\r\n {state_report}\r\n}\r\n{if system_engineer:\r\n {Pause(500)}\r\n {system_engineer}\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\r\n{_ Update if we have arrived at our route plotter's next destination. _}\r\n{if searchsystem && searchsystem.name != \"\":\r\n {RouteDetails(\"update\")}\r\n}",
370370
"default": true,
371371
"name": "Carrier jumped",
372372
"description": "Triggered when you are docked at a fleet carrier as it completes a jump"

SpeechResponder/eddi.de.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@
366366
"enabled": true,
367367
"priority": 3,
368368
"responder": true,
369-
"script": "{_ Context }\r\n{SetState('eddi_context_last_subject', 'carrier jump')}\r\n{SetState('eddi_context_last_action', 'complete')}\r\n{SetState('eddi_context_carrier_system_name', event.systemname)}\r\n{SetState('eddi_context_system_name', event.systemname)}\r\n{SetState('eddi_context_wanted_list', \"\")}\r\n\r\nFleet carrier {Spacialise(event.carriername)} has arrived at the {P(event.systemname, \"starsystem\")} system\r\n{if event.bodyname && len(event.bodyname) > 0:\r\n , near the {event.bodytype}: {P(event.bodyname, \"body\")}\r\n}.\r\n{Pause(1000)}\r\n\r\n{set reportsystem to SystemDetails(event.systemname)}\r\n\r\n{if reportsystem.systemname = homesystem.systemname:\r\n Welcome home, {F(\"Honorific\")}.\r\n|elif reportsystem.distancefromhome:\r\n {set ReportDistanceFromHome() to:\r\n {return cat(\r\n OneOf(\"You are\", \"Current location is\", \"You are now\"), \" \",\r\n Humanise(reportsystem.distancefromhome), \" lightyears from \",\r\n OneOf(\"home\", \"{P(homesystem.name, 'starsystem')}\"), \".\"\r\n )}\r\n }\r\n {Occasionally(7, ReportDistanceFromHome())}\r\n}\r\n\r\n{_ Report powerplay and faction states only if it's been more than an hour (3600 seconds) since our last visit. _}\r\n{if SecondsSince(reportsystem.lastVisitSeconds) > 3600:\r\n {set state_report to F(\"System state report\")}\r\n {set powerplay_report to F(\"Powerplay report\")}\r\n}\r\n\r\n{set system_engineer to F(\"Engineer report\")}\r\n{set system_missions to F(\"Mission check system\")}\r\n{set system_crimes to F(\"Crime check system\")}\r\n\r\n{if powerplay_report || state_report || system_engineer || system_missions || (system_crimes && find(system_crimes, \"Warning\") < 0):\r\n {Pause(500)}\r\n Information:\r\n}\r\n\r\n{if powerplay_report:\r\n {Pause(500)}\r\n {powerplay_report}\r\n}\r\n{if state_report:\r\n {Pause(500)}\r\n {state_report}\r\n}\r\n{if system_engineer:\r\n {Pause(500)}\r\n {system_engineer}\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\r\n{_ Update if we have arrived at our route plotter's next destination. _}\r\n{if searchsystem && searchsystem.name != \"\":\r\n {RouteDetails(\"update\")}\r\n}",
369+
"script": "{_ Context }\r\n{SetState('eddi_context_last_subject', 'carrier jump')}\r\n{SetState('eddi_context_last_action', 'complete')}\r\n{SetState('eddi_context_carrier_system_name', event.systemname)}\r\n{SetState('eddi_context_system_name', event.systemname)}\r\n{SetState('eddi_context_wanted_list', \"\")}\r\n\r\nFleet carrier {Spacialise(event.carriername)} has arrived at the {P(event.systemname, \"starsystem\")} system\r\n{if event.bodyname && len(event.bodyname) > 0:\r\n , near the {event.bodytype}: {P(event.bodyname, \"body\")}\r\n}.\r\n{Pause(1000)}\r\n\r\n{set reportsystem to SystemDetails(event.systemAddress)}\r\n\r\n{if reportsystem.systemname = homesystem.systemname:\r\n Welcome home, {F(\"Honorific\")}.\r\n|elif reportsystem.distancefromhome:\r\n {set ReportDistanceFromHome() to:\r\n {return cat(\r\n OneOf(\"You are\", \"Current location is\", \"You are now\"), \" \",\r\n Humanise(reportsystem.distancefromhome), \" lightyears from \",\r\n OneOf(\"home\", \"{P(homesystem.name, 'starsystem')}\"), \".\"\r\n )}\r\n }\r\n {Occasionally(7, ReportDistanceFromHome())}\r\n}\r\n\r\n{_ Report powerplay and faction states only if it's been more than an hour (3600 seconds) since our last visit. _}\r\n{if SecondsSince(reportsystem.lastVisitSeconds) > 3600:\r\n {set state_report to F(\"System state report\")}\r\n {set powerplay_report to F(\"Powerplay report\")}\r\n}\r\n\r\n{set system_engineer to F(\"Engineer report\")}\r\n{set system_missions to F(\"Mission check system\")}\r\n{set system_crimes to F(\"Crime check system\")}\r\n\r\n{if powerplay_report || state_report || system_engineer || system_missions || (system_crimes && find(system_crimes, \"Warning\") < 0):\r\n {Pause(500)}\r\n Information:\r\n}\r\n\r\n{if powerplay_report:\r\n {Pause(500)}\r\n {powerplay_report}\r\n}\r\n{if state_report:\r\n {Pause(500)}\r\n {state_report}\r\n}\r\n{if system_engineer:\r\n {Pause(500)}\r\n {system_engineer}\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\r\n{_ Update if we have arrived at our route plotter's next destination. _}\r\n{if searchsystem && searchsystem.name != \"\":\r\n {RouteDetails(\"update\")}\r\n}",
370370
"default": true,
371371
"name": "Carrier jumped",
372372
"description": "Triggered when you are docked at a fleet carrier as it completes a jump"

SpeechResponder/eddi.hu.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@
366366
"enabled": true,
367367
"priority": 3,
368368
"responder": true,
369-
"script": "{_ Context }\r\n{SetState('eddi_context_last_subject', 'carrier jump')}\r\n{SetState('eddi_context_last_action', 'complete')}\r\n{SetState('eddi_context_carrier_system_name', event.systemname)}\r\n{SetState('eddi_context_system_name', event.systemname)}\r\n{SetState('eddi_context_wanted_list', \"\")}\r\n\r\nFleet carrier {Spacialise(event.carriername)} has arrived at the {P(event.systemname, \"starsystem\")} system\r\n{if event.bodyname && len(event.bodyname) > 0:\r\n , near the {event.bodytype}: {P(event.bodyname, \"body\")}\r\n}.\r\n{Pause(1000)}\r\n\r\n{set reportsystem to SystemDetails(event.systemname)}\r\n\r\n{if reportsystem.systemname = homesystem.systemname:\r\n Welcome home, {F(\"Honorific\")}.\r\n|elif reportsystem.distancefromhome:\r\n {set ReportDistanceFromHome() to:\r\n {return cat(\r\n OneOf(\"You are\", \"Current location is\", \"You are now\"), \" \",\r\n Humanise(reportsystem.distancefromhome), \" lightyears from \",\r\n OneOf(\"home\", \"{P(homesystem.name, 'starsystem')}\"), \".\"\r\n )}\r\n }\r\n {Occasionally(7, ReportDistanceFromHome())}\r\n}\r\n\r\n{_ Report powerplay and faction states only if it's been more than an hour (3600 seconds) since our last visit. _}\r\n{if SecondsSince(reportsystem.lastVisitSeconds) > 3600:\r\n {set state_report to F(\"System state report\")}\r\n {set powerplay_report to F(\"Powerplay report\")}\r\n}\r\n\r\n{set system_engineer to F(\"Engineer report\")}\r\n{set system_missions to F(\"Mission check system\")}\r\n{set system_crimes to F(\"Crime check system\")}\r\n\r\n{if powerplay_report || state_report || system_engineer || system_missions || (system_crimes && find(system_crimes, \"Warning\") < 0):\r\n {Pause(500)}\r\n Information:\r\n}\r\n\r\n{if powerplay_report:\r\n {Pause(500)}\r\n {powerplay_report}\r\n}\r\n{if state_report:\r\n {Pause(500)}\r\n {state_report}\r\n}\r\n{if system_engineer:\r\n {Pause(500)}\r\n {system_engineer}\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\r\n{_ Update if we have arrived at our route plotter's next destination. _}\r\n{if searchsystem && searchsystem.name != \"\":\r\n {RouteDetails(\"update\")}\r\n}",
369+
"script": "{_ Context }\r\n{SetState('eddi_context_last_subject', 'carrier jump')}\r\n{SetState('eddi_context_last_action', 'complete')}\r\n{SetState('eddi_context_carrier_system_name', event.systemname)}\r\n{SetState('eddi_context_system_name', event.systemname)}\r\n{SetState('eddi_context_wanted_list', \"\")}\r\n\r\nFleet carrier {Spacialise(event.carriername)} has arrived at the {P(event.systemname, \"starsystem\")} system\r\n{if event.bodyname && len(event.bodyname) > 0:\r\n , near the {event.bodytype}: {P(event.bodyname, \"body\")}\r\n}.\r\n{Pause(1000)}\r\n\r\n{set reportsystem to SystemDetails(event.systemAddress)}\r\n\r\n{if reportsystem.systemname = homesystem.systemname:\r\n Welcome home, {F(\"Honorific\")}.\r\n|elif reportsystem.distancefromhome:\r\n {set ReportDistanceFromHome() to:\r\n {return cat(\r\n OneOf(\"You are\", \"Current location is\", \"You are now\"), \" \",\r\n Humanise(reportsystem.distancefromhome), \" lightyears from \",\r\n OneOf(\"home\", \"{P(homesystem.name, 'starsystem')}\"), \".\"\r\n )}\r\n }\r\n {Occasionally(7, ReportDistanceFromHome())}\r\n}\r\n\r\n{_ Report powerplay and faction states only if it's been more than an hour (3600 seconds) since our last visit. _}\r\n{if SecondsSince(reportsystem.lastVisitSeconds) > 3600:\r\n {set state_report to F(\"System state report\")}\r\n {set powerplay_report to F(\"Powerplay report\")}\r\n}\r\n\r\n{set system_engineer to F(\"Engineer report\")}\r\n{set system_missions to F(\"Mission check system\")}\r\n{set system_crimes to F(\"Crime check system\")}\r\n\r\n{if powerplay_report || state_report || system_engineer || system_missions || (system_crimes && find(system_crimes, \"Warning\") < 0):\r\n {Pause(500)}\r\n Information:\r\n}\r\n\r\n{if powerplay_report:\r\n {Pause(500)}\r\n {powerplay_report}\r\n}\r\n{if state_report:\r\n {Pause(500)}\r\n {state_report}\r\n}\r\n{if system_engineer:\r\n {Pause(500)}\r\n {system_engineer}\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\r\n{_ Update if we have arrived at our route plotter's next destination. _}\r\n{if searchsystem && searchsystem.name != \"\":\r\n {RouteDetails(\"update\")}\r\n}",
370370
"default": true,
371371
"name": "Carrier jumped",
372372
"description": "Triggered when you are docked at a fleet carrier as it completes a jump"

SpeechResponder/eddi.it.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@
366366
"enabled": true,
367367
"priority": 3,
368368
"responder": true,
369-
"script": "{_ Context }\r\n{SetState('eddi_context_last_subject', 'carrier jump')}\r\n{SetState('eddi_context_last_action', 'complete')}\r\n{SetState('eddi_context_carrier_system_name', event.systemname)}\r\n{SetState('eddi_context_system_name', event.systemname)}\r\n{SetState('eddi_context_wanted_list', \"\")}\r\n\r\nFleet carrier {Spacialise(event.carriername)} has arrived at the {P(event.systemname, \"starsystem\")} system\r\n{if event.bodyname && len(event.bodyname) > 0:\r\n , near the {event.bodytype}: {P(event.bodyname, \"body\")}\r\n}.\r\n{Pause(1000)}\r\n\r\n{set reportsystem to SystemDetails(event.systemname)}\r\n\r\n{if reportsystem.systemname = homesystem.systemname:\r\n Welcome home, {F(\"Honorific\")}.\r\n|elif reportsystem.distancefromhome:\r\n {set ReportDistanceFromHome() to:\r\n {return cat(\r\n OneOf(\"You are\", \"Current location is\", \"You are now\"), \" \",\r\n Humanise(reportsystem.distancefromhome), \" lightyears from \",\r\n OneOf(\"home\", \"{P(homesystem.name, 'starsystem')}\"), \".\"\r\n )}\r\n }\r\n {Occasionally(7, ReportDistanceFromHome())}\r\n}\r\n\r\n{_ Report powerplay and faction states only if it's been more than an hour (3600 seconds) since our last visit. _}\r\n{if SecondsSince(reportsystem.lastVisitSeconds) > 3600:\r\n {set state_report to F(\"System state report\")}\r\n {set powerplay_report to F(\"Powerplay report\")}\r\n}\r\n\r\n{set system_engineer to F(\"Engineer report\")}\r\n{set system_missions to F(\"Mission check system\")}\r\n{set system_crimes to F(\"Crime check system\")}\r\n\r\n{if powerplay_report || state_report || system_engineer || system_missions || (system_crimes && find(system_crimes, \"Warning\") < 0):\r\n {Pause(500)}\r\n Information:\r\n}\r\n\r\n{if powerplay_report:\r\n {Pause(500)}\r\n {powerplay_report}\r\n}\r\n{if state_report:\r\n {Pause(500)}\r\n {state_report}\r\n}\r\n{if system_engineer:\r\n {Pause(500)}\r\n {system_engineer}\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\r\n{_ Update if we have arrived at our route plotter's next destination. _}\r\n{if searchsystem && searchsystem.name != \"\":\r\n {RouteDetails(\"update\")}\r\n}",
369+
"script": "{_ Context }\r\n{SetState('eddi_context_last_subject', 'carrier jump')}\r\n{SetState('eddi_context_last_action', 'complete')}\r\n{SetState('eddi_context_carrier_system_name', event.systemname)}\r\n{SetState('eddi_context_system_name', event.systemname)}\r\n{SetState('eddi_context_wanted_list', \"\")}\r\n\r\nFleet carrier {Spacialise(event.carriername)} has arrived at the {P(event.systemname, \"starsystem\")} system\r\n{if event.bodyname && len(event.bodyname) > 0:\r\n , near the {event.bodytype}: {P(event.bodyname, \"body\")}\r\n}.\r\n{Pause(1000)}\r\n\r\n{set reportsystem to SystemDetails(event.systemAddress)}\r\n\r\n{if reportsystem.systemname = homesystem.systemname:\r\n Welcome home, {F(\"Honorific\")}.\r\n|elif reportsystem.distancefromhome:\r\n {set ReportDistanceFromHome() to:\r\n {return cat(\r\n OneOf(\"You are\", \"Current location is\", \"You are now\"), \" \",\r\n Humanise(reportsystem.distancefromhome), \" lightyears from \",\r\n OneOf(\"home\", \"{P(homesystem.name, 'starsystem')}\"), \".\"\r\n )}\r\n }\r\n {Occasionally(7, ReportDistanceFromHome())}\r\n}\r\n\r\n{_ Report powerplay and faction states only if it's been more than an hour (3600 seconds) since our last visit. _}\r\n{if SecondsSince(reportsystem.lastVisitSeconds) > 3600:\r\n {set state_report to F(\"System state report\")}\r\n {set powerplay_report to F(\"Powerplay report\")}\r\n}\r\n\r\n{set system_engineer to F(\"Engineer report\")}\r\n{set system_missions to F(\"Mission check system\")}\r\n{set system_crimes to F(\"Crime check system\")}\r\n\r\n{if powerplay_report || state_report || system_engineer || system_missions || (system_crimes && find(system_crimes, \"Warning\") < 0):\r\n {Pause(500)}\r\n Information:\r\n}\r\n\r\n{if powerplay_report:\r\n {Pause(500)}\r\n {powerplay_report}\r\n}\r\n{if state_report:\r\n {Pause(500)}\r\n {state_report}\r\n}\r\n{if system_engineer:\r\n {Pause(500)}\r\n {system_engineer}\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\r\n{_ Update if we have arrived at our route plotter's next destination. _}\r\n{if searchsystem && searchsystem.name != \"\":\r\n {RouteDetails(\"update\")}\r\n}",
370370
"default": true,
371371
"name": "Carrier jumped",
372372
"description": "Triggered when you are docked at a fleet carrier as it completes a jump"

0 commit comments

Comments
 (0)