Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: cmmcleod/coriolis-data
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: EDCD/coriolis-data
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.
Loading
Showing with 46,330 additions and 25,700 deletions.
  1. +21 −0 .editorconfig
  2. +13 −0 .eslintrc.js
  3. +4 −1 .gitignore
  4. +1 −0 .npmrc
  5. +168 −0 ChangeLog.md
  6. +24 −0 LICENSE.md
  7. +10 −2 README.md
  8. +0 −10,957 dist/index.js
  9. +0 −13,250 dist/index.json
  10. +8 −3 generate_distribution.js
  11. +9,822 −0 modifications/blueprints.json
  12. +7 −0 modifications/index.js
  13. +58 −0 modifications/modifications.json
  14. +580 −0 modifications/modifierActions.json
  15. +8,425 −0 modifications/modules.json
  16. +1,012 −0 modifications/specials.json
  17. +66 −0 modules/hardpoints/abrasion_blaster.json
  18. +136 −0 modules/hardpoints/ax_missile_rack.json
  19. +132 −0 modules/hardpoints/ax_missile_rack_enhanced.json
  20. +136 −0 modules/hardpoints/ax_multi_cannon.json
  21. +202 −0 modules/hardpoints/ax_multi_cannon_enhanced.json
  22. +317 −16 modules/hardpoints/beam_laser.json
  23. +353 −14 modules/hardpoints/burst_laser.json
  24. +382 −14 modules/hardpoints/cannon.json
  25. +81 −6 modules/hardpoints/cargo_scanner.json
  26. +25 −0 modules/hardpoints/caustic_sink_launcher.json
  27. +27 −0 modules/hardpoints/chaff_launcher.json
  28. +0 −8 modules/hardpoints/countermeasures.json
  29. +24 −0 modules/hardpoints/electronic_countermeasure.json
  30. +34 −0 modules/hardpoints/enzyme_missile_rack.json
  31. +333 −13 modules/hardpoints/fragment_cannon.json
  32. +76 −6 modules/hardpoints/frame_shift_wake_scanner.json
  33. +73 −0 modules/hardpoints/guardian_gauss_cannon.json
  34. +196 −0 modules/hardpoints/guardian_plasma_charger.json
  35. +208 −0 modules/hardpoints/guardian_shard_cannon.json
  36. +28 −0 modules/hardpoints/heat_sink_launcher.json
  37. +76 −6 modules/hardpoints/kill_warrant_scanner.json
  38. +88 −3 modules/hardpoints/mine_launcher.json
  39. +134 −4 modules/hardpoints/mining_laser.json
  40. +318 −5 modules/hardpoints/missile_rack.json
  41. +66 −0 modules/hardpoints/missile_rack_advanced.json
  42. +35 −0 modules/hardpoints/missing_hardpoint.json
  43. +377 −15 modules/hardpoints/multi_cannon.json
  44. +66 −0 modules/hardpoints/multi_cannon_advanced.json
  45. +58 −0 modules/hardpoints/nanite_torpedo_pylon.json
  46. +135 −4 modules/hardpoints/plasma_accelerator.json
  47. +33 −0 modules/hardpoints/point_defence.json
  48. +326 −16 modules/hardpoints/pulse_laser.json
  49. +89 −0 modules/hardpoints/pulse_wave_analyser.json
  50. +98 −3 modules/hardpoints/rail_gun.json
  51. +64 −0 modules/hardpoints/remote_release_flak_launcher.json
  52. +62 −0 modules/hardpoints/remote_release_flechette_launcher.json
  53. +66 −0 modules/hardpoints/seismic_charge_launcher.json
  54. +91 −6 modules/hardpoints/shield_booster.json
  55. +287 −0 modules/hardpoints/shock_cannon.json
  56. +41 −0 modules/hardpoints/shutdown_field_neutraliser.json
  57. +132 −0 modules/hardpoints/sub_surface_displacement_missile.json
  58. +90 −3 modules/hardpoints/torpedo_pylon.json
  59. +56 −0 modules/hardpoints/xeno_scanner.json
  60. +51 −6 modules/index.js
  61. +640 −47 modules/internal/auto_field_maintenance_unit.json
  62. +216 −8 modules/internal/bi_weave_shield_generator.json
  63. +60 −0 modules/internal/business_passenger_cabin.json
  64. +186 −9 modules/internal/cargo_rack.json
  65. +341 −24 modules/internal/collector_limpet_controllers.json
  66. +68 −0 modules/internal/decontamination_limpet_controller.json
  67. +31 −2 modules/internal/docking_computer.json
  68. +74 −0 modules/internal/economy_passenger_cabin.json
  69. +32 −0 modules/internal/experemental_weapon_stabilizer.json
  70. +58 −0 modules/internal/fighter_hangar.json
  71. +46 −0 modules/internal/first_passenger_cabin.json
  72. +361 −24 modules/internal/frame_shift_drive_interdictor.json
  73. +561 −48 modules/internal/fuel_scoop.json
  74. +321 −24 modules/internal/fuel_transfer_limpet_controllers.json
  75. +84 −0 modules/internal/guardian_fsd_booster.json
  76. +194 −0 modules/internal/guardian_hull_reinforcement_package.json
  77. +164 −0 modules/internal/guardian_module_reinforcement_package.json
  78. +164 −0 modules/internal/guardian_shield_reinforcement_package.json
  79. +341 −24 modules/internal/hatch_breaker_limpet_controller.json
  80. +181 −15 modules/internal/hull_reinforcement_package.json
  81. +105 −9 modules/internal/internal_fuel_tank.json
  82. +32 −0 modules/internal/luxury_passenger_cabin.json
  83. +184 −0 modules/internal/meta_alloy_hull_reinforcement_package.json
  84. +20 −0 modules/internal/missing_module.json
  85. +154 −0 modules/internal/module_reinforcement_package.json
  86. +172 −0 modules/internal/multi_limpet_controllers.json
  87. +35 −0 modules/internal/planetary_approach_suite.json
  88. +96 −8 modules/internal/planetary_vehicle_hanger.json
  89. +224 −8 modules/internal/pristmatic_shield_generator.json
  90. +321 −24 modules/internal/prospector_limpet_controllers.json
  91. +76 −0 modules/internal/recon_limpet_controllers.json
  92. +280 −23 modules/internal/refinery.json
  93. +324 −0 modules/internal/repair_limpet_controller.json
  94. +20 −0 modules/internal/research_limpet_controller.json
  95. +0 −8 modules/internal/scanner.json
  96. +960 −47 modules/internal/shield_cell_bank.json
  97. +1,054 −42 modules/internal/shield_generator.json
  98. +19 −0 modules/internal/supercruise_assist.json
  99. +20 −0 modules/internal/surface_scanner.json
  100. +21 −0 modules/mod.py
  101. +1,255 −42 modules/standard/frame_shift_drive.json
  102. +128 −9 modules/standard/fuel_tank.json
  103. +699 −48 modules/standard/life_support.json
  104. +0 −5 modules/standard/planetary_approach_suite.json
  105. +1,040 −48 modules/standard/power_distributor.json
  106. +698 −42 modules/standard/power_plant.json
  107. +699 −48 modules/standard/sensors.json
  108. +819 −44 modules/standard/thrusters.json
  109. +14 −9 package.json
  110. +135 −16 ships/adder.json
  111. +214 −0 ships/alliance_challenger.json
  112. +211 −0 ships/alliance_chieftain.json
  113. +213 −0 ships/alliance_crusader.json
  114. +184 −18 ships/anaconda.json
  115. +149 −18 ships/asp.json
  116. +140 −18 ships/asp_scout.json
  117. +185 −0 ships/beluga.json
  118. +141 −18 ships/cobra_mk_iii.json
  119. +150 −18 ships/cobra_mk_iv.json
  120. +146 −20 ships/diamondback_explorer.json
  121. +143 −20 ships/diamondback_scout.json
  122. +166 −0 ships/dolphin.json
  123. +145 −16 ships/eagle.json
  124. +175 −18 ships/federal_assault_ship.json
  125. +195 −16 ships/federal_corvette.json
  126. +177 −17 ships/federal_dropship.json
  127. +192 −17 ships/federal_gunship.json
  128. +145 −16 ships/fer_de_lance.json
  129. +129 −16 ships/hauler.json
  130. +151 −19 ships/imperial_clipper.json
  131. +149 −20 ships/imperial_courier.json
  132. +198 −20 ships/imperial_cutter.json
  133. +147 −18 ships/imperial_eagle.json
  134. +13 −1 ships/index.js
  135. +142 −18 ships/keelback.json
  136. +171 −0 ships/krait_mkii.json
  137. +168 −0 ships/krait_phantom.json
  138. +168 −0 ships/mamba.json
  139. +168 −0 ships/mandalay.json
  140. +146 −22 ships/orca.json
  141. +151 −18 ships/python.json
  142. +170 −0 ships/python_nx.json
  143. +131 −16 ships/sidewinder.json
  144. +216 −0 ships/type_10_defender.json
  145. +139 −18 ships/type_6_transporter.json
  146. +150 −19 ships/type_7_transport.json
  147. +164 −0 ships/type_8_transport.json
  148. +155 −19 ships/type_9_heavy.json
  149. +152 −19 ships/viper.json
  150. +154 −17 ships/viper_mk_iv.json
  151. +153 −18 ships/vulture.json
  152. +226 −126 spec/data-spec.js
