Mirroring/coriolis-data
1
0
Fork 0
mirror of https://github.com/EDCD/coriolis-data.git synced 2025-12-08 15:13:23 +00:00
Code Issues Projects Releases Wiki Activity

Conflict Resolve

Browse Source
This commit is contained in:
Unknown
2017-12-24 16:54:59 +00:00
parent 59a31cbb9f
commit 3bc828140a
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dist/index.js vendored
View File

@@ -2760,8 +2760,8 @@ module.exports = {
speed: 179,
boost: 219,
boostEnergy: 19,
baseShieldStrength: 99,
baseArmour: 1044,
baseShieldStrength: 320,
baseArmour: 580,
hardness: 75,
hullMass: 1200,
masslock: 26,

4
dist/index.json vendored
View File

@@ -4346,8 +4346,8 @@
"speed": 179,
"boost": 219,
"boostEnergy": 19,
"baseShieldStrength": 99,
"baseArmour": 1044,
"baseShieldStrength": 320,
"baseArmour": 580,
"hardness": 75,
"hullMass": 1200,
"masslock": 26,

5
ships/type_10_defender.json
View File

@@ -10,8 +10,13 @@
"speed": 179,
"boost": 219,
"boostEnergy": 19,
<<<<<<< HEAD
"baseShieldStrength": 320,
"baseArmour": 1879,
=======
"baseShieldStrength": 320,
"baseArmour": 580,
>>>>>>> 5dcfa6b... Final value for baseArmour
"hardness": 75,
"hullMass": 1200,
"masslock": 26,