From 4bc078178b7c05289cdde82bc0e66136aca6c65e Mon Sep 17 00:00:00 2001 From: Alex Williams Date: Sat, 9 Nov 2024 00:38:41 +0000 Subject: [PATCH] Issues/296 making engineers match (#31) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Adds missing missile modifications (#7) * Removing Seeker special from Advanced MR (#8) * Fixing missing 'falloff' value by adding the 'range' value to the data. (#9) * Add Type 8 to the Shipyard (#12) * Fix missile rack glitch (#11) * Adds missing missile modifications (#7) * Removing Seeker special from Advanced MR * Type 8 Added to Shipyard * Pricing update for generally available (not Guardian, trader or PP) modules, including standard, internal and hardpoints. Cross Referenced in-game. This will make pricing in Coriolis in-line with pricing in EDOMH, which is more accurate than Inara, or EDSY. Due to in-game discounts for Triple Elite status, at Jameson in Shin and various other discounts like LYR, pricing in Elite is difficult to keep track of, especially if prices have changed since launch and/or since introduction of a module. * Adding SCO Drive Price update * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo (#2) * Install uglify-js before use. Fixes https://github.com/EDCD/coriolis/issues/780 . I'm not a Node/NPM dev so if this is the Wong Way :tm: I'm open to better suggestions. * Initial Mandalay commit * Mandalay adjustments * Add mandalay (#17) * Pricing update for generally available (not Guardian, trader or PP) modules, including standard, internal and hardpoints. Cross Referenced in-game. This will make pricing in Coriolis in-line with pricing in EDOMH, which is more accurate than Inara, or EDSY. Due to in-game discounts for Triple Elite status, at Jameson in Shin and various other discounts like LYR, pricing in Elite is difficult to keep track of, especially if prices have changed since launch and/or since introduction of a module. * Adding SCO Drive Price update * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo (#2) * Install uglify-js before use. Fixes https://github.com/EDCD/coriolis/issues/780 . I'm not a Node/NPM dev so if this is the Wong Way :tm: I'm open to better suggestions. * Initial Mandalay commit * Mandalay adjustments * Fixing Mandalay data --------- Co-authored-by: Chris <2653277+chennin@users.noreply.github.com> * Add concord cannon (#19) * Adds dummy modules to facilitate improved import error handling. Removes unnecessary legacy PAS module from standard modules. Fixes /dist/index.js not being populated properly. (#1) * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo (#2) * Issue 600 add advanced weapons (#3) * Adds dummy modules to facilitate improved import error handling. Removes unnecessary legacy PAS module from standard modules. Fixes /dist/index.js not being populated properly. * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo * Added 'Special' field to special modules (groms, packhounds, etc.) to make them easier to distinguish in the search results when typing in search words. Also split out advanced missile racks from the missile rack group of hardpoints, to help distinguish them better, as I did with advanced MC's and AX Enhanced MC's and AX Enhanced MRs, etc. This gives sub-categories in the module selection drop down which were not there before. --------- Co-authored-by: David Sangrey * Pricing update for generally available (not Guardian, trader or PP) modules, including standard, internal and hardpoints. Cross Referenced in-game. This will make pricing in Coriolis in-line with pricing in EDOMH, which is more accurate than Inara, or EDSY. Due to in-game discounts for Triple Elite status, at Jameson in Shin and various other discounts like LYR, pricing in Elite is difficult to keep track of, especially if prices have changed since launch and/or since introduction of a module. * Adding SCO Drive Price update * Fix missile rack glitch (#11) * Adds missing missile modifications (#7) * Removing Seeker special from Advanced MR * Install uglify-js before use. Fixes https://github.com/EDCD/coriolis/issues/780 . I'm not a Node/NPM dev so if this is the Wong Way :tm: I'm open to better suggestions. * Type 8 Added to Shipyard (#14) * Initial Addition of the Concord Cannon * Adding EDId of Concord Cannon --------- Co-authored-by: David Sangrey Co-authored-by: Chris <2653277+chennin@users.noreply.github.com> * Display boost intervals better (#20) * Adds dummy modules to facilitate improved import error handling. Removes unnecessary legacy PAS module from standard modules. Fixes /dist/index.js not being populated properly. (#1) * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo (#2) * Issue 600 add advanced weapons (#3) * Adds dummy modules to facilitate improved import error handling. Removes unnecessary legacy PAS module from standard modules. Fixes /dist/index.js not being populated properly. * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo * Added 'Special' field to special modules (groms, packhounds, etc.) to make them easier to distinguish in the search results when typing in search words. Also split out advanced missile racks from the missile rack group of hardpoints, to help distinguish them better, as I did with advanced MC's and AX Enhanced MC's and AX Enhanced MRs, etc. This gives sub-categories in the module selection drop down which were not there before. --------- Co-authored-by: David Sangrey * Pricing update for generally available (not Guardian, trader or PP) modules, including standard, internal and hardpoints. Cross Referenced in-game. This will make pricing in Coriolis in-line with pricing in EDOMH, which is more accurate than Inara, or EDSY. Due to in-game discounts for Triple Elite status, at Jameson in Shin and various other discounts like LYR, pricing in Elite is difficult to keep track of, especially if prices have changed since launch and/or since introduction of a module. * Adding SCO Drive Price update * Fix missile rack glitch (#11) * Adds missing missile modifications (#7) * Removing Seeker special from Advanced MR * Install uglify-js before use. Fixes https://github.com/EDCD/coriolis/issues/780 . I'm not a Node/NPM dev so if this is the Wong Way :tm: I'm open to better suggestions. * Type 8 Added to Shipyard (#14) * Adding boostInt values to ships --------- Co-authored-by: David Sangrey Co-authored-by: Chris <2653277+chennin@users.noreply.github.com> * Add mandalay (#21) * Deploy current beta.coriolis.io content to coriolis.io (#5) * Python MkII (python_nx) (#99) * Python MkII data and SCO FSD data * Corrected speed/boost values to compensate for something coriolis does to the base values, changed pitch/roll/yaw values to match in game (although not fully tested yet) and added bulkhead costs and made up edID's for them since ED doesn't actually have ID's for them in the journal. Also changed the fuelpower value for the SCO 5C FSD to bring range in coriolis closer to what's in game, but 1 of the 3 values is still wrong. This gets worse on the SCO 5A, where all the values go out of whack and changing the fuelpower value does not have the same effect as it does on the 5C SCO. There is further work required here with each SCO FSD to get range to calculate properly. * changing the fuelpower values back to 2.45 in frame_shift_drive.json after some testing. * Removing code already in PR #98 * Setting EDDBId values to 0 as the ship and these modules do not exist in EDDB * SCO Modules (#98) * Add SCO Modules * Correct SCO Rating/Symbol * Update python_nx.json (#100) FDEV Localization Files have a space between Mk and II. To maintain consistency, we should also maintain such a spacing. (See also: Krait Mk II in this repo and the FDEVID repo under EDCD) * Updating hull pricing of Python and the Mk II so that retail pricing matches in game pricing. OG Python was 1,000cr out, the Mk II was 9Mcr out. * Adding Planetary Approach Suite modules for completeness of the interface (they are in game... should be in Coriolis). This also lead to discovering a bug, where Coriolis generated an inara link that included the planetary approach suite as a module to buy, when the Super Cruise Assist module was fitted... this was simply an incorrect EDDBId on the Super Cruise Assist module and has now been updated to the correct ID. It also raised another bug, where Coriolis would generate the link with the standard Docking Computer in it, no matter which docking computer you actually installed... again, this was an incorrect ID, both computers had the same EDDB Id, this has now been corrected. * [Fix] SCO 2A Group Fix The group FSD2 doesn't exist. A typo added it, and freezes Coriolis on selection. * Adjusted fall-off value for all MC's to 2km where they should be, from 1.8km, except the 'enforcer' which has no fall off. As there is no current way to suggest infinity/no fall-off, I have set this to 4.5km, which is its maximum range and therefore, more accurate than infinity anyway. This lines up with Cannon fall-off figures, which are also set to their maximum range, rather than infinity. * Changing Enforcer falloff to 3km to match in game metric * Adds dummy modules to facilitate improved import error handling. Removes unnecessary legacy PAS module from standard modules. Fixes /dist/index.js not being populated properly. * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo * Added 'Special' field to special modules (groms, packhounds, etc.) to make them easier to distinguish in the search results when typing in search words. Also split out advanced missile racks from the missile rack group of hardpoints, to help distinguish them better, as I did with advanced MC's and AX Enhanced MC's and AX Enhanced MRs, etc. This gives sub-categories in the module selection drop down which were not there before. --------- Co-authored-by: David Sangrey Co-authored-by: David Sangrey * Beta to live (#6) * Python MkII (python_nx) (#99) * Python MkII data and SCO FSD data * Corrected speed/boost values to compensate for something coriolis does to the base values, changed pitch/roll/yaw values to match in game (although not fully tested yet) and added bulkhead costs and made up edID's for them since ED doesn't actually have ID's for them in the journal. Also changed the fuelpower value for the SCO 5C FSD to bring range in coriolis closer to what's in game, but 1 of the 3 values is still wrong. This gets worse on the SCO 5A, where all the values go out of whack and changing the fuelpower value does not have the same effect as it does on the 5C SCO. There is further work required here with each SCO FSD to get range to calculate properly. * changing the fuelpower values back to 2.45 in frame_shift_drive.json after some testing. * Removing code already in PR #98 * Setting EDDBId values to 0 as the ship and these modules do not exist in EDDB * SCO Modules (#98) * Add SCO Modules * Correct SCO Rating/Symbol * Update python_nx.json (#100) FDEV Localization Files have a space between Mk and II. To maintain consistency, we should also maintain such a spacing. (See also: Krait Mk II in this repo and the FDEVID repo under EDCD) * Updating hull pricing of Python and the Mk II so that retail pricing matches in game pricing. OG Python was 1,000cr out, the Mk II was 9Mcr out. * Adding Planetary Approach Suite modules for completeness of the interface (they are in game... should be in Coriolis). This also lead to discovering a bug, where Coriolis generated an inara link that included the planetary approach suite as a module to buy, when the Super Cruise Assist module was fitted... this was simply an incorrect EDDBId on the Super Cruise Assist module and has now been updated to the correct ID. It also raised another bug, where Coriolis would generate the link with the standard Docking Computer in it, no matter which docking computer you actually installed... again, this was an incorrect ID, both computers had the same EDDB Id, this has now been corrected. * [Fix] SCO 2A Group Fix The group FSD2 doesn't exist. A typo added it, and freezes Coriolis on selection. * Adjusted fall-off value for all MC's to 2km where they should be, from 1.8km, except the 'enforcer' which has no fall off. As there is no current way to suggest infinity/no fall-off, I have set this to 4.5km, which is its maximum range and therefore, more accurate than infinity anyway. This lines up with Cannon fall-off figures, which are also set to their maximum range, rather than infinity. * Changing Enforcer falloff to 3km to match in game metric * Adds dummy modules to facilitate improved import error handling. Removes unnecessary legacy PAS module from standard modules. Fixes /dist/index.js not being populated properly. * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo * Added 'Special' field to special modules (groms, packhounds, etc.) to make them easier to distinguish in the search results when typing in search words. Also split out advanced missile racks from the missile rack group of hardpoints, to help distinguish them better, as I did with advanced MC's and AX Enhanced MC's and AX Enhanced MRs, etc. This gives sub-categories in the module selection drop down which were not there before. * Adds missing missile modifications (#7) * Removing Seeker special from Advanced MR (#8) --------- Co-authored-by: David Sangrey Co-authored-by: David Sangrey * Beta into live (#10) * Python MkII (python_nx) (#99) * Python MkII data and SCO FSD data * Corrected speed/boost values to compensate for something coriolis does to the base values, changed pitch/roll/yaw values to match in game (although not fully tested yet) and added bulkhead costs and made up edID's for them since ED doesn't actually have ID's for them in the journal. Also changed the fuelpower value for the SCO 5C FSD to bring range in coriolis closer to what's in game, but 1 of the 3 values is still wrong. This gets worse on the SCO 5A, where all the values go out of whack and changing the fuelpower value does not have the same effect as it does on the 5C SCO. There is further work required here with each SCO FSD to get range to calculate properly. * Setting EDDBId values to 0 as the ship and these modules do not exist in EDDB * SCO Modules (#98) * Add SCO Modules * Correct SCO Rating/Symbol * Update python_nx.json (#100) FDEV Localization Files have a space between Mk and II. To maintain consistency, we should also maintain such a spacing. (See also: Krait Mk II in this repo and the FDEVID repo under EDCD) * Updating hull pricing of Python and the Mk II so that retail pricing matches in game pricing. OG Python was 1,000cr out, the Mk II was 9Mcr out. * Adding Planetary Approach Suite modules for completeness of the interface (they are in game... should be in Coriolis). This also lead to discovering a bug, where Coriolis generated an inara link that included the planetary approach suite as a module to buy, when the Super Cruise Assist module was fitted... this was simply an incorrect EDDBId on the Super Cruise Assist module and has now been updated to the correct ID. It also raised another bug, where Coriolis would generate the link with the standard Docking Computer in it, no matter which docking computer you actually installed... again, this was an incorrect ID, both computers had the same EDDB Id, this has now been corrected. * [Fix] SCO 2A Group Fix The group FSD2 doesn't exist. A typo added it, and freezes Coriolis on selection. * Adjusted fall-off value for all MC's to 2km where they should be, from 1.8km, except the 'enforcer' which has no fall off. As there is no current way to suggest infinity/no fall-off, I have set this to 4.5km, which is its maximum range and therefore, more accurate than infinity anyway. This lines up with Cannon fall-off figures, which are also set to their maximum range, rather than infinity. * Changing Enforcer falloff to 3km to match in game metric * Adds dummy modules to facilitate improved import error handling. Removes unnecessary legacy PAS module from standard modules. Fixes /dist/index.js not being populated properly. * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo * Added 'Special' field to special modules (groms, packhounds, etc.) to make them easier to distinguish in the search results when typing in search words. Also split out advanced missile racks from the missile rack group of hardpoints, to help distinguish them better, as I did with advanced MC's and AX Enhanced MC's and AX Enhanced MRs, etc. This gives sub-categories in the module selection drop down which were not there before. * Adds missing missile modifications (#7) * Removing Seeker special from Advanced MR (#8) * Fixing missing 'falloff' value by adding the 'range' value to the data. (#9) * Beta to live (#13) * Python MkII (python_nx) (#99) * Python MkII data and SCO FSD data * Corrected speed/boost values to compensate for something coriolis does to the base values, changed pitch/roll/yaw values to match in game (although not fully tested yet) and added bulkhead costs and made up edID's for them since ED doesn't actually have ID's for them in the journal. Also changed the fuelpower value for the SCO 5C FSD to bring range in coriolis closer to what's in game, but 1 of the 3 values is still wrong. This gets worse on the SCO 5A, where all the values go out of whack and changing the fuelpower value does not have the same effect as it does on the 5C SCO. There is further work required here with each SCO FSD to get range to calculate properly. * changing the fuelpower values back to 2.45 in frame_shift_drive.json after some testing. * Removing code already in PR #98 * Setting EDDBId values to 0 as the ship and these modules do not exist in EDDB * SCO Modules (#98) * Add SCO Modules * Correct SCO Rating/Symbol * Update python_nx.json (#100) FDEV Localization Files have a space between Mk and II. To maintain consistency, we should also maintain such a spacing. (See also: Krait Mk II in this repo and the FDEVID repo under EDCD) * Updating hull pricing of Python and the Mk II so that retail pricing matches in game pricing. OG Python was 1,000cr out, the Mk II was 9Mcr out. * Adding Planetary Approach Suite modules for completeness of the interface (they are in game... should be in Coriolis). This also lead to discovering a bug, where Coriolis generated an inara link that included the planetary approach suite as a module to buy, when the Super Cruise Assist module was fitted... this was simply an incorrect EDDBId on the Super Cruise Assist module and has now been updated to the correct ID. It also raised another bug, where Coriolis would generate the link with the standard Docking Computer in it, no matter which docking computer you actually installed... again, this was an incorrect ID, both computers had the same EDDB Id, this has now been corrected. * [Fix] SCO 2A Group Fix The group FSD2 doesn't exist. A typo added it, and freezes Coriolis on selection. * Adjusted fall-off value for all MC's to 2km where they should be, from 1.8km, except the 'enforcer' which has no fall off. As there is no current way to suggest infinity/no fall-off, I have set this to 4.5km, which is its maximum range and therefore, more accurate than infinity anyway. This lines up with Cannon fall-off figures, which are also set to their maximum range, rather than infinity. * Changing Enforcer falloff to 3km to match in game metric * Adds dummy modules to facilitate improved import error handling. Removes unnecessary legacy PAS module from standard modules. Fixes /dist/index.js not being populated properly. * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo * Added 'Special' field to special modules (groms, packhounds, etc.) to make them easier to distinguish in the search results when typing in search words. Also split out advanced missile racks from the missile rack group of hardpoints, to help distinguish them better, as I did with advanced MC's and AX Enhanced MC's and AX Enhanced MRs, etc. This gives sub-categories in the module selection drop down which were not there before. * Adds missing missile modifications (#7) * Removing Seeker special from Advanced MR (#8) * Fixing missing 'falloff' value by adding the 'range' value to the data. (#9) * Add Type 8 to the Shipyard (#12) * Fix missile rack glitch (#11) * Adds missing missile modifications (#7) * Removing Seeker special from Advanced MR * Type 8 Added to Shipyard --------- Co-authored-by: David Sangrey Co-authored-by: David Sangrey * Pricing update for generally available (not Guardian, trader or PP) modules, including standard, internal and hardpoints. Cross Referenced in-game. This will make pricing in Coriolis in-line with pricing in EDOMH, which is more accurate than Inara, or EDSY. Due to in-game discounts for Triple Elite status, at Jameson in Shin and various other discounts like LYR, pricing in Elite is difficult to keep track of, especially if prices have changed since launch and/or since introduction of a module. * Adding SCO Drive Price update * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo (#2) * Install uglify-js before use. Fixes https://github.com/EDCD/coriolis/issues/780 . I'm not a Node/NPM dev so if this is the Wong Way :tm: I'm open to better suggestions. * Initial Mandalay commit * Mandalay adjustments * Fixing Mandalay data * Adding BoostInt value to Mandalay --------- Co-authored-by: David Sangrey Co-authored-by: David Sangrey Co-authored-by: Chris <2653277+chennin@users.noreply.github.com> * Issues/782 gpd stats wrong (#29) * Adds dummy modules to facilitate improved import error handling. Removes unnecessary legacy PAS module from standard modules. Fixes /dist/index.js not being populated properly. (#1) * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo (#2) * Issue 600 add advanced weapons (#3) * Adds dummy modules to facilitate improved import error handling. Removes unnecessary legacy PAS module from standard modules. Fixes /dist/index.js not being populated properly. * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo * Added 'Special' field to special modules (groms, packhounds, etc.) to make them easier to distinguish in the search results when typing in search words. Also split out advanced missile racks from the missile rack group of hardpoints, to help distinguish them better, as I did with advanced MC's and AX Enhanced MC's and AX Enhanced MRs, etc. This gives sub-categories in the module selection drop down which were not there before. --------- Co-authored-by: David Sangrey * Pricing update for generally available (not Guardian, trader or PP) modules, including standard, internal and hardpoints. Cross Referenced in-game. This will make pricing in Coriolis in-line with pricing in EDOMH, which is more accurate than Inara, or EDSY. Due to in-game discounts for Triple Elite status, at Jameson in Shin and various other discounts like LYR, pricing in Elite is difficult to keep track of, especially if prices have changed since launch and/or since introduction of a module. * Adding SCO Drive Price update * Fix missile rack glitch (#11) * Adds missing missile modifications (#7) * Removing Seeker special from Advanced MR * Install uglify-js before use. Fixes https://github.com/EDCD/coriolis/issues/780 . I'm not a Node/NPM dev so if this is the Wong Way :tm: I'm open to better suggestions. * Type 8 Added to Shipyard (#14) * Type 8 Added to Shipyard (#26) * Add concord cannon (#27) * Deploy current beta.coriolis.io content to coriolis.io (#5) * Python MkII (python_nx) (#99) * Python MkII data and SCO FSD data * Corrected speed/boost values to compensate for something coriolis does to the base values, changed pitch/roll/yaw values to match in game (although not fully tested yet) and added bulkhead costs and made up edID's for them since ED doesn't actually have ID's for them in the journal. Also changed the fuelpower value for the SCO 5C FSD to bring range in coriolis closer to what's in game, but 1 of the 3 values is still wrong. This gets worse on the SCO 5A, where all the values go out of whack and changing the fuelpower value does not have the same effect as it does on the 5C SCO. There is further work required here with each SCO FSD to get range to calculate properly. * changing the fuelpower values back to 2.45 in frame_shift_drive.json after some testing. * Removing code already in PR #98 * Setting EDDBId values to 0 as the ship and these modules do not exist in EDDB * SCO Modules (#98) * Add SCO Modules * Correct SCO Rating/Symbol * Update python_nx.json (#100) FDEV Localization Files have a space between Mk and II. To maintain consistency, we should also maintain such a spacing. (See also: Krait Mk II in this repo and the FDEVID repo under EDCD) * Updating hull pricing of Python and the Mk II so that retail pricing matches in game pricing. OG Python was 1,000cr out, the Mk II was 9Mcr out. * Adding Planetary Approach Suite modules for completeness of the interface (they are in game... should be in Coriolis). This also lead to discovering a bug, where Coriolis generated an inara link that included the planetary approach suite as a module to buy, when the Super Cruise Assist module was fitted... this was simply an incorrect EDDBId on the Super Cruise Assist module and has now been updated to the correct ID. It also raised another bug, where Coriolis would generate the link with the standard Docking Computer in it, no matter which docking computer you actually installed... again, this was an incorrect ID, both computers had the same EDDB Id, this has now been corrected. * [Fix] SCO 2A Group Fix The group FSD2 doesn't exist. A typo added it, and freezes Coriolis on selection. * Adjusted fall-off value for all MC's to 2km where they should be, from 1.8km, except the 'enforcer' which has no fall off. As there is no current way to suggest infinity/no fall-off, I have set this to 4.5km, which is its maximum range and therefore, more accurate than infinity anyway. This lines up with Cannon fall-off figures, which are also set to their maximum range, rather than infinity. * Changing Enforcer falloff to 3km to match in game metric * Adds dummy modules to facilitate improved import error handling. Removes unnecessary legacy PAS module from standard modules. Fixes /dist/index.js not being populated properly. * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo * Added 'Special' field to special modules (groms, packhounds, etc.) to make them easier to distinguish in the search results when typing in search words. Also split out advanced missile racks from the missile rack group of hardpoints, to help distinguish them better, as I did with advanced MC's and AX Enhanced MC's and AX Enhanced MRs, etc. This gives sub-categories in the module selection drop down which were not there before. --------- Co-authored-by: David Sangrey Co-authored-by: David Sangrey * Adds missing missile modifications (#7) * Removing Seeker special from Advanced MR (#8) * Beta to live (#6) * Python MkII (python_nx) (#99) * Python MkII data and SCO FSD data * Corrected speed/boost values to compensate for something coriolis does to the base values, changed pitch/roll/yaw values to match in game (although not fully tested yet) and added bulkhead costs and made up edID's for them since ED doesn't actually have ID's for them in the journal. Also changed the fuelpower value for the SCO 5C FSD to bring range in coriolis closer to what's in game, but 1 of the 3 values is still wrong. This gets worse on the SCO 5A, where all the values go out of whack and changing the fuelpower value does not have the same effect as it does on the 5C SCO. There is further work required here with each SCO FSD to get range to calculate properly. * changing the fuelpower values back to 2.45 in frame_shift_drive.json after some testing. * Removing code already in PR #98 * Setting EDDBId values to 0 as the ship and these modules do not exist in EDDB * SCO Modules (#98) * Add SCO Modules * Correct SCO Rating/Symbol * Update python_nx.json (#100) FDEV Localization Files have a space between Mk and II. To maintain consistency, we should also maintain such a spacing. (See also: Krait Mk II in this repo and the FDEVID repo under EDCD) * Updating hull pricing of Python and the Mk II so that retail pricing matches in game pricing. OG Python was 1,000cr out, the Mk II was 9Mcr out. * Adding Planetary Approach Suite modules for completeness of the interface (they are in game... should be in Coriolis). This also lead to discovering a bug, where Coriolis generated an inara link that included the planetary approach suite as a module to buy, when the Super Cruise Assist module was fitted... this was simply an incorrect EDDBId on the Super Cruise Assist module and has now been updated to the correct ID. It also raised another bug, where Coriolis would generate the link with the standard Docking Computer in it, no matter which docking computer you actually installed... again, this was an incorrect ID, both computers had the same EDDB Id, this has now been corrected. * [Fix] SCO 2A Group Fix The group FSD2 doesn't exist. A typo added it, and freezes Coriolis on selection. * Adjusted fall-off value for all MC's to 2km where they should be, from 1.8km, except the 'enforcer' which has no fall off. As there is no current way to suggest infinity/no fall-off, I have set this to 4.5km, which is its maximum range and therefore, more accurate than infinity anyway. This lines up with Cannon fall-off figures, which are also set to their maximum range, rather than infinity. * Changing Enforcer falloff to 3km to match in game metric * Adds dummy modules to facilitate improved import error handling. Removes unnecessary legacy PAS module from standard modules. Fixes /dist/index.js not being populated properly. * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo * Added 'Special' field to special modules (groms, packhounds, etc.) to make them easier to distinguish in the search results when typing in search words. Also split out advanced missile racks from the missile rack group of hardpoints, to help distinguish them better, as I did with advanced MC's and AX Enhanced MC's and AX Enhanced MRs, etc. This gives sub-categories in the module selection drop down which were not there before. * Adds missing missile modifications (#7) * Removing Seeker special from Advanced MR (#8) --------- Co-authored-by: David Sangrey Co-authored-by: David Sangrey * Fixing missing 'falloff' value by adding the 'range' value to the data. (#9) * Beta into live (#10) * Python MkII (python_nx) (#99) * Python MkII data and SCO FSD data * Corrected speed/boost values to compensate for something coriolis does to the base values, changed pitch/roll/yaw values to match in game (although not fully tested yet) and added bulkhead costs and made up edID's for them since ED doesn't actually have ID's for them in the journal. Also changed the fuelpower value for the SCO 5C FSD to bring range in coriolis closer to what's in game, but 1 of the 3 values is still wrong. This gets worse on the SCO 5A, where all the values go out of whack and changing the fuelpower value does not have the same effect as it does on the 5C SCO. There is further work required here with each SCO FSD to get range to calculate properly. * Setting EDDBId values to 0 as the ship and these modules do not exist in EDDB * SCO Modules (#98) * Add SCO Modules * Correct SCO Rating/Symbol * Update python_nx.json (#100) FDEV Localization Files have a space between Mk and II. To maintain consistency, we should also maintain such a spacing. (See also: Krait Mk II in this repo and the FDEVID repo under EDCD) * Updating hull pricing of Python and the Mk II so that retail pricing matches in game pricing. OG Python was 1,000cr out, the Mk II was 9Mcr out. * Adding Planetary Approach Suite modules for completeness of the interface (they are in game... should be in Coriolis). This also lead to discovering a bug, where Coriolis generated an inara link that included the planetary approach suite as a module to buy, when the Super Cruise Assist module was fitted... this was simply an incorrect EDDBId on the Super Cruise Assist module and has now been updated to the correct ID. It also raised another bug, where Coriolis would generate the link with the standard Docking Computer in it, no matter which docking computer you actually installed... again, this was an incorrect ID, both computers had the same EDDB Id, this has now been corrected. * [Fix] SCO 2A Group Fix The group FSD2 doesn't exist. A typo added it, and freezes Coriolis on selection. * Adjusted fall-off value for all MC's to 2km where they should be, from 1.8km, except the 'enforcer' which has no fall off. As there is no current way to suggest infinity/no fall-off, I have set this to 4.5km, which is its maximum range and therefore, more accurate than infinity anyway. This lines up with Cannon fall-off figures, which are also set to their maximum range, rather than infinity. * Changing Enforcer falloff to 3km to match in game metric * Adds dummy modules to facilitate improved import error handling. Removes unnecessary legacy PAS module from standard modules. Fixes /dist/index.js not being populated properly. * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo * Added 'Special' field to special modules (groms, packhounds, etc.) to make them easier to distinguish in the search results when typing in search words. Also split out advanced missile racks from the missile rack group of hardpoints, to help distinguish them better, as I did with advanced MC's and AX Enhanced MC's and AX Enhanced MRs, etc. This gives sub-categories in the module selection drop down which were not there before. * Adds missing missile modifications (#7) * Removing Seeker special from Advanced MR (#8) * Fixing missing 'falloff' value by adding the 'range' value to the data. (#9) * Add Type 8 to the Shipyard (#12) * Fix missile rack glitch (#11) * Adds missing missile modifications (#7) * Removing Seeker special from Advanced MR * Type 8 Added to Shipyard * Beta to live (#13) * Python MkII (python_nx) (#99) * Python MkII data and SCO FSD data * Corrected speed/boost values to compensate for something coriolis does to the base values, changed pitch/roll/yaw values to match in game (although not fully tested yet) and added bulkhead costs and made up edID's for them since ED doesn't actually have ID's for them in the journal. Also changed the fuelpower value for the SCO 5C FSD to bring range in coriolis closer to what's in game, but 1 of the 3 values is still wrong. This gets worse on the SCO 5A, where all the values go out of whack and changing the fuelpower value does not have the same effect as it does on the 5C SCO. There is further work required here with each SCO FSD to get range to calculate properly. * changing the fuelpower values back to 2.45 in frame_shift_drive.json after some testing. * Removing code already in PR #98 * Setting EDDBId values to 0 as the ship and these modules do not exist in EDDB * SCO Modules (#98) * Add SCO Modules * Correct SCO Rating/Symbol * Update python_nx.json (#100) FDEV Localization Files have a space between Mk and II. To maintain consistency, we should also maintain such a spacing. (See also: Krait Mk II in this repo and the FDEVID repo under EDCD) * Updating hull pricing of Python and the Mk II so that retail pricing matches in game pricing. OG Python was 1,000cr out, the Mk II was 9Mcr out. * Adding Planetary Approach Suite modules for completeness of the interface (they are in game... should be in Coriolis). This also lead to discovering a bug, where Coriolis generated an inara link that included the planetary approach suite as a module to buy, when the Super Cruise Assist module was fitted... this was simply an incorrect EDDBId on the Super Cruise Assist module and has now been updated to the correct ID. It also raised another bug, where Coriolis would generate the link with the standard Docking Computer in it, no matter which docking computer you actually installed... again, this was an incorrect ID, both computers had the same EDDB Id, this has now been corrected. * [Fix] SCO 2A Group Fix The group FSD2 doesn't exist. A typo added it, and freezes Coriolis on selection. * Adjusted fall-off value for all MC's to 2km where they should be, from 1.8km, except the 'enforcer' which has no fall off. As there is no current way to suggest infinity/no fall-off, I have set this to 4.5km, which is its maximum range and therefore, more accurate than infinity anyway. This lines up with Cannon fall-off figures, which are also set to their maximum range, rather than infinity. * Changing Enforcer falloff to 3km to match in game metric * Adds dummy modules to facilitate improved import error handling. Removes unnecessary legacy PAS module from standard modules. Fixes /dist/index.js not being populated properly. * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo * Added 'Special' field to special modules (groms, packhounds, etc.) to make them easier to distinguish in the search results when typing in search words. Also split out advanced missile racks from the missile rack group of hardpoints, to help distinguish them better, as I did with advanced MC's and AX Enhanced MC's and AX Enhanced MRs, etc. This gives sub-categories in the module selection drop down which were not there before. * Adds missing missile modifications (#7) * Removing Seeker special from Advanced MR (#8) * Fixing missing 'falloff' value by adding the 'range' value to the data. (#9) * Add Type 8 to the Shipyard (#12) * Fix missile rack glitch (#11) * Adds missing missile modifications (#7) * Removing Seeker special from Advanced MR * Type 8 Added to Shipyard --------- Co-authored-by: David Sangrey Co-authored-by: David Sangrey * Pricing update for generally available (not Guardian, trader or PP) modules, including standard, internal and hardpoints. Cross Referenced in-game. This will make pricing in Coriolis in-line with pricing in EDOMH, which is more accurate than Inara, or EDSY. Due to in-game discounts for Triple Elite status, at Jameson in Shin and various other discounts like LYR, pricing in Elite is difficult to keep track of, especially if prices have changed since launch and/or since introduction of a module. * Adding SCO Drive Price update * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo (#2) * Install uglify-js before use. Fixes https://github.com/EDCD/coriolis/issues/780 . I'm not a Node/NPM dev so if this is the Wong Way :tm: I'm open to better suggestions. * Initial Mandalay commit * Mandalay adjustments * Initial Addition of the Concord Cannon * Add mandalay (#17) * Pricing update for generally available (not Guardian, trader or PP) modules, including standard, internal and hardpoints. Cross Referenced in-game. This will make pricing in Coriolis in-line with pricing in EDOMH, which is more accurate than Inara, or EDSY. Due to in-game discounts for Triple Elite status, at Jameson in Shin and various other discounts like LYR, pricing in Elite is difficult to keep track of, especially if prices have changed since launch and/or since introduction of a module. * Adding SCO Drive Price update * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo (#2) * Install uglify-js before use. Fixes https://github.com/EDCD/coriolis/issues/780 . I'm not a Node/NPM dev so if this is the Wong Way :tm: I'm open to better suggestions. * Initial Mandalay commit * Mandalay adjustments * Fixing Mandalay data --------- Co-authored-by: Chris <2653277+chennin@users.noreply.github.com> * Add mandalay (#18) * Python MkII (python_nx) (#99) * Python MkII data and SCO FSD data * Corrected speed/boost values to compensate for something coriolis does to the base values, changed pitch/roll/yaw values to match in game (although not fully tested yet) and added bulkhead costs and made up edID's for them since ED doesn't actually have ID's for them in the journal. Also changed the fuelpower value for the SCO 5C FSD to bring range in coriolis closer to what's in game, but 1 of the 3 values is still wrong. This gets worse on the SCO 5A, where all the values go out of whack and changing the fuelpower value does not have the same effect as it does on the 5C SCO. There is further work required here with each SCO FSD to get range to calculate properly. * changing the fuelpower values back to 2.45 in frame_shift_drive.json after some testing. * Removing code already in PR #98 * Setting EDDBId values to 0 as the ship and these modules do not exist in EDDB * SCO Modules (#98) * Add SCO Modules * Correct SCO Rating/Symbol * Update python_nx.json (#100) FDEV Localization Files have a space between Mk and II. To maintain consistency, we should also maintain such a spacing. (See also: Krait Mk II in this repo and the FDEVID repo under EDCD) * Updating hull pricing of Python and the Mk II so that retail pricing matches in game pricing. OG Python was 1,000cr out, the Mk II was 9Mcr out. * Adding Planetary Approach Suite modules for completeness of the interface (they are in game... should be in Coriolis). This also lead to discovering a bug, where Coriolis generated an inara link that included the planetary approach suite as a module to buy, when the Super Cruise Assist module was fitted... this was simply an incorrect EDDBId on the Super Cruise Assist module and has now been updated to the correct ID. It also raised another bug, where Coriolis would generate the link with the standard Docking Computer in it, no matter which docking computer you actually installed... again, this was an incorrect ID, both computers had the same EDDB Id, this has now been corrected. * [Fix] SCO 2A Group Fix The group FSD2 doesn't exist. A typo added it, and freezes Coriolis on selection. * Adjusted fall-off value for all MC's to 2km where they should be, from 1.8km, except the 'enforcer' which has no fall off. As there is no current way to suggest infinity/no fall-off, I have set this to 4.5km, which is its maximum range and therefore, more accurate than infinity anyway. This lines up with Cannon fall-off figures, which are also set to their maximum range, rather than infinity. * Changing Enforcer falloff to 3km to match in game metric * Adds dummy modules to facilitate improved import error handling. Removes unnecessary legacy PAS module from standard modules. Fixes /dist/index.js not being populated properly. * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo * Added 'Special' field to special modules (groms, packhounds, etc.) to make them easier to distinguish in the search results when typing in search words. Also split out advanced missile racks from the missile rack group of hardpoints, to help distinguish them better, as I did with advanced MC's and AX Enhanced MC's and AX Enhanced MRs, etc. This gives sub-categories in the module selection drop down which were not there before. * Adds missing missile modifications (#7) * Removing Seeker special from Advanced MR (#8) * Fixing missing 'falloff' value by adding the 'range' value to the data. (#9) * Add Type 8 to the Shipyard (#12) * Fix missile rack glitch (#11) * Adds missing missile modifications (#7) * Removing Seeker special from Advanced MR * Type 8 Added to Shipyard * Pricing update for generally available (not Guardian, trader or PP) modules, including standard, internal and hardpoints. Cross Referenced in-game. This will make pricing in Coriolis in-line with pricing in EDOMH, which is more accurate than Inara, or EDSY. Due to in-game discounts for Triple Elite status, at Jameson in Shin and various other discounts like LYR, pricing in Elite is difficult to keep track of, especially if prices have changed since launch and/or since introduction of a module. * Adding SCO Drive Price update * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo (#2) * Install uglify-js before use. Fixes https://github.com/EDCD/coriolis/issues/780 . I'm not a Node/NPM dev so if this is the Wong Way :tm: I'm open to better suggestions. * Initial Mandalay commit * Mandalay adjustments * Pricing update for generally available (not Guardian, trader or PP) modules, including standard, internal and hardpoints. Cross Referenced in-game. This will make pricing in Coriolis in-line with pricing in EDOMH, which is more accurate than Inara, or EDSY. Due to in-game discounts for Triple Elite status, at Jameson in Shin and various other discounts like LYR, pricing in Elite is difficult to keep track of, especially if prices have changed since launch and/or since introduction of a module. * Adding SCO Drive Price update * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo (#2) * Install uglify-js before use. Fixes https://github.com/EDCD/coriolis/issues/780 . I'm not a Node/NPM dev so if this is the Wong Way :tm: I'm open to better suggestions. * Initial Mandalay commit * Mandalay adjustments * Fixing Mandalay data --------- Co-authored-by: David Sangrey Co-authored-by: David Sangrey Co-authored-by: Chris <2653277+chennin@users.noreply.github.com> * Adding EDId of Concord Cannon * Fixing up Concord numbers --------- Co-authored-by: David Sangrey Co-authored-by: David Sangrey Co-authored-by: Chris <2653277+chennin@users.noreply.github.com> * Add mandalay (#28) * Deploy current beta.coriolis.io content to coriolis.io (#5) * Python MkII (python_nx) (#99) * Python MkII data and SCO FSD data * Corrected speed/boost values to compensate for something coriolis does to the base values, changed pitch/roll/yaw values to match in game (although not fully tested yet) and added bulkhead costs and made up edID's for them since ED doesn't actually have ID's for them in the journal. Also changed the fuelpower value for the SCO 5C FSD to bring range in coriolis closer to what's in game, but 1 of the 3 values is still wrong. This gets worse on the SCO 5A, where all the values go out of whack and changing the fuelpower value does not have the same effect as it does on the 5C SCO. There is further work required here with each SCO FSD to get range to calculate properly. * changing the fuelpower values back to 2.45 in frame_shift_drive.json after some testing. * Removing code already in PR #98 * Setting EDDBId values to 0 as the ship and these modules do not exist in EDDB * SCO Modules (#98) * Add SCO Modules * Correct SCO Rating/Symbol * Update python_nx.json (#100) FDEV Localization Files have a space between Mk and II. To maintain consistency, we should also maintain such a spacing. (See also: Krait Mk II in this repo and the FDEVID repo under EDCD) * Updating hull pricing of Python and the Mk II so that retail pricing matches in game pricing. OG Python was 1,000cr out, the Mk II was 9Mcr out. * Adding Planetary Approach Suite modules for completeness of the interface (they are in game... should be in Coriolis). This also lead to discovering a bug, where Coriolis generated an inara link that included the planetary approach suite as a module to buy, when the Super Cruise Assist module was fitted... this was simply an incorrect EDDBId on the Super Cruise Assist module and has now been updated to the correct ID. It also raised another bug, where Coriolis would generate the link with the standard Docking Computer in it, no matter which docking computer you actually installed... again, this was an incorrect ID, both computers had the same EDDB Id, this has now been corrected. * [Fix] SCO 2A Group Fix The group FSD2 doesn't exist. A typo added it, and freezes Coriolis on selection. * Adjusted fall-off value for all MC's to 2km where they should be, from 1.8km, except the 'enforcer' which has no fall off. As there is no current way to suggest infinity/no fall-off, I have set this to 4.5km, which is its maximum range and therefore, more accurate than infinity anyway. This lines up with Cannon fall-off figures, which are also set to their maximum range, rather than infinity. * Changing Enforcer falloff to 3km to match in game metric * Adds dummy modules to facilitate improved import error handling. Removes unnecessary legacy PAS module from standard modules. Fixes /dist/index.js not being populated properly. * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo * Added 'Special' field to special modules (groms, packhounds, etc.) to make them easier to distinguish in the search results when typing in search words. Also split out advanced missile racks from the missile rack group of hardpoints, to help distinguish them better, as I did with advanced MC's and AX Enhanced MC's and AX Enhanced MRs, etc. This gives sub-categories in the module selection drop down which were not there before. --------- Co-authored-by: David Sangrey Co-authored-by: David Sangrey * Adds missing missile modifications (#7) * Removing Seeker special from Advanced MR (#8) * Beta to live (#6) * Python MkII (python_nx) (#99) * Python MkII data and SCO FSD data * Corrected speed/boost values to compensate for something coriolis does to the base values, changed pitch/roll/yaw values to match in game (although not fully tested yet) and added bulkhead costs and made up edID's for them since ED doesn't actually have ID's for them in the journal. Also changed the fuelpower value for the SCO 5C FSD to bring range in coriolis closer to what's in game, but 1 of the 3 values is still wrong. This gets worse on the SCO 5A, where all the values go out of whack and changing the fuelpower value does not have the same effect as it does on the 5C SCO. There is further work required here with each SCO FSD to get range to calculate properly. * changing the fuelpower values back to 2.45 in frame_shift_drive.json after some testing. * Removing code already in PR #98 * Setting EDDBId values to 0 as the ship and these modules do not exist in EDDB * SCO Modules (#98) * Add SCO Modules * Correct SCO Rating/Symbol * Update python_nx.json (#100) FDEV Localization Files have a space between Mk and II. To maintain consistency, we should also maintain such a spacing. (See also: Krait Mk II in this repo and the FDEVID repo under EDCD) * Updating hull pricing of Python and the Mk II so that retail pricing matches in game pricing. OG Python was 1,000cr out, the Mk II was 9Mcr out. * Adding Planetary Approach Suite modules for completeness of the interface (they are in game... should be in Coriolis). This also lead to discovering a bug, where Coriolis generated an inara link that included the planetary approach suite as a module to buy, when the Super Cruise Assist module was fitted... this was simply an incorrect EDDBId on the Super Cruise Assist module and has now been updated to the correct ID. It also raised another bug, where Coriolis would generate the link with the standard Docking Computer in it, no matter which docking computer you actually installed... again, this was an incorrect ID, both computers had the same EDDB Id, this has now been corrected. * [Fix] SCO 2A Group Fix The group FSD2 doesn't exist. A typo added it, and freezes Coriolis on selection. * Adjusted fall-off value for all MC's to 2km where they should be, from 1.8km, except the 'enforcer' which has no fall off. As there is no current way to suggest infinity/no fall-off, I have set this to 4.5km, which is its maximum range and therefore, more accurate than infinity anyway. This lines up with Cannon fall-off figures, which are also set to their maximum range, rather than infinity. * Changing Enforcer falloff to 3km to match in game metric * Adds dummy modules to facilitate improved import error handling. Removes unnecessary legacy PAS module from standard modules. Fixes /dist/index.js not being populated properly. * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo * Added 'Special' field to special modules (groms, packhounds, etc.) to make them easier to distinguish in the search results when typing in search words. Also split out advanced missile racks from the missile rack group of hardpoints, to help distinguish them better, as I did with advanced MC's and AX Enhanced MC's and AX Enhanced MRs, etc. This gives sub-categories in the module selection drop down which were not there before. * Adds missing missile modifications (#7) * Removing Seeker special from Advanced MR (#8) --------- Co-authored-by: David Sangrey Co-authored-by: David Sangrey * Fixing missing 'falloff' value by adding the 'range' value to the data. (#9) * Beta into live (#10) * Python MkII (python_nx) (#99) * Python MkII data and SCO FSD data * Corrected speed/boost values to compensate for something coriolis does to the base values, changed pitch/roll/yaw values to match in game (although not fully tested yet) and added bulkhead costs and made up edID's for them since ED doesn't actually have ID's for them in the journal. Also changed the fuelpower value for the SCO 5C FSD to bring range in coriolis closer to what's in game, but 1 of the 3 values is still wrong. This gets worse on the SCO 5A, where all the values go out of whack and changing the fuelpower value does not have the same effect as it does on the 5C SCO. There is further work required here with each SCO FSD to get range to calculate properly. * Setting EDDBId values to 0 as the ship and these modules do not exist in EDDB * SCO Modules (#98) * Add SCO Modules * Correct SCO Rating/Symbol * Update python_nx.json (#100) FDEV Localization Files have a space between Mk and II. To maintain consistency, we should also maintain such a spacing. (See also: Krait Mk II in this repo and the FDEVID repo under EDCD) * Updating hull pricing of Python and the Mk II so that retail pricing matches in game pricing. OG Python was 1,000cr out, the Mk II was 9Mcr out. * Adding Planetary Approach Suite modules for completeness of the interface (they are in game... should be in Coriolis). This also lead to discovering a bug, where Coriolis generated an inara link that included the planetary approach suite as a module to buy, when the Super Cruise Assist module was fitted... this was simply an incorrect EDDBId on the Super Cruise Assist module and has now been updated to the correct ID. It also raised another bug, where Coriolis would generate the link with the standard Docking Computer in it, no matter which docking computer you actually installed... again, this was an incorrect ID, both computers had the same EDDB Id, this has now been corrected. * [Fix] SCO 2A Group Fix The group FSD2 doesn't exist. A typo added it, and freezes Coriolis on selection. * Adjusted fall-off value for all MC's to 2km where they should be, from 1.8km, except the 'enforcer' which has no fall off. As there is no current way to suggest infinity/no fall-off, I have set this to 4.5km, which is its maximum range and therefore, more accurate than infinity anyway. This lines up with Cannon fall-off figures, which are also set to their maximum range, rather than infinity. * Changing Enforcer falloff to 3km to match in game metric * Adds dummy modules to facilitate improved import error handling. Removes unnecessary legacy PAS module from standard modules. Fixes /dist/index.js not being populated properly. * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo * Added 'Special' field to special modules (groms, packhounds, etc.) to make them easier to distinguish in the search results when typing in search words. Also split out advanced missile racks from the missile rack group of hardpoints, to help distinguish them better, as I did with advanced MC's and AX Enhanced MC's and AX Enhanced MRs, etc. This gives sub-categories in the module selection drop down which were not there before. * Adds missing missile modifications (#7) * Removing Seeker special from Advanced MR (#8) * Fixing missing 'falloff' value by adding the 'range' value to the data. (#9) * Add Type 8 to the Shipyard (#12) * Fix missile rack glitch (#11) * Adds missing missile modifications (#7) * Removing Seeker special from Advanced MR * Type 8 Added to Shipyard * Beta to live (#13) * Python MkII (python_nx) (#99) * Python MkII data and SCO FSD data * Corrected speed/boost values to compensate for something coriolis does to the base values, changed pitch/roll/yaw values to match in game (although not fully tested yet) and added bulkhead costs and made up edID's for them since ED doesn't actually have ID's for them in the journal. Also changed the fuelpower value for the SCO 5C FSD to bring range in coriolis closer to what's in game, but 1 of the 3 values is still wrong. This gets worse on the SCO 5A, where all the values go out of whack and changing the fuelpower value does not have the same effect as it does on the 5C SCO. There is further work required here with each SCO FSD to get range to calculate properly. * changing the fuelpower values back to 2.45 in frame_shift_drive.json after some testing. * Removing code already in PR #98 * Setting EDDBId values to 0 as the ship and these modules do not exist in EDDB * SCO Modules (#98) * Add SCO Modules * Correct SCO Rating/Symbol * Update python_nx.json (#100) FDEV Localization Files have a space between Mk and II. To maintain consistency, we should also maintain such a spacing. (See also: Krait Mk II in this repo and the FDEVID repo under EDCD) * Updating hull pricing of Python and the Mk II so that retail pricing matches in game pricing. OG Python was 1,000cr out, the Mk II was 9Mcr out. * Adding Planetary Approach Suite modules for completeness of the interface (they are in game... should be in Coriolis). This also lead to discovering a bug, where Coriolis generated an inara link that included the planetary approach suite as a module to buy, when the Super Cruise Assist module was fitted... this was simply an incorrect EDDBId on the Super Cruise Assist module and has now been updated to the correct ID. It also raised another bug, where Coriolis would generate the link with the standard Docking Computer in it, no matter which docking computer you actually installed... again, this was an incorrect ID, both computers had the same EDDB Id, this has now been corrected. * [Fix] SCO 2A Group Fix The group FSD2 doesn't exist. A typo added it, and freezes Coriolis on selection. * Adjusted fall-off value for all MC's to 2km where they should be, from 1.8km, except the 'enforcer' which has no fall off. As there is no current way to suggest infinity/no fall-off, I have set this to 4.5km, which is its maximum range and therefore, more accurate than infinity anyway. This lines up with Cannon fall-off figures, which are also set to their maximum range, rather than infinity. * Changing Enforcer falloff to 3km to match in game metric * Adds dummy modules to facilitate improved import error handling. Removes unnecessary legacy PAS module from standard modules. Fixes /dist/index.js not being populated properly. * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo * Added 'Special' field to special modules (groms, packhounds, etc.) to make them easier to distinguish in the search results when typing in search words. Also split out advanced missile racks from the missile rack group of hardpoints, to help distinguish them better, as I did with advanced MC's and AX Enhanced MC's and AX Enhanced MRs, etc. This gives sub-categories in the module selection drop down which were not there before. * Adds missing missile modifications (#7) * Removing Seeker special from Advanced MR (#8) * Fixing missing 'falloff' value by adding the 'range' value to the data. (#9) * Add Type 8 to the Shipyard (#12) * Fix missile rack glitch (#11) * Adds missing missile modifications (#7) * Removing Seeker special from Advanced MR * Type 8 Added to Shipyard --------- Co-authored-by: David Sangrey Co-authored-by: David Sangrey * Pricing update for generally available (not Guardian, trader or PP) modules, including standard, internal and hardpoints. Cross Referenced in-game. This will make pricing in Coriolis in-line with pricing in EDOMH, which is more accurate than Inara, or EDSY. Due to in-game discounts for Triple Elite status, at Jameson in Shin and various other discounts like LYR, pricing in Elite is difficult to keep track of, especially if prices have changed since launch and/or since introduction of a module. * Adding SCO Drive Price update * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo (#2) * Install uglify-js before use. Fixes https://github.com/EDCD/coriolis/issues/780 . I'm not a Node/NPM dev so if this is the Wong Way :tm: I'm open to better suggestions. * Initial Mandalay commit * Mandalay adjustments * Pricing update for generally available (not Guardian, trader or PP) modules, including standard, internal and hardpoints. Cross Referenced in-game. This will make pricing in Coriolis in-line with pricing in EDOMH, which is more accurate than Inara, or EDSY. Due to in-game discounts for Triple Elite status, at Jameson in Shin and various other discounts like LYR, pricing in Elite is difficult to keep track of, especially if prices have changed since launch and/or since introduction of a module. * Adding SCO Drive Price update * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo (#2) * Install uglify-js before use. Fixes https://github.com/EDCD/coriolis/issues/780 . I'm not a Node/NPM dev so if this is the Wong Way :tm: I'm open to better suggestions. * Initial Mandalay commit * Mandalay adjustments * Fixing Mandalay data * Add mandalay (#17) * Pricing update for generally available (not Guardian, trader or PP) modules, including standard, internal and hardpoints. Cross Referenced in-game. This will make pricing in Coriolis in-line with pricing in EDOMH, which is more accurate than Inara, or EDSY. Due to in-game discounts for Triple Elite status, at Jameson in Shin and various other discounts like LYR, pricing in Elite is difficult to keep track of, especially if prices have changed since launch and/or since introduction of a module. * Adding SCO Drive Price update * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo (#2) * Install uglify-js before use. Fixes https://github.com/EDCD/coriolis/issues/780 . I'm not a Node/NPM dev so if this is the Wong Way :tm: I'm open to better suggestions. * Initial Mandalay commit * Mandalay adjustments * Fixing Mandalay data --------- Co-authored-by: Chris <2653277+chennin@users.noreply.github.com> * Add mandalay (#18) * Python MkII (python_nx) (#99) * Python MkII data and SCO FSD data * Corrected speed/boost values to compensate for something coriolis does to the base values, changed pitch/roll/yaw values to match in game (although not fully tested yet) and added bulkhead costs and made up edID's for them since ED doesn't actually have ID's for them in the journal. Also changed the fuelpower value for the SCO 5C FSD to bring range in coriolis closer to what's in game, but 1 of the 3 values is still wrong. This gets worse on the SCO 5A, where all the values go out of whack and changing the fuelpower value does not have the same effect as it does on the 5C SCO. There is further work required here with each SCO FSD to get range to calculate properly. * changing the fuelpower values back to 2.45 in frame_shift_drive.json after some testing. * Removing code already in PR #98 * Setting EDDBId values to 0 as the ship and these modules do not exist in EDDB * SCO Modules (#98) * Add SCO Modules * Correct SCO Rating/Symbol * Update python_nx.json (#100) FDEV Localization Files have a space between Mk and II. To maintain consistency, we should also maintain such a spacing. (See also: Krait Mk II in this repo and the FDEVID repo under EDCD) * Updating hull pricing of Python and the Mk II so that retail pricing matches in game pricing. OG Python was 1,000cr out, the Mk II was 9Mcr out. * Adding Planetary Approach Suite modules for completeness of the interface (they are in game... should be in Coriolis). This also lead to discovering a bug, where Coriolis generated an inara link that included the planetary approach suite as a module to buy, when the Super Cruise Assist module was fitted... this was simply an incorrect EDDBId on the Super Cruise Assist module and has now been updated to the correct ID. It also raised another bug, where Coriolis would generate the link with the standard Docking Computer in it, no matter which docking computer you actually installed... again, this was an incorrect ID, both computers had the same EDDB Id, this has now been corrected. * [Fix] SCO 2A Group Fix The group FSD2 doesn't exist. A typo added it, and freezes Coriolis on selection. * Adjusted fall-off value for all MC's to 2km where they should be, from 1.8km, except the 'enforcer' which has no fall off. As there is no current way to suggest infinity/no fall-off, I have set this to 4.5km, which is its maximum range and therefore, more accurate than infinity anyway. This lines up with Cannon fall-off figures, which are also set to their maximum range, rather than infinity. * Changing Enforcer falloff to 3km to match in game metric * Adds dummy modules to facilitate improved import error handling. Removes unnecessary legacy PAS module from standard modules. Fixes /dist/index.js not being populated properly. * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo * Added 'Special' field to special modules (groms, packhounds, etc.) to make them easier to distinguish in the search results when typing in search words. Also split out advanced missile racks from the missile rack group of hardpoints, to help distinguish them better, as I did with advanced MC's and AX Enhanced MC's and AX Enhanced MRs, etc. This gives sub-categories in the module selection drop down which were not there before. * Adds missing missile modifications (#7) * Removing Seeker special from Advanced MR (#8) * Fixing missing 'falloff' value by adding the 'range' value to the data. (#9) * Add Type 8 to the Shipyard (#12) * Fix missile rack glitch (#11) * Adds missing missile modifications (#7) * Removing Seeker special from Advanced MR * Type 8 Added to Shipyard * Pricing update for generally available (not Guardian, trader or PP) modules, including standard, internal and hardpoints. Cross Referenced in-game. This will make pricing in Coriolis in-line with pricing in EDOMH, which is more accurate than Inara, or EDSY. Due to in-game discounts for Triple Elite status, at Jameson in Shin and various other discounts like LYR, pricing in Elite is difficult to keep track of, especially if prices have changed since launch and/or since introduction of a module. * Adding SCO Drive Price update * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo (#2) * Install uglify-js before use. Fixes https://github.com/EDCD/coriolis/issues/780 . I'm not a Node/NPM dev so if this is the Wong Way :tm: I'm open to better suggestions. * Initial Mandalay commit * Mandalay adjustments * Pricing update for generally available (not Guardian, trader or PP) modules, including standard, internal and hardpoints. Cross Referenced in-game. This will make pricing in Coriolis in-line with pricing in EDOMH, which is more accurate than Inara, or EDSY. Due to in-game discounts for Triple Elite status, at Jameson in Shin and various other discounts like LYR, pricing in Elite is difficult to keep track of, especially if prices have changed since launch and/or since introduction of a module. * Adding SCO Drive Price update * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo (#2) * Install uglify-js before use. Fixes https://github.com/EDCD/coriolis/issues/780 . I'm not a Node/NPM dev so if this is the Wong Way :tm: I'm open to better suggestions. * Initial Mandalay commit * Mandalay adjustments * Fixing Mandalay data --------- Co-authored-by: David Sangrey Co-authored-by: David Sangrey Co-authored-by: Chris <2653277+chennin@users.noreply.github.com> * Add concord cannon (#19) * Adds dummy modules to facilitate improved import error handling. Removes unnecessary legacy PAS module from standard modules. Fixes /dist/index.js not being populated properly. (#1) * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo (#2) * Issue 600 add advanced weapons (#3) * Adds dummy modules to facilitate improved import error handling. Removes unnecessary legacy PAS module from standard modules. Fixes /dist/index.js not being populated properly. * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo * Added 'Special' field to special modules (groms, packhounds, etc.) to make them easier to distinguish in the search results when typing in search words. Also split out advanced missile racks from the missile rack group of hardpoints, to help distinguish them better, as I did with advanced MC's and AX Enhanced MC's and AX Enhanced MRs, etc. This gives sub-categories in the module selection drop down which were not there before. --------- Co-authored-by: David Sangrey * Pricing update for generally available (not Guardian, trader or PP) modules, including standard, internal and hardpoints. Cross Referenced in-game. This will make pricing in Coriolis in-line with pricing in EDOMH, which is more accurate than Inara, or EDSY. Due to in-game discounts for Triple Elite status, at Jameson in Shin and various other discounts like LYR, pricing in Elite is difficult to keep track of, especially if prices have changed since launch and/or since introduction of a module. * Adding SCO Drive Price update * Fix missile rack glitch (#11) * Adds missing missile modifications (#7) * Removing Seeker special from Advanced MR * Install uglify-js before use. Fixes https://github.com/EDCD/coriolis/issues/780 . I'm not a Node/NPM dev so if this is the Wong Way :tm: I'm open to better suggestions. * Type 8 Added to Shipyard (#14) * Initial Addition of the Concord Cannon * Adding EDId of Concord Cannon --------- Co-authored-by: David Sangrey Co-authored-by: Chris <2653277+chennin@users.noreply.github.com> * Display boost intervals better (#20) * Adds dummy modules to facilitate improved import error handling. Removes unnecessary legacy PAS module from standard modules. Fixes /dist/index.js not being populated properly. (#1) * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo (#2) * Issue 600 add advanced weapons (#3) * Adds dummy modules to facilitate improved import error handling. Removes unnecessary legacy PAS module from standard modules. Fixes /dist/index.js not being populated properly. * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo * Added 'Special' field to special modules (groms, packhounds, etc.) to make them easier to distinguish in the search results when typing in search words. Also split out advanced missile racks from the missile rack group of hardpoints, to help distinguish them better, as I did with advanced MC's and AX Enhanced MC's and AX Enhanced MRs, etc. This gives sub-categories in the module selection drop down which were not there before. --------- Co-authored-by: David Sangrey * Pricing update for generally available (not Guardian, trader or PP) modules, including standard, internal and hardpoints. Cross Referenced in-game. This will make pricing in Coriolis in-line with pricing in EDOMH, which is more accurate than Inara, or EDSY. Due to in-game discounts for Triple Elite status, at Jameson in Shin and various other discounts like LYR, pricing in Elite is difficult to keep track of, especially if prices have changed since launch and/or since introduction of a module. * Adding SCO Drive Price update * Fix missile rack glitch (#11) * Adds missing missile modifications (#7) * Removing Seeker special from Advanced MR * Install uglify-js before use. Fixes https://github.com/EDCD/coriolis/issues/780 . I'm not a Node/NPM dev so if this is the Wong Way :tm: I'm open to better suggestions. * Type 8 Added to Shipyard (#14) * Adding boostInt values to ships --------- Co-authored-by: David Sangrey Co-authored-by: Chris <2653277+chennin@users.noreply.github.com> * Adding BoostInt value to Mandalay * Add concord cannon (#22) * Python MkII (python_nx) (#99) * Python MkII data and SCO FSD data * Corrected speed/boost values to compensate for something coriolis does to the base values, changed pitch/roll/yaw values to match in game (although not fully tested yet) and added bulkhead costs and made up edID's for them since ED doesn't actually have ID's for them in the journal. Also changed the fuelpower value for the SCO 5C FSD to bring range in coriolis closer to what's in game, but 1 of the 3 values is still wrong. This gets worse on the SCO 5A, where all the values go out of whack and changing the fuelpower value does not have the same effect as it does on the 5C SCO. There is further work required here with each SCO FSD to get range to calculate properly. * changing the fuelpower values back to 2.45 in frame_shift_drive.json after some testing. * Removing code already in PR #98 * Setting EDDBId values to 0 as the ship and these modules do not exist in EDDB * SCO Modules (#98) * Add SCO Modules * Correct SCO Rating/Symbol * Update python_nx.json (#100) FDEV Localization Files have a space between Mk and II. To maintain consistency, we should also maintain such a spacing. (See also: Krait Mk II in this repo and the FDEVID repo under EDCD) * Updating hull pricing of Python and the Mk II so that retail pricing matches in game pricing. OG Python was 1,000cr out, the Mk II was 9Mcr out. * Adding Planetary Approach Suite modules for completeness of the interface (they are in game... should be in Coriolis). This also lead to discovering a bug, where Coriolis generated an inara link that included the planetary approach suite as a module to buy, when the Super Cruise Assist module was fitted... this was simply an incorrect EDDBId on the Super Cruise Assist module and has now been updated to the correct ID. It also raised another bug, where Coriolis would generate the link with the standard Docking Computer in it, no matter which docking computer you actually installed... again, this was an incorrect ID, both computers had the same EDDB Id, this has now been corrected. * [Fix] SCO 2A Group Fix The group FSD2 doesn't exist. A typo added it, and freezes Coriolis on selection. * Adjusted fall-off value for all MC's to 2km where they should be, from 1.8km, except the 'enforcer' which has no fall off. As there is no current way to suggest infinity/no fall-off, I have set this to 4.5km, which is its maximum range and therefore, more accurate than infinity anyway. This lines up with Cannon fall-off figures, which are also set to their maximum range, rather than infinity. * Changing Enforcer falloff to 3km to match in game metric * Adds dummy modules to facilitate improved import error handling. Removes unnecessary legacy PAS module from standard modules. Fixes /dist/index.js not being populated properly. * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo * Adds dummy modules to facilitate improved import error handling. Removes unnecessary legacy PAS module from standard modules. Fixes /dist/index.js not being populated properly. (#1) * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo (#2) * Added 'Special' field to special modules (groms, packhounds, etc.) to make them easier to distinguish in the search results when typing in search words. Also split out advanced missile racks from the missile rack group of hardpoints, to help distinguish them better, as I did with advanced MC's and AX Enhanced MC's and AX Enhanced MRs, etc. This gives sub-categories in the module selection drop down which were not there before. * Issue 600 add advanced weapons (#3) * Adds dummy modules to facilitate improved import error handling. Removes unnecessary legacy PAS module from standard modules. Fixes /dist/index.js not being populated properly. * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo * Added 'Special' field to special modules (groms, packhounds, etc.) to make them easier to distinguish in the search results when typing in search words. Also split out advanced missile racks from the missile rack group of hardpoints, to help distinguish them better, as I did with advanced MC's and AX Enhanced MC's and AX Enhanced MRs, etc. This gives sub-categories in the module selection drop down which were not there before. --------- Co-authored-by: David Sangrey * Pricing update for generally available (not Guardian, trader or PP) modules, including standard, internal and hardpoints. Cross Referenced in-game. This will make pricing in Coriolis in-line with pricing in EDOMH, which is more accurate than Inara, or EDSY. Due to in-game discounts for Triple Elite status, at Jameson in Shin and various other discounts like LYR, pricing in Elite is difficult to keep track of, especially if prices have changed since launch and/or since introduction of a module. * Adding SCO Drive Price update * Adds missing missile modifications (#7) * Removing Seeker special from Advanced MR (#8) * Fixing missing 'falloff' value by adding the 'range' value to the data. (#9) * Fix missile rack glitch (#11) * Adds missing missile modifications (#7) * Removing Seeker special from Advanced MR * Add Type 8 to the Shipyard (#12) * Fix missile rack glitch (#11) * Adds missing missile modifications (#7) * Removing Seeker special from Advanced MR * Type 8 Added to Shipyard * Install uglify-js before use. Fixes https://github.com/EDCD/coriolis/issues/780 . I'm not a Node/NPM dev so if this is the Wong Way :tm: I'm open to better suggestions. * Type 8 Added to Shipyard (#14) * Pricing update for generally available (not Guardian, trader or PP) modules, including standard, internal and hardpoints. Cross Referenced in-game. This will make pricing in Coriolis in-line with pricing in EDOMH, which is more accurate than Inara, or EDSY. Due to in-game discounts for Triple Elite status, at Jameson in Shin and various other discounts like LYR, pricing in Elite is difficult to keep track of, especially if prices have changed since launch and/or since introduction of a module. * Adding SCO Drive Price update * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo (#2) * Install uglify-js before use. Fixes https://github.com/EDCD/coriolis/issues/780 . I'm not a Node/NPM dev so if this is the Wong Way :tm: I'm open to better suggestions. * Initial Mandalay commit * Mandalay adjustments * Initial Addition of the Concord Cannon * Add mandalay (#17) * Pricing update for generally available (not Guardian, trader or PP) modules, including standard, internal and hardpoints. Cross Referenced in-game. This will make pricing in Coriolis in-line with pricing in EDOMH, which is more accurate than Inara, or EDSY. Due to in-game discounts for Triple Elite status, at Jameson in Shin and various other discounts like LYR, pricing in Elite is difficult to keep track of, especially if prices have changed since launch and/or since introduction of a module. * Adding SCO Drive Price update * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo (#2) * Install uglify-js before use. Fixes https://github.com/EDCD/coriolis/issues/780 . I'm not a Node/NPM dev so if this is the Wong Way :tm: I'm open to better suggestions. * Initial Mandalay commit * Mandalay adjustments * Fixing Mandalay data --------- Co-authored-by: Chris <2653277+chennin@users.noreply.github.com> * Adding EDId of Concord Cannon * Fixing up Concord numbers --------- Co-authored-by: David Sangrey Co-authored-by: David Sangrey Co-authored-by: Chris <2653277+chennin@users.noreply.github.com> * Display boost intervals better (#23) * Python MkII (python_nx) (#99) * Python MkII data and SCO FSD data * Corrected speed/boost values to compensate for something coriolis does to the base values, changed pitch/roll/yaw values to match in game (although not fully tested yet) and added bulkhead costs and made up edID's for them since ED doesn't actually have ID's for them in the journal. Also changed the fuelpower value for the SCO 5C FSD to bring range in coriolis closer to what's in game, but 1 of the 3 values is still wrong. This gets worse on the SCO 5A, where all the values go out of whack and changing the fuelpower value does not have the same effect as it does on the 5C SCO. There is further work required here with each SCO FSD to get range to calculate properly. * changing the fuelpower values back to 2.45 in frame_shift_drive.json after some testing. * Removing code already in PR #98 * Setting EDDBId values to 0 as the ship and these modules do not exist in EDDB * SCO Modules (#98) * Add SCO Modules * Correct SCO Rating/Symbol * Update python_nx.json (#100) FDEV Localization Files have a space between Mk and II. To maintain consistency, we should also maintain such a spacing. (See also: Krait Mk II in this repo and the FDEVID repo under EDCD) * Updating hull pricing of Python and the Mk II so that retail pricing matches in game pricing. OG Python was 1,000cr out, the Mk II was 9Mcr out. * Adding Planetary Approach Suite modules for completeness of the interface (they are in game... should be in Coriolis). This also lead to discovering a bug, where Coriolis generated an inara link that included the planetary approach suite as a module to buy, when the Super Cruise Assist module was fitted... this was simply an incorrect EDDBId on the Super Cruise Assist module and has now been updated to the correct ID. It also raised another bug, where Coriolis would generate the link with the standard Docking Computer in it, no matter which docking computer you actually installed... again, this was an incorrect ID, both computers had the same EDDB Id, this has now been corrected. * [Fix] SCO 2A Group Fix The group FSD2 doesn't exist. A typo added it, and freezes Coriolis on selection. * Adjusted fall-off value for all MC's to 2km where they should be, from 1.8km, except the 'enforcer' which has no fall off. As there is no current way to suggest infinity/no fall-off, I have set this to 4.5km, which is its maximum range and therefore, more accurate than infinity anyway. This lines up with Cannon fall-off figures, which are also set to their maximum range, rather than infinity. * Changing Enforcer falloff to 3km to match in game metric * Adds dummy modules to facilitate improved import error handling. Removes unnecessary legacy PAS module from standard modules. Fixes /dist/index.js not being populated properly. * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo * Adds dummy modules to facilitate improved import error handling. Removes unnecessary legacy PAS module from standard modules. Fixes /dist/index.js not being populated properly. (#1) * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo (#2) * Added 'Special' field to special modules (groms, packhounds, etc.) to make them easier to distinguish in the search results when typing in search words. Also split out advanced missile racks from the missile rack group of hardpoints, to help distinguish them better, as I did with advanced MC's and AX Enhanced MC's and AX Enhanced MRs, etc. This gives sub-categories in the module selection drop down which were not there before. * Issue 600 add advanced weapons (#3) * Adds dummy modules to facilitate improved import error handling. Removes unnecessary legacy PAS module from standard modules. Fixes /dist/index.js not being populated properly. * Adds the Advanced MC's, AX MC's, AX MR's and Nanite Torpedo * Added 'Special' field to special modules (groms, packhounds, etc.) to make them easier to distinguish in the search results when typing in search words. Also split out advanced missile racks from the missile rack group of hardpoints, to help distinguish them better, as I did with advanced MC's and AX Enhanced MC's and AX Enhanced MRs, etc. This gives sub-categories in the module selection drop down which were not there before. --------- Co-authored-by: David Sangrey * Pricing update for generally available (not Guardian, trader or PP) modules, including standard, internal and hardpoints. Cross Referenced in-game. This will make pricing in Coriolis in-line with pricing in EDOMH, which is more accurate than Inara, or EDSY. Due to in-game discounts for Triple Elite status, at Jameson in Shin and various other discounts like LYR, pricing in Elite is difficult to keep track of, especially if prices have changed since launch and/or since introduction of a module. * Adding SCO Drive Price update * Adds missing missile modifications (#7) * Removing Seeker special from Advanced MR (#8) * Fixing missing 'falloff' value by adding the 'range' value to the data. (#9) * Fix missile rack glitch (#11) * Adds missing missile modifications (#7) * Removing Seeker special from Advanced MR * Add Type 8 to the Shipyard (#12) * Fix missile… * Making engineers match blueprints --------- Co-authored-by: Chris <2653277+chennin@users.noreply.github.com> Co-authored-by: David Sangrey Co-authored-by: David Sangrey --- modifications/modules.json | 2395 ++++++++++++++++------- modules/standard/power_distributor.json | 14 +- 2 files changed, 1723 insertions(+), 686 deletions(-) diff --git a/modifications/modules.json b/modifications/modules.json index 0d261b0..2fc9ee0 100644 --- a/modifications/modules.json +++ b/modifications/modules.json @@ -6,24 +6,33 @@ "1": { "engineers": [ "Bill Turner", - "Lori Jameson" + "Lori Jameson", + "Petra Olmanova" ] }, "2": { "engineers": [ "Bill Turner", - "Lori Jameson" + "Lori Jameson", + "Petra Olmanova" ] }, "3": { "engineers": [ "Bill Turner", - "Lori Jameson" + "Lori Jameson", + "Petra Olmanova" ] }, "4": { "engineers": [ - "Lori Jameson" + "Lori Jameson", + "Petra Olmanova" + ] + }, + "5": { + "engineers": [ + "Petra Olmanova" ] } } @@ -234,29 +243,34 @@ "1": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "2": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "3": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "4": { "engineers": [ - "Broo Tarquin" + "Broo Tarquin", + "Mel Brandon" ] }, "5": { "engineers": [ - "Broo Tarquin" + "Broo Tarquin", + "Mel Brandon" ] } } @@ -266,29 +280,34 @@ "1": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "2": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "3": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "4": { "engineers": [ - "Broo Tarquin" + "Broo Tarquin", + "Mel Brandon" ] }, "5": { "engineers": [ - "Broo Tarquin" + "Broo Tarquin", + "Mel Brandon" ] } } @@ -298,29 +317,34 @@ "1": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "2": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "3": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "4": { "engineers": [ - "Broo Tarquin" + "Broo Tarquin", + "Mel Brandon" ] }, "5": { "engineers": [ - "Broo Tarquin" + "Broo Tarquin", + "Mel Brandon" ] } } @@ -330,29 +354,34 @@ "1": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "2": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "3": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "4": { "engineers": [ - "Broo Tarquin" + "Broo Tarquin", + "Mel Brandon" ] }, "5": { "engineers": [ - "Broo Tarquin" + "Broo Tarquin", + "Mel Brandon" ] } } @@ -362,29 +391,34 @@ "1": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "2": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "3": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "4": { "engineers": [ - "Broo Tarquin" + "Broo Tarquin", + "Mel Brandon" ] }, "5": { "engineers": [ - "Broo Tarquin" + "Broo Tarquin", + "Mel Brandon" ] } } @@ -394,29 +428,34 @@ "1": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "2": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "3": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "4": { "engineers": [ - "Broo Tarquin" + "Broo Tarquin", + "Mel Brandon" ] }, "5": { "engineers": [ - "Broo Tarquin" + "Broo Tarquin", + "Mel Brandon" ] } } @@ -455,31 +494,36 @@ "engineers": [ "Didi Vatermann", "Elvira Martuuk", - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "2": { "engineers": [ "Didi Vatermann", "Elvira Martuuk", - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "3": { "engineers": [ "Didi Vatermann", "Elvira Martuuk", - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "4": { "engineers": [ - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "5": { "engineers": [ - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] } } @@ -490,31 +534,36 @@ "engineers": [ "Didi Vatermann", "Elvira Martuuk", - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "2": { "engineers": [ "Didi Vatermann", "Elvira Martuuk", - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "3": { "engineers": [ "Didi Vatermann", "Elvira Martuuk", - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "4": { "engineers": [ - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "5": { "engineers": [ - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] } } @@ -525,31 +574,36 @@ "engineers": [ "Didi Vatermann", "Elvira Martuuk", - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "2": { "engineers": [ "Didi Vatermann", "Elvira Martuuk", - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "3": { "engineers": [ "Didi Vatermann", "Elvira Martuuk", - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "4": { "engineers": [ - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "5": { "engineers": [ - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] } } @@ -560,31 +614,36 @@ "engineers": [ "Didi Vatermann", "Elvira Martuuk", - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "2": { "engineers": [ "Didi Vatermann", "Elvira Martuuk", - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "3": { "engineers": [ "Didi Vatermann", "Elvira Martuuk", - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "4": { "engineers": [ - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "5": { "engineers": [ - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] } } @@ -621,28 +680,33 @@ "1": { "engineers": [ "The Sarge", - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Marsha Hicks" ] }, "2": { "engineers": [ "The Sarge", - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Marsha Hicks" ] }, "3": { "engineers": [ - "The Sarge" + "The Sarge", + "Marsha Hicks" ] }, "4": { "engineers": [ - "The Sarge" + "The Sarge", + "Marsha Hicks" ] }, "5": { "engineers": [ - "The Sarge" + "The Sarge", + "Marsha Hicks" ] } } @@ -652,28 +716,33 @@ "1": { "engineers": [ "The Sarge", - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Marsha Hicks" ] }, "2": { "engineers": [ "The Sarge", - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Marsha Hicks" ] }, "3": { "engineers": [ - "The Sarge" + "The Sarge", + "Marsha Hicks" ] }, "4": { "engineers": [ - "The Sarge" + "The Sarge", + "Marsha Hicks" ] }, "5": { "engineers": [ - "The Sarge" + "The Sarge", + "Marsha Hicks" ] } } @@ -683,28 +752,33 @@ "1": { "engineers": [ "The Sarge", - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Marsha Hicks" ] }, "2": { "engineers": [ "The Sarge", - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Marsha Hicks" ] }, "3": { "engineers": [ - "The Sarge" + "The Sarge", + "Marsha Hicks" ] }, "4": { "engineers": [ - "The Sarge" + "The Sarge", + "Marsha Hicks" ] }, "5": { "engineers": [ - "The Sarge" + "The Sarge", + "Marsha Hicks" ] } } @@ -714,28 +788,33 @@ "1": { "engineers": [ "The Sarge", - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Marsha Hicks" ] }, "2": { "engineers": [ "The Sarge", - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Marsha Hicks" ] }, "3": { "engineers": [ - "The Sarge" + "The Sarge", + "Marsha Hicks" ] }, "4": { "engineers": [ - "The Sarge" + "The Sarge", + "Marsha Hicks" ] }, "5": { "engineers": [ - "The Sarge" + "The Sarge", + "Marsha Hicks" ] } } @@ -745,28 +824,33 @@ "1": { "engineers": [ "The Sarge", - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Marsha Hicks" ] }, "2": { "engineers": [ "The Sarge", - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Marsha Hicks" ] }, "3": { "engineers": [ - "The Sarge" + "The Sarge", + "Marsha Hicks" ] }, "4": { "engineers": [ - "The Sarge" + "The Sarge", + "Marsha Hicks" ] }, "5": { "engineers": [ - "The Sarge" + "The Sarge", + "Marsha Hicks" ] } } @@ -776,28 +860,33 @@ "1": { "engineers": [ "The Sarge", - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Marsha Hicks" ] }, "2": { "engineers": [ "The Sarge", - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Marsha Hicks" ] }, "3": { "engineers": [ - "The Sarge" + "The Sarge", + "Marsha Hicks" ] }, "4": { "engineers": [ - "The Sarge" + "The Sarge", + "Marsha Hicks" ] }, "5": { "engineers": [ - "The Sarge" + "The Sarge", + "Marsha Hicks" ] } } @@ -807,28 +896,33 @@ "1": { "engineers": [ "The Sarge", - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Marsha Hicks" ] }, "2": { "engineers": [ "The Sarge", - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Marsha Hicks" ] }, "3": { "engineers": [ - "The Sarge" + "The Sarge", + "Marsha Hicks" ] }, "4": { "engineers": [ - "The Sarge" + "The Sarge", + "Marsha Hicks" ] }, "5": { "engineers": [ - "The Sarge" + "The Sarge", + "Marsha Hicks" ] } } @@ -851,17 +945,20 @@ }, "3": { "engineers": [ - "The Sarge" + "The Sarge", + "Marsha Hicks" ] }, "4": { "engineers": [ - "The Sarge" + "The Sarge", + "Marsha Hicks" ] }, "5": { "engineers": [ - "The Sarge" + "The Sarge", + "Marsha Hicks" ] } } @@ -905,6 +1002,7 @@ "grades": { "1": { "engineers": [ + "Marsha Hicks", "Ram Tah", "The Sarge", "Tiana Fortune" @@ -912,6 +1010,7 @@ }, "2": { "engineers": [ + "Marsha Hicks", "Ram Tah", "The Sarge", "Tiana Fortune" @@ -919,6 +1018,7 @@ }, "3": { "engineers": [ + "Marsha Hicks", "Ram Tah", "The Sarge", "Tiana Fortune" @@ -926,6 +1026,7 @@ }, "4": { "engineers": [ + "Marsha Hicks", "Ram Tah", "The Sarge", "Tiana Fortune" @@ -933,6 +1034,7 @@ }, "5": { "engineers": [ + "Marsha Hicks", "The Sarge", "Tiana Fortune" ] @@ -943,6 +1045,7 @@ "grades": { "1": { "engineers": [ + "Marsha Hicks", "Ram Tah", "The Sarge", "Tiana Fortune" @@ -950,6 +1053,7 @@ }, "2": { "engineers": [ + "Marsha Hicks", "Ram Tah", "The Sarge", "Tiana Fortune" @@ -957,6 +1061,7 @@ }, "3": { "engineers": [ + "Marsha Hicks", "Ram Tah", "The Sarge", "Tiana Fortune" @@ -964,6 +1069,7 @@ }, "4": { "engineers": [ + "Marsha Hicks", "Ram Tah", "The Sarge", "Tiana Fortune" @@ -971,6 +1077,7 @@ }, "5": { "engineers": [ + "Marsha Hicks", "The Sarge", "Tiana Fortune" ] @@ -981,6 +1088,7 @@ "grades": { "1": { "engineers": [ + "Marsha Hicks", "Ram Tah", "The Sarge", "Tiana Fortune" @@ -988,6 +1096,7 @@ }, "2": { "engineers": [ + "Marsha Hicks", "Ram Tah", "The Sarge", "Tiana Fortune" @@ -995,6 +1104,7 @@ }, "3": { "engineers": [ + "Marsha Hicks", "Ram Tah", "The Sarge", "Tiana Fortune" @@ -1002,6 +1112,7 @@ }, "4": { "engineers": [ + "Marsha Hicks", "Ram Tah", "The Sarge", "Tiana Fortune" @@ -1009,6 +1120,7 @@ }, "5": { "engineers": [ + "Marsha Hicks", "The Sarge", "Tiana Fortune" ] @@ -1167,7 +1279,10 @@ "Lori Jameson", "Tiana Fortune", "Juri Ishmaak", - "Etienne Dorn" + "Etienne Dorn", + "Lei Cheung", + "Felicity Farseer", + "Hera Tani" ] }, "2": { @@ -1176,7 +1291,10 @@ "Lori Jameson", "Tiana Fortune", "Juri Ishmaak", - "Etienne Dorn" + "Etienne Dorn", + "Lei Cheung", + "Felicity Farseer", + "Hera Tani" ] }, "3": { @@ -1184,17 +1302,31 @@ "Bill Turner", "Lori Jameson", "Tiana Fortune", - "Juri Ishmaak" + "Juri Ishmaak", + "Etienne Dorn", + "Lei Cheung", + "Felicity Farseer", + "Hera Tani" ] }, "4": { "engineers": [ - "Tiana Fortune" + "Bill Turner", + "Lori Jameson", + "Tiana Fortune", + "Juri Ishmaak", + "Etienne Dorn", + "Lei Cheung" ] }, "5": { "engineers": [ - "Tiana Fortune" + "Bill Turner", + "Lori Jameson", + "Tiana Fortune", + "Juri Ishmaak", + "Etienne Dorn", + "Lei Cheung" ] } } @@ -1207,7 +1339,10 @@ "Lori Jameson", "Tiana Fortune", "Juri Ishmaak", - "Etienne Dorn" + "Etienne Dorn", + "Lei Cheung", + "Felicity Farseer", + "Hera Tani" ] }, "2": { @@ -1216,7 +1351,10 @@ "Lori Jameson", "Tiana Fortune", "Juri Ishmaak", - "Etienne Dorn" + "Etienne Dorn", + "Lei Cheung", + "Felicity Farseer", + "Hera Tani" ] }, "3": { @@ -1224,17 +1362,31 @@ "Bill Turner", "Lori Jameson", "Tiana Fortune", - "Juri Ishmaak" + "Juri Ishmaak", + "Etienne Dorn", + "Lei Cheung", + "Felicity Farseer", + "Hera Tani" ] }, "4": { "engineers": [ - "Tiana Fortune" + "Bill Turner", + "Lori Jameson", + "Tiana Fortune", + "Juri Ishmaak", + "Etienne Dorn", + "Lei Cheung" ] }, "5": { "engineers": [ - "Tiana Fortune" + "Bill Turner", + "Lori Jameson", + "Tiana Fortune", + "Juri Ishmaak", + "Etienne Dorn", + "Lei Cheung" ] } } @@ -1247,7 +1399,10 @@ "Lori Jameson", "Tiana Fortune", "Juri Ishmaak", - "Etienne Dorn" + "Etienne Dorn", + "Lei Cheung", + "Felicity Farseer", + "Hera Tani" ] }, "2": { @@ -1256,7 +1411,10 @@ "Lori Jameson", "Tiana Fortune", "Juri Ishmaak", - "Etienne Dorn" + "Etienne Dorn", + "Lei Cheung", + "Felicity Farseer", + "Hera Tani" ] }, "3": { @@ -1264,17 +1422,31 @@ "Bill Turner", "Lori Jameson", "Tiana Fortune", - "Juri Ishmaak" + "Juri Ishmaak", + "Etienne Dorn", + "Lei Cheung", + "Felicity Farseer", + "Hera Tani" ] }, "4": { "engineers": [ - "Tiana Fortune" + "Bill Turner", + "Lori Jameson", + "Tiana Fortune", + "Juri Ishmaak", + "Etienne Dorn", + "Lei Cheung" ] }, "5": { "engineers": [ - "Tiana Fortune" + "Bill Turner", + "Lori Jameson", + "Tiana Fortune", + "Juri Ishmaak", + "Etienne Dorn", + "Lei Cheung" ] } } @@ -1287,7 +1459,10 @@ "Lori Jameson", "Tiana Fortune", "Juri Ishmaak", - "Etienne Dorn" + "Etienne Dorn", + "Lei Cheung", + "Felicity Farseer", + "Hera Tani" ] }, "2": { @@ -1296,7 +1471,10 @@ "Lori Jameson", "Tiana Fortune", "Juri Ishmaak", - "Etienne Dorn" + "Etienne Dorn", + "Lei Cheung", + "Felicity Farseer", + "Hera Tani" ] }, "3": { @@ -1304,17 +1482,31 @@ "Bill Turner", "Lori Jameson", "Tiana Fortune", - "Juri Ishmaak" + "Juri Ishmaak", + "Etienne Dorn", + "Lei Cheung", + "Felicity Farseer", + "Hera Tani" ] }, "4": { "engineers": [ - "Tiana Fortune" + "Bill Turner", + "Lori Jameson", + "Tiana Fortune", + "Juri Ishmaak", + "Etienne Dorn", + "Lei Cheung" ] }, "5": { "engineers": [ - "Tiana Fortune" + "Bill Turner", + "Lori Jameson", + "Tiana Fortune", + "Juri Ishmaak", + "Etienne Dorn", + "Lei Cheung" ] } } @@ -1327,7 +1519,10 @@ "Lori Jameson", "Tiana Fortune", "Juri Ishmaak", - "Etienne Dorn" + "Etienne Dorn", + "Lei Cheung", + "Felicity Farseer", + "Hera Tani" ] }, "2": { @@ -1336,7 +1531,10 @@ "Lori Jameson", "Tiana Fortune", "Juri Ishmaak", - "Etienne Dorn" + "Etienne Dorn", + "Lei Cheung", + "Felicity Farseer", + "Hera Tani" ] }, "3": { @@ -1344,17 +1542,31 @@ "Bill Turner", "Lori Jameson", "Tiana Fortune", - "Juri Ishmaak" + "Juri Ishmaak", + "Etienne Dorn", + "Lei Cheung", + "Felicity Farseer", + "Hera Tani" ] }, "4": { "engineers": [ - "Tiana Fortune" + "Bill Turner", + "Lori Jameson", + "Tiana Fortune", + "Juri Ishmaak", + "Etienne Dorn", + "Lei Cheung" ] }, "5": { "engineers": [ - "Tiana Fortune" + "Bill Turner", + "Lori Jameson", + "Tiana Fortune", + "Juri Ishmaak", + "Etienne Dorn", + "Lei Cheung" ] } } @@ -1367,7 +1579,10 @@ "Lori Jameson", "Tiana Fortune", "Juri Ishmaak", - "Etienne Dorn" + "Etienne Dorn", + "Lei Cheung", + "Felicity Farseer", + "Hera Tani" ] }, "2": { @@ -1376,7 +1591,10 @@ "Lori Jameson", "Tiana Fortune", "Juri Ishmaak", - "Etienne Dorn" + "Etienne Dorn", + "Lei Cheung", + "Felicity Farseer", + "Hera Tani" ] }, "3": { @@ -1384,17 +1602,31 @@ "Bill Turner", "Lori Jameson", "Tiana Fortune", - "Juri Ishmaak" + "Juri Ishmaak", + "Etienne Dorn", + "Lei Cheung", + "Felicity Farseer", + "Hera Tani" ] }, "4": { "engineers": [ - "Tiana Fortune" + "Bill Turner", + "Lori Jameson", + "Tiana Fortune", + "Juri Ishmaak", + "Etienne Dorn", + "Lei Cheung" ] }, "5": { "engineers": [ - "Tiana Fortune" + "Bill Turner", + "Lori Jameson", + "Tiana Fortune", + "Juri Ishmaak", + "Etienne Dorn", + "Lei Cheung" ] } } @@ -1544,26 +1776,31 @@ "grades": { "1": { "engineers": [ + "Petra Olmanova", "Ram Tah" ] }, "2": { "engineers": [ + "Petra Olmanova", "Ram Tah" ] }, "3": { "engineers": [ + "Petra Olmanova", "Ram Tah" ] }, "4": { "engineers": [ + "Petra Olmanova", "Ram Tah" ] }, "5": { "engineers": [ + "Petra Olmanova", "Ram Tah" ] } @@ -1573,26 +1810,31 @@ "grades": { "1": { "engineers": [ + "Petra Olmanova", "Ram Tah" ] }, "2": { "engineers": [ + "Petra Olmanova", "Ram Tah" ] }, "3": { "engineers": [ + "Petra Olmanova", "Ram Tah" ] }, "4": { "engineers": [ + "Petra Olmanova", "Ram Tah" ] }, "5": { "engineers": [ + "Petra Olmanova", "Ram Tah" ] } @@ -1602,26 +1844,31 @@ "grades": { "1": { "engineers": [ + "Petra Olmanova", "Ram Tah" ] }, "2": { "engineers": [ + "Petra Olmanova", "Ram Tah" ] }, "3": { "engineers": [ + "Petra Olmanova", "Ram Tah" ] }, "4": { "engineers": [ + "Petra Olmanova", "Ram Tah" ] }, "5": { "engineers": [ + "Petra Olmanova", "Ram Tah" ] } @@ -1640,29 +1887,34 @@ "grades": { "1": { "engineers": [ - "Tod McQuinn", + "Marsha Hicks", + "Tod \"The Blaster\" McQuinn", "Zacariah Nemo" ] }, "2": { "engineers": [ - "Tod McQuinn", + "Marsha Hicks", + "Tod \"The Blaster\" McQuinn", "Zacariah Nemo" ] }, "3": { "engineers": [ - "Tod McQuinn", + "Marsha Hicks", + "Tod \"The Blaster\" McQuinn", "Zacariah Nemo" ] }, "4": { "engineers": [ + "Marsha Hicks", "Zacariah Nemo" ] }, "5": { "engineers": [ + "Marsha Hicks", "Zacariah Nemo" ] } @@ -1672,29 +1924,34 @@ "grades": { "1": { "engineers": [ - "Tod McQuinn", + "Marsha Hicks", + "Tod \"The Blaster\" McQuinn", "Zacariah Nemo" ] }, "2": { "engineers": [ - "Tod McQuinn", + "Marsha Hicks", + "Tod \"The Blaster\" McQuinn", "Zacariah Nemo" ] }, "3": { "engineers": [ - "Tod McQuinn", + "Marsha Hicks", + "Tod \"The Blaster\" McQuinn", "Zacariah Nemo" ] }, "4": { "engineers": [ + "Marsha Hicks", "Zacariah Nemo" ] }, "5": { "engineers": [ + "Marsha Hicks", "Zacariah Nemo" ] } @@ -1704,29 +1961,34 @@ "grades": { "1": { "engineers": [ - "Tod McQuinn", + "Marsha Hicks", + "Tod \"The Blaster\" McQuinn", "Zacariah Nemo" ] }, "2": { "engineers": [ - "Tod McQuinn", + "Marsha Hicks", + "Tod \"The Blaster\" McQuinn", "Zacariah Nemo" ] }, "3": { "engineers": [ - "Tod McQuinn", + "Marsha Hicks", + "Tod \"The Blaster\" McQuinn", "Zacariah Nemo" ] }, "4": { "engineers": [ + "Marsha Hicks", "Zacariah Nemo" ] }, "5": { "engineers": [ + "Marsha Hicks", "Zacariah Nemo" ] } @@ -1736,29 +1998,34 @@ "grades": { "1": { "engineers": [ - "Tod McQuinn", + "Marsha Hicks", + "Tod \"The Blaster\" McQuinn", "Zacariah Nemo" ] }, "2": { "engineers": [ - "Tod McQuinn", + "Marsha Hicks", + "Tod \"The Blaster\" McQuinn", "Zacariah Nemo" ] }, "3": { "engineers": [ - "Tod McQuinn", + "Marsha Hicks", + "Tod \"The Blaster\" McQuinn", "Zacariah Nemo" ] }, "4": { "engineers": [ + "Marsha Hicks", "Zacariah Nemo" ] }, "5": { "engineers": [ + "Marsha Hicks", "Zacariah Nemo" ] } @@ -1768,29 +2035,34 @@ "grades": { "1": { "engineers": [ - "Tod McQuinn", + "Marsha Hicks", + "Tod \"The Blaster\" McQuinn", "Zacariah Nemo" ] }, "2": { "engineers": [ - "Tod McQuinn", + "Marsha Hicks", + "Tod \"The Blaster\" McQuinn", "Zacariah Nemo" ] }, "3": { "engineers": [ - "Tod McQuinn", + "Marsha Hicks", + "Tod \"The Blaster\" McQuinn", "Zacariah Nemo" ] }, "4": { "engineers": [ + "Marsha Hicks", "Zacariah Nemo" ] }, "5": { "engineers": [ + "Marsha Hicks", "Zacariah Nemo" ] } @@ -1800,29 +2072,34 @@ "grades": { "1": { "engineers": [ - "Tod McQuinn", + "Marsha Hicks", + "Tod \"The Blaster\" McQuinn", "Zacariah Nemo" ] }, "2": { "engineers": [ - "Tod McQuinn", + "Marsha Hicks", + "Tod \"The Blaster\" McQuinn", "Zacariah Nemo" ] }, "3": { "engineers": [ - "Tod McQuinn", + "Marsha Hicks", + "Tod \"The Blaster\" McQuinn", "Zacariah Nemo" ] }, "4": { "engineers": [ + "Marsha Hicks", "Zacariah Nemo" ] }, "5": { "engineers": [ + "Marsha Hicks", "Zacariah Nemo" ] } @@ -1832,29 +2109,34 @@ "grades": { "1": { "engineers": [ - "Tod McQuinn", + "Marsha Hicks", + "Tod \"The Blaster\" McQuinn", "Zacariah Nemo" ] }, "2": { "engineers": [ - "Tod McQuinn", + "Marsha Hicks", + "Tod \"The Blaster\" McQuinn", "Zacariah Nemo" ] }, "3": { "engineers": [ - "Tod McQuinn", + "Marsha Hicks", + "Tod \"The Blaster\" McQuinn", "Zacariah Nemo" ] }, "4": { "engineers": [ + "Marsha Hicks", "Zacariah Nemo" ] }, "5": { "engineers": [ + "Marsha Hicks", "Zacariah Nemo" ] } @@ -1999,24 +2281,33 @@ "1": { "engineers": [ "Bill Turner", - "Lori Jameson" + "Lori Jameson", + "Marsha Hicks" ] }, "2": { "engineers": [ "Bill Turner", - "Lori Jameson" + "Lori Jameson", + "Marsha Hicks" ] }, "3": { "engineers": [ "Bill Turner", - "Lori Jameson" + "Lori Jameson", + "Marsha Hicks" ] }, "4": { "engineers": [ - "Lori Jameson" + "Lori Jameson", + "Marsha Hicks" + ] + }, + "5": { + "engineers": [ + "Marsha Hicks" ] } } @@ -2036,7 +2327,9 @@ "Colonel Bris Dekker", "Elvira Martuuk", "Felicity Farseer", - "Professor Palin" + "Professor Palin", + "Chloe Sedesi", + "Mel Brandon" ] }, "2": { @@ -2044,7 +2337,9 @@ "Colonel Bris Dekker", "Elvira Martuuk", "Felicity Farseer", - "Professor Palin" + "Professor Palin", + "Chloe Sedesi", + "Mel Brandon" ] }, "3": { @@ -2052,19 +2347,23 @@ "Colonel Bris Dekker", "Elvira Martuuk", "Felicity Farseer", - "Professor Palin" + "Professor Palin", + "Chloe Sedesi", + "Mel Brandon" ] }, "4": { "engineers": [ "Elvira Martuuk", - "Felicity Farseer" + "Felicity Farseer", + "Mel Brandon" ] }, "5": { "engineers": [ "Elvira Martuuk", - "Felicity Farseer" + "Felicity Farseer", + "Mel Brandon" ] } } @@ -2076,7 +2375,9 @@ "Colonel Bris Dekker", "Elvira Martuuk", "Felicity Farseer", - "Professor Palin" + "Professor Palin", + "Chloe Sedesi", + "Mel Brandon" ] }, "2": { @@ -2084,7 +2385,9 @@ "Colonel Bris Dekker", "Elvira Martuuk", "Felicity Farseer", - "Professor Palin" + "Professor Palin", + "Chloe Sedesi", + "Mel Brandon" ] }, "3": { @@ -2092,19 +2395,23 @@ "Colonel Bris Dekker", "Elvira Martuuk", "Felicity Farseer", - "Professor Palin" + "Professor Palin", + "Chloe Sedesi", + "Mel Brandon" ] }, "4": { "engineers": [ "Elvira Martuuk", - "Felicity Farseer" + "Felicity Farseer", + "Mel Brandon" ] }, "5": { "engineers": [ "Elvira Martuuk", - "Felicity Farseer" + "Felicity Farseer", + "Mel Brandon" ] } } @@ -2116,7 +2423,9 @@ "Colonel Bris Dekker", "Elvira Martuuk", "Felicity Farseer", - "Professor Palin" + "Professor Palin", + "Chloe Sedesi", + "Mel Brandon" ] }, "2": { @@ -2124,7 +2433,9 @@ "Colonel Bris Dekker", "Elvira Martuuk", "Felicity Farseer", - "Professor Palin" + "Professor Palin", + "Chloe Sedesi", + "Mel Brandon" ] }, "3": { @@ -2132,19 +2443,23 @@ "Colonel Bris Dekker", "Elvira Martuuk", "Felicity Farseer", - "Professor Palin" + "Professor Palin", + "Chloe Sedesi", + "Mel Brandon" ] }, "4": { "engineers": [ "Elvira Martuuk", - "Felicity Farseer" + "Felicity Farseer", + "Mel Brandon" ] }, "5": { "engineers": [ "Elvira Martuuk", - "Felicity Farseer" + "Felicity Farseer", + "Mel Brandon" ] } } @@ -2179,6 +2494,7 @@ "grades": { "1": { "engineers": [ + "Marsha Hicks", "Ram Tah", "The Sarge", "Tiana Fortune" @@ -2186,6 +2502,7 @@ }, "2": { "engineers": [ + "Marsha Hicks", "Ram Tah", "The Sarge", "Tiana Fortune" @@ -2193,6 +2510,7 @@ }, "3": { "engineers": [ + "Marsha Hicks", "Ram Tah", "The Sarge", "Tiana Fortune" @@ -2200,6 +2518,7 @@ }, "4": { "engineers": [ + "Marsha Hicks", "Ram Tah", "The Sarge", "Tiana Fortune" @@ -2207,6 +2526,7 @@ }, "5": { "engineers": [ + "Marsha Hicks", "The Sarge", "Tiana Fortune" ] @@ -2217,6 +2537,7 @@ "grades": { "1": { "engineers": [ + "Marsha Hicks", "Ram Tah", "The Sarge", "Tiana Fortune" @@ -2224,6 +2545,7 @@ }, "2": { "engineers": [ + "Marsha Hicks", "Ram Tah", "The Sarge", "Tiana Fortune" @@ -2231,6 +2553,7 @@ }, "3": { "engineers": [ + "Marsha Hicks", "Ram Tah", "The Sarge", "Tiana Fortune" @@ -2238,6 +2561,7 @@ }, "4": { "engineers": [ + "Marsha Hicks", "Ram Tah", "The Sarge", "Tiana Fortune" @@ -2245,6 +2569,7 @@ }, "5": { "engineers": [ + "Marsha Hicks", "The Sarge", "Tiana Fortune" ] @@ -2255,6 +2580,7 @@ "grades": { "1": { "engineers": [ + "Marsha Hicks", "Ram Tah", "The Sarge", "Tiana Fortune" @@ -2262,6 +2588,7 @@ }, "2": { "engineers": [ + "Marsha Hicks", "Ram Tah", "The Sarge", "Tiana Fortune" @@ -2269,6 +2596,7 @@ }, "3": { "engineers": [ + "Marsha Hicks", "Ram Tah", "The Sarge", "Tiana Fortune" @@ -2276,6 +2604,7 @@ }, "4": { "engineers": [ + "Marsha Hicks", "Ram Tah", "The Sarge", "Tiana Fortune" @@ -2283,6 +2612,7 @@ }, "5": { "engineers": [ + "Marsha Hicks", "The Sarge", "Tiana Fortune" ] @@ -2302,6 +2632,7 @@ "grades": { "1": { "engineers": [ + "Marsha Hicks", "Ram Tah", "The Sarge", "Tiana Fortune" @@ -2309,6 +2640,7 @@ }, "2": { "engineers": [ + "Marsha Hicks", "Ram Tah", "The Sarge", "Tiana Fortune" @@ -2316,6 +2648,7 @@ }, "3": { "engineers": [ + "Marsha Hicks", "Ram Tah", "The Sarge", "Tiana Fortune" @@ -2323,6 +2656,7 @@ }, "4": { "engineers": [ + "Marsha Hicks", "Ram Tah", "The Sarge", "Tiana Fortune" @@ -2330,6 +2664,7 @@ }, "5": { "engineers": [ + "Marsha Hicks", "The Sarge", "Tiana Fortune" ] @@ -2340,6 +2675,7 @@ "grades": { "1": { "engineers": [ + "Marsha Hicks", "Ram Tah", "The Sarge", "Tiana Fortune" @@ -2347,6 +2683,7 @@ }, "2": { "engineers": [ + "Marsha Hicks", "Ram Tah", "The Sarge", "Tiana Fortune" @@ -2354,6 +2691,7 @@ }, "3": { "engineers": [ + "Marsha Hicks", "Ram Tah", "The Sarge", "Tiana Fortune" @@ -2361,6 +2699,7 @@ }, "4": { "engineers": [ + "Marsha Hicks", "Ram Tah", "The Sarge", "Tiana Fortune" @@ -2368,6 +2707,7 @@ }, "5": { "engineers": [ + "Marsha Hicks", "The Sarge", "Tiana Fortune" ] @@ -2378,6 +2718,7 @@ "grades": { "1": { "engineers": [ + "Marsha Hicks", "Ram Tah", "The Sarge", "Tiana Fortune" @@ -2385,6 +2726,7 @@ }, "2": { "engineers": [ + "Marsha Hicks", "Ram Tah", "The Sarge", "Tiana Fortune" @@ -2392,6 +2734,7 @@ }, "3": { "engineers": [ + "Marsha Hicks", "Ram Tah", "The Sarge", "Tiana Fortune" @@ -2399,6 +2742,7 @@ }, "4": { "engineers": [ + "Marsha Hicks", "Ram Tah", "The Sarge", "Tiana Fortune" @@ -2406,6 +2750,7 @@ }, "5": { "engineers": [ + "Marsha Hicks", "The Sarge", "Tiana Fortune" ] @@ -2762,17 +3107,20 @@ "Bill Turner", "Lori Jameson", "Tiana Fortune", - "Juri Ishmaak" + "Juri Ishmaak", + "Etienne Dorn" ] }, "4": { "engineers": [ - "Tiana Fortune" + "Tiana Fortune", + "Etienne Dorn" ] }, "5": { "engineers": [ - "Tiana Fortune" + "Tiana Fortune", + "Etienne Dorn" ] } } @@ -2802,17 +3150,20 @@ "Bill Turner", "Lori Jameson", "Tiana Fortune", - "Juri Ishmaak" + "Juri Ishmaak", + "Etienne Dorn" ] }, "4": { "engineers": [ - "Tiana Fortune" + "Tiana Fortune", + "Etienne Dorn" ] }, "5": { "engineers": [ - "Tiana Fortune" + "Tiana Fortune", + "Etienne Dorn" ] } } @@ -2842,17 +3193,20 @@ "Bill Turner", "Lori Jameson", "Tiana Fortune", - "Juri Ishmaak" + "Juri Ishmaak", + "Etienne Dorn" ] }, "4": { "engineers": [ - "Tiana Fortune" + "Tiana Fortune", + "Etienne Dorn" ] }, "5": { "engineers": [ - "Tiana Fortune" + "Tiana Fortune", + "Etienne Dorn" ] } } @@ -2882,17 +3236,20 @@ "Bill Turner", "Lori Jameson", "Tiana Fortune", - "Juri Ishmaak" + "Juri Ishmaak", + "Etienne Dorn" ] }, "4": { "engineers": [ - "Tiana Fortune" + "Tiana Fortune", + "Etienne Dorn" ] }, "5": { "engineers": [ - "Tiana Fortune" + "Tiana Fortune", + "Etienne Dorn" ] } } @@ -2922,17 +3279,20 @@ "Bill Turner", "Lori Jameson", "Tiana Fortune", - "Juri Ishmaak" + "Juri Ishmaak", + "Etienne Dorn" ] }, "4": { "engineers": [ - "Tiana Fortune" + "Tiana Fortune", + "Etienne Dorn" ] }, "5": { "engineers": [ - "Tiana Fortune" + "Tiana Fortune", + "Etienne Dorn" ] } } @@ -2962,17 +3322,20 @@ "Bill Turner", "Lori Jameson", "Tiana Fortune", - "Juri Ishmaak" + "Juri Ishmaak", + "Etienne Dorn" ] }, "4": { "engineers": [ - "Tiana Fortune" + "Tiana Fortune", + "Etienne Dorn" ] }, "5": { "engineers": [ - "Tiana Fortune" + "Tiana Fortune", + "Etienne Dorn" ] } } @@ -2994,28 +3357,33 @@ "1": { "engineers": [ "Bill Turner", - "Lori Jameson" + "Lori Jameson", + "Etienne Dorn" ] }, "2": { "engineers": [ "Bill Turner", - "Lori Jameson" + "Lori Jameson", + "Etienne Dorn" ] }, "3": { "engineers": [ "Bill Turner", - "Lori Jameson" + "Lori Jameson", + "Etienne Dorn" ] }, "4": { "engineers": [ - "Lori Jameson" + "Lori Jameson", + "Etienne Dorn" ] }, "5": { "engineers": [ + "Etienne Dorn", "Etienne Dorn" ] } @@ -3026,28 +3394,33 @@ "1": { "engineers": [ "Bill Turner", - "Lori Jameson" + "Lori Jameson", + "Etienne Dorn" ] }, "2": { "engineers": [ "Bill Turner", - "Lori Jameson" + "Lori Jameson", + "Etienne Dorn" ] }, "3": { "engineers": [ "Bill Turner", - "Lori Jameson" + "Lori Jameson", + "Etienne Dorn" ] }, "4": { "engineers": [ - "Lori Jameson" + "Lori Jameson", + "Etienne Dorn" ] }, "5": { "engineers": [ + "Etienne Dorn", "Etienne Dorn" ] } @@ -3058,28 +3431,33 @@ "1": { "engineers": [ "Bill Turner", - "Lori Jameson" + "Lori Jameson", + "Etienne Dorn" ] }, "2": { "engineers": [ "Bill Turner", - "Lori Jameson" + "Lori Jameson", + "Etienne Dorn" ] }, "3": { "engineers": [ "Bill Turner", - "Lori Jameson" + "Lori Jameson", + "Etienne Dorn" ] }, "4": { "engineers": [ - "Lori Jameson" + "Lori Jameson", + "Etienne Dorn" ] }, "5": { "engineers": [ + "Etienne Dorn", "Etienne Dorn" ] } @@ -3099,30 +3477,35 @@ "grades": { "1": { "engineers": [ - "Tod McQuinn", - "Zacariah Nemo" + "Tod \"The Blaster\" McQuinn", + "Zacariah Nemo", + "Marsha Hicks" ] }, "2": { "engineers": [ - "Tod McQuinn", - "Zacariah Nemo" + "Tod \"The Blaster\" McQuinn", + "Zacariah Nemo", + "Marsha Hicks" ] }, "3": { "engineers": [ - "Tod McQuinn", - "Zacariah Nemo" + "Tod \"The Blaster\" McQuinn", + "Zacariah Nemo", + "Marsha Hicks" ] }, "4": { "engineers": [ - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Marsha Hicks" ] }, "5": { "engineers": [ - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Marsha Hicks" ] } } @@ -3131,30 +3514,35 @@ "grades": { "1": { "engineers": [ - "Tod McQuinn", - "Zacariah Nemo" + "Tod \"The Blaster\" McQuinn", + "Zacariah Nemo", + "Marsha Hicks" ] }, "2": { "engineers": [ - "Tod McQuinn", - "Zacariah Nemo" + "Tod \"The Blaster\" McQuinn", + "Zacariah Nemo", + "Marsha Hicks" ] }, "3": { "engineers": [ - "Tod McQuinn", - "Zacariah Nemo" + "Tod \"The Blaster\" McQuinn", + "Zacariah Nemo", + "Marsha Hicks" ] }, "4": { "engineers": [ - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Marsha Hicks" ] }, "5": { "engineers": [ - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Marsha Hicks" ] } } @@ -3163,30 +3551,35 @@ "grades": { "1": { "engineers": [ - "Tod McQuinn", - "Zacariah Nemo" + "Tod \"The Blaster\" McQuinn", + "Zacariah Nemo", + "Marsha Hicks" ] }, "2": { "engineers": [ - "Tod McQuinn", - "Zacariah Nemo" + "Tod \"The Blaster\" McQuinn", + "Zacariah Nemo", + "Marsha Hicks" ] }, "3": { "engineers": [ - "Tod McQuinn", - "Zacariah Nemo" + "Tod \"The Blaster\" McQuinn", + "Zacariah Nemo", + "Marsha Hicks" ] }, "4": { "engineers": [ - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Marsha Hicks" ] }, "5": { "engineers": [ - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Marsha Hicks" ] } } @@ -3195,30 +3588,35 @@ "grades": { "1": { "engineers": [ - "Tod McQuinn", - "Zacariah Nemo" + "Tod \"The Blaster\" McQuinn", + "Zacariah Nemo", + "Marsha Hicks" ] }, "2": { "engineers": [ - "Tod McQuinn", - "Zacariah Nemo" + "Tod \"The Blaster\" McQuinn", + "Zacariah Nemo", + "Marsha Hicks" ] }, "3": { "engineers": [ - "Tod McQuinn", - "Zacariah Nemo" + "Tod \"The Blaster\" McQuinn", + "Zacariah Nemo", + "Marsha Hicks" ] }, "4": { "engineers": [ - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Marsha Hicks" ] }, "5": { "engineers": [ - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Marsha Hicks" ] } } @@ -3227,30 +3625,35 @@ "grades": { "1": { "engineers": [ - "Tod McQuinn", - "Zacariah Nemo" + "Tod \"The Blaster\" McQuinn", + "Zacariah Nemo", + "Marsha Hicks" ] }, "2": { "engineers": [ - "Tod McQuinn", - "Zacariah Nemo" + "Tod \"The Blaster\" McQuinn", + "Zacariah Nemo", + "Marsha Hicks" ] }, "3": { "engineers": [ - "Tod McQuinn", - "Zacariah Nemo" + "Tod \"The Blaster\" McQuinn", + "Zacariah Nemo", + "Marsha Hicks" ] }, "4": { "engineers": [ - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Marsha Hicks" ] }, "5": { "engineers": [ - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Marsha Hicks" ] } } @@ -3259,30 +3662,35 @@ "grades": { "1": { "engineers": [ - "Tod McQuinn", - "Zacariah Nemo" + "Tod \"The Blaster\" McQuinn", + "Zacariah Nemo", + "Marsha Hicks" ] }, "2": { "engineers": [ - "Tod McQuinn", - "Zacariah Nemo" + "Tod \"The Blaster\" McQuinn", + "Zacariah Nemo", + "Marsha Hicks" ] }, "3": { "engineers": [ - "Tod McQuinn", - "Zacariah Nemo" + "Tod \"The Blaster\" McQuinn", + "Zacariah Nemo", + "Marsha Hicks" ] }, "4": { "engineers": [ - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Marsha Hicks" ] }, "5": { "engineers": [ - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Marsha Hicks" ] } } @@ -3291,30 +3699,35 @@ "grades": { "1": { "engineers": [ - "Tod McQuinn", - "Zacariah Nemo" + "Tod \"The Blaster\" McQuinn", + "Zacariah Nemo", + "Marsha Hicks" ] }, "2": { "engineers": [ - "Tod McQuinn", - "Zacariah Nemo" + "Tod \"The Blaster\" McQuinn", + "Zacariah Nemo", + "Marsha Hicks" ] }, "3": { "engineers": [ - "Tod McQuinn", - "Zacariah Nemo" + "Tod \"The Blaster\" McQuinn", + "Zacariah Nemo", + "Marsha Hicks" ] }, "4": { "engineers": [ - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Marsha Hicks" ] }, "5": { "engineers": [ - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Marsha Hicks" ] } } @@ -3323,30 +3736,35 @@ "grades": { "1": { "engineers": [ - "Tod McQuinn", - "Zacariah Nemo" + "Tod \"The Blaster\" McQuinn", + "Zacariah Nemo", + "Marsha Hicks" ] }, "2": { "engineers": [ - "Tod McQuinn", - "Zacariah Nemo" + "Tod \"The Blaster\" McQuinn", + "Zacariah Nemo", + "Marsha Hicks" ] }, "3": { "engineers": [ - "Tod McQuinn", - "Zacariah Nemo" + "Tod \"The Blaster\" McQuinn", + "Zacariah Nemo", + "Marsha Hicks" ] }, "4": { "engineers": [ - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Marsha Hicks" ] }, "5": { "engineers": [ - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Marsha Hicks" ] } } @@ -3390,30 +3808,35 @@ "grades": { "1": { "engineers": [ - "Tod McQuinn", - "Zacariah Nemo" + "Tod \"The Blaster\" McQuinn", + "Zacariah Nemo", + "Marsha Hicks" ] }, "2": { "engineers": [ - "Tod McQuinn", - "Zacariah Nemo" + "Tod \"The Blaster\" McQuinn", + "Zacariah Nemo", + "Marsha Hicks" ] }, "3": { "engineers": [ - "Tod McQuinn", - "Zacariah Nemo" + "Tod \"The Blaster\" McQuinn", + "Zacariah Nemo", + "Marsha Hicks" ] }, "4": { "engineers": [ - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Marsha Hicks" ] }, "5": { "engineers": [ - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Marsha Hicks" ] } } @@ -3422,30 +3845,35 @@ "grades": { "1": { "engineers": [ - "Tod McQuinn", - "Zacariah Nemo" + "Tod \"The Blaster\" McQuinn", + "Zacariah Nemo", + "Marsha Hicks" ] }, "2": { "engineers": [ - "Tod McQuinn", - "Zacariah Nemo" + "Tod \"The Blaster\" McQuinn", + "Zacariah Nemo", + "Marsha Hicks" ] }, "3": { "engineers": [ - "Tod McQuinn", - "Zacariah Nemo" + "Tod \"The Blaster\" McQuinn", + "Zacariah Nemo", + "Marsha Hicks" ] }, "4": { "engineers": [ - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Marsha Hicks" ] }, "5": { "engineers": [ - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Marsha Hicks" ] } } @@ -3454,30 +3882,35 @@ "grades": { "1": { "engineers": [ - "Tod McQuinn", - "Zacariah Nemo" + "Tod \"The Blaster\" McQuinn", + "Zacariah Nemo", + "Marsha Hicks" ] }, "2": { "engineers": [ - "Tod McQuinn", - "Zacariah Nemo" + "Tod \"The Blaster\" McQuinn", + "Zacariah Nemo", + "Marsha Hicks" ] }, "3": { "engineers": [ - "Tod McQuinn", - "Zacariah Nemo" + "Tod \"The Blaster\" McQuinn", + "Zacariah Nemo", + "Marsha Hicks" ] }, "4": { "engineers": [ - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Marsha Hicks" ] }, "5": { "engineers": [ - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Marsha Hicks" ] } } @@ -3486,30 +3919,35 @@ "grades": { "1": { "engineers": [ - "Tod McQuinn", - "Zacariah Nemo" + "Tod \"The Blaster\" McQuinn", + "Zacariah Nemo", + "Marsha Hicks" ] }, "2": { "engineers": [ - "Tod McQuinn", - "Zacariah Nemo" + "Tod \"The Blaster\" McQuinn", + "Zacariah Nemo", + "Marsha Hicks" ] }, "3": { "engineers": [ - "Tod McQuinn", - "Zacariah Nemo" + "Tod \"The Blaster\" McQuinn", + "Zacariah Nemo", + "Marsha Hicks" ] }, "4": { "engineers": [ - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Marsha Hicks" ] }, "5": { "engineers": [ - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Marsha Hicks" ] } } @@ -3518,30 +3956,35 @@ "grades": { "1": { "engineers": [ - "Tod McQuinn", - "Zacariah Nemo" + "Tod \"The Blaster\" McQuinn", + "Zacariah Nemo", + "Marsha Hicks" ] }, "2": { "engineers": [ - "Tod McQuinn", - "Zacariah Nemo" + "Tod \"The Blaster\" McQuinn", + "Zacariah Nemo", + "Marsha Hicks" ] }, "3": { "engineers": [ - "Tod McQuinn", - "Zacariah Nemo" + "Tod \"The Blaster\" McQuinn", + "Zacariah Nemo", + "Marsha Hicks" ] }, "4": { "engineers": [ - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Marsha Hicks" ] }, "5": { "engineers": [ - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Marsha Hicks" ] } } @@ -3550,30 +3993,35 @@ "grades": { "1": { "engineers": [ - "Tod McQuinn", - "Zacariah Nemo" + "Tod \"The Blaster\" McQuinn", + "Zacariah Nemo", + "Marsha Hicks" ] }, "2": { "engineers": [ - "Tod McQuinn", - "Zacariah Nemo" + "Tod \"The Blaster\" McQuinn", + "Zacariah Nemo", + "Marsha Hicks" ] }, "3": { "engineers": [ - "Tod McQuinn", - "Zacariah Nemo" + "Tod \"The Blaster\" McQuinn", + "Zacariah Nemo", + "Marsha Hicks" ] }, "4": { "engineers": [ - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Marsha Hicks" ] }, "5": { "engineers": [ - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Marsha Hicks" ] } } @@ -3582,30 +4030,35 @@ "grades": { "1": { "engineers": [ - "Tod McQuinn", - "Zacariah Nemo" + "Tod \"The Blaster\" McQuinn", + "Zacariah Nemo", + "Marsha Hicks" ] }, "2": { "engineers": [ - "Tod McQuinn", - "Zacariah Nemo" + "Tod \"The Blaster\" McQuinn", + "Zacariah Nemo", + "Marsha Hicks" ] }, "3": { "engineers": [ - "Tod McQuinn", - "Zacariah Nemo" + "Tod \"The Blaster\" McQuinn", + "Zacariah Nemo", + "Marsha Hicks" ] }, "4": { "engineers": [ - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Marsha Hicks" ] }, "5": { "engineers": [ - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Marsha Hicks" ] } } @@ -3614,30 +4067,35 @@ "grades": { "1": { "engineers": [ - "Tod McQuinn", - "Zacariah Nemo" + "Tod \"The Blaster\" McQuinn", + "Zacariah Nemo", + "Marsha Hicks" ] }, "2": { "engineers": [ - "Tod McQuinn", - "Zacariah Nemo" + "Tod \"The Blaster\" McQuinn", + "Zacariah Nemo", + "Marsha Hicks" ] }, "3": { "engineers": [ - "Tod McQuinn", - "Zacariah Nemo" + "Tod \"The Blaster\" McQuinn", + "Zacariah Nemo", + "Marsha Hicks" ] }, "4": { "engineers": [ - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Marsha Hicks" ] }, "5": { "engineers": [ - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Marsha Hicks" ] } } @@ -3700,29 +4158,34 @@ "1": { "engineers": [ "Juri Ishmaak", - "Liz Ryder" + "Liz Ryder", + "Petra Olmanova" ] }, "2": { "engineers": [ "Juri Ishmaak", - "Liz Ryder" + "Liz Ryder", + "Petra Olmanova" ] }, "3": { "engineers": [ "Juri Ishmaak", - "Liz Ryder" + "Liz Ryder", + "Petra Olmanova" ] }, "4": { "engineers": [ - "Liz Ryder" + "Liz Ryder", + "Petra Olmanova" ] }, "5": { "engineers": [ - "Liz Ryder" + "Liz Ryder", + "Petra Olmanova" ] } } @@ -3732,29 +4195,34 @@ "1": { "engineers": [ "Juri Ishmaak", - "Liz Ryder" + "Liz Ryder", + "Petra Olmanova" ] }, "2": { "engineers": [ "Juri Ishmaak", - "Liz Ryder" + "Liz Ryder", + "Petra Olmanova" ] }, "3": { "engineers": [ "Juri Ishmaak", - "Liz Ryder" + "Liz Ryder", + "Petra Olmanova" ] }, "4": { "engineers": [ - "Liz Ryder" + "Liz Ryder", + "Petra Olmanova" ] }, "5": { "engineers": [ - "Liz Ryder" + "Liz Ryder", + "Petra Olmanova" ] } } @@ -3764,29 +4232,34 @@ "1": { "engineers": [ "Juri Ishmaak", - "Liz Ryder" + "Liz Ryder", + "Petra Olmanova" ] }, "2": { "engineers": [ "Juri Ishmaak", - "Liz Ryder" + "Liz Ryder", + "Petra Olmanova" ] }, "3": { "engineers": [ "Juri Ishmaak", - "Liz Ryder" + "Liz Ryder", + "Petra Olmanova" ] }, "4": { "engineers": [ - "Liz Ryder" + "Liz Ryder", + "Petra Olmanova" ] }, "5": { "engineers": [ - "Liz Ryder" + "Liz Ryder", + "Petra Olmanova" ] } } @@ -3796,29 +4269,34 @@ "1": { "engineers": [ "Juri Ishmaak", - "Liz Ryder" + "Liz Ryder", + "Petra Olmanova" ] }, "2": { "engineers": [ "Juri Ishmaak", - "Liz Ryder" + "Liz Ryder", + "Petra Olmanova" ] }, "3": { "engineers": [ "Juri Ishmaak", - "Liz Ryder" + "Liz Ryder", + "Petra Olmanova" ] }, "4": { "engineers": [ - "Liz Ryder" + "Liz Ryder", + "Petra Olmanova" ] }, "5": { "engineers": [ - "Liz Ryder" + "Liz Ryder", + "Petra Olmanova" ] } } @@ -3864,6 +4342,186 @@ "special_penetrator_munitions" ] }, + "amr": { + "blueprints": { + "Weapon_HighCapacity": { + "grades": { + "1": { + "engineers": [ + "Juri Ishmaak", + "Liz Ryder", + "Petra Olmanova" + ] + }, + "2": { + "engineers": [ + "Juri Ishmaak", + "Liz Ryder", + "Petra Olmanova" + ] + }, + "3": { + "engineers": [ + "Juri Ishmaak", + "Liz Ryder", + "Petra Olmanova" + ] + }, + "4": { + "engineers": [ + "Liz Ryder", + "Petra Olmanova" + ] + }, + "5": { + "engineers": [ + "Liz Ryder", + "Petra Olmanova" + ] + } + } + }, + "Weapon_LightWeight": { + "grades": { + "1": { + "engineers": [ + "Juri Ishmaak", + "Liz Ryder", + "Petra Olmanova" + ] + }, + "2": { + "engineers": [ + "Juri Ishmaak", + "Liz Ryder", + "Petra Olmanova" + ] + }, + "3": { + "engineers": [ + "Juri Ishmaak", + "Liz Ryder", + "Petra Olmanova" + ] + }, + "4": { + "engineers": [ + "Liz Ryder", + "Petra Olmanova" + ] + }, + "5": { + "engineers": [ + "Liz Ryder", + "Petra Olmanova" + ] + } + } + }, + "Weapon_RapidFire": { + "grades": { + "1": { + "engineers": [ + "Juri Ishmaak", + "Liz Ryder", + "Petra Olmanova" + ] + }, + "2": { + "engineers": [ + "Juri Ishmaak", + "Liz Ryder", + "Petra Olmanova" + ] + }, + "3": { + "engineers": [ + "Juri Ishmaak", + "Liz Ryder", + "Petra Olmanova" + ] + }, + "4": { + "engineers": [ + "Liz Ryder", + "Petra Olmanova" + ] + }, + "5": { + "engineers": [ + "Liz Ryder", + "Petra Olmanova" + ] + } + } + }, + "Weapon_Sturdy": { + "grades": { + "1": { + "engineers": [ + "Juri Ishmaak", + "Liz Ryder", + "Petra Olmanova" + ] + }, + "2": { + "engineers": [ + "Juri Ishmaak", + "Liz Ryder", + "Petra Olmanova" + ] + }, + "3": { + "engineers": [ + "Juri Ishmaak", + "Liz Ryder", + "Petra Olmanova" + ] + }, + "4": { + "engineers": [ + "Liz Ryder", + "Petra Olmanova" + ] + }, + "5": { + "engineers": [ + "Liz Ryder", + "Petra Olmanova" + ] + } + } + } + }, + "modifications": [ + "ammo", + "clip", + "damage", + "damagedist", + "fallofffromrange", + "distdraw", + "integrity", + "jitter", + "mass", + "piercing", + "power", + "reload", + "rof", + "thermload" + ], + "specials_D": [ + "special_emissive_munitions", + "special_fsd_interrupt", + "special_overload_munitions", + "special_thermal_cascade", + "special_weapon_damage", + "special_weapon_efficient", + "special_weapon_rateoffire", + "special_weapon_toughened", + "special_weapon_lightweight", + "special_penetrator_munitions" + ] + }, "amr": { "blueprints": { "Weapon_HighCapacity": { @@ -4055,29 +4713,34 @@ "1": { "engineers": [ "Juri Ishmaak", - "Liz Ryder" + "Liz Ryder", + "Petra Olmanova" ] }, "2": { "engineers": [ "Juri Ishmaak", - "Liz Ryder" + "Liz Ryder", + "Petra Olmanova" ] }, "3": { "engineers": [ "Juri Ishmaak", - "Liz Ryder" + "Liz Ryder", + "Petra Olmanova" ] }, "4": { "engineers": [ - "Juri Ishmaak" + "Juri Ishmaak", + "Petra Olmanova" ] }, "5": { "engineers": [ - "Juri Ishmaak" + "Juri Ishmaak", + "Petra Olmanova" ] } } @@ -4087,29 +4750,34 @@ "1": { "engineers": [ "Juri Ishmaak", - "Liz Ryder" + "Liz Ryder", + "Petra Olmanova" ] }, "2": { "engineers": [ "Juri Ishmaak", - "Liz Ryder" + "Liz Ryder", + "Petra Olmanova" ] }, "3": { "engineers": [ "Juri Ishmaak", - "Liz Ryder" + "Liz Ryder", + "Petra Olmanova" ] }, "4": { "engineers": [ - "Juri Ishmaak" + "Juri Ishmaak", + "Petra Olmanova" ] }, "5": { "engineers": [ - "Juri Ishmaak" + "Juri Ishmaak", + "Petra Olmanova" ] } } @@ -4119,29 +4787,34 @@ "1": { "engineers": [ "Juri Ishmaak", - "Liz Ryder" + "Liz Ryder", + "Petra Olmanova" ] }, "2": { "engineers": [ "Juri Ishmaak", - "Liz Ryder" + "Liz Ryder", + "Petra Olmanova" ] }, "3": { "engineers": [ "Juri Ishmaak", - "Liz Ryder" + "Liz Ryder", + "Petra Olmanova" ] }, "4": { "engineers": [ - "Juri Ishmaak" + "Juri Ishmaak", + "Petra Olmanova" ] }, "5": { "engineers": [ - "Juri Ishmaak" + "Juri Ishmaak", + "Petra Olmanova" ] } } @@ -4151,29 +4824,34 @@ "1": { "engineers": [ "Juri Ishmaak", - "Liz Ryder" + "Liz Ryder", + "Petra Olmanova" ] }, "2": { "engineers": [ "Juri Ishmaak", - "Liz Ryder" + "Liz Ryder", + "Petra Olmanova" ] }, "3": { "engineers": [ "Juri Ishmaak", - "Liz Ryder" + "Liz Ryder", + "Petra Olmanova" ] }, "4": { "engineers": [ - "Juri Ishmaak" + "Juri Ishmaak", + "Petra Olmanova" ] }, "5": { "engineers": [ - "Juri Ishmaak" + "Juri Ishmaak", + "Petra Olmanova" ] } } @@ -4276,28 +4954,33 @@ "1": { "engineers": [ "Bill Turner", - "Zacariah Nemo" + "Zacariah Nemo", + "Etienne Dorn" ] }, "2": { "engineers": [ "Bill Turner", - "Zacariah Nemo" + "Zacariah Nemo", + "Etienne Dorn" ] }, "3": { "engineers": [ - "Bill Turner" + "Bill Turner", + "Etienne Dorn" ] }, "4": { "engineers": [ - "Bill Turner" + "Bill Turner", + "Etienne Dorn" ] }, "5": { "engineers": [ - "Bill Turner" + "Bill Turner", + "Etienne Dorn" ] } } @@ -4307,28 +4990,33 @@ "1": { "engineers": [ "Bill Turner", - "Zacariah Nemo" + "Zacariah Nemo", + "Etienne Dorn" ] }, "2": { "engineers": [ "Bill Turner", - "Zacariah Nemo" + "Zacariah Nemo", + "Etienne Dorn" ] }, "3": { "engineers": [ - "Bill Turner" + "Bill Turner", + "Etienne Dorn" ] }, "4": { "engineers": [ - "Bill Turner" + "Bill Turner", + "Etienne Dorn" ] }, "5": { "engineers": [ - "Bill Turner" + "Bill Turner", + "Etienne Dorn" ] } } @@ -4338,28 +5026,33 @@ "1": { "engineers": [ "Bill Turner", - "Zacariah Nemo" + "Zacariah Nemo", + "Etienne Dorn" ] }, "2": { "engineers": [ "Bill Turner", - "Zacariah Nemo" + "Zacariah Nemo", + "Etienne Dorn" ] }, "3": { "engineers": [ - "Bill Turner" + "Bill Turner", + "Etienne Dorn" ] }, "4": { "engineers": [ - "Bill Turner" + "Bill Turner", + "Etienne Dorn" ] }, "5": { "engineers": [ - "Bill Turner" + "Bill Turner", + "Etienne Dorn" ] } } @@ -4369,28 +5062,33 @@ "1": { "engineers": [ "Bill Turner", - "Zacariah Nemo" + "Zacariah Nemo", + "Etienne Dorn" ] }, "2": { "engineers": [ "Bill Turner", - "Zacariah Nemo" + "Zacariah Nemo", + "Etienne Dorn" ] }, "3": { "engineers": [ - "Bill Turner" + "Bill Turner", + "Etienne Dorn" ] }, "4": { "engineers": [ - "Bill Turner" + "Bill Turner", + "Etienne Dorn" ] }, "5": { "engineers": [ - "Bill Turner" + "Bill Turner", + "Etienne Dorn" ] } } @@ -4400,28 +5098,33 @@ "1": { "engineers": [ "Bill Turner", - "Zacariah Nemo" + "Zacariah Nemo", + "Etienne Dorn" ] }, "2": { "engineers": [ "Bill Turner", - "Zacariah Nemo" + "Zacariah Nemo", + "Etienne Dorn" ] }, "3": { "engineers": [ - "Bill Turner" + "Bill Turner", + "Etienne Dorn" ] }, "4": { "engineers": [ - "Bill Turner" + "Bill Turner", + "Etienne Dorn" ] }, "5": { "engineers": [ - "Bill Turner" + "Bill Turner", + "Etienne Dorn" ] } } @@ -4431,28 +5134,33 @@ "1": { "engineers": [ "Bill Turner", - "Zacariah Nemo" + "Zacariah Nemo", + "Etienne Dorn" ] }, "2": { "engineers": [ "Bill Turner", - "Zacariah Nemo" + "Zacariah Nemo", + "Etienne Dorn" ] }, "3": { "engineers": [ - "Bill Turner" + "Bill Turner", + "Etienne Dorn" ] }, "4": { "engineers": [ - "Bill Turner" + "Bill Turner", + "Etienne Dorn" ] }, "5": { "engineers": [ - "Bill Turner" + "Bill Turner", + "Etienne Dorn" ] } } @@ -4462,28 +5170,33 @@ "1": { "engineers": [ "Bill Turner", - "Zacariah Nemo" + "Zacariah Nemo", + "Etienne Dorn" ] }, "2": { "engineers": [ "Bill Turner", - "Zacariah Nemo" + "Zacariah Nemo", + "Etienne Dorn" ] }, "3": { "engineers": [ - "Bill Turner" + "Bill Turner", + "Etienne Dorn" ] }, "4": { "engineers": [ - "Bill Turner" + "Bill Turner", + "Etienne Dorn" ] }, "5": { "engineers": [ - "Bill Turner" + "Bill Turner", + "Etienne Dorn" ] } } @@ -4493,28 +5206,33 @@ "1": { "engineers": [ "Bill Turner", - "Zacariah Nemo" + "Zacariah Nemo", + "Etienne Dorn" ] }, "2": { "engineers": [ "Bill Turner", - "Zacariah Nemo" + "Zacariah Nemo", + "Etienne Dorn" ] }, "3": { "engineers": [ - "Bill Turner" + "Bill Turner", + "Etienne Dorn" ] }, "4": { "engineers": [ - "Bill Turner" + "Bill Turner", + "Etienne Dorn" ] }, "5": { "engineers": [ - "Bill Turner" + "Bill Turner", + "Etienne Dorn" ] } } @@ -4565,6 +5283,7 @@ "grades": { "1": { "engineers": [ + "Marsha Hicks", "Ram Tah", "The Sarge", "Tiana Fortune" @@ -4572,6 +5291,7 @@ }, "2": { "engineers": [ + "Marsha Hicks", "Ram Tah", "The Sarge", "Tiana Fortune" @@ -4579,6 +5299,7 @@ }, "3": { "engineers": [ + "Marsha Hicks", "Ram Tah", "The Sarge", "Tiana Fortune" @@ -4586,6 +5307,7 @@ }, "4": { "engineers": [ + "Marsha Hicks", "Ram Tah", "The Sarge", "Tiana Fortune" @@ -4593,6 +5315,7 @@ }, "5": { "engineers": [ + "Marsha Hicks", "The Sarge", "Tiana Fortune" ] @@ -4603,6 +5326,7 @@ "grades": { "1": { "engineers": [ + "Marsha Hicks", "Ram Tah", "The Sarge", "Tiana Fortune" @@ -4610,6 +5334,7 @@ }, "2": { "engineers": [ + "Marsha Hicks", "Ram Tah", "The Sarge", "Tiana Fortune" @@ -4617,6 +5342,7 @@ }, "3": { "engineers": [ + "Marsha Hicks", "Ram Tah", "The Sarge", "Tiana Fortune" @@ -4624,6 +5350,7 @@ }, "4": { "engineers": [ + "Marsha Hicks", "Ram Tah", "The Sarge", "Tiana Fortune" @@ -4631,6 +5358,7 @@ }, "5": { "engineers": [ + "Marsha Hicks", "The Sarge", "Tiana Fortune" ] @@ -4641,6 +5369,7 @@ "grades": { "1": { "engineers": [ + "Marsha Hicks", "Ram Tah", "The Sarge", "Tiana Fortune" @@ -4648,6 +5377,7 @@ }, "2": { "engineers": [ + "Marsha Hicks", "Ram Tah", "The Sarge", "Tiana Fortune" @@ -4655,6 +5385,7 @@ }, "3": { "engineers": [ + "Marsha Hicks", "Ram Tah", "The Sarge", "Tiana Fortune" @@ -4662,6 +5393,7 @@ }, "4": { "engineers": [ + "Marsha Hicks", "Ram Tah", "The Sarge", "Tiana Fortune" @@ -4669,6 +5401,7 @@ }, "5": { "engineers": [ + "Marsha Hicks", "The Sarge", "Tiana Fortune" ] @@ -4714,31 +5447,36 @@ "engineers": [ "Hera Tani", "Marco Qwent", - "The Dweller" + "The Dweller", + "Etienne Dorn" ] }, "2": { "engineers": [ "Hera Tani", "Marco Qwent", - "The Dweller" + "The Dweller", + "Etienne Dorn" ] }, "3": { "engineers": [ "Hera Tani", "Marco Qwent", - "The Dweller" + "The Dweller", + "Etienne Dorn" ] }, "4": { "engineers": [ - "The Dweller" + "The Dweller", + "Etienne Dorn" ] }, "5": { "engineers": [ - "The Dweller" + "The Dweller", + "Etienne Dorn" ] } } @@ -4749,31 +5487,36 @@ "engineers": [ "Hera Tani", "Marco Qwent", - "The Dweller" + "The Dweller", + "Etienne Dorn" ] }, "2": { "engineers": [ "Hera Tani", "Marco Qwent", - "The Dweller" + "The Dweller", + "Etienne Dorn" ] }, "3": { "engineers": [ "Hera Tani", "Marco Qwent", - "The Dweller" + "The Dweller", + "Etienne Dorn" ] }, "4": { "engineers": [ - "The Dweller" + "The Dweller", + "Etienne Dorn" ] }, "5": { "engineers": [ - "The Dweller" + "The Dweller", + "Etienne Dorn" ] } } @@ -4784,31 +5527,36 @@ "engineers": [ "Hera Tani", "Marco Qwent", - "The Dweller" + "The Dweller", + "Etienne Dorn" ] }, "2": { "engineers": [ "Hera Tani", "Marco Qwent", - "The Dweller" + "The Dweller", + "Etienne Dorn" ] }, "3": { "engineers": [ "Hera Tani", "Marco Qwent", - "The Dweller" + "The Dweller", + "Etienne Dorn" ] }, "4": { "engineers": [ - "The Dweller" + "The Dweller", + "Etienne Dorn" ] }, "5": { "engineers": [ - "The Dweller" + "The Dweller", + "Etienne Dorn" ] } } @@ -4819,31 +5567,36 @@ "engineers": [ "Hera Tani", "Marco Qwent", - "The Dweller" + "The Dweller", + "Etienne Dorn" ] }, "2": { "engineers": [ "Hera Tani", "Marco Qwent", - "The Dweller" + "The Dweller", + "Etienne Dorn" ] }, "3": { "engineers": [ "Hera Tani", "Marco Qwent", - "The Dweller" + "The Dweller", + "Etienne Dorn" ] }, "4": { "engineers": [ - "The Dweller" + "The Dweller", + "Etienne Dorn" ] }, "5": { "engineers": [ - "The Dweller" + "The Dweller", + "Etienne Dorn" ] } } @@ -4854,31 +5607,36 @@ "engineers": [ "Hera Tani", "Marco Qwent", - "The Dweller" + "The Dweller", + "Etienne Dorn" ] }, "2": { "engineers": [ "Hera Tani", "Marco Qwent", - "The Dweller" + "The Dweller", + "Etienne Dorn" ] }, "3": { "engineers": [ "Hera Tani", "Marco Qwent", - "The Dweller" + "The Dweller", + "Etienne Dorn" ] }, "4": { "engineers": [ - "The Dweller" + "The Dweller", + "Etienne Dorn" ] }, "5": { "engineers": [ - "The Dweller" + "The Dweller", + "Etienne Dorn" ] } } @@ -4889,31 +5647,36 @@ "engineers": [ "Hera Tani", "Marco Qwent", - "The Dweller" + "The Dweller", + "Etienne Dorn" ] }, "2": { "engineers": [ "Hera Tani", "Marco Qwent", - "The Dweller" + "The Dweller", + "Etienne Dorn" ] }, "3": { "engineers": [ "Hera Tani", "Marco Qwent", - "The Dweller" + "The Dweller", + "Etienne Dorn" ] }, "4": { "engineers": [ - "The Dweller" + "The Dweller", + "Etienne Dorn" ] }, "5": { "engineers": [ - "The Dweller" + "The Dweller", + "Etienne Dorn" ] } } @@ -4946,30 +5709,35 @@ "1": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "2": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "3": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "4": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "5": { "engineers": [ - "Broo Tarquin" + "Broo Tarquin", + "Mel Brandon" ] } } @@ -4979,30 +5747,35 @@ "1": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "2": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "3": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "4": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "5": { "engineers": [ - "Broo Tarquin" + "Broo Tarquin", + "Mel Brandon" ] } } @@ -5012,30 +5785,35 @@ "1": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "2": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "3": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "4": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "5": { "engineers": [ - "Broo Tarquin" + "Broo Tarquin", + "Mel Brandon" ] } } @@ -5045,30 +5823,35 @@ "1": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "2": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "3": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "4": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "5": { "engineers": [ - "Broo Tarquin" + "Broo Tarquin", + "Mel Brandon" ] } } @@ -5078,30 +5861,35 @@ "1": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "2": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "3": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "4": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "5": { "engineers": [ - "Broo Tarquin" + "Broo Tarquin", + "Mel Brandon" ] } } @@ -5111,30 +5899,35 @@ "1": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "2": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "3": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "4": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "5": { "engineers": [ - "Broo Tarquin" + "Broo Tarquin", + "Mel Brandon" ] } } @@ -5144,30 +5937,35 @@ "1": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "2": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "3": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "4": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "5": { "engineers": [ - "Broo Tarquin" + "Broo Tarquin", + "Mel Brandon" ] } } @@ -5177,30 +5975,35 @@ "1": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "2": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "3": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "4": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "5": { "engineers": [ - "Broo Tarquin" + "Broo Tarquin", + "Mel Brandon" ] } } @@ -5364,30 +6167,35 @@ "engineers": [ "Felicity Farseer", "Hera Tani", - "Marco Qwent" + "Marco Qwent", + "Etienne Dorn" ] }, "2": { "engineers": [ "Hera Tani", - "Marco Qwent" + "Marco Qwent", + "Etienne Dorn" ] }, "3": { "engineers": [ "Hera Tani", - "Marco Qwent" + "Marco Qwent", + "Etienne Dorn" ] }, "4": { "engineers": [ "Hera Tani", - "Marco Qwent" + "Marco Qwent", + "Etienne Dorn" ] }, "5": { "engineers": [ - "Hera Tani" + "Hera Tani", + "Etienne Dorn" ] } } @@ -5398,30 +6206,35 @@ "engineers": [ "Felicity Farseer", "Hera Tani", - "Marco Qwent" + "Marco Qwent", + "Etienne Dorn" ] }, "2": { "engineers": [ "Hera Tani", - "Marco Qwent" + "Marco Qwent", + "Etienne Dorn" ] }, "3": { "engineers": [ "Hera Tani", - "Marco Qwent" + "Marco Qwent", + "Etienne Dorn" ] }, "4": { "engineers": [ "Hera Tani", - "Marco Qwent" + "Marco Qwent", + "Etienne Dorn" ] }, "5": { "engineers": [ - "Hera Tani" + "Hera Tani", + "Etienne Dorn" ] } } @@ -5432,30 +6245,35 @@ "engineers": [ "Felicity Farseer", "Hera Tani", - "Marco Qwent" + "Marco Qwent", + "Etienne Dorn" ] }, "2": { "engineers": [ "Hera Tani", - "Marco Qwent" + "Marco Qwent", + "Etienne Dorn" ] }, "3": { "engineers": [ "Hera Tani", - "Marco Qwent" + "Marco Qwent", + "Etienne Dorn" ] }, "4": { "engineers": [ "Hera Tani", - "Marco Qwent" + "Marco Qwent", + "Etienne Dorn" ] }, "5": { "engineers": [ - "Hera Tani" + "Hera Tani", + "Etienne Dorn" ] } } @@ -5482,31 +6300,36 @@ "engineers": [ "Didi Vatermann", "Elvira Martuuk", - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "2": { "engineers": [ "Didi Vatermann", "Elvira Martuuk", - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "3": { "engineers": [ "Didi Vatermann", "Elvira Martuuk", - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "4": { "engineers": [ - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "5": { "engineers": [ - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] } } @@ -5517,31 +6340,36 @@ "engineers": [ "Didi Vatermann", "Elvira Martuuk", - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "2": { "engineers": [ "Didi Vatermann", "Elvira Martuuk", - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "3": { "engineers": [ "Didi Vatermann", "Elvira Martuuk", - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "4": { "engineers": [ - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "5": { "engineers": [ - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] } } @@ -5552,31 +6380,36 @@ "engineers": [ "Didi Vatermann", "Elvira Martuuk", - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "2": { "engineers": [ "Didi Vatermann", "Elvira Martuuk", - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "3": { "engineers": [ "Didi Vatermann", "Elvira Martuuk", - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "4": { "engineers": [ - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "5": { "engineers": [ - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] } } @@ -5587,31 +6420,36 @@ "engineers": [ "Didi Vatermann", "Elvira Martuuk", - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "2": { "engineers": [ "Didi Vatermann", "Elvira Martuuk", - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "3": { "engineers": [ "Didi Vatermann", "Elvira Martuuk", - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "4": { "engineers": [ - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "5": { "engineers": [ - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] } } @@ -5654,24 +6492,33 @@ "1": { "engineers": [ "Bill Turner", - "Lori Jameson" + "Lori Jameson", + "Marsha Hicks" ] }, "2": { "engineers": [ "Bill Turner", - "Lori Jameson" + "Lori Jameson", + "Marsha Hicks" ] }, "3": { "engineers": [ "Bill Turner", - "Lori Jameson" + "Lori Jameson", + "Marsha Hicks" ] }, "4": { "engineers": [ - "Lori Jameson" + "Lori Jameson", + "Marsha Hicks" + ] + }, + "5": { + "engineers": [ + "Marsha Hicks" ] } } @@ -5689,29 +6536,34 @@ "1": { "engineers": [ "The Sarge", - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Etienne Dorn" ] }, "2": { "engineers": [ "The Sarge", - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Etienne Dorn" ] }, "3": { "engineers": [ "The Sarge", - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Etienne Dorn" ] }, "4": { "engineers": [ - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Etienne Dorn" ] }, "5": { "engineers": [ - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Etienne Dorn" ] } } @@ -5721,29 +6573,34 @@ "1": { "engineers": [ "The Sarge", - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Etienne Dorn" ] }, "2": { "engineers": [ "The Sarge", - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Etienne Dorn" ] }, "3": { "engineers": [ "The Sarge", - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Etienne Dorn" ] }, "4": { "engineers": [ - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Etienne Dorn" ] }, "5": { "engineers": [ - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Etienne Dorn" ] } } @@ -5753,29 +6610,34 @@ "1": { "engineers": [ "The Sarge", - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Etienne Dorn" ] }, "2": { "engineers": [ "The Sarge", - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Etienne Dorn" ] }, "3": { "engineers": [ "The Sarge", - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Etienne Dorn" ] }, "4": { "engineers": [ - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Etienne Dorn" ] }, "5": { "engineers": [ - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Etienne Dorn" ] } } @@ -5785,29 +6647,34 @@ "1": { "engineers": [ "The Sarge", - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Etienne Dorn" ] }, "2": { "engineers": [ "The Sarge", - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Etienne Dorn" ] }, "3": { "engineers": [ "The Sarge", - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Etienne Dorn" ] }, "4": { "engineers": [ - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Etienne Dorn" ] }, "5": { "engineers": [ - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Etienne Dorn" ] } } @@ -5817,29 +6684,34 @@ "1": { "engineers": [ "The Sarge", - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Etienne Dorn" ] }, "2": { "engineers": [ "The Sarge", - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Etienne Dorn" ] }, "3": { "engineers": [ "The Sarge", - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Etienne Dorn" ] }, "4": { "engineers": [ - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Etienne Dorn" ] }, "5": { "engineers": [ - "Tod McQuinn" + "Tod \"The Blaster\" McQuinn", + "Etienne Dorn" ] } } @@ -5922,7 +6794,8 @@ "Juri Ishmaak", "Lei Cheung", "Lori Jameson", - "Tiana Fortune" + "Tiana Fortune", + "Etienne Dorn" ] }, "5": { @@ -5931,7 +6804,8 @@ "Juri Ishmaak", "Lei Cheung", "Lori Jameson", - "Tiana Fortune" + "Tiana Fortune", + "Etienne Dorn" ] } } @@ -5980,7 +6854,8 @@ "Juri Ishmaak", "Lei Cheung", "Lori Jameson", - "Tiana Fortune" + "Tiana Fortune", + "Etienne Dorn" ] }, "5": { @@ -5989,7 +6864,8 @@ "Juri Ishmaak", "Lei Cheung", "Lori Jameson", - "Tiana Fortune" + "Tiana Fortune", + "Etienne Dorn" ] } } @@ -6038,7 +6914,8 @@ "Juri Ishmaak", "Lei Cheung", "Lori Jameson", - "Tiana Fortune" + "Tiana Fortune", + "Etienne Dorn" ] }, "5": { @@ -6047,7 +6924,8 @@ "Juri Ishmaak", "Lei Cheung", "Lori Jameson", - "Tiana Fortune" + "Tiana Fortune", + "Etienne Dorn" ] } } @@ -6069,29 +6947,34 @@ "engineers": [ "Didi Vatermann", "Felicity Farseer", - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "2": { "engineers": [ "Didi Vatermann", - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "3": { "engineers": [ "Didi Vatermann", - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "4": { "engineers": [ - "Didi Vatermann" + "Didi Vatermann", + "Mel Brandon" ] }, "5": { "engineers": [ - "Didi Vatermann" + "Didi Vatermann", + "Mel Brandon" ] } } @@ -6102,29 +6985,34 @@ "engineers": [ "Didi Vatermann", "Felicity Farseer", - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "2": { "engineers": [ "Didi Vatermann", - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "3": { "engineers": [ "Didi Vatermann", - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "4": { "engineers": [ - "Didi Vatermann" + "Didi Vatermann", + "Mel Brandon" ] }, "5": { "engineers": [ - "Didi Vatermann" + "Didi Vatermann", + "Mel Brandon" ] } } @@ -6135,29 +7023,34 @@ "engineers": [ "Didi Vatermann", "Felicity Farseer", - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "2": { "engineers": [ "Didi Vatermann", - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "3": { "engineers": [ "Didi Vatermann", - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "4": { "engineers": [ - "Didi Vatermann" + "Didi Vatermann", + "Mel Brandon" ] }, "5": { "engineers": [ - "Didi Vatermann" + "Didi Vatermann", + "Mel Brandon" ] } } @@ -6168,29 +7061,34 @@ "engineers": [ "Didi Vatermann", "Felicity Farseer", - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "2": { "engineers": [ "Didi Vatermann", - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "3": { "engineers": [ "Didi Vatermann", - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "4": { "engineers": [ - "Didi Vatermann" + "Didi Vatermann", + "Mel Brandon" ] }, "5": { "engineers": [ - "Didi Vatermann" + "Didi Vatermann", + "Mel Brandon" ] } } @@ -6201,29 +7099,34 @@ "engineers": [ "Didi Vatermann", "Felicity Farseer", - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "2": { "engineers": [ "Didi Vatermann", - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "3": { "engineers": [ "Didi Vatermann", - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "4": { "engineers": [ - "Didi Vatermann" + "Didi Vatermann", + "Mel Brandon" ] }, "5": { "engineers": [ - "Didi Vatermann" + "Didi Vatermann", + "Mel Brandon" ] } } @@ -6266,17 +7169,20 @@ "1": { "engineers": [ "Elvira Martuuk", - "Lori Jameson" + "Lori Jameson", + "Mel Brandon" ] }, "2": { "engineers": [ - "Lori Jameson" + "Lori Jameson", + "Mel Brandon" ] }, "3": { "engineers": [ - "Lori Jameson" + "Lori Jameson", + "Mel Brandon" ] }, "4": { @@ -6291,17 +7197,20 @@ "1": { "engineers": [ "Elvira Martuuk", - "Lori Jameson" + "Lori Jameson", + "Mel Brandon" ] }, "2": { "engineers": [ - "Lori Jameson" + "Lori Jameson", + "Mel Brandon" ] }, "3": { "engineers": [ - "Lori Jameson" + "Lori Jameson", + "Mel Brandon" ] }, "4": { @@ -6339,31 +7248,36 @@ "engineers": [ "Didi Vatermann", "Elvira Martuuk", - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "2": { "engineers": [ "Didi Vatermann", "Elvira Martuuk", - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "3": { "engineers": [ "Didi Vatermann", "Elvira Martuuk", - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "4": { "engineers": [ - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "5": { "engineers": [ - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] } } @@ -6374,31 +7288,36 @@ "engineers": [ "Didi Vatermann", "Elvira Martuuk", - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "2": { "engineers": [ "Didi Vatermann", "Elvira Martuuk", - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "3": { "engineers": [ "Didi Vatermann", "Elvira Martuuk", - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "4": { "engineers": [ - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "5": { "engineers": [ - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] } } @@ -6409,31 +7328,36 @@ "engineers": [ "Didi Vatermann", "Elvira Martuuk", - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "2": { "engineers": [ "Didi Vatermann", "Elvira Martuuk", - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "3": { "engineers": [ "Didi Vatermann", "Elvira Martuuk", - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "4": { "engineers": [ - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "5": { "engineers": [ - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] } } @@ -6444,31 +7368,36 @@ "engineers": [ "Didi Vatermann", "Elvira Martuuk", - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "2": { "engineers": [ "Didi Vatermann", "Elvira Martuuk", - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "3": { "engineers": [ "Didi Vatermann", "Elvira Martuuk", - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "4": { "engineers": [ - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] }, "5": { "engineers": [ - "Lei Cheung" + "Lei Cheung", + "Mel Brandon" ] } } @@ -6509,7 +7438,9 @@ "Juri Ishmaak", "Lei Cheung", "Lori Jameson", - "Tiana Fortune" + "Tiana Fortune", + "Etienne Dorn", + "Hera Tani" ] }, "2": { @@ -6519,7 +7450,9 @@ "Juri Ishmaak", "Lei Cheung", "Lori Jameson", - "Tiana Fortune" + "Tiana Fortune", + "Etienne Dorn", + "Hera Tani" ] }, "3": { @@ -6529,7 +7462,9 @@ "Juri Ishmaak", "Lei Cheung", "Lori Jameson", - "Tiana Fortune" + "Tiana Fortune", + "Etienne Dorn", + "Hera Tani" ] }, "4": { @@ -6537,7 +7472,9 @@ "Bill Turner", "Juri Ishmaak", "Lei Cheung", - "Lori Jameson" + "Lori Jameson", + "Etienne Dorn", + "Hera Tani" ] }, "5": { @@ -6545,7 +7482,9 @@ "Bill Turner", "Juri Ishmaak", "Lei Cheung", - "Lori Jameson" + "Lori Jameson", + "Etienne Dorn", + "Hera Tani" ] } } @@ -6573,30 +7512,40 @@ "engineers": [ "Elvira Martuuk", "Felicty Farseer", - "Professor Palin" + "Professor Palin", + "Mel Brandon", + "Chloe Sedesi" ] }, "2": { "engineers": [ "Elvira Martuuk", "Felicty Farseer", - "Professor Palin" + "Professor Palin", + "Mel Brandon", + "Chloe Sedesi" ] }, "3": { "engineers": [ "Felicty Farseer", - "Professor Palin" + "Professor Palin", + "Mel Brandon", + "Chloe Sedesi" ] }, "4": { "engineers": [ - "Professor Palin" + "Professor Palin", + "Mel Brandon", + "Chloe Sedesi" ] }, "5": { "engineers": [ - "Professor Palin" + "Professor Palin", + "Mel Brandon", + "Chloe Sedesi" ] } } @@ -6607,30 +7556,40 @@ "engineers": [ "Elvira Martuuk", "Felicty Farseer", - "Professor Palin" + "Professor Palin", + "Mel Brandon", + "Chloe Sedesi" ] }, "2": { "engineers": [ "Elvira Martuuk", "Felicty Farseer", - "Professor Palin" + "Professor Palin", + "Mel Brandon", + "Chloe Sedesi" ] }, "3": { "engineers": [ "Felicty Farseer", - "Professor Palin" + "Professor Palin", + "Mel Brandon", + "Chloe Sedesi" ] }, "4": { "engineers": [ - "Professor Palin" + "Professor Palin", + "Mel Brandon", + "Chloe Sedesi" ] }, "5": { "engineers": [ - "Professor Palin" + "Professor Palin", + "Mel Brandon", + "Chloe Sedesi" ] } } @@ -6641,30 +7600,40 @@ "engineers": [ "Elvira Martuuk", "Felicty Farseer", - "Professor Palin" + "Professor Palin", + "Mel Brandon", + "Chloe Sedesi" ] }, "2": { "engineers": [ "Elvira Martuuk", "Felicty Farseer", - "Professor Palin" + "Professor Palin", + "Mel Brandon", + "Chloe Sedesi" ] }, "3": { "engineers": [ "Felicty Farseer", - "Professor Palin" + "Professor Palin", + "Mel Brandon", + "Chloe Sedesi" ] }, "4": { "engineers": [ - "Professor Palin" + "Professor Palin", + "Mel Brandon", + "Chloe Sedesi" ] }, "5": { "engineers": [ - "Professor Palin" + "Professor Palin", + "Mel Brandon", + "Chloe Sedesi" ] } } @@ -6693,29 +7662,34 @@ "1": { "engineers": [ "Juri Ishmaak", - "Liz Ryder" + "Liz Ryder", + "Petra Olmanova" ] }, "2": { "engineers": [ "Juri Ishmaak", - "Liz Ryder" + "Liz Ryder", + "Petra Olmanova" ] }, "3": { "engineers": [ "Juri Ishmaak", - "Liz Ryder" + "Liz Ryder", + "Petra Olmanova" ] }, "4": { "engineers": [ - "Liz Ryder" + "Liz Ryder", + "Petra Olmanova" ] }, "5": { "engineers": [ - "Liz Ryder" + "Liz Ryder", + "Petra Olmanova" ] } } @@ -6725,29 +7699,34 @@ "1": { "engineers": [ "Juri Ishmaak", - "Liz Ryder" + "Liz Ryder", + "Petra Olmanova" ] }, "2": { "engineers": [ "Juri Ishmaak", - "Liz Ryder" + "Liz Ryder", + "Petra Olmanova" ] }, "3": { "engineers": [ "Juri Ishmaak", - "Liz Ryder" + "Liz Ryder", + "Petra Olmanova" ] }, "4": { "engineers": [ - "Liz Ryder" + "Liz Ryder", + "Petra Olmanova" ] }, "5": { "engineers": [ - "Liz Ryder" + "Liz Ryder", + "Petra Olmanova" ] } } @@ -6792,29 +7771,34 @@ "1": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "2": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "3": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "4": { "engineers": [ - "Broo Tarquin" + "Broo Tarquin", + "Mel Brandon" ] }, "5": { "engineers": [ - "Broo Tarquin" + "Broo Tarquin", + "Mel Brandon" ] } } @@ -6824,29 +7808,34 @@ "1": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "2": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "3": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "4": { "engineers": [ - "Broo Tarquin" + "Broo Tarquin", + "Mel Brandon" ] }, "5": { "engineers": [ - "Broo Tarquin" + "Broo Tarquin", + "Mel Brandon" ] } } @@ -6856,29 +7845,34 @@ "1": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "2": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "3": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "4": { "engineers": [ - "Broo Tarquin" + "Broo Tarquin", + "Mel Brandon" ] }, "5": { "engineers": [ - "Broo Tarquin" + "Broo Tarquin", + "Mel Brandon" ] } } @@ -6888,29 +7882,34 @@ "1": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "2": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "3": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "4": { "engineers": [ - "Broo Tarquin" + "Broo Tarquin", + "Mel Brandon" ] }, "5": { "engineers": [ - "Broo Tarquin" + "Broo Tarquin", + "Mel Brandon" ] } } @@ -6920,29 +7919,34 @@ "1": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "2": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "3": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "4": { "engineers": [ - "Broo Tarquin" + "Broo Tarquin", + "Mel Brandon" ] }, "5": { "engineers": [ - "Broo Tarquin" + "Broo Tarquin", + "Mel Brandon" ] } } @@ -6952,29 +7956,34 @@ "1": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "2": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "3": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "4": { "engineers": [ - "Broo Tarquin" + "Broo Tarquin", + "Mel Brandon" ] }, "5": { "engineers": [ - "Broo Tarquin" + "Broo Tarquin", + "Mel Brandon" ] } } @@ -6984,29 +7993,34 @@ "1": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "2": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "3": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "4": { "engineers": [ - "Broo Tarquin" + "Broo Tarquin", + "Mel Brandon" ] }, "5": { "engineers": [ - "Broo Tarquin" + "Broo Tarquin", + "Mel Brandon" ] } } @@ -7016,29 +8030,34 @@ "1": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "2": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "3": { "engineers": [ "Broo Tarquin", - "The Dweller" + "The Dweller", + "Mel Brandon" ] }, "4": { "engineers": [ - "Broo Tarquin" + "Broo Tarquin", + "Mel Brandon" ] }, "5": { "engineers": [ - "Broo Tarquin" + "Broo Tarquin", + "Mel Brandon" ] } } @@ -7100,17 +8119,20 @@ "Bill Turner", "Lori Jameson", "Tiana Fortune", - "Juri Ishmaak" + "Juri Ishmaak", + "Etienne Dorn" ] }, "4": { "engineers": [ - "Tiana Fortune" + "Tiana Fortune", + "Etienne Dorn" ] }, "5": { "engineers": [ - "Tiana Fortune" + "Tiana Fortune", + "Etienne Dorn" ] } } @@ -7140,17 +8162,20 @@ "Bill Turner", "Lori Jameson", "Tiana Fortune", - "Juri Ishmaak" + "Juri Ishmaak", + "Etienne Dorn" ] }, "4": { "engineers": [ - "Tiana Fortune" + "Tiana Fortune", + "Etienne Dorn" ] }, "5": { "engineers": [ - "Tiana Fortune" + "Tiana Fortune", + "Etienne Dorn" ] } } @@ -7180,17 +8205,20 @@ "Bill Turner", "Lori Jameson", "Tiana Fortune", - "Juri Ishmaak" + "Juri Ishmaak", + "Etienne Dorn" ] }, "4": { "engineers": [ - "Tiana Fortune" + "Tiana Fortune", + "Etienne Dorn" ] }, "5": { "engineers": [ - "Tiana Fortune" + "Tiana Fortune", + "Etienne Dorn" ] } } @@ -7220,17 +8248,20 @@ "Bill Turner", "Lori Jameson", "Tiana Fortune", - "Juri Ishmaak" + "Juri Ishmaak", + "Etienne Dorn" ] }, "4": { "engineers": [ - "Tiana Fortune" + "Tiana Fortune", + "Etienne Dorn" ] }, "5": { "engineers": [ - "Tiana Fortune" + "Tiana Fortune", + "Etienne Dorn" ] } } @@ -7260,17 +8291,20 @@ "Bill Turner", "Lori Jameson", "Tiana Fortune", - "Juri Ishmaak" + "Juri Ishmaak", + "Etienne Dorn" ] }, "4": { "engineers": [ - "Tiana Fortune" + "Tiana Fortune", + "Etienne Dorn" ] }, "5": { "engineers": [ - "Tiana Fortune" + "Tiana Fortune", + "Etienne Dorn" ] } } @@ -7300,17 +8334,20 @@ "Bill Turner", "Lori Jameson", "Tiana Fortune", - "Juri Ishmaak" + "Juri Ishmaak", + "Etienne Dorn" ] }, "4": { "engineers": [ - "Tiana Fortune" + "Tiana Fortune", + "Etienne Dorn" ] }, "5": { "engineers": [ - "Tiana Fortune" + "Tiana Fortune", + "Etienne Dorn" ] } } diff --git a/modules/standard/power_distributor.json b/modules/standard/power_distributor.json index 9207b1f..8b3a472 100644 --- a/modules/standard/power_distributor.json +++ b/modules/standard/power_distributor.json @@ -867,18 +867,18 @@ "cost": 111600, "edID": 128833981, "eddbID": 1040, - "engcap": 9, - "engrate": 0.8, + "engcap": 11, + "engrate": 1, "grp": "pd", "id": "0U", - "integrity": 56, + "integrity": 45, "mass": 2.6, "power": 0.73, "rating": "A", - "syscap": 10, - "sysrate": 0.8, - "wepcap": 10, - "weprate": 2.5, + "syscap": 11, + "sysrate": 1, + "wepcap": 13, + "weprate": 3.1, "name": "Guardian Power Distributor", "symbol": "Int_GuardianPowerDistributor_Size2", "ukName": "Guardian Power Distributor",