21 changes: 21 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
root = true


[*]

# change these settings to your own preference
indent_style = space
indent_size = 2

# we recommend you to keep these unchanged
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true

[*.md]
trim_trailing_whitespace = false

[{package,bower}.json]
indent_style = space
indent_size = 2
13 changes: 13 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
module.exports = {
'env': {
'browser': true,
'node': true
},
'extends': 'eslint:recommended',
'rules': {
'indent': ['error', 2],
'linebreak-style': [2, 'unix'],
'quotes': [2, 'single'],
'semi': [2, 'always']
}
};
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
node_modules
node_modules/*
*.log

.idea
.vscode/
package-lock.json
dist/
1 change: 1 addition & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
package-lock=false
168 changes: 168 additions & 0 deletions ChangeLog.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,168 @@
#2.5.1
* AX Modules
* Fixed some engineering values

#2.5.0
* Willyb321 fixed engineering. Some stuff doesn't work. We currently believe this is FDevs fault and not ours.

#2.4.3
* T10 Defender

#2.4.2
* Add requirements to UI
* Fix for limpets

#2.4.1
* Config Fix

#2.4.0
* Added Repair Limpet Computers

#2.3.7
* Fixed Orca mass-lock

#2.3.5
* Fix list of available blueprints for Point Defence
* Fix integrity values for class 6 power plants
* Add shot speed for long range weapon
* Fix components for dirty drive grade 3
* Update values for Cytoscrambler
* Add shotspeed modifier to cannon/multi-cannon/fragment cannon

#2.3.4
* Add missing Long Range blueprint to multi-cannon
* Fix values for thermal load of focused weapon grade 4
* Fix internal module information for power plant blueprints
* Add 'FSD Interrupt' special to dumbfire missile racks; this module now has `specials_S` and `specials_D` keys for specials to differentiate

#2.3.3
* Add Felicity Farseer to list of engineers that supply sensor and detailed surface scanner modifications

#2.3.2
* Update ownership of module blueprints for sensors and scanners
* Update railgun penetration

#2.3.1
* Separate scan time and scan range
* Add Frontier IDs for new items in 2.3

#2.3.0
* Add Dolphin
* Add turreted mining lasers
* Add long range / wide angle / fast scan scanner blueprints
* Fix EDDB IDs for class 5 and 7 fighter hangars for correct shopping list
* Fix cost for rocket-propelled FSD disruptor
* Add module names for blueprints
* Fix erroneous value for grade 5 kinetic shield booster
* Add missing integrity values for some modules
* Update module reinforcement package integrity
* Update specs of Beluga as per 2.3
* Update specs of Asp Scout as per 2.3
* Update specs of Diamondback Explorer as per 2.3
* Add ED ID for Rocket Propelled FSD Disruptor
* Fix ED name for target lock breaker special
* Update scan range and angle information for sensors
* Tidy up shield cell bank information to allow for accurate calculations with modifications
* Update mine launcher stats
* Add appropriate engineers to per-module blueprint information

#2.2.19
* Remove shot speed modification - it is directly tied to range
* Fix incorrect minimal mass for 3C bi-weave shield generator

#2.2.18
* Correct lower efficiency value to be better, not worse

#2.2.17
* Add mass as potential SCB modification
* Fix mining laser statistics
* Remove non-existent grade 4 and 5 wake scanner modifications
* Add number of crew for each ship

#2.2.16
* Fix incorrect thermal load modifiers for dirty drives
* Provide explicit information about if values are higher numeric value == better or not

#2.2.15
* Fix location of initial cargo rack for Vulture
* Fix broken regeneration rate for 6B shield generators
* Tidy up breach damage values

#2.2.14
* Alter blueprint structure to combine components and features
* Make hidden value of modifications its own attribute
* Fix incorrect ED ID for class 6 passenger cabins

#2.2.13
* Add plasma slug special effect for plasma accelerator
* Tweak hull costs of ships

#2.2.12
* Add special effects for each blueprint
* Add IDs for most Powerplay modules

#2.2.11
* Remove non-existant chaff launcher capacity blueprint grades
* Fix incorrect values for charge enhanced power distributor
* Remove incorrect AFMU blueprints
* Correct fragment cannon Double Shot blueprint information
* Correct Focused weapon blueprint information

#2.2.10
* Fix incorrect base shield values for Cutter and Corvette
* Update weapons to have %-based damage distributions
* Remove power draw for detailed surface scanner - although shown in outfitting it is not part of active power
* Fix incorrect names for lightweight and kinetic armour
* Add engineering blueprints

#2.2.9
* Add falloff metric for weapons
* Add falloff from range modification

#2.2.8
* Set military slot of Viper Mk IV to class 3; was incorrectly set as class 2
* Update base regeneration rate of prismatic shield generators to values in 2.2.03
* Update specials with information in 2.2.03

#2.2.6
* Update weapons with changed values for 2.2.03
* Add individual pitch/roll/yaw statistics for each ship
* Remove old and meaningless agility stat
* Use sane order for multi-module JSON - coriolis can re-order as it sees fit when displaying modules
* Fix cost of fighter hangars
* Update Powerplay weapons with current statistics
* Add separate min/opt/max multipliers for enhanced thrusters for speed, acceleration and rotation
* Add module reinforcement packages
* Add military compartments
* Fix missing damage value for 2B dumbfires
* Update shield recharge rates
* Reduce hull mass of Viper to 50T
* Fix incorrect optimal mass value for 8A thrusters
* Add power draw for detailed surface scanner

#2.2.5
* Fix incorrect ID for emissive munitions special
* Fix rate of fire for burst lasers
* Add fragment cannon modifications
* Fix internal name of dazzle shell

#2.2.4
* Fix incorrect ID for class 5 luxury passenger cabin
* Add damage type modifier
* Change modifications from simple strings to objects, to allow more data-driven behaviour
* Add special effects

#2.2.3
* Fix mismatch between class 5 and class 7 fighter hangars
* Add details for concordant sequence special effect
* Fix details for thermal shock special effect
* Add engineer blueprints

#2.2.2
* Add distributor draw modifier to shield generators
* Remove modifiers for sensors
* Add initial loadout passenger cabins for Beluga
* Add initial loadout passenger cabins for Orca
* Update costs and initial loadouts for Keelback and Type-7
* Add resistances for hull reinforcement packages
* Added modifier actions to create modifications from raw data
24 changes: 24 additions & 0 deletions LICENSE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
All Data and [associated JSON](https://github.com/EDCD/coriolis-data) files are intellectual property and copyright of Frontier Developments plc ('Frontier', 'Frontier Developments') and are subject to their
[terms and conditions](https://www.frontierstore.net/terms-and-conditions/).

The code (Javascript, CSS, HTML, and SVG files only) specificially for Coriolis.io is released under the MIT License.

Copyright (c) 2015 Coriolis.io, Colin McLeod

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software (Javascript, CSS, HTML, and SVG files only), and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
12 changes: 10 additions & 2 deletions README.md
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,10 +1,18 @@
[![Build Status](https://travis-ci.org/cmmcleod/coriolis-data.svg?branch=master)](https://travis-ci.org/cmmcleod/coriolis-data)
[![Build Status](https://travis-ci.org/EDCD/coriolis-data.svg?branch=master)](https://travis-ci.org/EDCD/coriolis-data)
# Coriolis Data Files

JSON Data modelling Elite Dangerous ships and components.

See [the wiki](https://github.com/cmmcleod/coriolis-data/wiki) for more details
See [the wiki](https://github.com/edcd/coriolis-data/wiki) for more details

## Issues

If you want to report an issue for this repository, please do this in the main repository of the coriolis project: https://github.com/EDCD/coriolis/issues

## Hosted Versions

You can find hosted and compiled versions of the data-json under https://coriolis.io/data/ and https://beta.coriolis.io/data/.
You might want to load these as depedency instead of reyling on the npm-dependency.

## Development

Loading