New tets and fixes due to new tests

This commit is contained in:
Cmdr McDonald
2016-10-14 20:36:05 +01:00
parent d0cc8ffb1c
commit 53b7f8e316
11 changed files with 166 additions and 62 deletions

View File

@@ -8,7 +8,7 @@
{ "id": "0o", "edID": 128049437, "eddbID": 849, "grp": "bl", "class": 3, "rating": "D", "cost": 19399600, "mass": 8, "integrity": 64, "power": 1.68, "mount": "T", "type": "T", "armourpen": 50, "breachdps": 11.5, "breachmin": 0.4, "breachmax": 0.8, "dps": 14.4, "eps" : 3.51, "hps" : 5.1 },
{ "id": "0r", "edID": 128049429, "eddbID": 842, "grp": "bl", "class": 2, "rating": "D", "cost": 299520, "mass": 4, "integrity": 51, "power": 1.12, "mount": "F", "type": "T", "armourpen": 35, "breachdps": 12.8, "breachmin": 0.4, "breachmax": 0.8, "dps": 16, "eps" : 3.51, "hps" : 5.1 },
{ "id": "0s", "edID": 128049433, "eddbID": 845, "grp": "bl", "class": 2, "rating": "D", "cost": 500600, "mass": 4, "integrity": 51, "power": 1.1, "mount": "G", "type": "T", "armourpen": 35, "breachdps": 10, "breachmin": 0.4, "breachmax": 0.8, "dps": 12.5, "edps": 3.44, "hps" : 5.3 },
{ "id": "0s", "edID": 128049433, "eddbID": 845, "grp": "bl", "class": 2, "rating": "D", "cost": 500600, "mass": 4, "integrity": 51, "power": 1.1, "mount": "G", "type": "T", "armourpen": 35, "breachdps": 10, "breachmin": 0.4, "breachmax": 0.8, "dps": 12.5, "eps": 3.44, "hps" : 5.3 },
{ "id": "0t", "edID": 128049436, "eddbID": 848, "grp": "bl", "class": 2, "rating": "E", "cost": 2099900, "mass": 4, "integrity": 51, "power": 1.03, "mount": "T", "type": "T", "armourpen": 35, "breachdps": 7.1, "breachmin": 0.4, "breachmax": 0.8, "dps": 8.8, "eps" : 2.16, "hps" : 3.5 },
{ "id": "10", "edID": 128049428, "eddbID": 841, "grp": "bl", "class": 1, "rating": "E", "cost": 37430, "mass": 2, "integrity": 40, "power": 0.69, "mount": "F", "type": "T", "armourpen": 18, "breachdps": 7.9, "breachmin": 0.4, "breachmax": 0.8, "dps": 9.8, "eps" : 2.16, "hps" : 3.5 },

View File

@@ -1,9 +1,9 @@
{
"cs": [
{ "id": "0d", "edID": 128662520, "eddbID": 1227, "grp": "cs", "class": 0, "rating": "E", "cost": 13540, "mass": 1.3, "power": 0.2, "range": 2000, "time": 10 },
{ "id": "0c", "edID": 128662521, "eddbID": 1228, "grp": "cs", "class": 0, "rating": "D", "cost": 40630, "mass": 1.3, "power": 0.4, "range": 2500, "time": 10 },
{ "id": "0b", "edID": 128662522, "eddbID": 1229, "grp": "cs", "class": 0, "rating": "C", "cost": 121900, "mass": 1.3, "power": 0.8, "range": 3000, "time": 10 },
{ "id": "0a", "edID": 128662523, "eddbID": 1230, "grp": "cs", "class": 0, "rating": "B", "cost": 365700, "mass": 1.3, "power": 1.6, "range": 3500, "time": 10 },
{ "id": "09", "edID": 128662524, "eddbID": 1231, "grp": "cs", "class": 0, "rating": "A", "cost": 1097100, "mass": 1.3, "power": 3.2, "range": 4000, "time": 10 }
{ "id": "0d", "edID": 128662520, "eddbID": 1227, "grp": "cs", "class": 0, "rating": "E", "integrity": 32, "cost": 13540, "mass": 1.3, "power": 0.2, "range": 2000, "angle": 15, "time": 10 },
{ "id": "0c", "edID": 128662521, "eddbID": 1228, "grp": "cs", "class": 0, "rating": "D", "integrity": 24, "cost": 40630, "mass": 1.3, "power": 0.4, "range": 2500, "angle": 15, "time": 10 },
{ "id": "0b", "edID": 128662522, "eddbID": 1229, "grp": "cs", "class": 0, "rating": "C", "integrity": 40, "cost": 121900, "mass": 1.3, "power": 0.8, "range": 3000, "angle": 15, "time": 10 },
{ "id": "0a", "edID": 128662523, "eddbID": 1230, "grp": "cs", "class": 0, "rating": "B", "integrity": 56, "cost": 365700, "mass": 1.3, "power": 1.6, "range": 3500, "angle": 15, "time": 10 },
{ "id": "09", "edID": 128662524, "eddbID": 1231, "grp": "cs", "class": 0, "rating": "A", "integrity": 48, "cost": 1097100, "mass": 1.3, "power": 3.2, "range": 4000, "angle": 15, "time": 10 }
]
}

