Merge pull request #91 from Sid127/uuids-fix

Engineering fix
This commit is contained in:
Felix Linker
2022-10-21 17:12:02 +02:00
committed by GitHub
2 changed files with 597 additions and 255 deletions

View File

@@ -126,7 +126,7 @@
0.03
]
},
"uuid": "fb33c5c9-24e4-48b5-8227-cc7b855572cd"
"uuid": "d5a539c5-120a-450f-bb68-e10abbeca8a9"
},
"2": {
"components": {
@@ -155,7 +155,7 @@
0.06
]
},
"uuid": "a9417081-356c-43d7-bf30-9cc1de0c62a1"
"uuid": "b6a80556-c22a-466e-931c-239c208c9890"
},
"3": {
"components": {
@@ -185,7 +185,7 @@
0.09
]
},
"uuid": "b93f110f-c467-4340-8496-9ea99332ef55"
"uuid": "cbec8003-80e4-455a-84fe-257d2018386e"
},
"4": {
"components": {
@@ -215,7 +215,7 @@
0.12
]
},
"uuid": "4b9c30c9-0acf-4b56-bce9-3fc65be95382"
"uuid": "3a57effa-ccac-448d-8d1c-3e0966042e24"
},
"5": {
"components": {
@@ -245,7 +245,7 @@
0.15
]
},
"uuid": "b97b8100-b8bb-4ef3-84bf-65f9b49eaa30"
"uuid": "89f5d8e2-4f4c-4ef0-9e74-9f0691244b22"
}
},
"id": 6,
@@ -783,7 +783,7 @@
-0.45
]
},
"uuid": "5ebd5d76-7bb8-4958-9cc3-f5e2176f2b5e"
"uuid": "d5a539c5-120a-450f-bb68-e10abbeca8a9"
},
"2": {
"components": {
@@ -800,7 +800,7 @@
-0.55
]
},
"uuid": "c49d42a8-cd8f-4576-9c60-85725f635185"
"uuid": "b6a80556-c22a-466e-931c-239c208c9890"
},
"3": {
"components": {
@@ -818,7 +818,7 @@
-0.65
]
},
"uuid": "bc048a95-b5aa-4f6c-a696-6c40b87a1606"
"uuid": "cbec8003-80e4-455a-84fe-257d2018386e"
},
"4": {
"components": {
@@ -836,7 +836,7 @@
-0.75
]
},
"uuid": "4f9467f7-0c5f-4ab3-856b-aaad019bd79d"
"uuid": "3a57effa-ccac-448d-8d1c-3e0966042e24"
},
"5": {
"components": {
@@ -854,7 +854,7 @@
-0.85
]
},
"uuid": "15d2a67d-71b5-405a-ba21-4f94583064a3"
"uuid": "89f5d8e2-4f4c-4ef0-9e74-9f0691244b22"
}
},
"id": 9,
@@ -890,7 +890,7 @@
0.3
]
},
"uuid": "9b714883-e0e7-46b5-a2bb-5367f2cc9b3f"
"uuid": "c952091e-30de-4b13-8e7e-c59aee4c1466"
},
"2": {
"components": {
@@ -907,7 +907,7 @@
0.6
]
},
"uuid": "9de3e096-fbfa-4694-a2e4-919494d39ee1"
"uuid": "5f868185-7351-49ec-95b4-87dab4d08e02"
},
"3": {
"components": {
@@ -925,7 +925,7 @@
0.9
]
},
"uuid": "4a5d7441-2543-4405-8587-9b969fffd3f2"
"uuid": "33e63006-29ae-4466-b240-7708ddd9804b"
},
"4": {
"components": {
@@ -943,7 +943,7 @@
1.2
]
},
"uuid": "f4b41ce9-d3a8-4362-9821-0d45f2b975bc"
"uuid": "5d0cb508-a654-4dc8-8e04-6cafac0ea86d"
},
"5": {
"components": {
@@ -961,7 +961,7 @@
1.5
]
},
"uuid": "d5d06450-a1cf-4dd2-b8f0-12d0142ad773"
"uuid": "06a5631b-036b-47ac-9d41-4c1728a5d34e"
}
},
"id": 10,
@@ -997,7 +997,7 @@
0.2
]
},
"uuid": "f3684224-dfb1-4b30-81df-827246ccce14"
"uuid": "ac3908c2-c5aa-44a1-a847-a9d27c34a326"
},
"2": {
"components": {
@@ -1014,7 +1014,7 @@
0.4
]
},
"uuid": "0fec52b1-3a81-4260-8168-7af698e9ebf3"
"uuid": "ee1ad091-7a25-44ac-b3e4-9ee5e4228483"
},
"3": {
"components": {
@@ -1032,7 +1032,7 @@
0.6
]
},
"uuid": "6ca69c4f-07b6-43e4-97c9-e9134cb1eaf4"
"uuid": "eddd7f16-035d-4e9e-96fc-bf82e9ce7397"
},
"4": {
"components": {
@@ -1050,7 +1050,7 @@
0.8
]
},
"uuid": "e6ebc222-ec93-4f0f-ac8a-e690ab50656d"
"uuid": "1fef7b64-bf77-4024-a9b4-24146d5cefe3"
},
"5": {
"components": {
@@ -1068,7 +1068,7 @@
1
]
},
"uuid": "b307db6f-a54c-49e9-be82-5a4458661fe1"
"uuid": "f6df4a5b-58f4-4854-843c-a99b2f106154"
}
},
"id": 11,
@@ -1136,7 +1136,7 @@
-0.45
]
},
"uuid": "40d015c8-e3c3-4e6c-8703-0e5dc0c0ca7a"
"uuid": "d5a539c5-120a-450f-bb68-e10abbeca8a9"
},
"2": {
"components": {
@@ -1153,7 +1153,7 @@
-0.55
]
},
"uuid": "4f4f23cf-fb43-4542-8d60-c96cf884c3c9"
"uuid": "b6a80556-c22a-466e-931c-239c208c9890"
},
"3": {
"components": {
@@ -1171,7 +1171,7 @@
-0.65
]
},
"uuid": "9c4ebeff-12e1-4f0e-a972-bb8d4d7e4f08"
"uuid": "cbec8003-80e4-455a-84fe-257d2018386e"
},
"4": {
"components": {
@@ -1189,7 +1189,7 @@
-0.75
]
},
"uuid": "befa7711-25fa-49d2-97fb-3f8a4cc8b91e"
"uuid": "3a57effa-ccac-448d-8d1c-3e0966042e24"
},
"5": {
"components": {
@@ -1207,7 +1207,7 @@
-0.85
]
},
"uuid": "d5c4d258-6597-4557-bc1b-b4afc7b59784"
"uuid": "89f5d8e2-4f4c-4ef0-9e74-9f0691244b22"
}
},
"id": 16,
@@ -2598,7 +2598,7 @@
-0.45
]
},
"uuid": "b4abda7b-ac4c-4ddf-ac76-f3d9640e217b"
"uuid": "d5a539c5-120a-450f-bb68-e10abbeca8a9"
},
"2": {
"components": {
@@ -2615,7 +2615,7 @@
-0.55
]
},
"uuid": "7bae1015-d4b9-4c33-8286-79c93386cf33"
"uuid": "b6a80556-c22a-466e-931c-239c208c9890"
},
"3": {
"components": {
@@ -2633,7 +2633,7 @@
-0.65
]
},
"uuid": "b69e0eb2-67c4-402a-8b4d-69d64c899fdc"
"uuid": "cbec8003-80e4-455a-84fe-257d2018386e"
},
"4": {
"components": {
@@ -2651,7 +2651,7 @@
-0.75
]
},
"uuid": "36d13200-4c1d-4d49-9936-af8562a6fbce"
"uuid": "3a57effa-ccac-448d-8d1c-3e0966042e24"
},
"5": {
"components": {
@@ -2669,7 +2669,7 @@
-0.85
]
},
"uuid": "e7ac0755-b319-4e35-b736-8235b68a1b09"
"uuid": "89f5d8e2-4f4c-4ef0-9e74-9f0691244b22"
}
},
"id": 31,
@@ -2889,7 +2889,7 @@
-0.45
]
},
"uuid": "3434789e-7555-4bca-a901-09ddbae0d323"
"uuid": "d5a539c5-120a-450f-bb68-e10abbeca8a9"
},
"2": {
"components": {
@@ -2906,7 +2906,7 @@
-0.55
]
},
"uuid": "c62a09da-8157-474e-8b8f-04b43792a372"
"uuid": "b6a80556-c22a-466e-931c-239c208c9890"
},
"3": {
"components": {
@@ -2924,7 +2924,7 @@
-0.65
]
},
"uuid": "ad0166b8-9313-4c7a-a95c-5e4b0e53fc40"
"uuid": "cbec8003-80e4-455a-84fe-257d2018386e"
},
"4": {
"components": {
@@ -2942,7 +2942,7 @@
-0.75
]
},
"uuid": "cf482f0a-de37-4fec-8bcd-f087203e0f2d"
"uuid": "3a57effa-ccac-448d-8d1c-3e0966042e24"
},
"5": {
"components": {
@@ -2960,7 +2960,7 @@
-0.85
]
},
"uuid": "80d2445b-47ef-4738-8729-152f45c732f9"
"uuid": "89f5d8e2-4f4c-4ef0-9e74-9f0691244b22"
}
},
"id": 34,
@@ -4978,7 +4978,7 @@
0.16
]
},
"uuid": "dd023cf4-0b4d-4d18-957f-4b1eecb71c0a"
"uuid": "05883145-2407-46a1-9eea-5a56ac549cfd"
},
"2": {
"components": {
@@ -5011,7 +5011,7 @@
0.23
]
},
"uuid": "cac790f3-9852-4673-a219-0f5e4dc6a0ad"
"uuid": "5822ff0c-fa6c-4072-95be-e2534f37be00"
},
"3": {
"components": {
@@ -5045,7 +5045,7 @@
0.3
]
},
"uuid": "cc5507e8-613b-4d43-a7fe-a874be963125"
"uuid": "d5040eac-fa75-4613-828d-ea71aefd9051"
},
"4": {
"components": {
@@ -5079,7 +5079,7 @@
0.37
]
},
"uuid": "34c9c5e5-8a42-4509-a22a-7313528263f2"
"uuid": "32c94fd6-71c3-461b-80ed-bfe1543f9651"
},
"5": {
"components": {
@@ -5113,7 +5113,7 @@
0.44
]
},
"uuid": "23d55bbf-af1c-46ac-b77b-214e70628fe2"
"uuid": "1b073867-c10f-474b-88d7-5fb6c602b838"
}
},
"id": 60,
@@ -5629,7 +5629,7 @@
-0.45
]
},
"uuid": "bb27a6b6-5c10-41e8-a6b3-3abc8a4ed23e"
"uuid": "d5a539c5-120a-450f-bb68-e10abbeca8a9"
},
"2": {
"components": {
@@ -5646,7 +5646,7 @@
-0.55
]
},
"uuid": "95af3c55-ec45-4f5d-848d-1639307fee41"
"uuid": "b6a80556-c22a-466e-931c-239c208c9890"
},
"3": {
"components": {
@@ -5664,7 +5664,7 @@
-0.65
]
},
"uuid": "a3b84b26-d67e-4d8c-9653-f23181cce9f8"
"uuid": "cbec8003-80e4-455a-84fe-257d2018386e"
},
"4": {
"components": {
@@ -5682,7 +5682,7 @@
-0.75
]
},
"uuid": "363a9543-4072-4211-8c89-8e9477fa72eb"
"uuid": "3a57effa-ccac-448d-8d1c-3e0966042e24"
},
"5": {
"components": {
@@ -5700,7 +5700,7 @@
-0.85
]
},
"uuid": "4de10a2c-e440-4b2e-95fb-e1121bff19a4"
"uuid": "89f5d8e2-4f4c-4ef0-9e74-9f0691244b22"
}
},
"id": 65,
@@ -6143,7 +6143,7 @@
0.24
]
},
"uuid": "1b566f8d-56ef-4b11-bb06-1fd9c603ab1c"
"uuid": "2689c846-02d7-4694-97f1-85cd5437b42f"
},
"2": {
"components": {
@@ -6164,7 +6164,7 @@
0.48
]
},
"uuid": "9371ee9f-12a1-4859-9b97-e3c3c87ee0a0"
"uuid": "c2160767-b03f-491e-9a45-31976fb78899"
},
"3": {
"components": {
@@ -6186,7 +6186,7 @@
0.72
]
},
"uuid": "317bbfd2-7b05-4f7a-b6ca-55e0a7d3f147"
"uuid": "4d9ccdb6-89cc-4f27-a8c8-584de68dae4b"
},
"4": {
"components": {
@@ -6208,7 +6208,7 @@
0.96
]
},
"uuid": "5e3ac270-69ef-4301-9e86-8c9cbc5ada89"
"uuid": "0ecb3bee-4033-4937-a5ed-161f50cb6024"
},
"5": {
"components": {
@@ -6230,7 +6230,7 @@
1.2
]
},
"uuid": "993b050e-b308-4010-8ba6-58e08483793d"
"uuid": "8ec2cbd4-b944-448b-b230-d9de87aea5b8"
}
},
"id": 104,
@@ -6805,7 +6805,7 @@
0.5
]
},
"uuid": "ea7dfe28-95d0-4939-bcf2-282dbed7d80f\n"
"uuid": "ea7dfe28-95d0-4939-bcf2-282dbed7d80f"
}
},
"id": 93,
@@ -9275,123 +9275,6 @@
],
"name": "Overcharged"
},
"Weapon_Overcharged": {
"fdname": "Weapon_Overcharged",
"grades": {
"1": {
"components": {
"Nickel": 1
},
"features": {
"damage": [
0,
0.3
],
"distdraw": [
0.15,
0.15
],
"thermload": [
0.03,
0.03
]
},
"uuid": "e917ebe3-d5f1-4016-b8a9-2c759e16a7d4"
},
"2": {
"components": {
"Conductive Components": 1,
"Nickel": 1
},
"features": {
"damage": [
0.3,
0.4
],
"distdraw": [
0.2,
0.2
],
"thermload": [
0.06,
0.06
]
},
"uuid": "f5921fc1-fb10-4d2f-8e0a-cd8d8e9e3a84"
},
"3": {
"components": {
"Conductive Components": 1,
"Electrochemical Arrays": 1,
"Nickel": 1
},
"features": {
"damage": [
0.4,
0.5
],
"distdraw": [
0.25,
0.25
],
"thermload": [
0.09,
0.09
]
},
"uuid": "4389883f-c2b3-4487-9b1a-b668a761057a"
},
"4": {
"components": {
"Conductive Ceramics": 1,
"Polymer Capacitors": 1,
"Zinc": 1
},
"features": {
"damage": [
0.5,
0.6
],
"distdraw": [
0.3,
0.3
],
"thermload": [
0.12,
0.12
]
},
"uuid": "25ec26dd-63b8-4e83-9a6e-86e5b80c4771"
},
"5": {
"components": {
"Conductive Polymers": 1,
"Modified Embedded Firmware": 1,
"Zirconium": 1
},
"features": {
"damage": [
0.6,
0.7
],
"distdraw": [
0.35,
0.35
],
"thermload": [
0.15,
0.15
]
},
"uuid": "4dcf6bdc-bcff-448a-92a0-7612de548db7"
}
},
"id": 103,
"modulename": [
"Weapon"
],
"name": "Overcharged"
},
"Weapon_RapidFire": {
"fdname": "Weapon_RapidFire",
"grades": {

File diff suppressed because it is too large Load Diff