From 8dbd250929120002a6b7cc436a479c5683901d7d Mon Sep 17 00:00:00 2001 From: T'kael Date: Thu, 8 Aug 2024 22:14:44 -0700 Subject: [PATCH] To 4.1.0-b2. Fixed a typo in the `Commodity sale check` script. Updated the telemetry token. --- ChangeLog.md | 5 +++++ Installer.iss | 2 +- SpeechResponder/eddi.cs.json | 2 +- SpeechResponder/eddi.de.json | 2 +- SpeechResponder/eddi.hu.json | 2 +- SpeechResponder/eddi.it.json | 2 +- SpeechResponder/eddi.ja.json | 2 +- SpeechResponder/eddi.json | 2 +- SpeechResponder/eddi.ru.json | 2 +- Utilities/Constants.cs | 2 +- Utilities/TelemetryService/TelemetryTokens.cs | 2 +- 11 files changed, 15 insertions(+), 10 deletions(-) diff --git a/ChangeLog.md b/ChangeLog.md index 2c06f21cd8..b690c84639 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -2,6 +2,11 @@ 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). +## 4.1.0-b2 + * Speech Responder + * Scripts + * `Commodity sale check` updated fix a typo. + ## 4.1.0-b1 * Core * Added support for the Type-8 Transporter. diff --git a/Installer.iss b/Installer.iss index 24982a2f36..43688bbf29 100644 --- 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 "4.1.0-b1" +#define MyAppVersion "4.1.0-b2" #define MyAppPublisher "Elite Dangerous Community Developers (EDCD)" #define MyAppURL "https://github.com/EDCD/EDDI/" #define MyAppExeName "EDDI.exe" diff --git a/SpeechResponder/eddi.cs.json b/SpeechResponder/eddi.cs.json index 1fc80d418a..c7a804418b 100644 --- a/SpeechResponder/eddi.cs.json +++ b/SpeechResponder/eddi.cs.json @@ -546,7 +546,7 @@ "enabled": true, "priority": 3, "responder": false, - "script": "{_ Function to find a given commodity in market}\r\n{set market(commodity) to:\r\n {for marketcommodity in station.commodities:\r\n {if marketcommodity.name = commodity.name:\r\n {return marketcommodity}\r\n }\r\n }\r\n}\r\n\r\n{set totalprofit to 0}\r\n{set missioncommodities to []}\r\n{set profitablecommodities to []}\r\n{set stolencommodities to []}\r\n{set unknowncommodities to []}\r\n\r\n{for cargo in inventory:\r\n {if cargo.name != 'Limpet' && cargo.total > 0:\r\n {set marketcommodity to market(cargo.commodity)}\r\n {set profit to (marketcommodity.sellprice - cargo.price) * cargo.owned}\r\n\r\n {if cargo.owned > 0 && marketcommodity && profit > 0:\r\n {set profitablecommodities to cat(profitablecommodities, [cargo.commodity.name])}\r\n {set totalprofit to totalprofit + profit}\r\n |elif cargo.owned > 0 !marketcommodity && lcase(cargo.category) != \"powerplay\":\r\n {set unknowncommodities to cat(unknowncommodities, [cargo.commodity.name])}\r\n |elif cargo.stolen > 0:\r\n {set stolencommodities to cat(stolencommodities, [cargo.commodity.name])}\r\n |elif cargo.haulage > 0:\r\n {set missioncommodities to cat(missioncommodities, [cargo.commodity.name])}\r\n }\r\n }\r\n}\r\n\r\n{_ Let the user know about any commodities they can sell here for a profit}\r\n{if len(profitablecommodities) > 0:\r\n You can sell your {List(profitablecommodities)} for a profit of {Humanise(totalprofit)} credits.\r\n}\r\n\r\n{_ Let the user know about any commodities about which we are unsure if they can sell for a profit}\r\n{if len(unknowncommodities) > 0:\r\n You could {if len(profitablecommodities) > 0: also } sell your {List(unknowncommodities)}, although check potential profits for {if len(unknowncommodities) > 1: these |else: this} before confirming the transaction.\r\n}\r\n\r\n{_ Let the user know about any stolen commodities they can sell on the black market}\r\n{if len(stolencommodities) > 0:\r\n {if station.hasblackmarket:\r\n You can fence your stolen {List(stolencommodities)} here.\r\n |else:\r\n Reminder: you {OneOf(\"have stolen cargo on-board\", \"have stolen goods on-board\", \"are carrying stolen goods\", \"are carrying stolen cargo\")}.\r\n }\r\n}\r\n\r\n{_ Let the user know about any mission related commodities they can sell on the black market}\r\n{if len(missioncommodities) > 0 && station.hasblackmarket:\r\n You can {if len(stolencommodities) > 0: also} {OneOf('offload', 'dump')} your mission related {List(missioncommodities)} here.\r\n}\r\n", + "script": "{_ Function to find a given commodity in market}\r\n{set market(commodity) to:\r\n {for marketcommodity in station.commodities:\r\n {if marketcommodity.name = commodity.name:\r\n {return marketcommodity}\r\n }\r\n }\r\n}\r\n\r\n{set totalprofit to 0}\r\n{set missioncommodities to []}\r\n{set profitablecommodities to []}\r\n{set stolencommodities to []}\r\n{set unknowncommodities to []}\r\n\r\n{for cargo in inventory:\r\n {if cargo.name != 'Limpet' && cargo.total > 0:\r\n {set marketcommodity to market(cargo.commodity)}\r\n {set profit to (marketcommodity.sellprice - cargo.price) * cargo.owned}\r\n\r\n {if cargo.owned > 0 && marketcommodity && profit > 0:\r\n {set profitablecommodities to cat(profitablecommodities, [cargo.commodity.name])}\r\n {set totalprofit to totalprofit + profit}\r\n |elif cargo.owned > 0 && !marketcommodity && lcase(cargo.category) != \"powerplay\":\r\n {set unknowncommodities to cat(unknowncommodities, [cargo.commodity.name])}\r\n |elif cargo.stolen > 0:\r\n {set stolencommodities to cat(stolencommodities, [cargo.commodity.name])}\r\n |elif cargo.haulage > 0:\r\n {set missioncommodities to cat(missioncommodities, [cargo.commodity.name])}\r\n }\r\n }\r\n}\r\n\r\n{_ Let the user know about any commodities they can sell here for a profit}\r\n{if len(profitablecommodities) > 0:\r\n You can sell your {List(profitablecommodities)} for a profit of {Humanise(totalprofit)} credits.\r\n}\r\n\r\n{_ Let the user know about any commodities about which we are unsure if they can sell for a profit}\r\n{if len(unknowncommodities) > 0:\r\n You could {if len(profitablecommodities) > 0: also } sell your {List(unknowncommodities)}, although check potential profits for {if len(unknowncommodities) > 1: these |else: this} before confirming the transaction.\r\n}\r\n\r\n{_ Let the user know about any stolen commodities they can sell on the black market}\r\n{if len(stolencommodities) > 0:\r\n {if station.hasblackmarket:\r\n You can fence your stolen {List(stolencommodities)} here.\r\n |else:\r\n Reminder: you {OneOf(\"have stolen cargo on-board\", \"have stolen goods on-board\", \"are carrying stolen goods\", \"are carrying stolen cargo\")}.\r\n }\r\n}\r\n\r\n{_ Let the user know about any mission related commodities they can sell on the black market}\r\n{if len(missioncommodities) > 0 && station.hasblackmarket:\r\n You can {if len(stolencommodities) > 0: also} {OneOf('offload', 'dump')} your mission related {List(missioncommodities)} here.\r\n}", "default": true, "name": "Commodity sale check", "description": "Check to see which commodities can be sold here" diff --git a/SpeechResponder/eddi.de.json b/SpeechResponder/eddi.de.json index cd9c5ff89c..13e17bc161 100644 --- a/SpeechResponder/eddi.de.json +++ b/SpeechResponder/eddi.de.json @@ -546,7 +546,7 @@ "enabled": true, "priority": 3, "responder": false, - "script": "{_ Function to find a given commodity in market}\r\n{set market(commodity) to:\r\n {for marketcommodity in station.commodities:\r\n {if marketcommodity.name = commodity.name:\r\n {return marketcommodity}\r\n }\r\n }\r\n}\r\n\r\n{set totalprofit to 0}\r\n{set missioncommodities to []}\r\n{set profitablecommodities to []}\r\n{set stolencommodities to []}\r\n{set unknowncommodities to []}\r\n\r\n{for cargo in inventory:\r\n {if cargo.name != 'Limpet' && cargo.total > 0:\r\n {set marketcommodity to market(cargo.commodity)}\r\n {set profit to (marketcommodity.sellprice - cargo.price) * cargo.owned}\r\n\r\n {if cargo.owned > 0 && marketcommodity && profit > 0:\r\n {set profitablecommodities to cat(profitablecommodities, [cargo.commodity.name])}\r\n {set totalprofit to totalprofit + profit}\r\n |elif cargo.owned > 0 !marketcommodity && lcase(cargo.category) != \"powerplay\":\r\n {set unknowncommodities to cat(unknowncommodities, [cargo.commodity.name])}\r\n |elif cargo.stolen > 0:\r\n {set stolencommodities to cat(stolencommodities, [cargo.commodity.name])}\r\n |elif cargo.haulage > 0:\r\n {set missioncommodities to cat(missioncommodities, [cargo.commodity.name])}\r\n }\r\n }\r\n}\r\n\r\n{_ Let the user know about any commodities they can sell here for a profit}\r\n{if len(profitablecommodities) > 0:\r\n You can sell your {List(profitablecommodities)} for a profit of {Humanise(totalprofit)} credits.\r\n}\r\n\r\n{_ Let the user know about any commodities about which we are unsure if they can sell for a profit}\r\n{if len(unknowncommodities) > 0:\r\n You could {if len(profitablecommodities) > 0: also } sell your {List(unknowncommodities)}, although check potential profits for {if len(unknowncommodities) > 1: these |else: this} before confirming the transaction.\r\n}\r\n\r\n{_ Let the user know about any stolen commodities they can sell on the black market}\r\n{if len(stolencommodities) > 0:\r\n {if station.hasblackmarket:\r\n You can fence your stolen {List(stolencommodities)} here.\r\n |else:\r\n Reminder: you {OneOf(\"have stolen cargo on-board\", \"have stolen goods on-board\", \"are carrying stolen goods\", \"are carrying stolen cargo\")}.\r\n }\r\n}\r\n\r\n{_ Let the user know about any mission related commodities they can sell on the black market}\r\n{if len(missioncommodities) > 0 && station.hasblackmarket:\r\n You can {if len(stolencommodities) > 0: also} {OneOf('offload', 'dump')} your mission related {List(missioncommodities)} here.\r\n}\r\n", + "script": "{_ Function to find a given commodity in market}\r\n{set market(commodity) to:\r\n {for marketcommodity in station.commodities:\r\n {if marketcommodity.name = commodity.name:\r\n {return marketcommodity}\r\n }\r\n }\r\n}\r\n\r\n{set totalprofit to 0}\r\n{set missioncommodities to []}\r\n{set profitablecommodities to []}\r\n{set stolencommodities to []}\r\n{set unknowncommodities to []}\r\n\r\n{for cargo in inventory:\r\n {if cargo.name != 'Limpet' && cargo.total > 0:\r\n {set marketcommodity to market(cargo.commodity)}\r\n {set profit to (marketcommodity.sellprice - cargo.price) * cargo.owned}\r\n\r\n {if cargo.owned > 0 && marketcommodity && profit > 0:\r\n {set profitablecommodities to cat(profitablecommodities, [cargo.commodity.name])}\r\n {set totalprofit to totalprofit + profit}\r\n |elif cargo.owned > 0 && !marketcommodity && lcase(cargo.category) != \"powerplay\":\r\n {set unknowncommodities to cat(unknowncommodities, [cargo.commodity.name])}\r\n |elif cargo.stolen > 0:\r\n {set stolencommodities to cat(stolencommodities, [cargo.commodity.name])}\r\n |elif cargo.haulage > 0:\r\n {set missioncommodities to cat(missioncommodities, [cargo.commodity.name])}\r\n }\r\n }\r\n}\r\n\r\n{_ Let the user know about any commodities they can sell here for a profit}\r\n{if len(profitablecommodities) > 0:\r\n You can sell your {List(profitablecommodities)} for a profit of {Humanise(totalprofit)} credits.\r\n}\r\n\r\n{_ Let the user know about any commodities about which we are unsure if they can sell for a profit}\r\n{if len(unknowncommodities) > 0:\r\n You could {if len(profitablecommodities) > 0: also } sell your {List(unknowncommodities)}, although check potential profits for {if len(unknowncommodities) > 1: these |else: this} before confirming the transaction.\r\n}\r\n\r\n{_ Let the user know about any stolen commodities they can sell on the black market}\r\n{if len(stolencommodities) > 0:\r\n {if station.hasblackmarket:\r\n You can fence your stolen {List(stolencommodities)} here.\r\n |else:\r\n Reminder: you {OneOf(\"have stolen cargo on-board\", \"have stolen goods on-board\", \"are carrying stolen goods\", \"are carrying stolen cargo\")}.\r\n }\r\n}\r\n\r\n{_ Let the user know about any mission related commodities they can sell on the black market}\r\n{if len(missioncommodities) > 0 && station.hasblackmarket:\r\n You can {if len(stolencommodities) > 0: also} {OneOf('offload', 'dump')} your mission related {List(missioncommodities)} here.\r\n}", "default": true, "name": "Commodity sale check", "description": "Check to see which commodities can be sold here" diff --git a/SpeechResponder/eddi.hu.json b/SpeechResponder/eddi.hu.json index c5b8dfa17a..f9800ef600 100644 --- a/SpeechResponder/eddi.hu.json +++ b/SpeechResponder/eddi.hu.json @@ -546,7 +546,7 @@ "enabled": true, "priority": 3, "responder": false, - "script": "{_ Function to find a given commodity in market}\r\n{set market(commodity) to:\r\n {for marketcommodity in station.commodities:\r\n {if marketcommodity.name = commodity.name:\r\n {return marketcommodity}\r\n }\r\n }\r\n}\r\n\r\n{set totalprofit to 0}\r\n{set missioncommodities to []}\r\n{set profitablecommodities to []}\r\n{set stolencommodities to []}\r\n{set unknowncommodities to []}\r\n\r\n{for cargo in inventory:\r\n {if cargo.name != 'Limpet' && cargo.total > 0:\r\n {set marketcommodity to market(cargo.commodity)}\r\n {set profit to (marketcommodity.sellprice - cargo.price) * cargo.owned}\r\n\r\n {if cargo.owned > 0 && marketcommodity && profit > 0:\r\n {set profitablecommodities to cat(profitablecommodities, [cargo.commodity.name])}\r\n {set totalprofit to totalprofit + profit}\r\n |elif cargo.owned > 0 !marketcommodity && lcase(cargo.category) != \"powerplay\":\r\n {set unknowncommodities to cat(unknowncommodities, [cargo.commodity.name])}\r\n |elif cargo.stolen > 0:\r\n {set stolencommodities to cat(stolencommodities, [cargo.commodity.name])}\r\n |elif cargo.haulage > 0:\r\n {set missioncommodities to cat(missioncommodities, [cargo.commodity.name])}\r\n }\r\n }\r\n}\r\n\r\n{_ Let the user know about any commodities they can sell here for a profit}\r\n{if len(profitablecommodities) > 0:\r\n You can sell your {List(profitablecommodities)} for a profit of {Humanise(totalprofit)} credits.\r\n}\r\n\r\n{_ Let the user know about any commodities about which we are unsure if they can sell for a profit}\r\n{if len(unknowncommodities) > 0:\r\n You could {if len(profitablecommodities) > 0: also } sell your {List(unknowncommodities)}, although check potential profits for {if len(unknowncommodities) > 1: these |else: this} before confirming the transaction.\r\n}\r\n\r\n{_ Let the user know about any stolen commodities they can sell on the black market}\r\n{if len(stolencommodities) > 0:\r\n {if station.hasblackmarket:\r\n You can fence your stolen {List(stolencommodities)} here.\r\n |else:\r\n Reminder: you {OneOf(\"have stolen cargo on-board\", \"have stolen goods on-board\", \"are carrying stolen goods\", \"are carrying stolen cargo\")}.\r\n }\r\n}\r\n\r\n{_ Let the user know about any mission related commodities they can sell on the black market}\r\n{if len(missioncommodities) > 0 && station.hasblackmarket:\r\n You can {if len(stolencommodities) > 0: also} {OneOf('offload', 'dump')} your mission related {List(missioncommodities)} here.\r\n}\r\n", + "script": "{_ Function to find a given commodity in market}\r\n{set market(commodity) to:\r\n {for marketcommodity in station.commodities:\r\n {if marketcommodity.name = commodity.name:\r\n {return marketcommodity}\r\n }\r\n }\r\n}\r\n\r\n{set totalprofit to 0}\r\n{set missioncommodities to []}\r\n{set profitablecommodities to []}\r\n{set stolencommodities to []}\r\n{set unknowncommodities to []}\r\n\r\n{for cargo in inventory:\r\n {if cargo.name != 'Limpet' && cargo.total > 0:\r\n {set marketcommodity to market(cargo.commodity)}\r\n {set profit to (marketcommodity.sellprice - cargo.price) * cargo.owned}\r\n\r\n {if cargo.owned > 0 && marketcommodity && profit > 0:\r\n {set profitablecommodities to cat(profitablecommodities, [cargo.commodity.name])}\r\n {set totalprofit to totalprofit + profit}\r\n |elif cargo.owned > 0 && !marketcommodity && lcase(cargo.category) != \"powerplay\":\r\n {set unknowncommodities to cat(unknowncommodities, [cargo.commodity.name])}\r\n |elif cargo.stolen > 0:\r\n {set stolencommodities to cat(stolencommodities, [cargo.commodity.name])}\r\n |elif cargo.haulage > 0:\r\n {set missioncommodities to cat(missioncommodities, [cargo.commodity.name])}\r\n }\r\n }\r\n}\r\n\r\n{_ Let the user know about any commodities they can sell here for a profit}\r\n{if len(profitablecommodities) > 0:\r\n You can sell your {List(profitablecommodities)} for a profit of {Humanise(totalprofit)} credits.\r\n}\r\n\r\n{_ Let the user know about any commodities about which we are unsure if they can sell for a profit}\r\n{if len(unknowncommodities) > 0:\r\n You could {if len(profitablecommodities) > 0: also } sell your {List(unknowncommodities)}, although check potential profits for {if len(unknowncommodities) > 1: these |else: this} before confirming the transaction.\r\n}\r\n\r\n{_ Let the user know about any stolen commodities they can sell on the black market}\r\n{if len(stolencommodities) > 0:\r\n {if station.hasblackmarket:\r\n You can fence your stolen {List(stolencommodities)} here.\r\n |else:\r\n Reminder: you {OneOf(\"have stolen cargo on-board\", \"have stolen goods on-board\", \"are carrying stolen goods\", \"are carrying stolen cargo\")}.\r\n }\r\n}\r\n\r\n{_ Let the user know about any mission related commodities they can sell on the black market}\r\n{if len(missioncommodities) > 0 && station.hasblackmarket:\r\n You can {if len(stolencommodities) > 0: also} {OneOf('offload', 'dump')} your mission related {List(missioncommodities)} here.\r\n}", "default": true, "name": "Commodity sale check", "description": "Check to see which commodities can be sold here" diff --git a/SpeechResponder/eddi.it.json b/SpeechResponder/eddi.it.json index c5b8dfa17a..f9800ef600 100644 --- a/SpeechResponder/eddi.it.json +++ b/SpeechResponder/eddi.it.json @@ -546,7 +546,7 @@ "enabled": true, "priority": 3, "responder": false, - "script": "{_ Function to find a given commodity in market}\r\n{set market(commodity) to:\r\n {for marketcommodity in station.commodities:\r\n {if marketcommodity.name = commodity.name:\r\n {return marketcommodity}\r\n }\r\n }\r\n}\r\n\r\n{set totalprofit to 0}\r\n{set missioncommodities to []}\r\n{set profitablecommodities to []}\r\n{set stolencommodities to []}\r\n{set unknowncommodities to []}\r\n\r\n{for cargo in inventory:\r\n {if cargo.name != 'Limpet' && cargo.total > 0:\r\n {set marketcommodity to market(cargo.commodity)}\r\n {set profit to (marketcommodity.sellprice - cargo.price) * cargo.owned}\r\n\r\n {if cargo.owned > 0 && marketcommodity && profit > 0:\r\n {set profitablecommodities to cat(profitablecommodities, [cargo.commodity.name])}\r\n {set totalprofit to totalprofit + profit}\r\n |elif cargo.owned > 0 !marketcommodity && lcase(cargo.category) != \"powerplay\":\r\n {set unknowncommodities to cat(unknowncommodities, [cargo.commodity.name])}\r\n |elif cargo.stolen > 0:\r\n {set stolencommodities to cat(stolencommodities, [cargo.commodity.name])}\r\n |elif cargo.haulage > 0:\r\n {set missioncommodities to cat(missioncommodities, [cargo.commodity.name])}\r\n }\r\n }\r\n}\r\n\r\n{_ Let the user know about any commodities they can sell here for a profit}\r\n{if len(profitablecommodities) > 0:\r\n You can sell your {List(profitablecommodities)} for a profit of {Humanise(totalprofit)} credits.\r\n}\r\n\r\n{_ Let the user know about any commodities about which we are unsure if they can sell for a profit}\r\n{if len(unknowncommodities) > 0:\r\n You could {if len(profitablecommodities) > 0: also } sell your {List(unknowncommodities)}, although check potential profits for {if len(unknowncommodities) > 1: these |else: this} before confirming the transaction.\r\n}\r\n\r\n{_ Let the user know about any stolen commodities they can sell on the black market}\r\n{if len(stolencommodities) > 0:\r\n {if station.hasblackmarket:\r\n You can fence your stolen {List(stolencommodities)} here.\r\n |else:\r\n Reminder: you {OneOf(\"have stolen cargo on-board\", \"have stolen goods on-board\", \"are carrying stolen goods\", \"are carrying stolen cargo\")}.\r\n }\r\n}\r\n\r\n{_ Let the user know about any mission related commodities they can sell on the black market}\r\n{if len(missioncommodities) > 0 && station.hasblackmarket:\r\n You can {if len(stolencommodities) > 0: also} {OneOf('offload', 'dump')} your mission related {List(missioncommodities)} here.\r\n}\r\n", + "script": "{_ Function to find a given commodity in market}\r\n{set market(commodity) to:\r\n {for marketcommodity in station.commodities:\r\n {if marketcommodity.name = commodity.name:\r\n {return marketcommodity}\r\n }\r\n }\r\n}\r\n\r\n{set totalprofit to 0}\r\n{set missioncommodities to []}\r\n{set profitablecommodities to []}\r\n{set stolencommodities to []}\r\n{set unknowncommodities to []}\r\n\r\n{for cargo in inventory:\r\n {if cargo.name != 'Limpet' && cargo.total > 0:\r\n {set marketcommodity to market(cargo.commodity)}\r\n {set profit to (marketcommodity.sellprice - cargo.price) * cargo.owned}\r\n\r\n {if cargo.owned > 0 && marketcommodity && profit > 0:\r\n {set profitablecommodities to cat(profitablecommodities, [cargo.commodity.name])}\r\n {set totalprofit to totalprofit + profit}\r\n |elif cargo.owned > 0 && !marketcommodity && lcase(cargo.category) != \"powerplay\":\r\n {set unknowncommodities to cat(unknowncommodities, [cargo.commodity.name])}\r\n |elif cargo.stolen > 0:\r\n {set stolencommodities to cat(stolencommodities, [cargo.commodity.name])}\r\n |elif cargo.haulage > 0:\r\n {set missioncommodities to cat(missioncommodities, [cargo.commodity.name])}\r\n }\r\n }\r\n}\r\n\r\n{_ Let the user know about any commodities they can sell here for a profit}\r\n{if len(profitablecommodities) > 0:\r\n You can sell your {List(profitablecommodities)} for a profit of {Humanise(totalprofit)} credits.\r\n}\r\n\r\n{_ Let the user know about any commodities about which we are unsure if they can sell for a profit}\r\n{if len(unknowncommodities) > 0:\r\n You could {if len(profitablecommodities) > 0: also } sell your {List(unknowncommodities)}, although check potential profits for {if len(unknowncommodities) > 1: these |else: this} before confirming the transaction.\r\n}\r\n\r\n{_ Let the user know about any stolen commodities they can sell on the black market}\r\n{if len(stolencommodities) > 0:\r\n {if station.hasblackmarket:\r\n You can fence your stolen {List(stolencommodities)} here.\r\n |else:\r\n Reminder: you {OneOf(\"have stolen cargo on-board\", \"have stolen goods on-board\", \"are carrying stolen goods\", \"are carrying stolen cargo\")}.\r\n }\r\n}\r\n\r\n{_ Let the user know about any mission related commodities they can sell on the black market}\r\n{if len(missioncommodities) > 0 && station.hasblackmarket:\r\n You can {if len(stolencommodities) > 0: also} {OneOf('offload', 'dump')} your mission related {List(missioncommodities)} here.\r\n}", "default": true, "name": "Commodity sale check", "description": "Check to see which commodities can be sold here" diff --git a/SpeechResponder/eddi.ja.json b/SpeechResponder/eddi.ja.json index c5b8dfa17a..f9800ef600 100644 --- a/SpeechResponder/eddi.ja.json +++ b/SpeechResponder/eddi.ja.json @@ -546,7 +546,7 @@ "enabled": true, "priority": 3, "responder": false, - "script": "{_ Function to find a given commodity in market}\r\n{set market(commodity) to:\r\n {for marketcommodity in station.commodities:\r\n {if marketcommodity.name = commodity.name:\r\n {return marketcommodity}\r\n }\r\n }\r\n}\r\n\r\n{set totalprofit to 0}\r\n{set missioncommodities to []}\r\n{set profitablecommodities to []}\r\n{set stolencommodities to []}\r\n{set unknowncommodities to []}\r\n\r\n{for cargo in inventory:\r\n {if cargo.name != 'Limpet' && cargo.total > 0:\r\n {set marketcommodity to market(cargo.commodity)}\r\n {set profit to (marketcommodity.sellprice - cargo.price) * cargo.owned}\r\n\r\n {if cargo.owned > 0 && marketcommodity && profit > 0:\r\n {set profitablecommodities to cat(profitablecommodities, [cargo.commodity.name])}\r\n {set totalprofit to totalprofit + profit}\r\n |elif cargo.owned > 0 !marketcommodity && lcase(cargo.category) != \"powerplay\":\r\n {set unknowncommodities to cat(unknowncommodities, [cargo.commodity.name])}\r\n |elif cargo.stolen > 0:\r\n {set stolencommodities to cat(stolencommodities, [cargo.commodity.name])}\r\n |elif cargo.haulage > 0:\r\n {set missioncommodities to cat(missioncommodities, [cargo.commodity.name])}\r\n }\r\n }\r\n}\r\n\r\n{_ Let the user know about any commodities they can sell here for a profit}\r\n{if len(profitablecommodities) > 0:\r\n You can sell your {List(profitablecommodities)} for a profit of {Humanise(totalprofit)} credits.\r\n}\r\n\r\n{_ Let the user know about any commodities about which we are unsure if they can sell for a profit}\r\n{if len(unknowncommodities) > 0:\r\n You could {if len(profitablecommodities) > 0: also } sell your {List(unknowncommodities)}, although check potential profits for {if len(unknowncommodities) > 1: these |else: this} before confirming the transaction.\r\n}\r\n\r\n{_ Let the user know about any stolen commodities they can sell on the black market}\r\n{if len(stolencommodities) > 0:\r\n {if station.hasblackmarket:\r\n You can fence your stolen {List(stolencommodities)} here.\r\n |else:\r\n Reminder: you {OneOf(\"have stolen cargo on-board\", \"have stolen goods on-board\", \"are carrying stolen goods\", \"are carrying stolen cargo\")}.\r\n }\r\n}\r\n\r\n{_ Let the user know about any mission related commodities they can sell on the black market}\r\n{if len(missioncommodities) > 0 && station.hasblackmarket:\r\n You can {if len(stolencommodities) > 0: also} {OneOf('offload', 'dump')} your mission related {List(missioncommodities)} here.\r\n}\r\n", + "script": "{_ Function to find a given commodity in market}\r\n{set market(commodity) to:\r\n {for marketcommodity in station.commodities:\r\n {if marketcommodity.name = commodity.name:\r\n {return marketcommodity}\r\n }\r\n }\r\n}\r\n\r\n{set totalprofit to 0}\r\n{set missioncommodities to []}\r\n{set profitablecommodities to []}\r\n{set stolencommodities to []}\r\n{set unknowncommodities to []}\r\n\r\n{for cargo in inventory:\r\n {if cargo.name != 'Limpet' && cargo.total > 0:\r\n {set marketcommodity to market(cargo.commodity)}\r\n {set profit to (marketcommodity.sellprice - cargo.price) * cargo.owned}\r\n\r\n {if cargo.owned > 0 && marketcommodity && profit > 0:\r\n {set profitablecommodities to cat(profitablecommodities, [cargo.commodity.name])}\r\n {set totalprofit to totalprofit + profit}\r\n |elif cargo.owned > 0 && !marketcommodity && lcase(cargo.category) != \"powerplay\":\r\n {set unknowncommodities to cat(unknowncommodities, [cargo.commodity.name])}\r\n |elif cargo.stolen > 0:\r\n {set stolencommodities to cat(stolencommodities, [cargo.commodity.name])}\r\n |elif cargo.haulage > 0:\r\n {set missioncommodities to cat(missioncommodities, [cargo.commodity.name])}\r\n }\r\n }\r\n}\r\n\r\n{_ Let the user know about any commodities they can sell here for a profit}\r\n{if len(profitablecommodities) > 0:\r\n You can sell your {List(profitablecommodities)} for a profit of {Humanise(totalprofit)} credits.\r\n}\r\n\r\n{_ Let the user know about any commodities about which we are unsure if they can sell for a profit}\r\n{if len(unknowncommodities) > 0:\r\n You could {if len(profitablecommodities) > 0: also } sell your {List(unknowncommodities)}, although check potential profits for {if len(unknowncommodities) > 1: these |else: this} before confirming the transaction.\r\n}\r\n\r\n{_ Let the user know about any stolen commodities they can sell on the black market}\r\n{if len(stolencommodities) > 0:\r\n {if station.hasblackmarket:\r\n You can fence your stolen {List(stolencommodities)} here.\r\n |else:\r\n Reminder: you {OneOf(\"have stolen cargo on-board\", \"have stolen goods on-board\", \"are carrying stolen goods\", \"are carrying stolen cargo\")}.\r\n }\r\n}\r\n\r\n{_ Let the user know about any mission related commodities they can sell on the black market}\r\n{if len(missioncommodities) > 0 && station.hasblackmarket:\r\n You can {if len(stolencommodities) > 0: also} {OneOf('offload', 'dump')} your mission related {List(missioncommodities)} here.\r\n}", "default": true, "name": "Commodity sale check", "description": "Check to see which commodities can be sold here" diff --git a/SpeechResponder/eddi.json b/SpeechResponder/eddi.json index 638d3d29bf..4cf7246e48 100644 --- a/SpeechResponder/eddi.json +++ b/SpeechResponder/eddi.json @@ -546,7 +546,7 @@ "enabled": true, "priority": 3, "responder": false, - "script": "{_ Function to find a given commodity in market}\r\n{set market(commodity) to:\r\n {for marketcommodity in station.commodities:\r\n {if marketcommodity.name = commodity.name:\r\n {return marketcommodity}\r\n }\r\n }\r\n}\r\n\r\n{set totalprofit to 0}\r\n{set missioncommodities to []}\r\n{set profitablecommodities to []}\r\n{set stolencommodities to []}\r\n{set unknowncommodities to []}\r\n\r\n{for cargo in inventory:\r\n {if cargo.name != 'Limpet' && cargo.total > 0:\r\n {set marketcommodity to market(cargo.commodity)}\r\n {set profit to (marketcommodity.sellprice - cargo.price) * cargo.owned}\r\n\r\n {if cargo.owned > 0 && marketcommodity && profit > 0:\r\n {set profitablecommodities to cat(profitablecommodities, [cargo.commodity.name])}\r\n {set totalprofit to totalprofit + profit}\r\n |elif cargo.owned > 0 !marketcommodity && lcase(cargo.category) != \"powerplay\":\r\n {set unknowncommodities to cat(unknowncommodities, [cargo.commodity.name])}\r\n |elif cargo.stolen > 0:\r\n {set stolencommodities to cat(stolencommodities, [cargo.commodity.name])}\r\n |elif cargo.haulage > 0:\r\n {set missioncommodities to cat(missioncommodities, [cargo.commodity.name])}\r\n }\r\n }\r\n}\r\n\r\n{_ Let the user know about any commodities they can sell here for a profit}\r\n{if len(profitablecommodities) > 0:\r\n You can sell your {List(profitablecommodities)} for a profit of {Humanise(totalprofit)} credits.\r\n}\r\n\r\n{_ Let the user know about any commodities about which we are unsure if they can sell for a profit}\r\n{if len(unknowncommodities) > 0:\r\n You could {if len(profitablecommodities) > 0: also } sell your {List(unknowncommodities)}, although check potential profits for {if len(unknowncommodities) > 1: these |else: this} before confirming the transaction.\r\n}\r\n\r\n{_ Let the user know about any stolen commodities they can sell on the black market}\r\n{if len(stolencommodities) > 0:\r\n {if station.hasblackmarket:\r\n You can fence your stolen {List(stolencommodities)} here.\r\n |else:\r\n Reminder: you {OneOf(\"have stolen cargo on-board\", \"have stolen goods on-board\", \"are carrying stolen goods\", \"are carrying stolen cargo\")}.\r\n }\r\n}\r\n\r\n{_ Let the user know about any mission related commodities they can sell on the black market}\r\n{if len(missioncommodities) > 0 && station.hasblackmarket:\r\n You can {if len(stolencommodities) > 0: also} {OneOf('offload', 'dump')} your mission related {List(missioncommodities)} here.\r\n}\r\n", + "script": "{_ Function to find a given commodity in market}\r\n{set market(commodity) to:\r\n {for marketcommodity in station.commodities:\r\n {if marketcommodity.name = commodity.name:\r\n {return marketcommodity}\r\n }\r\n }\r\n}\r\n\r\n{set totalprofit to 0}\r\n{set missioncommodities to []}\r\n{set profitablecommodities to []}\r\n{set stolencommodities to []}\r\n{set unknowncommodities to []}\r\n\r\n{for cargo in inventory:\r\n {if cargo.name != 'Limpet' && cargo.total > 0:\r\n {set marketcommodity to market(cargo.commodity)}\r\n {set profit to (marketcommodity.sellprice - cargo.price) * cargo.owned}\r\n\r\n {if cargo.owned > 0 && marketcommodity && profit > 0:\r\n {set profitablecommodities to cat(profitablecommodities, [cargo.commodity.name])}\r\n {set totalprofit to totalprofit + profit}\r\n |elif cargo.owned > 0 && !marketcommodity && lcase(cargo.category) != \"powerplay\":\r\n {set unknowncommodities to cat(unknowncommodities, [cargo.commodity.name])}\r\n |elif cargo.stolen > 0:\r\n {set stolencommodities to cat(stolencommodities, [cargo.commodity.name])}\r\n |elif cargo.haulage > 0:\r\n {set missioncommodities to cat(missioncommodities, [cargo.commodity.name])}\r\n }\r\n }\r\n}\r\n\r\n{_ Let the user know about any commodities they can sell here for a profit}\r\n{if len(profitablecommodities) > 0:\r\n You can sell your {List(profitablecommodities)} for a profit of {Humanise(totalprofit)} credits.\r\n}\r\n\r\n{_ Let the user know about any commodities about which we are unsure if they can sell for a profit}\r\n{if len(unknowncommodities) > 0:\r\n You could {if len(profitablecommodities) > 0: also } sell your {List(unknowncommodities)}, although check potential profits for {if len(unknowncommodities) > 1: these |else: this} before confirming the transaction.\r\n}\r\n\r\n{_ Let the user know about any stolen commodities they can sell on the black market}\r\n{if len(stolencommodities) > 0:\r\n {if station.hasblackmarket:\r\n You can fence your stolen {List(stolencommodities)} here.\r\n |else:\r\n Reminder: you {OneOf(\"have stolen cargo on-board\", \"have stolen goods on-board\", \"are carrying stolen goods\", \"are carrying stolen cargo\")}.\r\n }\r\n}\r\n\r\n{_ Let the user know about any mission related commodities they can sell on the black market}\r\n{if len(missioncommodities) > 0 && station.hasblackmarket:\r\n You can {if len(stolencommodities) > 0: also} {OneOf('offload', 'dump')} your mission related {List(missioncommodities)} here.\r\n}", "default": true, "name": "Commodity sale check", "description": "Check to see which commodities can be sold here" diff --git a/SpeechResponder/eddi.ru.json b/SpeechResponder/eddi.ru.json index c5b8dfa17a..f9800ef600 100644 --- a/SpeechResponder/eddi.ru.json +++ b/SpeechResponder/eddi.ru.json @@ -546,7 +546,7 @@ "enabled": true, "priority": 3, "responder": false, - "script": "{_ Function to find a given commodity in market}\r\n{set market(commodity) to:\r\n {for marketcommodity in station.commodities:\r\n {if marketcommodity.name = commodity.name:\r\n {return marketcommodity}\r\n }\r\n }\r\n}\r\n\r\n{set totalprofit to 0}\r\n{set missioncommodities to []}\r\n{set profitablecommodities to []}\r\n{set stolencommodities to []}\r\n{set unknowncommodities to []}\r\n\r\n{for cargo in inventory:\r\n {if cargo.name != 'Limpet' && cargo.total > 0:\r\n {set marketcommodity to market(cargo.commodity)}\r\n {set profit to (marketcommodity.sellprice - cargo.price) * cargo.owned}\r\n\r\n {if cargo.owned > 0 && marketcommodity && profit > 0:\r\n {set profitablecommodities to cat(profitablecommodities, [cargo.commodity.name])}\r\n {set totalprofit to totalprofit + profit}\r\n |elif cargo.owned > 0 !marketcommodity && lcase(cargo.category) != \"powerplay\":\r\n {set unknowncommodities to cat(unknowncommodities, [cargo.commodity.name])}\r\n |elif cargo.stolen > 0:\r\n {set stolencommodities to cat(stolencommodities, [cargo.commodity.name])}\r\n |elif cargo.haulage > 0:\r\n {set missioncommodities to cat(missioncommodities, [cargo.commodity.name])}\r\n }\r\n }\r\n}\r\n\r\n{_ Let the user know about any commodities they can sell here for a profit}\r\n{if len(profitablecommodities) > 0:\r\n You can sell your {List(profitablecommodities)} for a profit of {Humanise(totalprofit)} credits.\r\n}\r\n\r\n{_ Let the user know about any commodities about which we are unsure if they can sell for a profit}\r\n{if len(unknowncommodities) > 0:\r\n You could {if len(profitablecommodities) > 0: also } sell your {List(unknowncommodities)}, although check potential profits for {if len(unknowncommodities) > 1: these |else: this} before confirming the transaction.\r\n}\r\n\r\n{_ Let the user know about any stolen commodities they can sell on the black market}\r\n{if len(stolencommodities) > 0:\r\n {if station.hasblackmarket:\r\n You can fence your stolen {List(stolencommodities)} here.\r\n |else:\r\n Reminder: you {OneOf(\"have stolen cargo on-board\", \"have stolen goods on-board\", \"are carrying stolen goods\", \"are carrying stolen cargo\")}.\r\n }\r\n}\r\n\r\n{_ Let the user know about any mission related commodities they can sell on the black market}\r\n{if len(missioncommodities) > 0 && station.hasblackmarket:\r\n You can {if len(stolencommodities) > 0: also} {OneOf('offload', 'dump')} your mission related {List(missioncommodities)} here.\r\n}\r\n", + "script": "{_ Function to find a given commodity in market}\r\n{set market(commodity) to:\r\n {for marketcommodity in station.commodities:\r\n {if marketcommodity.name = commodity.name:\r\n {return marketcommodity}\r\n }\r\n }\r\n}\r\n\r\n{set totalprofit to 0}\r\n{set missioncommodities to []}\r\n{set profitablecommodities to []}\r\n{set stolencommodities to []}\r\n{set unknowncommodities to []}\r\n\r\n{for cargo in inventory:\r\n {if cargo.name != 'Limpet' && cargo.total > 0:\r\n {set marketcommodity to market(cargo.commodity)}\r\n {set profit to (marketcommodity.sellprice - cargo.price) * cargo.owned}\r\n\r\n {if cargo.owned > 0 && marketcommodity && profit > 0:\r\n {set profitablecommodities to cat(profitablecommodities, [cargo.commodity.name])}\r\n {set totalprofit to totalprofit + profit}\r\n |elif cargo.owned > 0 && !marketcommodity && lcase(cargo.category) != \"powerplay\":\r\n {set unknowncommodities to cat(unknowncommodities, [cargo.commodity.name])}\r\n |elif cargo.stolen > 0:\r\n {set stolencommodities to cat(stolencommodities, [cargo.commodity.name])}\r\n |elif cargo.haulage > 0:\r\n {set missioncommodities to cat(missioncommodities, [cargo.commodity.name])}\r\n }\r\n }\r\n}\r\n\r\n{_ Let the user know about any commodities they can sell here for a profit}\r\n{if len(profitablecommodities) > 0:\r\n You can sell your {List(profitablecommodities)} for a profit of {Humanise(totalprofit)} credits.\r\n}\r\n\r\n{_ Let the user know about any commodities about which we are unsure if they can sell for a profit}\r\n{if len(unknowncommodities) > 0:\r\n You could {if len(profitablecommodities) > 0: also } sell your {List(unknowncommodities)}, although check potential profits for {if len(unknowncommodities) > 1: these |else: this} before confirming the transaction.\r\n}\r\n\r\n{_ Let the user know about any stolen commodities they can sell on the black market}\r\n{if len(stolencommodities) > 0:\r\n {if station.hasblackmarket:\r\n You can fence your stolen {List(stolencommodities)} here.\r\n |else:\r\n Reminder: you {OneOf(\"have stolen cargo on-board\", \"have stolen goods on-board\", \"are carrying stolen goods\", \"are carrying stolen cargo\")}.\r\n }\r\n}\r\n\r\n{_ Let the user know about any mission related commodities they can sell on the black market}\r\n{if len(missioncommodities) > 0 && station.hasblackmarket:\r\n You can {if len(stolencommodities) > 0: also} {OneOf('offload', 'dump')} your mission related {List(missioncommodities)} here.\r\n}", "default": true, "name": "Commodity sale check", "description": "Check to see which commodities can be sold here" diff --git a/Utilities/Constants.cs b/Utilities/Constants.cs index ae63134f7f..f83ab7d826 100644 --- a/Utilities/Constants.cs +++ b/Utilities/Constants.cs @@ -9,7 +9,7 @@ public class Constants { public const string EDDI_NAME = "EDDI"; public const string EDDI_URL_PROTOCOL = "eddi"; - public static Version EDDI_VERSION = new Version(4, 1, 0, Version.TestPhase.b, 1); + public static Version EDDI_VERSION = new Version(4, 1, 0, Version.TestPhase.b, 2); 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")}"; diff --git a/Utilities/TelemetryService/TelemetryTokens.cs b/Utilities/TelemetryService/TelemetryTokens.cs index b0c7f1798e..cfa516f9ee 100644 --- a/Utilities/TelemetryService/TelemetryTokens.cs +++ b/Utilities/TelemetryService/TelemetryTokens.cs @@ -3,6 +3,6 @@ internal static class TelemetryTokens { // replace with official token for writing to the telemetry service - public static readonly string rollbarToken = null; + public static readonly string rollbarToken = "6c6786a24dd64995b7062639ebcc2bf8"; } }