View File

@@ -1,8 +1,8 @@
{
"cm": [
{ "id": "00", "edID": 128049513, "eddbID": 884, "grp": "cm", "name": "Chaff Launcher", "class": 0, "rating": "I", "cost": 8500, "mass": 1.3, "power": 0.2, "passive": 1, "thermload": 2, "clip": 1, "ammo": 10, "ammocost": 30 },
{ "id": "01", "edID": 128049516, "eddbID": 885, "grp": "cm", "name": "Electronic Countermeasure", "class": 0, "rating": "F", "cost": 12500, "mass": 1.3, "power": 0.2, "range": 3000, "chargeup": 4, "activepower": 4, "cooldown": 10 },
{ "id": "02", "edID": 128049519, "eddbID": 886, "grp": "cm", "name": "Heat Sink Launcher", "class": 0, "rating": "I", "cost": 3500, "mass": 1.3, "power": 0.2, "passive": 1, "thermload": 0, "clip": 1, "ammo": 2, "ammocost": 25 },
{ "id": "03", "edID": 128049522, "eddbID": 887, "grp": "cm", "name": "Point Defence", "class": 0, "rating": "I", "cost": 18550, "mass": 0.5, "power": 0.2, "passive": 1, "thermload": 1, "clip": 50, "ammo": 10000, "ammocost": 1 }
{ "id": "00", "edID": 128049513, "eddbID": 884, "grp": "cm", "name": "Chaff Launcher", "class": 0, "rating": "I", "cost": 8500, "mass": 1.3, "integrity": 20, "power": 0.2, "passive": 1, "eps": 4, "hps": 4, "clip": 1, "ammo": 10, "reload": 10, "duration": 20 },
{ "id": "01", "edID": 128049516, "eddbID": 885, "grp": "cm", "name": "Electronic Countermeasure", "class": 0, "rating": "F", "cost": 12500, "mass": 1.3, "integrity": 20, "power": 0.2, "range": 3000, "chargeup": 4, "activepower": 4, "cooldown": 10 },
{ "id": "02", "edID": 128049519, "eddbID": 886, "grp": "cm", "name": "Heat Sink Launcher", "class": 0, "rating": "I", "cost": 3500, "mass": 1.3, "integrity": 20, "power": 0.2, "passive": 1, "rof": 0.2, "eps": 0.4, "clip": 1, "ammo": 2, "duration": 10, "reload": 10 },
{ "id": "03", "edID": 128049522, "eddbID": 887, "grp": "cm", "name": "Point Defence", "class": 0, "type": "K", "rating": "I", "cost": 18550, "mass": 0.5, "integrity": 20, "power": 0.2, "passive": 1, "speed": 1000, "rof": 10, "clip": 50, "ammo": 10000, "reload": 0, "burst": 4, "burstrof": 15 , "jitter": 1.5}
]
}

View File

