Skip to content

Commit

Permalink
To 4.1.0-b2. Fixed a typo in the Commodity sale check script. Updat…
Browse files Browse the repository at this point in the history
…ed the telemetry token.
  • Loading branch information
Tkael committed Aug 9, 2024
1 parent 25f6138 commit 8dbd250
Show file tree
Hide file tree
Showing 11 changed files with 15 additions and 10 deletions.
5 changes: 5 additions & 0 deletions ChangeLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion Installer.iss
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion SpeechResponder/eddi.cs.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion SpeechResponder/eddi.de.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion SpeechResponder/eddi.hu.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading

0 comments on commit 8dbd250

Please sign in to comment.