diff --git a/demo-missions/skynet-iads-compiled.lua b/demo-missions/skynet-iads-compiled.lua index 0108cd5..60c008d 100644 --- a/demo-missions/skynet-iads-compiled.lua +++ b/demo-missions/skynet-iads-compiled.lua @@ -1,7 +1,35 @@ -env.info("--- SKYNET VERSION: 2.2.0 | BUILD TIME: 28.07.2021 1023Z ---") +env.info("--- SKYNET VERSION: 2.3.0 | BUILD TIME: 18.10.2021 1046Z ---") do --this file contains the required units per sam type samTypesDB = { + + ['S-200'] = { + ['type'] = 'complex', + ['searchRadar'] = { + ['RLS_19J6'] = { + ['name'] = { + ['NATO'] = 'Tin Shield', + }, + }, + }, + ['EWR P-37 BAR LOCK'] = { + ['Name'] = { + ['NATO'] = "Bar lock", + }, + }, + ['trackingRadar'] = { + ['RPC_5N62V'] = { + }, + }, + ['launchers'] = { + ['S-200_Launcher'] = { + }, + }, + ['name'] = { + ['NATO'] = 'SA-5 Gammon', + }, + ['harm_detection_chance'] = 60 + }, ['S-300'] = { ['type'] = 'complex', ['searchRadar'] = { diff --git a/demo-missions/skynet-test-persian-gulf -stress-test.miz b/demo-missions/skynet-test-persian-gulf -stress-test.miz index 6b268cb..5830ea2 100644 Binary files a/demo-missions/skynet-test-persian-gulf -stress-test.miz and b/demo-missions/skynet-test-persian-gulf -stress-test.miz differ diff --git a/demo-missions/skynet-test-persian-gulf.miz b/demo-missions/skynet-test-persian-gulf.miz index 523f0ea..4d7cd72 100644 Binary files a/demo-missions/skynet-test-persian-gulf.miz and b/demo-missions/skynet-test-persian-gulf.miz differ diff --git a/skynet-iads-source/skynet-iads-supported-types.lua b/skynet-iads-source/skynet-iads-supported-types.lua index 768dec1..ad3d981 100644 --- a/skynet-iads-source/skynet-iads-supported-types.lua +++ b/skynet-iads-source/skynet-iads-supported-types.lua @@ -1,6 +1,34 @@ do --this file contains the required units per sam type samTypesDB = { + + ['S-200'] = { + ['type'] = 'complex', + ['searchRadar'] = { + ['RLS_19J6'] = { + ['name'] = { + ['NATO'] = 'Tin Shield', + }, + }, + }, + ['EWR P-37 BAR LOCK'] = { + ['Name'] = { + ['NATO'] = "Bar lock", + }, + }, + ['trackingRadar'] = { + ['RPC_5N62V'] = { + }, + }, + ['launchers'] = { + ['S-200_Launcher'] = { + }, + }, + ['name'] = { + ['NATO'] = 'SA-5 Gammon', + }, + ['harm_detection_chance'] = 60 + }, ['S-300'] = { ['type'] = 'complex', ['searchRadar'] = { diff --git a/unit-tests/highdigitsams/highdigitsams-unit-tests.miz b/unit-tests/highdigitsams/highdigitsams-unit-tests.miz index ffaf367..0b64c00 100644 Binary files a/unit-tests/highdigitsams/highdigitsams-unit-tests.miz and b/unit-tests/highdigitsams/highdigitsams-unit-tests.miz differ diff --git a/unit-tests/skynet-unit-tests.lua b/unit-tests/skynet-unit-tests.lua index 1dd8b4b..8f578a2 100644 --- a/unit-tests/skynet-unit-tests.lua +++ b/unit-tests/skynet-unit-tests.lua @@ -2,7 +2,7 @@ do ---IADS Unit Tests SKYNET_UNIT_TESTS_NUM_EW_SITES_RED = 18 -SKYNET_UNIT_TESTS_NUM_SAM_SITES_RED = 15 +SKYNET_UNIT_TESTS_NUM_SAM_SITES_RED = 16 --factory method used in multiple unit tests function IADSContactFactory(unitName) diff --git a/unit-tests/skynet-unit-tests.miz b/unit-tests/skynet-unit-tests.miz index dc301c3..3b2eb59 100644 Binary files a/unit-tests/skynet-unit-tests.miz and b/unit-tests/skynet-unit-tests.miz differ diff --git a/unit-tests/test-skynet-iads-abstract-radar-element.lua b/unit-tests/test-skynet-iads-abstract-radar-element.lua index b25cd4e..72d0953 100644 --- a/unit-tests/test-skynet-iads-abstract-radar-element.lua +++ b/unit-tests/test-skynet-iads-abstract-radar-element.lua @@ -2053,6 +2053,21 @@ Launcher: lu.assertEquals(mist.utils.round(self.samSite:getRadars()[1]:getMaxRangeFindingTarget()), mist.utils.round(10090.756835938)) end +function TestSkynetIADSAbstractRadarElement:testSA5() + self.samSiteName = "SAM-SA-5" + self:setUp() + lu.assertEquals(self.samSite:getNatoName(), "SA-5") + local searchRadar = self.samSite:getSearchRadars()[1] + lu.assertEquals(searchRadar:getMaxRangeFindingTarget(), 100311.046875) + local trackingRadar = self.samSite:getTrackingRadars()[1] + lu.assertEquals(trackingRadar:getMaxRangeFindingTarget(), 100311.046875) + lu.assertEquals(self.samSite:getLaunchers()[1]:getRange(), 240000) + lu.assertEquals(self.samSite:getLaunchers()[1]:getInitialNumberOfMissiles(), 1) + +-- lu.assertEquals(self.samSite:getLaunchers()[2]:getRange(), 61000) + --lu.assertEquals(self.samSite:getLaunchers()[2]:getInitialNumberOfMissiles(), 6) +end + --[[ function TestSkynetIADSAbstractRadarElement:testCallMethodOnTableElements() local test = {}