@@ -1,9 +1,9 @@
{
"ws": [
{ "id": "0i", "edID": 128662525, "eddbID": 1232, "grp": "ws", "class": 0, "rating": "E", "cost": 13540, "mass": 1.3, "power": 0.2, "range": 2000, "time": 10 },
{ "id": "0h", "edID": 128662526, "eddbID": 1233, "grp": "ws", "class": 0, "rating": "D", "cost": 40630, "mass": 1.3, "power": 0.4, "range": 2500, "time": 10 },
{ "id": "0g", "edID": 128662527, "eddbID": 1234, "grp": "ws", "class": 0, "rating": "C", "cost": 121900, "mass": 1.3, "power": 0.8, "range": 3000, "time": 10 },
{ "id": "0f", "edID": 128662528, "eddbID": 1235, "grp": "ws", "class": 0, "rating": "B", "cost": 365700, "mass": 1.3, "power": 1.6, "range": 3500, "time": 10 },
{ "id": "0e", "edID": 128662529, "eddbID": 1236, "grp": "ws", "class": 0, "rating": "A", "cost": 1097100, "mass": 1.3, "power": 3.2, "range": 4000, "time": 10 }
{ "id": "0i", "edID": 128662525, "eddbID": 1232, "grp": "ws", "class": 0, "rating": "E", "cost": 13540, "mass": 1.3, "integrity": 32, "power": 0.2, "range": 2000, "time": 10 },
{ "id": "0h", "edID": 128662526, "eddbID": 1233, "grp": "ws", "class": 0, "rating": "D", "cost": 40630, "mass": 1.3, "integrity": 24, "power": 0.4, "range": 2500, "time": 10 },
{ "id": "0g", "edID": 128662527, "eddbID": 1234, "grp": "ws", "class": 0, "rating": "C", "cost": 121900, "mass": 1.3, "integrity": 40, "power": 0.8, "range": 3000, "time": 10 },
{ "id": "0f", "edID": 128662528, "eddbID": 1235, "grp": "ws", "class": 0, "rating": "B", "cost": 365700, "mass": 1.3, "integrity": 56, "power": 1.6, "range": 3500, "time": 10 },
{ "id": "0e", "edID": 128662529, "eddbID": 1236, "grp": "ws", "class": 0, "rating": "A", "cost": 1097100, "mass": 1.3, "integrity": 48, "power": 3.2, "range": 4000, "time": 10 }
]
}

View File

@@ -1,9 +1,9 @@
{
"kw": [
{ "id": "0n", "edID": 128662530, "eddbID": 1237, "grp": "kw", "class": 0, "rating": "E", "cost": 13540, "mass": 1.3, "power": 0.2, "range": 2000, "time": 10 },
{ "id": "0m", "edID": 128662531, "eddbID": 1238, "grp": "kw", "class": 0, "rating": "D", "cost": 40630, "mass": 1.3, "power": 0.4, "range": 2500, "time": 10 },
{ "id": "0l", "edID": 128662532, "eddbID": 1239, "grp": "kw", "class": 0, "rating": "C", "cost": 121900, "mass": 1.3, "power": 0.8, "range": 3000, "time": 10 },
{ "id": "0k", "edID": 128662533, "eddbID": 1240, "grp": "kw", "class": 0, "rating": "B", "cost": 365700, "mass": 1.3, "power": 1.6, "range": 3500, "time": 10 },
{ "id": "0j", "edID": 128662534, "eddbID": 1241, "grp": "kw", "class": 0, "rating": "A", "cost": 1097100, "mass": 1.3, "power": 3.2, "range": 4000, "time": 10 }
{ "id": "0n", "edID": 128662530, "eddbID": 1237, "grp": "kw", "class": 0, "rating": "E", "cost": 13540, "mass": 1.3, "integrity": 32, "power": 0.2, "range": 2000, "time": 10 },
{ "id": "0m", "edID": 128662531, "eddbID": 1238, "grp": "kw", "class": 0, "rating": "D", "cost": 40630, "mass": 1.3, "integrity": 24, "power": 0.4, "range": 2500, "time": 10 },
{ "id": "0l", "edID": 128662532, "eddbID": 1239, "grp": "kw", "class": 0, "rating": "C", "cost": 121900, "mass": 1.3, "integrity": 40, "power": 0.8, "range": 3000, "time": 10 },
{ "id": "0k", "edID": 128662533, "eddbID": 1240, "grp": "kw", "class": 0, "rating": "B", "cost": 365700, "mass": 1.3, "integrity": 56, "power": 1.6, "range": 3500, "time": 10 },
{ "id": "0j", "edID": 128662534, "eddbID": 1241, "grp": "kw", "class": 0, "rating": "A", "cost": 1097100, "mass": 1.3, "integrity": 48, "power": 3.2, "range": 4000, "time": 10 }
]
}

View File

@@ -1,7 +1,7 @@
{
"nl": [
{ "id": "2j", "edID": 128049500, "eddbID": 880, "grp": "nl", "class": 1, "rating": "I", "cost": 24260, "mass": 2, "integrity": 40, "power": 0.4, "mount": "F", "type": "ET", "armourpen": 60, "breachdps": 0, "breachmin": 0, "breachmax": 0, "dps": 44, "hps": 5, "rof": 1, "clip": 3, "ammo": 36, "reload": 2 },
{ "id": "2k", "edID": 128049501, "eddbID": 881, "grp": "nl", "class": 2, "rating": "I", "cost": 294080, "mass": 4, "integrity": 51, "power": 0.4, "mount": "F", "type": "ET", "armourpen": 60, "breachdps": 0, "breachmin": 0, "breachmax": 0, "dps": 44, "hps": 7.5, "rof": 1, "clip": 3, "ammo": 36, "reload": 2 },
{ "id": "2j", "edID": 128049500, "eddbID": 880, "grp": "nl", "class": 1, "rating": "I", "cost": 24260, "mass": 2, "integrity": 40, "power": 0.4, "mount": "F", "type": "ET", "armourpen": 60, "breachdps": 0, "breachmin": 0, "breachmax": 0, "dps": 44, "eps": 0, "hps": 5, "rof": 1, "clip": 3, "ammo": 36, "reload": 2 },
{ "id": "2k", "edID": 128049501, "eddbID": 881, "grp": "nl", "class": 2, "rating": "I", "cost": 294080, "mass": 4, "integrity": 51, "power": 0.4, "mount": "F", "type": "ET", "armourpen": 60, "breachdps": 0, "breachmin": 0, "breachmax": 0, "dps": 44, "eps": 0, "hps": 7.5, "rof": 1, "clip": 3, "ammo": 36, "reload": 2 },
{ "id": "kp", "edID": 128671448, "eddbID": 1523, "grp": "nl", "name":"Shock Mine Launcher", "class": 1, "rating": "I", "cost": 36400, "mass": 2, "integrity": 40, "power": 0.4, "mount": "F", "type": "ET", "armourpen": "C", "breachdps": 0, "breachmin": 0, "breachmax": 0, "dps": 32, "hps": 5, "rof": 1, "clip": 3, "ammo": 36, "reload": 2 }
]
}

View File

@@ -1,6 +1,6 @@
{
"mr": [
{ "id": "1z", "grp": "mr", "name": "Rocket Propelled FSD Disruptor", "class": 2, "rating": "B", "cost": 190227, "mass": 4, "power": 1.2, "mount": "F", "type": "?", "damage": 50, "armourpen": "?", "rof": 0.5, "dps": 0, "thermload": 0, "clip": 12, "ammo": 48, "mjdps": 0, "ssdam": 0, "missile": "D", "ammocost": 0 },
{ "id": "1z", "grp": "mr", "name": "Rocket Propelled FSD Disruptor", "class": 2, "rating": "B", "cost": 190227, "mass": 4, "power": 1.2, "integrity": 51, "mount": "F", "type": "E", "armourpen": 60, "rof": 0.5, "dps": 25, "eps": 0.12, "clip": 12, "ammo": 48, "missile": "D", "speed": 750, "breachdps": 0, "breachmin": 0, "breachmax": 0},
{ "id": "2f", "edID": 128666725, "eddbID": 1327, "grp": "mr", "class": 2, "rating": "B", "cost": 240400, "mass": 4, "integrity": 51, "power": 1.2, "mount": "F", "type": "E", "armourpen": 60, "breachdps": 0, "breachmin": 0, "breachmax": 0, "dps": 25, "eps": 0.12, "hps": 1.8, "clip": 12, "ammo": 48, "speed": 750, "reload": 5, "roundspershot": 1, "missile": "D" },
{ "id": "2g", "edID": 128049493, "eddbID": 879, "grp": "mr", "class": 2, "rating": "B", "cost": 512400, "mass": 4, "integrity": 51, "power": 1.2, "mount": "F", "type": "E", "armourpen": 60, "breachdps": 0, "breachmin": 0, "breachmax": 0, "dps": 13.3, "eps": 0.07, "hps": 1.08, "clip": 6, "ammo": 18, "speed": 625, "reload": 12, "roundspershot": 1, "missile": "S" },
@@ -8,6 +8,6 @@
{ "id": "2d", "edID": 128666724, "eddbID": 1326, "grp": "mr", "class": 1, "rating": "B", "cost": 32180, "mass": 2, "integrity": 40, "power": 0.4, "mount": "F", "type": "E", "armourpen": 60, "breachdps": 0, "breachmin": 0, "breachmax": 0, "dps": 25, "eps": 0.12, "hps": 1.8, "rof": 0.5, "clip": 8, "ammo": 16, "speed": 750, "reload": 5, "roundspershot": 1, "missile": "D" },
{ "id": "2e", "edID": 128049492, "eddbID": 878, "grp": "mr", "class": 1, "rating": "B", "cost": 72600, "mass": 2, "integrity": 40, "power": 0.6, "mount": "F", "type": "E", "armourpen": 60, "breachdps": 0, "breachmin": 0, "breachmax": 0, "dps": 13.3, "eps": 0.07, "hps": 1.08, "rof": 0.3, "clip": 6, "ammo": 6, "speed": 625, "reload": 12, "roundspershot": 1, "missile": "S" },
{ "id": "Ph", "edID": 128671344, "eddbID": 1480, "grp": "mr", "name": "Pack-Hound", "class": 2, "rating": "B", "cost": 768600, "mass": 4, "power": 1.2, "mount": "F", "type": "E", "damage": 3, "armourpen": "F", "rof": 0.5, "dps": 4, "thermload": 3, "clip": 12, "ammo": 120, "missile": "S", "pp": "Li Yong-Rui" }
{ "id": "Ph", "edID": 128671344, "eddbID": 1480, "grp": "mr", "name": "Pack-Hound", "class": 2, "rating": "B", "cost": 768600, "mass": 4, "power": 1.2, "mount": "F", "type": "E", "damage": 3, "armourpen": "F", "rof": 0.5, "dps": 4, "thermload": 3, "clip": 12, "ammo": 120, "missile": "S", "pp": "Li Yong-Rui", "breachdps": 0, "breachmin": 0, "breachmax": 0 }
]
}

View File

@@ -1,9 +1,9 @@
{
"sb": [
{ "id": "08", "edID": 128668532, "eddbID": 1368, "grp": "sb", "class": 0, "rating": "E", "cost": 10000, "mass": 0.5, "power": 0.2, "passive": 1, "shieldmul": 0.04 },
{ "id": "07", "edID": 128668533, "eddbID": 1369, "grp": "sb", "class": 0, "rating": "D", "cost": 23000, "mass": 1, "power": 0.5, "passive": 1, "shieldmul": 0.08 },
{ "id": "06", "edID": 128668534, "eddbID": 1370, "grp": "sb", "class": 0, "rating": "C", "cost": 53000, "mass": 2, "power": 0.7, "passive": 1, "shieldmul": 0.12 },
{ "id": "05", "edID": 128668535, "eddbID": 1371, "grp": "sb", "class": 0, "rating": "B", "cost": 122000, "mass": 3, "power": 1, "passive": 1, "shieldmul": 0.16 },
{ "id": "04", "edID": 128668536, "eddbID": 1372, "grp": "sb", "class": 0, "rating": "A", "cost": 281000, "mass": 3.5, "power": 1.2, "passive": 1, "shieldmul": 0.2 }
{ "id": "08", "edID": 128668532, "eddbID": 1368, "grp": "sb", "class": 0, "rating": "E", "cost": 10000, "mass": 0.5, "integrity": 25, "power": 0.2, "passive": 1, "shieldmul": 0.04 },
{ "id": "07", "edID": 128668533, "eddbID": 1369, "grp": "sb", "class": 0, "rating": "D", "cost": 23000, "mass": 1, "integrity": 35, "power": 0.5, "passive": 1, "shieldmul": 0.08 },
{ "id": "06", "edID": 128668534, "eddbID": 1370, "grp": "sb", "class": 0, "rating": "C", "cost": 53000, "mass": 2, "integrity": 40, "power": 0.7, "passive": 1, "shieldmul": 0.12 },
{ "id": "05", "edID": 128668535, "eddbID": 1371, "grp": "sb", "class": 0, "rating": "B", "cost": 122000, "mass": 3, "integrity": 45, "power": 1, "passive": 1, "shieldmul": 0.16 },
{ "id": "04", "edID": 128668536, "eddbID": 1372, "grp": "sb", "class": 0, "rating": "A", "cost": 281000, "mass": 3.5, "integrity": 48, "power": 1.2, "passive": 1, "shieldmul": 0.2 }
]
}
}